Bug 21622: Adjust incorrect GROUP BY clauses in acqui script
acqui/ordered.pl: GROUP BY aqorders.ordernumber
acqui/spent.pl: GROUP BY aqorders.ordernumbe
'koha_kohadev.aqorders.biblionumber' isn't in GROUP BY
Test plan:
- Create orders for different basket and using different funds
- Receive some of them
- Hit the ordered and spent pages (from the acqui home page)
=> The tables must contain the same data with and without this patch
Signed-off-by: Jasmine Amohia <jasmineamohia.student@wegc.school.nz>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 2d904a55e7)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
This commit is contained in:
parent
111ddbfa57
commit
7d30e64996
|
|
@ -74,7 +74,13 @@ WHERE
|
|||
(datecancellationprinted IS NULL OR
|
||||
datecancellationprinted='0000-00-00') AND
|
||||
(quantity > quantityreceived OR quantityreceived IS NULL)
|
||||
GROUP BY aqorders.ordernumber
|
||||
GROUP BY aqorders.biblionumber, aqorders.basketno, aqorders.ordernumber,
|
||||
tleft,
|
||||
ecost, budgetdate, entrydate,
|
||||
aqbasket.booksellerid,
|
||||
aqbooksellers.name,
|
||||
itype,
|
||||
title
|
||||
EOQ
|
||||
|
||||
my $sth = $dbh->prepare($query);
|
||||
|
|
|
|||
|
|
@ -83,7 +83,19 @@ WHERE
|
|||
(datecancellationprinted IS NULL OR
|
||||
datecancellationprinted='0000-00-00') AND
|
||||
datereceived IS NOT NULL
|
||||
GROUP BY aqorders.ordernumber
|
||||
GROUP BY aqorders.biblionumber, aqorders.basketno, aqorders.ordernumber,
|
||||
tleft,
|
||||
ecost, budgetdate, entrydate,
|
||||
aqbasket.booksellerid,
|
||||
itype,
|
||||
title,
|
||||
aqorders.invoiceid,
|
||||
aqinvoices.invoicenumber,
|
||||
quantityreceived,
|
||||
unitprice,
|
||||
datereceived,
|
||||
aqbooksellers.name
|
||||
|
||||
EOQ
|
||||
my $sth = $dbh->prepare($query);
|
||||
$sth->execute($bookfund);
|
||||
|
|
|
|||
Loading…
Reference in New Issue