From 40a4d693ebf2b08a05030f19ebc5a664c04bf596 Mon Sep 17 00:00:00 2001
From: Kyle M Hall <kyle@bywatersolutions.com>
Date: Tue, 5 Nov 2013 11:31:20 -0500
Subject: [PATCH] [SIGNED-OFF] Bug 11203 - Datatables in acqusitions do not
 ignore "stopwords" in titles
Content-Type: text/plain; charset="utf-8"

Sorting by the "summary" column does not produce the preferred results.
Title beginning with 'a', 'an', or 'the' are sorted using those
articles.

Test plan:
1) Place an order for 2 items with the titles "Alpha" and "The Alpha",
   along with some other records with titles starting with something
   between 'a' and 't', and 't' and 'z'
2) Sort the "pending orders" table, note the incorrect sorting
3) Receive all the items
4) Sort the "already received" table, note the incorrect sorting
5) Apply the patch
6) Repeat steps 1-4, note the corrected sorting
7) Check acqui/basket.pl for correct sorting
8) Check acqui/invoice.pl for correct sorting

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
---
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt  | 9 +++++----
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt | 7 +++++--
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt  | 4 ++--
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
index 9ab28be..24677ca 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
@@ -92,11 +92,12 @@
         var orderst = $("#orders").dataTable($.extend(true, {}, dataTablesDefaults, {
             "sPaginationType": "four_button",
             [% IF ( active ) %]
-              [% UNLESS ( closedate ) %]
                 "aoColumnDefs": [
-                    { "aTargets": [ -1, -2 ], "bSortable": false, "bSearchable": false },
+                    [% UNLESS ( closedate ) %]
+                        { "aTargets": [ -1, -2 ], "bSortable": false, "bSearchable": false },
+                    [% END %]
+                    { "sType": "anti-the", "aTargets": [ "anti-the" ] }
                 ],
-              [% END %]
             [% END %]
         } ) );
         var cancelledorderst = $("#cancelledorderst").dataTable($.extend(true, {}, dataTablesDefaults, {
@@ -391,7 +392,7 @@
                 <thead>
                     <tr>
                         <th>No.</th>
-                        <th>Order</th>
+                        <th class="anti-the">Order</th>
                         <th class="gste">RRP tax exc.</th>
                         <th class="gste">ecost tax exc.</th>
                         <th class="gsti">RRP tax inc.</th>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt
index 59e20f9..e620e5c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt
@@ -27,7 +27,10 @@
             bInfo: false,
             bPaginate: false,
             bFilter: false,
-            sDom: "t"
+            sDom: "t",
+            "aoColumnDefs": [
+                { "sType": "anti-the", "aTargets": [ "anti-the" ] }
+            ]
         }));
 [% IF ( (Koha.Preference('AcqEnableFiles')) && files ) %]
         $("#invoice_files_table").dataTable($.extend(true, {}, dataTablesDefaults, {
@@ -131,7 +134,7 @@
           <table id="orderst">
             <thead>
               <tr>
-                <th>Summary</th>
+                <th class="anti-the">Summary</th>
                 <th>Library</th>
                 <th class="gste">Actual cost tax exc.</th>
                 <th class="gsti">Actual cost tax inc.</th>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
index 05de288..f705694 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
@@ -32,7 +32,7 @@
                 { "sType": "html" },
                 { "sType": "html" },
                 { "sType": "num-html" },
-                { "sType": "html" },
+                { "sType": "anti-the" },
                 null,
                 null,
                 null,
@@ -76,7 +76,7 @@
                 { "sType": "html" },
                 { "sType": "html" },
                 { "sType": "num-html" },
-                null,
+                { "sType": "anti-the" },
                 null,
                 null,
                 null,
-- 
2.1.4