[Koha-cvs] koha/C4 Bookfund.pm

[Henri-Damien LAURENT]

CVSROOT:        /cvsroot/koha
Module name:    koha
Changes by:     Henri-Damien LAURENT <hdl>      07/07/20 10:41:34

Modified files:
        C4             : Bookfund.pm 

Log message:
        Bug FIXING:
        One query was not mysql5 compliant.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Bookfund.pm?cvsroot=koha&r1=1.9&r2=1.10

Patches:
Index: Bookfund.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Bookfund.pm,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- Bookfund.pm 28 May 2007 15:26:43 -0000      1.9
+++ Bookfund.pm 20 Jul 2007 10:41:34 -0000      1.10
@@ -17,7 +17,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: Bookfund.pm,v 1.9 2007/05/28 15:26:43 hdl Exp $
+# $Id: Bookfund.pm,v 1.10 2007/07/20 10:41:34 hdl Exp $
 
 use strict;
 
@@ -25,7 +25,7 @@
 use vars qw($VERSION @ISA @EXPORT);
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.9 $' =~ /\d+/g; shift(@v) . "." . join( 
"_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.10 $' =~ /\d+/g; shift(@v) . "." . join( 
"_", map { sprintf "%03d", $_ } @v ); };
 
 =head1 NAME
 
@@ -257,25 +257,21 @@
                 subscription,title,itemtype,aqorders.biblionumber,
                 aqorders.booksellerinvoicenumber,
                 quantity-quantityreceived AS tleft,
-                aqorders.ordernumber AS ordnum,entrydate,budgetdate,
-                booksellerid,aqbasket.basketno
-        FROM    aqorderbreakdown,
-                aqbasket,
-                aqorders
+                aqorders.ordernumber AS ordnum,entrydate,budgetdate
+        FROM    aqorders
         LEFT JOIN biblioitems ON 
biblioitems.biblioitemnumber=aqorders.biblioitemnumber
+        LEFT JOIN aqorderbreakdown ON 
aqorders.ordernumber=aqorderbreakdown.ordernumber
         WHERE   bookfundid=?
-            AND aqorders.ordernumber=aqorderbreakdown.ordernumber
-            AND aqorders.basketno=aqbasket.basketno
             AND (budgetdate >= ? AND budgetdate < ?)
             AND (datecancellationprinted IS NULL OR 
datecancellationprinted='0000-00-00')
     ";
 
     $sth = $dbh->prepare($query);
+#      warn "$start $end";     
     $sth->execute( $id, $start, $end );
 
-    my $comtd;
+    my $comtd=0;
 
-    my $total = 0;
     while ( my $data = $sth->fetchrow_hashref ) {
         my $left = $data->{'tleft'};
         if ( !$left || $left eq '' ) {
@@ -287,6 +283,7 @@
             $data->{'left'} = $left;
             $comtd += $subtotal;
         }
+#         use Data::Dumper; warn Dumper($data);    
     }
 
     $sth->finish;