From 12afb5e7e0f07eb3ce36722daceaa73af57e8f86 Mon Sep 17 00:00:00 2001 From: Jonathan Druart 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. --- C4/Acquisition.pm | 2 ++ .../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 24 ++++++++++++++++---- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm index e470b24..a603470 100644 --- a/C4/Acquisition.pm +++ b/C4/Acquisition.pm @@ -1459,6 +1459,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 250cc96..0f45e37 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt @@ -182,6 +182,7 @@ Basket + Basket group Order line Summary View record @@ -197,6 +198,13 @@ [% FOREACH loop_order IN loop_orders %] [% loop_order.basketname %] ([% loop_order.basketno %]) + + [% IF loop_order.basketgroupid %] + [% loop_order.basketgroupname %] ([% loop_order.basketgroupid %]) + [% ELSE %] + No basketgroup + [% END %] + [% loop_order.ordernumber %] [% loop_order.title |html %] @@ -271,7 +279,8 @@ - + + @@ -284,19 +293,19 @@ - + [% FOREACH book_foot IN book_foot_loop %] - + [% END %] - + @@ -305,6 +314,13 @@ [% FOREACH loop_receive IN loop_received %] +
BasketBasketBasket group Order line Summary View record
Total tax exc.Total tax exc. [% total_gste %]
Total (GST [% book_foot.gstrate * 100 | format ("%.1f") %]%)Total (GST [% book_foot.gstrate * 100 | format ("%.1f") %]%) [% book_foot.value %]
Total tax inc.Total tax inc. [% total_gsti %]
[% loop_receive.basketname %] ([% loop_receive.basketno %]) + [% IF loop_order.basketgroupid %] + [% loop_receive.basketgroupname %] ([% loop_receive.basketgroupid %]) + [% ELSE %] + No basketgroup + [% END %] + [% loop_receive.ordernumber %] [% loop_receive.title |html %] [% IF ( loop_receive.author ) %] / [% loop_receive.author %][% END %] -- 1.7.10.4