Bugzilla – Attachment 22682 Details for
Bug 11111
The basket group is not displayed on the parcel page
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 11111: The basket group is not display on the parcel page
Bug-11111-The-basket-group-is-not-display-on-the-p.patch (text/plain), 5.44 KB, created by
Jonathan Druart
on 2013-11-04 08:35:53 UTC
(
hide
)
Description:
Bug 11111: The basket group is not display on the parcel page
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2013-11-04 08:35:53 UTC
Size:
5.44 KB
patch
obsolete
>From 95ec9a600c8f62e160499412b18d4f1ee075824c Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@biblibre.com> >Date: Tue, 22 Oct 2013 14:05:48 +0200 >Subject: [PATCH] Bug 11111: The basket group is not display on the parcel > page > >Test plan: >Go on acqui/parcel.pl?invoiceid=XX page and verify the basket group name >is displayed into the 2nd column. > >Signed-off-by: Ed Veal <ed.veal@bywatersolutions.com> >Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> >Changed basketgroup to basket group to match spelling on other >pages. >Works as described, passes tests and QA script. >--- > C4/Acquisition.pm | 2 ++ > .../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 25 +++++++++++++++++--- > 2 files changed, 24 insertions(+), 3 deletions(-) > >diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm >index aabc0ed..8b4ef8a 100644 >--- a/C4/Acquisition.pm >+++ b/C4/Acquisition.pm >@@ -1678,6 +1678,8 @@ sub SearchOrders { > aqbasket.closedate, > aqbasket.creationdate, > aqbasket.basketname, >+ aqbasketgroups.id as basketgroupid, >+ aqbasketgroups.name as basketgroupname, > aqorders.* > FROM aqorders > LEFT JOIN aqbasket ON aqorders.basketno = aqbasket.basketno >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 db6783b..b066450 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >@@ -24,6 +24,7 @@ > "aoColumns": [ > { "sType": "num-html" }, > { "sType": "num-html" }, >+ { "sType": "num-html" }, > { "sType": "html" }, > null, > null, >@@ -42,6 +43,7 @@ > { type: "text" }, > { type: "text" }, > { type: "text" }, >+ { type: "text" }, > null, > { type: "text" }, > { type: "text" }, >@@ -204,6 +206,7 @@ > <thead> > <tr> > <th>Basket search</th> >+ <th>Basket group search</th> > <th>Order line search</th> > <th>Summary search</th> > <th> </th> >@@ -216,6 +219,7 @@ > </tr> > <tr> > <th>Basket</th> >+ <th>Basket group</th> > <th>Order line</th> > <th>Summary</th> > <th>View record</th> >@@ -231,6 +235,13 @@ > [% FOREACH loop_order IN loop_orders %] > <tr> > <td class="basketfilterclass">[% loop_order.basketname %] (<a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_order.basketno %]">[% loop_order.basketno %]</a>)</td> >+ <td> >+ [% IF loop_order.basketgroupid %] >+ [% loop_order.basketgroupname %] (<a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% loop_order.booksellerid %]">[% loop_order.basketgroupid %]</a>) >+ [% ELSE %] >+ No basket group >+ [% END %] >+ </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> >@@ -321,6 +332,7 @@ > <thead> > <tr> > <th>Basket</th> >+ <th>Basket group</th> > <th>Order Line</th> > <th>Holds</th> > <th>Summary</th> >@@ -345,19 +357,19 @@ > </tr> > [% END %] > <tr> >- <th colspan="9" class="total">Total tax exc.</th> >+ <th colspan="10" class="total">Total tax exc.</th> > <th>[% total_gste %]</th> > <th></th> > </tr> > [% FOREACH book_foot IN book_foot_loop %] > <tr> >- <th colspan="9">Total (GST [% book_foot.gstrate * 100 | format ("%.1f") %]%)</th> >+ <th colspan="10">Total (GST [% book_foot.gstrate * 100 | format ("%.1f") %]%)</th> > <th>[% book_foot.value %]</th> > <th></th> > </tr> > [% END %] > <tr> >- <th colspan="9" class="total">Total tax inc.</th> >+ <th colspan="10" class="total">Total tax inc.</th> > <th>[% total_gsti %]</th> > <th></th> > </tr> >@@ -366,6 +378,13 @@ > [% FOREACH loop_receive IN loop_received %] > <tr> > <td>[% loop_receive.basketname %] (<a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_receive.basketno %]">[% loop_receive.basketno %]</a>)</td> >+ <td> >+ [% IF loop_order.basketgroupid %] >+ [% loop_receive.basketgroupname %] (<a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% loop_receive.booksellerid %]">[% loop_receive.basketgroupid %]</a>) >+ [% ELSE %] >+ No basket group >+ [% END %] >+ </td> > <td><a href="neworderempty.pl?ordernumber=[% loop_receive.ordernumber %]&booksellerid=[% booksellerid %]">[% loop_receive.ordernumber %]</a></td> > <td> > [% IF loop_receive.holds > 0 %] >-- >1.7.10.4
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 11111
:
22266
|
22287
|
22435
|
22680
|
22681
| 22682 |
22683