bug Fix 3712

[koha.git] / acqui / bookfund.pl

diff --git a/acqui/bookfund.pl b/acqui/bookfund.pl
index 18c0683..bac0bf9 100755 (executable)
--- a/acqui/bookfund.pl
+++ b/acqui/bookfund.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 # Copyright 2006 Katipo Communications
 #                                     
@@ -21,7 +21,7 @@ use C4::Context;
 use strict;
 use CGI;
 use C4::Auth;
-use C4::Interface::CGI::Output;
+use C4::Output;
 
 my $dbh      = C4::Context->dbh;
 my $input    = new CGI;
@@ -64,17 +64,17 @@ SELECT quantity,
       ON aqorderbreakdown.ordernumber = aqorders.ordernumber
     INNER JOIN aqbasket
       ON aqbasket.basketno = aqorders.basketno
-    LEFT JOIN biblio
-      ON biblio.biblionumber = aqorders.biblionumber
+    LEFT JOIN biblioitems
+      ON biblioitems.biblioitemnumber = aqorders.biblioitemnumber
   WHERE bookfundid = ?
     AND budgetdate >= ?
     AND budgetdate < ?
     AND (datecancellationprinted IS NULL
          OR datecancellationprinted = \'0000-00-00\')
+    AND (closedate >= ? and closedate < ?)
 ';
-##warn $query;
 my $sth = $dbh->prepare($query);
-$sth->execute( $bookfund, $start, $end );
+$sth->execute( $bookfund, $start, $end, $start, $end);
 my @commited_loop;
 
 my $total = 0;
@@ -85,7 +85,7 @@ while ( my $data = $sth->fetchrow_hashref ) {
     }
     if ( $left && $left > 0 ) {
         my $subtotal = $left * $data->{'ecost'};
-        $data->{subtotal} = $subtotal;
+        $data->{subtotal} = sprintf("%.2f",$subtotal);
         $data->{'left'} = $left;
         push @commited_loop, $data;
         $total += $subtotal;
@@ -93,10 +93,10 @@ while ( my $data = $sth->fetchrow_hashref ) {
 }
 
 $template->param(
-    COMMITEDLOOP => \@commited_loop,
-    total        => $total
+    COMMITTEDLOOP => \@commited_loop,
+    total        =>  sprintf("%.2f",$total),
 );
 $sth->finish;
-#$dbh->disconnect;
+$dbh->disconnect;
 
 output_html_with_http_headers $input, $cookie, $template->output;