From 7f62009c8824e029f5da6b9dae4cff94ec22dd8b Mon Sep 17 00:00:00 2001
From: Julian Maurice <julian.maurice@biblibre.com>
Date: Mon, 16 Jun 2014 16:44:50 +0200
Subject: [PATCH 5/6] 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.

Signed-off-by: Paola Rossi <paola.rossi@cineca.it>
---
 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 c235570..51dab30 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -8782,7 +8782,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 @@
 	<li><a href="/cgi-bin/koha/acqui/lateorders.pl">Late orders</a></li>
 	[% IF ( suggestion ) %]<li><a href="/cgi-bin/koha/suggestion/suggestion.pl">Suggestions</a></li>[% ELSE %][% END %]
     <li><a href="/cgi-bin/koha/acqui/invoices.pl">Invoices</a></li>
-    <li><a href="/cgi-bin/koha/acqui/basketgroup.pl">Basket groups</a></li>
+    [% IF ( CAN_user_acquisition_group_manage ) %]
+      <li><a href="/cgi-bin/koha/acqui/basketgroup.pl">Basket groups</a></li>
+    [% END %]
     [% IF ( CAN_user_acquisition_budget_manage ) %]
     <li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a></li>
     <li><a href="/cgi-bin/koha/admin/aqbudgets.pl">Funds</a></li>
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 fa15e3d..eec68d0 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 %]
-  <title>Koha &rsaquo; Basket grouping for [% booksellername |html %]</title>
+  <title>Koha &rsaquo; Basket groups for [% booksellername |html %]</title>
 [% ELSE %]
-  <title>Koha &rsaquo; Basket grouping</title>
+  <title>Koha &rsaquo; Basket groups</title>
 [% END %]
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
 [% INCLUDE 'doc-head-close.inc' %]
 [% INCLUDE 'datatables.inc' %]
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.columnFilter.js"></script>
+<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.dataTables.columnFilter.js"></script>
 <script type="text/javascript" src="[% yuipath %]/utilities/utilities.js"></script>
 <script type="text/javascript" src="[% yuipath %]/button/button-min.js"></script>
 <script type="text/javascript" src="[% yuipath %]/container/container_core-min.js"></script>
@@ -158,12 +158,12 @@ function submitForm(form) {
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo;
 [% IF ( grouping ) %]
-    <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername |html %]</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid %]">Basket grouping</a> &rsaquo; Add basket group for [% booksellername |html %]
+    <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername |html %]</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid %]">Basket groups</a> &rsaquo; Add basket group for [% booksellername |html %]
 [% ELSE %]
   [% IF (booksellerid) %]
     <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername |html %]</a> &rsaquo;
   [% END %]
-  Basket grouping
+  Basket groups
 [% END %]
 </div>
 
@@ -340,7 +340,7 @@ function submitForm(form) {
                     [% END %]
                     [% FOREACH bookseller IN booksellers %]
                         [% IF bookseller.basketgroups.size > 0 %]
-                            <h1>Basket grouping for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername |html %]</a></h1>
+                            <h1>Basket groups for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% bookseller.id %]">[% bookseller.name |html %]</a></h1>
                             <div class="basket_groups toptabs">
                                 <ul class="ui-tabs-nav">
                                     [% UNLESS ( listclosed ) %]<li class="ui-tabs-active"><a href="#opened[% bookseller.id %]">Open</a></li>
@@ -371,8 +371,8 @@ function submitForm(form) {
                                                 <th>No. of baskets</th>
                                                 <th>No. of ordered titles</th>
                                                 <th>No. of received titles</th>
-                                                <th>Ordered amount</th>
-                                                <th>Charged amount</th>
+                                                <th>Amount ordered</th>
+                                                <th>Amount spent</th>
                                                 <th>Action</th>
                                             </tr>
                                         </thead>
@@ -431,8 +431,8 @@ function submitForm(form) {
                                                 <th>No. of baskets</th>
                                                 <th>No. of ordered titles</th>
                                                 <th>No. of received titles</th>
-                                                <th>Ordered amount</th>
-                                                <th>Charged amount</th>
+                                                <th>Amount ordered</th>
+                                                <th>Amount spent</th>
                                                 <th>Action</th>
                                             </tr>
                                         </thead>
-- 
1.7.10.4