[Koha-cvs] CVS: koha/C4/Circulation Circ2.pm,1.87.2.10,1.87.2.11

[Paul POULAIN]

Update of /cvsroot/koha/koha/C4/Circulation
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26934/C4/Circulation

Modified Files:
      Tag: rel_2_2
        Circ2.pm 
Log Message:
fixing a big bug in circulation rules : the number of issued books was 
calculated poorly. Seems the bug had not been found before because there most 
books are of the same itemtype. Of borrowers don't try to issue more than what 
they can ;-)

(thanks to sylvain from doXulting, that pointed the problem & suggested the fix)

Index: Circ2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Circ2.pm,v
retrieving revision 1.87.2.10
retrieving revision 1.87.2.11
diff -C2 -r1.87.2.10 -r1.87.2.11
*** Circ2.pm    1 Aug 2005 15:17:35 -0000       1.87.2.10
--- Circ2.pm    23 Sep 2005 09:31:15 -0000      1.87.2.11
***************
*** 603,607 ****
        my $type = $sth->fetchrow;
        $sth = $dbh->prepare('select * from issuingrules where categorycode = ? 
and itemtype = ? and branchcode = ?');
!       my $sth2 = $dbh->prepare("select COUNT(*) from issues i, biblioitems s 
where i.borrowernumber = ? and i.returndate is null and i.itemnumber = 
s.biblioitemnumber and s.itemtype like ?");
        my $sth3 = $dbh->prepare('select COUNT(*) from issues where 
borrowernumber = ? and returndate is null');
        my $alreadyissued;
--- 603,608 ----
        my $type = $sth->fetchrow;
        $sth = $dbh->prepare('select * from issuingrules where categorycode = ? 
and itemtype = ? and branchcode = ?');
! #     my $sth2 = $dbh->prepare("select COUNT(*) from issues i, biblioitems s 
where i.borrowernumber = ? and i.returndate is null and i.itemnumber = 
s.biblioitemnumber and s.itemtype like ?");
!       my $sth2 = $dbh->prepare("select COUNT(*) from issues i, biblioitems 
s1, items s2 where i.borrowernumber = ? and i.returndate is null and 
i.itemnumber = s2.itemnumber and s1.itemtype like ? and s1.biblioitemnumber = 
s2.biblioitemnumber");
        my $sth3 = $dbh->prepare('select COUNT(*) from issues where 
borrowernumber = ? and returndate is null');
        my $alreadyissued;