# Copyright 2010,2011 Catalyst IT Limited
# This file is part of Koha.
#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-# You should have received a copy of the GNU General Public License along
-# with Koha; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
=head1 NAME
use C4::Context;
use C4::Auth;
use C4::Output;
-use strict;
-use warnings;
-use CGI;
+use Modern::Perl;
+use CGI qw ( -utf8 );
+use Koha::Acquisition::Invoice::Adjustments;
my $dbh = C4::Context->dbh;
my $input = new CGI;
my $query = <<EOQ;
SELECT
- aqorders.basketno, aqorders.ordernumber,
+ aqorders.biblionumber, aqorders.basketno, aqorders.ordernumber,
quantity-quantityreceived AS tleft,
ecost, budgetdate, entrydate,
aqbasket.booksellerid,
aqinvoices.invoicenumber,
quantityreceived,
unitprice,
- datereceived,
- aqorders.biblionumber
+ datereceived
FROM (aqorders, aqbasket)
-LEFT JOIN items ON
- items.biblioitemnumber=aqorders.biblioitemnumber
LEFT JOIN biblio ON
biblio.biblionumber=aqorders.biblionumber
LEFT JOIN aqorders_items ON
- aqorders.ordernumber=aqorders_items.ordernumber
+ aqorders.ordernumber = aqorders_items.ordernumber
+LEFT JOIN items ON
+ aqorders_items.itemnumber = items.itemnumber
LEFT JOIN aqinvoices ON
aqorders.invoiceid = aqinvoices.invoiceid
WHERE
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);
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'};
}
$sth->finish;
+my $adjustments = Koha::Acquisition::Invoice::Adjustments->search({budget_id => $bookfund, closedate => { '!=' => undef } }, { join => 'invoiceid' } );
+while ( my $adj = $adjustments->next ){
+ $total += $adj->adjustment;
+}
+
$total = sprintf( "%.2f", $total );
$template->param(
spent => \@spent,
subtotal => $subtotal,
shipmentcosts => \@shipmentcosts,
+ adjustments => $adjustments,
total => $total,
fund_code => $fund_code
);