From ee45b0c034751b9496eaf653f92b214f2f511d81 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. Signed-off-by: Ed Veal Signed-off-by: Katrin Fischer 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 | 24 +++++++++++++++++--- 2 files changed, 23 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..ec7d70f 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, @@ -204,6 +205,7 @@ Basket search + Basket group search Order line search Summary search   @@ -216,6 +218,7 @@ Basket + Basket group Order line Summary View record @@ -231,6 +234,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 basket group + [% END %] + [% loop_order.ordernumber %] [% loop_order.title |html %] @@ -321,6 +331,7 @@ Basket + Basket group Order Line Holds Summary @@ -345,19 +356,19 @@ [% END %] - 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 %] @@ -366,6 +377,13 @@ [% FOREACH loop_receive IN loop_received %] [% loop_receive.basketname %] ([% loop_receive.basketno %]) + + [% IF loop_order.basketgroupid %] + [% loop_receive.basketgroupname %] ([% loop_receive.basketgroupid %]) + [% ELSE %] + No basket group + [% END %] + [% loop_receive.ordernumber %] [% IF loop_receive.holds > 0 %] -- 1.7.10.4