From ee83cb77ec98b687cddf06395f4d1b62b2253b7b Mon Sep 17 00:00:00 2001 From: Julian Maurice Date: Mon, 16 Jun 2014 16:44:50 +0200 Subject: [PATCH] Bug 11708: All basketgroups on one page - several fixes 1/ Change wording from "Basket grouping" to "Basket groups" 2/ Display vendor name in front of "Baskets group for" 3/ Change wording from "Charged amount" to "Amount spent" 4/ Change wording from "Ordered amount" to "Amount ordered" 5/ Add bug number in updatedatabase.pl 6/ Show "Basket groups" link in menu only if user have group_manage permission. --- 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(-) diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index ac31f53..c9b0c59 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -8897,7 +8897,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); } diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc index 20a7ad8..990466f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc +++ b/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
    • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt index 6a993f7..c492c98 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt +++ b/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' %] - + @@ -157,12 +157,12 @@ function submitForm(form) { @@ -339,7 +339,7 @@ function submitForm(form) { [% END %] [% FOREACH bookseller IN booksellers %] [% IF bookseller.basketgroups.size > 0 %] -

    Basket grouping for [% booksellername |html %]

    +

    Basket groups for [% bookseller.name |html %]