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

(-)a/acqui/ordered.pl (-1 / +7 lines)
Lines 74-80 WHERE Link Here
74
    (datecancellationprinted IS NULL OR
74
    (datecancellationprinted IS NULL OR
75
        datecancellationprinted='0000-00-00') AND
75
        datecancellationprinted='0000-00-00') AND
76
    (quantity > quantityreceived OR quantityreceived IS NULL)
76
    (quantity > quantityreceived OR quantityreceived IS NULL)
77
    GROUP BY aqorders.ordernumber
77
    GROUP BY aqorders.biblionumber, aqorders.basketno, aqorders.ordernumber,
78
             tleft,
79
             ecost, budgetdate, entrydate,
80
             aqbasket.booksellerid,
81
             aqbooksellers.name,
82
             itype,
83
             title
78
EOQ
84
EOQ
79
85
80
my $sth = $dbh->prepare($query);
86
my $sth = $dbh->prepare($query);
(-)a/acqui/spent.pl (-2 / +13 lines)
Lines 83-89 WHERE Link Here
83
    (datecancellationprinted IS NULL OR
83
    (datecancellationprinted IS NULL OR
84
        datecancellationprinted='0000-00-00') AND
84
        datecancellationprinted='0000-00-00') AND
85
    datereceived IS NOT NULL
85
    datereceived IS NOT NULL
86
    GROUP BY aqorders.ordernumber
86
    GROUP BY aqorders.biblionumber, aqorders.basketno, aqorders.ordernumber,
87
             tleft,
88
             ecost, budgetdate, entrydate,
89
             aqbasket.booksellerid,
90
             itype,
91
             title,
92
             aqorders.invoiceid,
93
             aqinvoices.invoicenumber,
94
             quantityreceived,
95
             unitprice,
96
             datereceived,
97
             aqbooksellers.name
98
87
EOQ
99
EOQ
88
my $sth = $dbh->prepare($query);
100
my $sth = $dbh->prepare($query);
89
$sth->execute($bookfund);
101
$sth->execute($bookfund);
90
- 

Return to bug 21622