Bug 9508: Standardize the dateformat value from C4::Auth

[koha.git] / acqui / spent.pl

diff --git a/acqui/spent.pl b/acqui/spent.pl
index 80a89d3..2d555f9 100755 (executable)
--- a/acqui/spent.pl
+++ b/acqui/spent.pl
@@ -3,7 +3,7 @@
 # script to show a breakdown of committed and spent budgets
 
 # Copyright 2002-2009 Katipo Communications Limited
-# 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
@@ -25,22 +25,21 @@
 
 =head1 DESCRIPTION
 
-this script is designed to show the spent amount in budges
+this script is designed to show the spent amount in budgets
 
 =cut
 
-
 use C4::Context;
 use C4::Auth;
 use C4::Output;
 use strict;
+use warnings;
 use CGI;
 
 my $dbh      = C4::Context->dbh;
 my $input    = new CGI;
 my $bookfund = $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(
     {
@@ -48,7 +47,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
-        flagsrequired   => { acquisition => 1 },
+        flagsrequired   => { acquisition => '*' },
         debug           => 1,
     }
 );
@@ -57,14 +56,14 @@ my $query = <<EOQ;
 SELECT
     aqorders.basketno, aqorders.ordernumber,
     quantity-quantityreceived AS tleft,
-    ecost, budgetdate,
+    ecost, budgetdate, entrydate,
     aqbasket.booksellerid,
     itype,
     title,
-    aqorders.booksellerinvoicenumber,
+    aqorders.invoiceid,
+    aqinvoices.invoicenumber,
     quantityreceived,
     unitprice,
-    freight,
     datereceived,
     aqorders.biblionumber
 FROM (aqorders, aqbasket)
@@ -74,6 +73,8 @@ LEFT JOIN biblio ON
     biblio.biblionumber=aqorders.biblionumber
 LEFT JOIN aqorders_items ON
     aqorders.ordernumber=aqorders_items.ordernumber
+LEFT JOIN aqinvoices ON
+    aqorders.invoiceid = aqinvoices.invoiceid
 WHERE
     aqorders.basketno=aqbasket.basketno AND
     budget_id=? AND
@@ -82,40 +83,52 @@ WHERE
     GROUP BY aqorders.ordernumber
 EOQ
 my $sth = $dbh->prepare($query);
-$sth->execute( $bookfund);
-if ($sth->err) {
-    die "An error occurred fetching records: ".$sth->errstr;
+$sth->execute($bookfund);
+if ( $sth->err ) {
+    die "An error occurred fetching records: " . $sth->errstr;
 }
-my $total = 0;
+my $subtotal = 0;
 my $toggle;
 my @spent;
 while ( my $data = $sth->fetchrow_hashref ) {
     my $recv = $data->{'quantityreceived'};
     if ( $recv > 0 ) {
-        my $subtotal = $recv * ($data->{'unitprice'} + $data->{'freight'});
-        $data->{'subtotal'}  =   sprintf ("%.2f",  $subtotal);
-       $data->{'freight'}   =   sprintf ("%.2f", $data->{'freight'});
-        $data->{'unitprice'} =   sprintf ("%.2f",   $data->{'unitprice'}  );
-        $total               += $subtotal;
-
-        if ($toggle) {
-            $toggle = 0;
-        }
-        else {
-            $toggle = 1;
-        }
-        $data->{'toggle'} = $toggle;
+        my $rowtotal = $recv * $data->{'unitprice'};
+        $data->{'rowtotal'}  = sprintf( "%.2f", $rowtotal );
+        $data->{'unitprice'} = sprintf( "%.2f", $data->{'unitprice'} );
+        $subtotal += $rowtotal;
         push @spent, $data;
     }
 
 }
-$total =   sprintf ("%.2f",  $total);
+
+my $total = $subtotal;
+$query = qq{
+    SELECT invoicenumber, shipmentcost
+    FROM aqinvoices
+    WHERE shipmentcost_budgetid = ?
+};
+$sth = $dbh->prepare($query);
+$sth->execute($bookfund);
+my @shipmentcosts;
+while (my $data = $sth->fetchrow_hashref) {
+    push @shipmentcosts, {
+        shipmentcost => sprintf("%.2f", $data->{shipmentcost}),
+        invoicenumber => $data->{invoicenumber}
+    };
+    $total += $data->{shipmentcost};
+}
+$sth->finish;
+
+$total = sprintf( "%.2f", $total );
 
 $template->param(
-    spent       => \@spent,
-    total       => $total
+    fund => $bookfund,
+    spent => \@spent,
+    subtotal => $subtotal,
+    shipmentcosts => \@shipmentcosts,
+    total => $total,
+    fund_code => $fund_code
 );
-$sth->finish;
 
-$dbh->disconnect;
 output_html_with_http_headers $input, $cookie, $template->output;