Bug 20115: Trigger "modified" when sort is changed

[koha.git] / acqui / spent.pl

diff --git a/acqui/spent.pl b/acqui/spent.pl
index 1aaedf2..9a1c805 100755 (executable)
--- a/acqui/spent.pl
+++ b/acqui/spent.pl
@@ -32,8 +32,7 @@ this script is designed to show the spent amount in budgets
 use C4::Context;
 use C4::Auth;
 use C4::Output;
-use strict;
-use warnings;
+use Modern::Perl;
 use CGI qw ( -utf8 );
 
 my $dbh      = C4::Context->dbh;
@@ -54,7 +53,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
 
 my $query = <<EOQ;
 SELECT
-    aqorders.basketno, aqorders.ordernumber,
+    aqorders.biblionumber, aqorders.basketno, aqorders.ordernumber,
     quantity-quantityreceived AS tleft,
     ecost, budgetdate, entrydate,
     aqbasket.booksellerid,
@@ -64,23 +63,22 @@ SELECT
     aqinvoices.invoicenumber,
     quantityreceived,
     unitprice,
-    datereceived,
-    aqorders.biblionumber
+    datereceived
 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
+    aqorders.ordernumber = aqorders_items.ordernumber
+LEFT JOIN items ON
+    aqorders_items.itemnumber = 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')
+        datecancellationprinted='0000-00-00') AND
+    datereceived IS NOT NULL
     GROUP BY aqorders.ordernumber
 EOQ
 my $sth = $dbh->prepare($query);
@@ -89,7 +87,6 @@ if ( $sth->err ) {
     die "An error occurred fetching records: " . $sth->errstr;
 }
 my $subtotal = 0;
-my $toggle;
 my @spent;
 while ( my $data = $sth->fetchrow_hashref ) {
     my $recv = $data->{'quantityreceived'};