X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=acqui%2Fspent.pl;h=12260c044edd22fb6fd06ad09ae68026d1fcaf0f;hb=d4b132136cef6204dd074205aef94b6b0efc6930;hp=f4231e268a168c44f63ad97892b8eb3fb7601e3c;hpb=f8e9fb6445dadbdef91e13a253c9c6bcb75e0eec;p=koha_gimpoz

diff --git a/acqui/spent.pl b/acqui/spent.pl
index f4231e268a..12260c044e 100755
--- a/acqui/spent.pl
+++ b/acqui/spent.pl
@@ -2,23 +2,49 @@
 
 # script to show a breakdown of committed and spent budgets
 
-# needs to be templated at some point
+# Copyright 2002-2009 Katipo Communications 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 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.
+
+=head1 NAME
+
+ spent.pl
+
+=head1 DESCRIPTION
+
+this script is designed to show the spent amount in budges
+
+=cut
 
 use C4::Context;
 use C4::Auth;
-use C4::Interface::CGI::Output;
+use C4::Output;
+use C4::Dates;
 use strict;
+use warnings;
 use CGI;
 
 my $dbh      = C4::Context->dbh;
 my $input    = new CGI;
-my $bookfund = $input->param('bookfund');
-my $start    = $input->param('start');
-my $end      = $input->param('end');
+my $bookfund = $input->param('fund');
+my $fund_code = $input->param('fund_code');
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "acqui/spent.tmpl",
+        template_name   => "acqui/spent.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
@@ -27,54 +53,60 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 
-my $query =
-"Select quantity,datereceived,freight,unitprice,listprice,ecost,quantityreceived
-    as qrev,subscription,title,itemtype,aqorders.biblionumber,aqorders.booksellerinvoicenumber,
-    quantity-quantityreceived as tleft,
-    aqorders.ordernumber
-    as ordnum,entrydate,budgetdate,booksellerid,aqbasket.basketno
-    from aqorders,aqorderbreakdown,aqbasket 
-    left join biblioitems on  biblioitems.biblioitemnumber=aqorders.biblioitemnumber 
-    where bookfundid=? and
-    aqorders.ordernumber=aqorderbreakdown.ordernumber and
-    aqorders.basketno=aqbasket.basketno
-   and (
-	(datereceived >= ? and datereceived < ?))
-    and (datecancellationprinted is NULL or
-	   datecancellationprinted='0000-00-00')
-
-
-  ";
+my $query = <<EOQ;
+SELECT
+    aqorders.basketno, aqorders.ordernumber,
+    quantity-quantityreceived AS tleft,
+    ecost, budgetdate, entrydate,
+    aqbasket.booksellerid,
+    itype,
+    title,
+    aqorders.booksellerinvoicenumber,
+    quantityreceived,
+    unitprice,
+    freight,
+    datereceived,
+    aqorders.biblionumber
+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
+WHERE
+    aqorders.basketno=aqbasket.basketno AND
+    budget_id=? AND
+    (datecancellationprinted IS NULL OR
+        datecancellationprinted='0000-00-00')
+    GROUP BY aqorders.ordernumber
+EOQ
 my $sth = $dbh->prepare($query);
-$sth->execute( $bookfund, $start, $end );
-
+$sth->execute($bookfund);
+if ( $sth->err ) {
+    die "An error occurred fetching records: " . $sth->errstr;
+}
 my $total = 0;
 my $toggle;
-my @spent_loop;
+my @spent;
 while ( my $data = $sth->fetchrow_hashref ) {
-    my $recv = $data->{'qrev'};
+    my $recv = $data->{'quantityreceived'};
     if ( $recv > 0 ) {
-        my $subtotal = $recv * $data->{'unitprice'};
-        $data->{'subtotal'} = $subtotal;
-        $data->{'unitprice'} += 0;
-        $total               += $subtotal;
-        if ($toggle) {
-            $toggle = 0;
-        }
-        else {
-            $toggle = 1;
-        }
-        $data->{'toggle'} = $toggle;
-        push @spent_loop, $data;
+        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;
+        push @spent, $data;
     }
 
 }
+$total = sprintf( "%.2f", $total );
 
-$template->param(
-    SPENTLOOP => \@spent_loop,
-    total     => $total
-);
+$template->{VARS}->{'fund'}  = $bookfund;
+$template->{VARS}->{'spent'} = \@spent;
+$template->{VARS}->{'total'} = $total;
+$template->{VARS}->{'fund_code'} = $fund_code;
 $sth->finish;
 
-$dbh->disconnect;
 output_html_with_http_headers $input, $cookie, $template->output;