Bug 26997: Remove 0000-00-00 from aqorders.datecancellationprinted

This patch remove the 0000-00-00 from the WHERE condition from
ordered.pl and spent.pl to prevent an error under MySQL 8

It also fixes the wrong values in DB (if possible, ie. under other DBMS
that MySQL 8)

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This commit is contained in:
Jonathan Druart 2020-11-13 13:59:46 +01:00
parent 3c087bc216
commit 0e0700a691
2 changed files with 2 additions and 4 deletions

View File

@ -71,8 +71,7 @@ LEFT JOIN aqbooksellers ON
aqbasket.booksellerid = aqbooksellers.id
WHERE
budget_id=? AND
(datecancellationprinted IS NULL OR
datecancellationprinted='0000-00-00') AND
datecancellationprinted IS NULL AND
(quantity > quantityreceived OR quantityreceived IS NULL)
GROUP BY aqorders.biblionumber, aqorders.basketno, aqorders.ordernumber,
tleft,

View File

@ -80,8 +80,7 @@ LEFT JOIN aqbooksellers ON
WHERE
aqorders.basketno=aqbasket.basketno AND
budget_id=? AND
(datecancellationprinted IS NULL OR
datecancellationprinted='0000-00-00') AND
datecancellationprinted IS NULL AND
datereceived IS NOT NULL
GROUP BY aqorders.biblionumber, aqorders.basketno, aqorders.ordernumber,
tleft,