diff --git a/acqui/ordered.pl b/acqui/ordered.pl index 20be8a0462..7f17310532 100755 --- a/acqui/ordered.pl +++ b/acqui/ordered.pl @@ -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, diff --git a/acqui/spent.pl b/acqui/spent.pl index 938ca90ccd..f90671b3eb 100755 --- a/acqui/spent.pl +++ b/acqui/spent.pl @@ -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,