Bug 21622: (RM follow-up) adjust for changes from bug 21282

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

diff --git a/acqui/ordered.pl b/acqui/ordered.pl
index 3eb0519..09fd607 100755 (executable)
--- a/acqui/ordered.pl
+++ b/acqui/ordered.pl
@@ -77,7 +77,7 @@ WHERE
     (quantity > quantityreceived OR quantityreceived IS NULL)
     GROUP BY aqorders.biblionumber, aqorders.basketno, aqorders.ordernumber,
              tleft,
-             ecost, budgetdate, entrydate,
+             ecost_tax_included, budgetdate, entrydate,
              aqbasket.booksellerid,
              aqbooksellers.name,
              itype,

diff --git a/acqui/spent.pl b/acqui/spent.pl
index 80d9361..75b495b 100755 (executable)
--- a/acqui/spent.pl
+++ b/acqui/spent.pl
@@ -86,14 +86,14 @@ WHERE
     datereceived IS NOT NULL
     GROUP BY aqorders.biblionumber, aqorders.basketno, aqorders.ordernumber,
              tleft,
-             ecost, budgetdate, entrydate,
+             budgetdate, entrydate,
              aqbasket.booksellerid,
              itype,
              title,
              aqorders.invoiceid,
              aqinvoices.invoicenumber,
              quantityreceived,
-             unitprice,
+             unitprice_tax_included,
              datereceived,
              aqbooksellers.name