# 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
-committed.pl
+ordered.pl
=head1 DESCRIPTION
=cut
use C4::Context;
-use strict;
-use warnings;
-use CGI;
+use Modern::Perl;
+use CGI qw ( -utf8 );
use C4::Auth;
use C4::Output;
-use C4::Dates;
+use Koha::Acquisition::Invoice::Adjustments;
my $dbh = C4::Context->dbh;
my $input = new CGI;
my $fund_id = $input->param('fund');
-my $start = $input->param('start');
-my $end = $input->param('end');
+my $fund_code = $input->param('fund_code');
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
{
query => $input,
type => "intranet",
authnotrequired => 0,
- flagsrequired => { acquisition => 1 },
+ flagsrequired => { acquisition => '*' },
debug => 1,
}
);
my $query = <<EOQ;
SELECT
- aqorders.basketno, aqorders.ordernumber,
+ 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,
title
FROM (aqorders, aqbasket)
aqorders.ordernumber=aqorders_items.ordernumber
LEFT JOIN items ON
items.itemnumber=aqorders_items.itemnumber
+LEFT JOIN aqbooksellers ON
+ aqbasket.booksellerid = aqbooksellers.id
WHERE
aqorders.basketno=aqbasket.basketno AND
budget_id=? AND
(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);
$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;
$total += $subtotal;
}
- my $entrydate = C4::Dates->new( $data->{'entrydate'}, 'iso' );
- $data->{'entrydate'} = $entrydate->output("syspref");
}
+
+my $adjustments = Koha::Acquisition::Invoice::Adjustments->search({budget_id => $fund_id, closedate => undef, encumber_open => 1 }, { join => 'invoiceid' } );
+while ( my $adj = $adjustments->next ){
+ $total += $adj->adjustment;
+}
+
$total = sprintf( "%.2f", $total );
$template->{VARS}->{'fund'} = $fund_id;
$template->{VARS}->{'ordered'} = \@ordered;
$template->{VARS}->{'total'} = $total;
+$template->{VARS}->{'fund_code'} = $fund_code;
+$template->{VARS}->{'adjustments'} = $adjustments;
$sth->finish;