Bug 15774: Add additional fields to order baskets

[koha.git] / acqui / ordered.pl

diff --git a/acqui/ordered.pl b/acqui/ordered.pl
index 9d319f6..7366cca 100755 (executable)
--- a/acqui/ordered.pl
+++ b/acqui/ordered.pl
@@ -1,25 +1,25 @@
 #!/usr/bin/perl
 
 # Copyright 2008 - 2009 BibLibre SARL
-# Copyright 2010 Catalyst IT Limited
+# 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
 
@@ -27,19 +27,17 @@ this script is to show orders ordered but not yet received
 
 =cut
 
-
 use C4::Context;
-use strict;
-use warnings;
-use CGI;
+use Modern::Perl;
+use CGI qw ( -utf8 );
 use C4::Auth;
 use C4::Output;
+use Koha::Acquisition::Invoice::Adjustments;
 
-my $dbh      = C4::Context->dbh;
-my $input    = new CGI;
+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(
     {
@@ -47,17 +45,18 @@ 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,
+    ecost_tax_included, budgetdate, entrydate,
     aqbasket.booksellerid,
+    aqbooksellers.name as vendorname,
     itype,
     title
 FROM (aqorders, aqbasket)
@@ -67,19 +66,28 @@ LEFT JOIN aqorders_items ON
     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.biblionumber, aqorders.basketno, aqorders.ordernumber,
+             tleft,
+             ecost, budgetdate, entrydate,
+             aqbasket.booksellerid,
+             aqbooksellers.name,
+             itype,
+             title
 EOQ
 
 my $sth = $dbh->prepare($query);
 
-$sth->execute( $fund_id);
-if ($sth->err) {
-    die "Error occurred fetching records: ".$sth->errstr;
+$sth->execute($fund_id);
+if ( $sth->err ) {
+    die "Error occurred fetching records: " . $sth->errstr;
 }
 my @ordered;
 
@@ -90,19 +98,27 @@ while ( my $data = $sth->fetchrow_hashref ) {
         $left = $data->{'quantity'};
     }
     if ( $left && $left > 0 ) {
-        my $subtotal = $left * $data->{'ecost'};
-        $data->{subtotal} =  sprintf ("%.2f",  $subtotal);
+        my $subtotal = $left * $data->{'ecost_tax_included'};
+        $data->{subtotal} = sprintf( "%.2f", $subtotal );
         $data->{'left'} = $left;
         push @ordered, $data;
         $total += $subtotal;
     }
 }
-$total =   sprintf ("%.2f",  $total);
-$template->param(
-    ordered     => \@ordered,
-    total       => $total
-);
+
+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;
-$dbh->disconnect;
 
 output_html_with_http_headers $input, $cookie, $template->output;