From 10d8a789f9b81ed94ddb154596e23de78173fc1d Mon Sep 17 00:00:00 2001 From: Amit Gupta Date: Tue, 13 Aug 2013 10:46:16 +0530 Subject: [PATCH] [SIGNED-OFF] Bug 10531 - Basket name and PO number on receipt screen Content-Type: text/plain; charset="utf-8" To list the basket name or PO number on the receipt screen to identify the lot that you are receiving Test Plan: 1) Create an basket 2) Create an order 3) Click on Receive shipment button enter vendor invoice no and shipment date click on Next button. 4) Basket name and Purchase order number will display both in pending and already receive screen. Signed-off-by: Owen Leonard Two minor edits on signoff: Changed "basketname" to "basket name," and converted tabs to spaces on added lines. --- C4/Acquisition.pm | 3 ++- .../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 16 ++++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm index 74aae85..41d4b72 100644 --- a/C4/Acquisition.pm +++ b/C4/Acquisition.pm @@ -2366,9 +2366,10 @@ sub GetInvoiceDetails { my $invoice = $sth->fetchrow_hashref; $query = qq{ - SELECT aqorders.*, biblio.* + SELECT aqorders.*, biblio.*, aqbasket.* FROM aqorders LEFT JOIN biblio ON aqorders.biblionumber = biblio.biblionumber + LEFT JOIN aqbasket ON aqorders.basketno = aqbasket.basketno WHERE invoiceid = ? }; $sth = $dbh->prepare($query); 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 10382cb..582467a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt @@ -20,7 +20,7 @@ "iCookieDuration": 60*60*24*1000, // 1000 days "aLengthMenu": [[10, 25, 50, 100, -1], [10, 25, 50, 100, "All"]], "aoColumnDefs": [ - { "aTargets": [ 3, 8, 9 ], "bSortable": false, "bSearchable": false }, + { "aTargets": [ 5, 10, 11 ], "bSortable": false, "bSearchable": false }, ], "aoColumns": [ { "sType": "num-html" }, @@ -178,6 +178,8 @@ Basket + Basket name + PO no. Order line Summary View record @@ -193,6 +195,8 @@ [% FOREACH loop_order IN loop_orders %] [% loop_order.basketno %] + [% loop_order.basketname %] + [% loop_order.purchaseordernumber %] [% loop_order.ordernumber %] [% loop_order.title |html %] @@ -266,6 +270,8 @@ Basket + Basket name + PO no. Order line Summary View record @@ -278,19 +284,19 @@ - Total tax exc. + Total tax exc. [% total_gste %] [% FOREACH book_foot IN book_foot_loop %] - Total (GST [% book_foot.gstrate * 100 | format ("%.1f") %]%) + Total (GST [% book_foot.gstrate * 100 | format ("%.1f") %]%) [% book_foot.value %] [% END %] - Total tax inc. + Total tax inc. [% total_gsti %] @@ -299,6 +305,8 @@ [% FOREACH loop_receive IN loop_received %] [% loop_receive.basketno %] + [% loop_receive.basketname %] + [% loop_receive.purchaseordernumber %] [% loop_receive.ordernumber %] [% loop_receive.title |html %] [% IF ( loop_receive.author ) %] / [% loop_receive.author %][% END %] -- 1.7.9.5