View | Details | Raw Unified | Return to bug 3080
Collapse All | Expand All

(-)a/acqui/spent.pl (-7 / +4 lines)
Lines 33-46 my $query = Link Here
33
    quantity-quantityreceived as tleft,
33
    quantity-quantityreceived as tleft,
34
    aqorders.ordernumber
34
    aqorders.ordernumber
35
    as ordnum,entrydate,budgetdate,booksellerid,aqbasket.basketno
35
    as ordnum,entrydate,budgetdate,booksellerid,aqbasket.basketno
36
    from aqorderbreakdown,aqbasket,aqorders
36
    from aqorderbreakdown,aqorders
37
    left join biblioitems on  biblioitems.biblioitemnumber=aqorders.biblioitemnumber 
37
    left join biblioitems on  biblioitems.biblioitemnumber=aqorders.biblioitemnumber 
38
    LEFT JOINaqbasket USING (basketno)
38
    LEFT JOIN aqbasket USING (basketno)
39
    where bookfundid=? and
39
    where bookfundid=? and
40
    aqorders.ordernumber=aqorderbreakdown.ordernumber and
40
    aqorders.ordernumber=aqorderbreakdown.ordernumber
41
    aqorders.basketno=aqbasket.basketno
41
   and (datereceived >= ? and datereceived < ?)
42
   and (
43
	(datereceived >= ? and datereceived < ?))
44
    and (datecancellationprinted is NULL or
42
    and (datecancellationprinted is NULL or
45
	   datecancellationprinted='0000-00-00')
43
	   datecancellationprinted='0000-00-00')
46
	and (closedate >= ? and closedate < ?)
44
	and (closedate >= ? and closedate < ?)
47
- 

Return to bug 3080