This patch is the last fix for this ticket.
---
C4/Bookfund.pm | 18 +++++++++---------
acqui/spent.pl | 2 +-
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/C4/Bookfund.pm b/C4/Bookfund.pm
index 5933858..5f754d7 100644
--- a/C4/Bookfund.pm
+++ b/C4/Bookfund.pm
@@ -223,20 +223,20 @@ sub GetBookFundBreakdown {
# do a query for spent totals.
my $query = "
Select
quantity,datereceived,freight,unitprice,listprice,ecost,quantityreceived
- as
qrev,subscription,title,itemtype,aqorders.biblionumber,aqorders.booksellerinvoicenumber,
+ as qrev,subscription,title,itype as
itemtype,aqorders.biblionumber,aqorders.booksellerinvoicenumber,
quantity-quantityreceived as tleft,
aqorders.ordernumber
- as ordnum,entrydate,budgetdate,booksellerid,aqbasket.basketno
- from aqorderbreakdown,aqbasket,aqorders
- left join biblioitems on
biblioitems.biblioitemnumber=aqorders.biblioitemnumber
- where bookfundid=? and
- aqorders.ordernumber=aqorderbreakdown.ordernumber and
- aqorders.basketno=aqbasket.basketno
- and (
- (datereceived >= ? and datereceived < ?))
+ as ordnum,entrydate,budgetdate,aqbasket.booksellerid,aqbasket.basketno
+ from aqorders
+ inner join aqorderbreakdown on aqorderbreakdown.ordernumber =
aqorders.ordernumber
+ inner join aqbasket on aqbasket.basketno = aqorders.basketno
+ left join items on items.biblionumber=aqorders.biblionumber
+ where bookfundid=?
+ and (datereceived >= ? and datereceived < ?)
and (datecancellationprinted is NULL or
datecancellationprinted='0000-00-00')
and (closedate >= ? and closedate < ?)
+ ORDER BY datereceived
";
my $sth = $dbh->prepare($query);
$sth->execute( $id, $start, $end, $start, $end);
diff --git a/acqui/spent.pl b/acqui/spent.pl
index aebe98a..ec7977d 100755
--- a/acqui/spent.pl
+++ b/acqui/spent.pl
@@ -31,7 +31,7 @@ my ( $template, $loggedinuser, $cookie ) =
get_template_and_user(
# correctly due to missing joins between tables
my $query =
-"Select distinct
quantity,datereceived,freight,unitprice,listprice,ecost,quantityreceived
+"Select
quantity,datereceived,freight,unitprice,listprice,ecost,quantityreceived
as qrev,subscription,title,itype as
itemtype,aqorders.biblionumber,aqorders.booksellerinvoicenumber,
quantity-quantityreceived as tleft,
aqorders.ordernumber
--
1.6.0.4
_______________________________________________
Koha-patches mailing list
[email protected]
http://lists.koha.org/mailman/listinfo/koha-patches
