-my $query =
-"Select quantity,datereceived,freight,unitprice,listprice,ecost,quantityreceived
- as qrev,subscription,title,itemtype,aqorders.biblionumber,aqorders.booksellerinvoicenumber,
- quantity-quantityreceived as tleft,
- aqorders.ordernumber
- as ordnum,entrydate,budgetdate,booksellerid,aqbasket.basketno
- from aqorders,aqorderbreakdown,aqbasket
- left join biblioitems on biblioitems.biblioitemnumber=aqorders.biblioitemnumber
- where bookfundid=? and
- aqorders.ordernumber=aqorderbreakdown.ordernumber and
- aqorders.basketno=aqbasket.basketno
- and (
- (datereceived >= ? and datereceived < ?))
- and (datecancellationprinted is NULL or
- datecancellationprinted='0000-00-00')
-
-
- ";
+my $query = <<EOQ;
+SELECT
+ aqorders.basketno, aqorders.ordernumber,
+ quantity-quantityreceived AS tleft,
+ ecost, budgetdate, entrydate,
+ aqbasket.booksellerid,
+ itype,
+ title,
+ aqorders.invoiceid,
+ aqinvoices.invoicenumber,
+ quantityreceived,
+ unitprice,
+ datereceived,
+ aqorders.biblionumber
+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
+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')
+ GROUP BY aqorders.ordernumber
+EOQ