@@ -, +, @@
---
installer/data/mysql/updatedatabase.pl | 2 +-
.../prog/en/includes/acquisitions-menu.inc | 4 +++-
.../prog/en/modules/acqui/basketgroup.tt | 20 ++++++++++----------
3 files changed, 14 insertions(+), 12 deletions(-)
--- installer/data/mysql/updatedatabase.pl
+++ installer/data/mysql/updatedatabase.pl
@@ -8757,7 +8757,7 @@ if (CheckVersion($DBversion)) {
ALTER TABLE aqbasketgroups
ADD COLUMN closeddate DATE DEFAULT NULL AFTER closed
|);
- print "Upgrade to $DBversion done (Bug XXXXX: Add aqbasketgroups.closeddate)\n";
+ print "Upgrade to $DBversion done (Bug 11708: Add aqbasketgroups.closeddate)\n";
SetVersion($DBversion);
}
--- koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc
+++ koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc
@@ -2,7 +2,9 @@
Late orders
[% IF ( suggestion ) %]Suggestions [% ELSE %][% END %]
Invoices
- Basket groups
+ [% IF ( CAN_user_acquisition_group_manage ) %]
+ Basket groups
+ [% END %]
[% IF ( CAN_user_acquisition_budget_manage ) %]
Budgets
Funds
--- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
+++ koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
@@ -2,14 +2,14 @@
[% USE KohaDates %]
[% INCLUDE 'doc-head-open.inc' %]
[% IF booksellerid %]
- Koha › Basket grouping for [% booksellername |html %]
+ Koha › Basket groups for [% booksellername |html %]
[% ELSE %]
- Koha › Basket grouping
+ Koha › Basket groups
[% END %]
[% INCLUDE 'doc-head-close.inc' %]
[% INCLUDE 'datatables.inc' %]
-
+
@@ -158,12 +158,12 @@ function submitForm(form) {
@@ -340,7 +340,7 @@ function submitForm(form) {
[% END %]
[% FOREACH bookseller IN booksellers %]
[% IF bookseller.basketgroups.size > 0 %]
-
+
[% UNLESS ( listclosed ) %]Open
@@ -371,8 +371,8 @@ function submitForm(form) {
No. of baskets
No. of ordered titles
No. of received titles
- Ordered amount
- Charged amount
+ Amount ordered
+ Amount spent
Action
@@ -431,8 +431,8 @@ function submitForm(form) {
No. of baskets
No. of ordered titles
No. of received titles
- Ordered amount
- Charged amount
+ Amount ordered
+ Amount spent
Action
--