Attachment 34940 Details for Bug 11708 – Bug 11708: All basketgroups on one page - several fixes

[patch] Bug 11708: All basketgroups on one page - several fixes

Bug-11708-All-basketgroups-on-one-page---several-f.patch (text/plain), 6.89 KB, created by Jonathan Druart on 2015-01-05 09:23:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2015-01-05 09:23:08 UTC

Size: 6.89 KB

patch

obsolete

>From a1b5e17791a6c223c340f00530d7500bdb28cc94 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] 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 44f872e..fb0dab9 100755
>--- a/installer/data/mysql/updatedatabase.pl
>+++ b/installer/data/mysql/updatedatabase.pl
>@@ -9662,7 +9662,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 d38c463..0ce5274 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="[% themelang %]/lib/yui/utilities/utilities.js"></script>
> <script type="text/javascript" src="[% themelang %]/lib/yui/button/button-min.js"></script>
> <script type="text/javascript" src="[% themelang %]/lib/yui/container/container_core-min.js"></script>
>@@ -157,12 +157,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>
> 
>@@ -339,7 +339,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>
>@@ -370,8 +370,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>
>@@ -430,8 +430,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>
>-- 
>2.1.0

Actions: View | Diff | Splinter Review

Attachments on bug 11708: 25115 | 25116 | 25117 | 26003 | 26004 | 26006 | 28868 | 28869 | 28870 | 28871 | 28872 | 31305 | 31306 | 31307 | 31308 | 31309 | 31530 | 31531 | 31532 | 31533 | 31534 | 31535 | 31536 | 31537 | 31538 | 31539 | 31540 | 31541 | 31542 | 31543 | 31544 | 31702 | 31703 | 31704 | 31705 | 31748 | 31749 | 31750 | 31751 | 31752 | 31753 | 32909 | 32910 | 32911 | 32912 | 32913 | 32914 | 33308 | 33309 | 33310 | 33311 | 33312 | 33313 | 34936 | 34937 | 34938 | 34939 | 34940 | 34941 | 34977 | 35748 | 35749 | 35750 | 35751 | 35752 | 35753 | 35754 | 35755 | 35756 | 35971 | 35972 | 35973 | 35974 | 35975 | 35976 | 35977 | 35978 | 35979 | 40260 | 40261 | 40262 | 40263 | 40264 | 40265 | 40266 | 40267 | 40268 | 40272 | 48992 | 48993 | 48994 | 48995 | 48996 | 52417 | 52418 | 52419 | 52420 | 52421 | 55277 | 55278 | 55279 | 58770 | 58771 | 58772 | 58773 | 58774 | 58775 | 58776 | 58777 | 58778 | 59301 | 59302 | 59303 | 59304 | 59305 | 59306 | 59307 | 59308 | 59309 | 61018 | 61019 | 61020 | 61021 | 61022 | 61023 | 61024 | 61025 | 61026 | 71260 | 71261 | 71262 | 71263 | 71264 | 71265 | 71266 | 71267 | 71268 | 72069 | 72070 | 72071 | 72072 | 72073 | 72074 | 72075 | 72076 | 72077 | 72691 | 72692 | 72693 | 72694 | 72695 | 72696 | 72697 | 72698 | 72699 | 74213 | 74214 | 74215 | 74216 | 74217 | 74218 | 74219 | 74220 | 74221 | 74222 | 74302 | 74303 | 74304 | 74305 | 74306 | 74307 | 74308 | 74309 | 74310 | 74311 | 74349 | 74350 | 74351 | 74352 | 74353 | 74354 | 74355 | 74356 | 74357 | 74358 | 75003 | 75004 | 75908 | 75909 | 78662 | 78663 | 78664 | 80697 | 80698 | 80699 | 80700 | 80979 | 80980 | 80981 | 80982 | 85786 | 85787 | 91285 | 91286 | 92378 | 92379 | 92380 | 92381 | 92382 | 93460 | 93461 | 93462 | 93463 | 93464 | 93482 | 93483 | 93484 | 93485 | 93487 | 104928 | 104929 | 104930 | 104931 | 104932 | 104933 | 104934 | 104935