Bug 21206: Replace C4::Items::GetItem

[koha.git] / acqui / ordered.pl

diff --git a/acqui/ordered.pl b/acqui/ordered.pl
index cc3f049..7366cca 100755 (executable)
--- a/acqui/ordered.pl
+++ b/acqui/ordered.pl
@@ -54,7 +54,7 @@ my $query = <<EOQ;
 SELECT
     aqorders.biblionumber, aqorders.basketno, aqorders.ordernumber,
     quantity-quantityreceived AS tleft,
-    ecost, budgetdate, entrydate,
+    ecost_tax_included, budgetdate, entrydate,
     aqbasket.booksellerid,
     aqbooksellers.name as vendorname,
     itype,
@@ -74,7 +74,13 @@ WHERE
     (datecancellationprinted IS NULL OR
         datecancellationprinted='0000-00-00') AND
     (quantity > quantityreceived OR quantityreceived IS NULL)
-    GROUP BY aqorders.ordernumber
+    GROUP BY aqorders.biblionumber, aqorders.basketno, aqorders.ordernumber,
+             tleft,
+             ecost, budgetdate, entrydate,
+             aqbasket.booksellerid,
+             aqbooksellers.name,
+             itype,
+             title
 EOQ
 
 my $sth = $dbh->prepare($query);
@@ -92,7 +98,7 @@ while ( my $data = $sth->fetchrow_hashref ) {
         $left = $data->{'quantity'};
     }
     if ( $left && $left > 0 ) {
-        my $subtotal = $left * $data->{'ecost'};
+        my $subtotal = $left * $data->{'ecost_tax_included'};
         $data->{subtotal} = sprintf( "%.2f", $subtotal );
         $data->{'left'} = $left;
         push @ordered, $data;