Attachment 32301 Details for Bug 12732 – Bug 12732 - Sort late orders by basket creation or closing date

Bug 12732 - Sort late orders by basket creation or closing date

Bug-12732---Sort-late-orders-by-basket-creation-or.patch (text/plain), 3.07 KB, created by simith.doliveira on 2014-10-14 13:16:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: simith.doliveira

Created: 2014-10-14 13:16:56 UTC

Size: 3.07 KB

patch

obsolete

>From a500c147fbd0e6f508715f965f5c867954cf35d6 Mon Sep 17 00:00:00 2001
>From: simith <simith@inlibro.com>
>Date: Tue, 14 Oct 2014 09:14:50 -0400
>Subject: [PATCH] Bug 12732 - Sort late orders by basket creation or closing
> date
>
>---
> installer/data/mysql/updatedatabase.pl                             | 7 +++++++
> koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt        | 6 +++++-
> .../prog/en/modules/admin/preferences/acquisitions.pref            | 7 ++++---
> 3 files changed, 16 insertions(+), 4 deletions(-)
>
>diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
>index d6b7d24..32946e1 100755
>--- a/installer/data/mysql/updatedatabase.pl
>+++ b/installer/data/mysql/updatedatabase.pl
>@@ -8800,6 +8800,13 @@ if ( CheckVersion($DBversion) ) {
>     SetVersion($DBversion);
> }
> 
>+$DBversion = 'XXX';
>+if ( CheckVersion($DBversion) ) {
>+    $dbh->do("
>+        INSERT INTO systempreferences (variable,value,explanation,type) VALUES ('AcqLateOrderUseCreationDate',  'closing',  'creation|closing',  'Change late order default sort.', 'Choice')");
>+    print "Upgrade to $DBversion done (Bug 12732 - Sort late orders by basket creation or closing date)\n";
>+    SetVersion($DBversion);
>+}
> 
> =head1 FUNCTIONS
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
>index a1a3947..03ef411 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
>@@ -111,7 +111,11 @@ $(document).ready(function() {
>             [% ELSE %]
>                 <th></th>
>             [% END %]
>-            <th class="title-string">Order [% lateOrderSort %] date</th>
>+            [% IF ( lateOrderSort == "creation") %]
>+                <th class="title-string">Order creation date</th>
>+            [% ELSE %]
>+                <th class="title-string">Order closing date</th>
>+            [% END %]
>             <th class="title-string">Estimated delivery date</th>
>             <th>Vendor</th>
>             <th class="anti-the">Information</th>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref
>index d8af93a..298d76d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref
>@@ -61,11 +61,12 @@ Acquisitions:
>             - "You can use the following fields: price, quantity, budget_code, discount, sort1, sort2"
>             - "<br/>For example:<br/>price: 947$a|947$c<br/>quantity: 969$h<br/>budget_code: 922$a"
>         -
>+            - Use
>             - pref: AcqLateOrderUseCreationDate
>               choices:
>-                  creation: Do
>-                  closing: Don't
>-            - Use the creation date of the basket to sort late order.
>+                  creation: creation date
>+                  closing: closing date
>+            - of the basket to sort late order.
> 
>     Printing:
>         -
>-- 
>1.9.1

Actions: View

Attachments on bug 12732: 30592 | 30794 | 31064 | 32298 | 32301 | 32303 | 58232 | 58233 | 153617 | 153618 | 154633 | 156280 | 156291 | 156292