Bug 19296: Allow all tax processing to happen in C4::Acquisition::populate_order_with...

[koha.git] / acqui / ordered.pl

diff --git a/acqui/ordered.pl b/acqui/ordered.pl
index 0ae5dad..5c2cc6d 100755 (executable)
--- a/acqui/ordered.pl
+++ b/acqui/ordered.pl
@@ -4,22 +4,22 @@
 # 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
 
@@ -30,16 +30,14 @@ this script is to show orders ordered but not yet received
 use C4::Context;
 use strict;
 use warnings;
-use CGI;
+use CGI qw ( -utf8 );
 use C4::Auth;
 use C4::Output;
-use C4::Dates;
 
 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,14 +45,14 @@ 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,
     aqbasket.booksellerid,
@@ -97,14 +95,13 @@ while ( my $data = $sth->fetchrow_hashref ) {
         push @ordered, $data;
         $total += $subtotal;
     }
-    my $entrydate = C4::Dates->new( $data->{'entrydate'}, 'iso' );
-    $data->{'entrydate'} = $entrydate->output("syspref");
 }
 $total = sprintf( "%.2f", $total );
 
 $template->{VARS}->{'fund'}    = $fund_id;
 $template->{VARS}->{'ordered'} = \@ordered;
 $template->{VARS}->{'total'}   = $total;
+$template->{VARS}->{'fund_code'} = $fund_code;
 
 $sth->finish;