@@ -, +, @@ late orders table and improve other columns - adding a new column for basketgroup, displaying the name and number of the basketgroup - displaying the name of the basket as well as its number, with a hyperlink to this basketgroup - displaying fund in a separate column to make sorting easier, and renaming it from "budget" to "fund" (the confusion can be found elsewhere in Koha...) - displaying branch in a separate column to make sorting easier (this column could be improved later, by getting branch from basketgroup if there is one) - 3 new columns in SELECT - 1 new join --- C4/Acquisition.pm | 4 ++++ .../prog/en/modules/acqui/lateorders.tt | 19 ++++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-) --- a/C4/Acquisition.pm +++ a/C4/Acquisition.pm @@ -2031,6 +2031,9 @@ sub GetLateOrders { SELECT aqbasket.basketno, aqorders.ordernumber, DATE(aqbasket.closedate) AS orderdate, + aqbasket.basketname AS basketname, + aqbasket.basketgroupid AS basketgroupid, + aqbasketgroups.name AS basketgroupname, aqorders.rrp AS unitpricesupplier, aqorders.ecost AS unitpricelib, aqorders.claims_count AS claims_count, @@ -2051,6 +2054,7 @@ sub GetLateOrders { LEFT JOIN aqbudgets ON aqorders.budget_id = aqbudgets.budget_id, aqbasket LEFT JOIN borrowers ON aqbasket.authorisedby = borrowers.borrowernumber LEFT JOIN aqbooksellers ON aqbasket.booksellerid = aqbooksellers.id + LEFT JOIN aqbasketgroups ON aqbasket.basketgroupid = aqbasketgroups.id WHERE aqorders.basketno = aqbasket.basketno AND ( datereceived = '' OR datereceived IS NULL --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt @@ -117,6 +117,9 @@ $(document).ready(function() { Information Total cost Basket + Basket group + Branch + Fund Claims count Claimed date @@ -154,14 +157,16 @@ $(document).ready(function() { [% lateorder.unitpricesupplier %]x[% lateorder.quantity %] = [% lateorder.subtotal %] -

[% lateorder.budget %]

-

- [% lateorder.basketno %] - -

-

[% lateorder.branch %]

+ [% lateorder.basketname %] ([% lateorder.basketno %]) + + + [% lateorder.basketgroupname %] ([% lateorder.basketgroupid %]) + + [% lateorder.branch %] + + [% lateorder.budget %] [% lateorder.claims_count %] [% lateorder.claimed_date %] @@ -172,7 +177,7 @@ $(document).ready(function() { Total [% total %] -   +   --