@@ -, +, @@ list - Create different orders for one fund and receive them - normal order with a few items - subscription order (no item) - normal order with an item, delete the item after receiving - include some freight cost in one of the invoices - Compare the amount spent shown on the acq start page with the amount shown at the end of the 'spent' page - Without the patch, the amounts don't match and not all received titles are listed - With the patch, amounts should match and list shoudl be complete --- acqui/spent.pl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) --- a/acqui/spent.pl +++ a/acqui/spent.pl @@ -69,18 +69,18 @@ SELECT FROM (aqorders, aqbasket) LEFT JOIN biblio ON biblio.biblionumber=aqorders.biblionumber -LEFT JOIN items ON - biblio.biblionumber = items.biblionumber LEFT JOIN aqorders_items ON - items.itemnumber = aqorders_items.itemnumber + aqorders.ordernumber = aqorders_items.ordernumber +LEFT JOIN items ON + aqorders_items.itemnumber = items.itemnumber LEFT JOIN aqinvoices ON aqorders.invoiceid = aqinvoices.invoiceid WHERE - aqorders.ordernumber=aqorders_items.ordernumber AND aqorders.basketno=aqbasket.basketno AND budget_id=? AND (datecancellationprinted IS NULL OR - datecancellationprinted='0000-00-00') + datecancellationprinted='0000-00-00') AND + datereceived IS NOT NULL GROUP BY aqorders.ordernumber EOQ my $sth = $dbh->prepare($query); --