projects
/
koha_fer
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug 10728: fix log noise generated by subscription-renew.pl
[koha_fer]
/
acqui
/
spent.pl
diff --git
a/acqui/spent.pl
b/acqui/spent.pl
index
2d555f9
..
c3c4693
100755
(executable)
--- a/
acqui/spent.pl
+++ b/
acqui/spent.pl
@@
-67,15
+67,16
@@
SELECT
datereceived,
aqorders.biblionumber
FROM (aqorders, aqbasket)
datereceived,
aqorders.biblionumber
FROM (aqorders, aqbasket)
-LEFT JOIN items ON
- items.biblioitemnumber=aqorders.biblioitemnumber
LEFT JOIN biblio ON
biblio.biblionumber=aqorders.biblionumber
LEFT JOIN biblio ON
biblio.biblionumber=aqorders.biblionumber
+LEFT JOIN items ON
+ biblio.biblionumber = items.biblionumber
LEFT JOIN aqorders_items ON
LEFT JOIN aqorders_items ON
-
aqorders.ordernumber=aqorders_items.order
number
+
items.itemnumber = aqorders_items.item
number
LEFT JOIN aqinvoices ON
aqorders.invoiceid = aqinvoices.invoiceid
WHERE
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
aqorders.basketno=aqbasket.basketno AND
budget_id=? AND
(datecancellationprinted IS NULL OR