From 632b1193bba1ac8bdb19c0d4c2f5b8e048faff21 Mon Sep 17 00:00:00 2001
From: David Bourgault <david.bourgault@inlibro.com>
Date: Mon, 25 Sep 2017 15:30:50 -0400
Subject: [PATCH] Bug 12502 - Add ordernumber and ISBN to late order

Adds ordernumber as 2nd column and ISBN as last

Followed test plan and patch worked as described. Also ran QA test tools
and all modified files passed

Signed-off-by: Alex Buckley <alexbuckley@catalyst.net.nz>
---
 C4/Acquisition.pm                                           |  3 ++-
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt | 10 ++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm
index ea13caf..62cb1ba 100644
--- a/C4/Acquisition.pm
+++ b/C4/Acquisition.pm
@@ -2131,7 +2131,7 @@ sub GetLateOrders {
     my @query_params = ();
     my $select = "
     SELECT aqbasket.basketno,
-        aqorders.ordernumber,
+        aqorders.ordernumber      AS ordernumber,
         DATE(aqbasket.closedate)  AS orderdate,
         aqbasket.basketname       AS basketname,
         aqbasket.basketgroupid    AS basketgroupid,
@@ -2149,6 +2149,7 @@ sub GetLateOrders {
         biblio.author, biblio.title,
         biblioitems.publishercode AS publisher,
         biblioitems.publicationyear,
+        biblioitems.isbn          AS isbn,
         ADDDATE(aqbasket.closedate, INTERVAL aqbooksellers.deliverytime DAY) AS estimateddeliverydate,
     ";
     my $from = "
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 d838834..a545c32 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
@@ -139,6 +139,7 @@ $(document).ready(function() {
             [% ELSE %]
                 <th></th>
             [% END %]
+            <th>Order No.</th>
             <th class="title-string">Order date</th>
             <th class="title-string">Estimated delivery date</th>
             <th>Vendor</th>
@@ -152,6 +153,7 @@ $(document).ready(function() {
             <th class="title-string">Claimed date</th>
             <th>Internal note</th>
             <th>Vendor note</th>
+            <th>ISBN</th>
         </tr>
       </thead>
       <tbody>
@@ -161,6 +163,9 @@ $(document).ready(function() {
                 <input type="checkbox" value="[% lateorder.ordernumber %]" data-booksellerid="[% lateorder.supplierid %]" name="ordernumber">
             </td>
             <td>
+                [% lateorder.ordernumber %]
+            </td>
+            <td>
                 <span title="[% lateorder.orderdate %]">[% lateorder.orderdate | $KohaDates %] ([% lateorder.latesince %] days)</span>
             </td>
             <td>
@@ -218,14 +223,15 @@ $(document).ready(function() {
             </td>
             <td><input name="internalnote" id="internalnote" type="text" value="[% lateorder.internalnote %]"></td>
             <td><input name="vendornote" id="vendornote" type="text" value="[% lateorder.vendornote %]"></td>
+            <td>[% lateorder.isbn %]</td>
         </tr>
       [% END %]
       </tbody>
       <tfoot>
         <tr>
-            <th colspan="5">Total</th>
+            <th colspan="6">Total</th>
             <th>[% total %]</th>
-            <th colspan="8">&nbsp;</th>
+            <th colspan="9">&nbsp;</th>
         </tr>
       </tfoot>
     </table>
-- 
2.1.4