Bugzilla – Attachment 20285 Details for
Bug 10531
Add basket name, PO number and order date on receive
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Basket name and PO number on receipt screen
0003-Bug-10531-Basket-name-and-PO-number-on-receipt-scree.patch (text/plain), 4.98 KB, created by
Amit Gupta
on 2013-08-13 05:19:04 UTC
(
hide
)
Description:
Basket name and PO number on receipt screen
Filename:
MIME Type:
Creator:
Amit Gupta
Created:
2013-08-13 05:19:04 UTC
Size:
4.98 KB
patch
obsolete
>From f950de5f9e0c19e6ee06afebdd12de9c78d60425 Mon Sep 17 00:00:00 2001 >From: Amit Gupta <amitddng135@gmail.com> >Date: Tue, 13 Aug 2013 10:46:16 +0530 >Subject: [PATCH 3/3] Bug 10531 - Basket name and PO number on receipt screen > >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. >--- > 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 a62dab4..307104b 100644 >--- a/C4/Acquisition.pm >+++ b/C4/Acquisition.pm >@@ -2372,9 +2372,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..f1fcab4 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 @@ > <thead> > <tr> > <th>Basket</th> >+ <th>Basketname</th> >+ <th>PO no.</th> > <th>Order line</th> > <th>Summary</th> > <th>View record</th> >@@ -193,6 +195,8 @@ > [% FOREACH loop_order IN loop_orders %] > <tr> > <td class="basketfilterclass"><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_order.basketno %]">[% loop_order.basketno %]</a></td> >+ <td class="basketnamefilterclass"><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_order.basketno %]">[% loop_order.basketname %]</a></td> >+ <td class="purchaseordernumberfilterclass">[% loop_order.purchaseordernumber %]</a></td> > <td class="orderfilterclass"><a href="neworderempty.pl?ordernumber=[% loop_order.ordernumber %]&booksellerid=[% loop_order.booksellerid %]">[% loop_order.ordernumber %]</a></td> > <td class="summaryfilterclass"> > <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_order.biblionumber %]">[% loop_order.title |html %]</a> >@@ -266,6 +270,8 @@ > <thead> > <tr> > <th>Basket</th> >+ <th>Basketname</th> >+ <th>PO no.</th> > <th>Order line</th> > <th>Summary</th> > <th>View record</th> >@@ -278,19 +284,19 @@ > </thead> > <tfoot> > <tr> >- <th colspan="7" class="total">Total tax exc.</th> >+ <th colspan="9" class="total">Total tax exc.</th> > <th>[% total_gste %]</th> > <th></th> > </tr> > [% FOREACH book_foot IN book_foot_loop %] > <tr> >- <th colspan="7">Total (GST [% book_foot.gstrate * 100 | format ("%.1f") %]%)</th> >+ <th colspan="9">Total (GST [% book_foot.gstrate * 100 | format ("%.1f") %]%)</th> > <th>[% book_foot.value %]</th> > <th></th> > </tr> > [% END %] > <tr> >- <th colspan="7" class="total">Total tax inc.</th> >+ <th colspan="9" class="total">Total tax inc.</th> > <th>[% total_gsti %]</th> > <th></th> > </tr> >@@ -299,6 +305,8 @@ > [% FOREACH loop_receive IN loop_received %] > <tr> > <td><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_receive.basketno %]">[% loop_receive.basketno %]</a></td> >+ <td><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_receive.basketno %]">[% loop_receive.basketname %]</a></td> >+ <td>[% loop_receive.purchaseordernumber %]</td> > <td><a href="neworderempty.pl?ordernumber=[% loop_receive.ordernumber %]&booksellerid=[% booksellerid %]">[% loop_receive.ordernumber %]</a></td> > <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_receive.biblionumber %]">[% loop_receive.title |html %]</a> > [% IF ( loop_receive.author ) %] / [% loop_receive.author %][% END %] >-- >1.7.9.5 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 10531
:
20285
|
20636