Bug 11111: display the basket group name 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 of the pending orders and already
received tables.

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.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 7962819144)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
This commit is contained in:
Jonathan Druart 2013-10-22 14:05:48 +02:00 committed by Fridolin SOMERS
parent cd394cda1e
commit fef1d9fcbf
2 changed files with 24 additions and 3 deletions

View File

@ -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

View File

@ -22,6 +22,7 @@
{ "aTargets": [ 3, 8, 9 ], "bSortable": false, "bSearchable": false },
],
"aoColumns": [
{ "sType": "num-html" },
{ "sType": "num-html" },
{ "sType": "num-html" },
{ "sType": "html" },
@ -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>&nbsp;</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 %]&amp;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 %]&amp;booksellerid=[% booksellerid %]">[% loop_receive.ordernumber %]</a></td>
<td>
[% IF loop_receive.holds > 0 %]