[Koha-cvs] koha/C4 Circulation.pm

[paul poulain]

CVSROOT:        /sources/koha
Module name:    koha
Changes by:     paul poulain <tipaul>   07/05/30 09:12:36

Modified files:
        C4             : Circulation.pm 

Log message:
        BugFixing CanBookBeRenewed was too strict. If a book could be renewed 1 
time, it wouldnot do.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Circulation.pm?cvsroot=koha&r1=1.27&r2=1.28

Patches:
Index: Circulation.pm
===================================================================
RCS file: /sources/koha/koha/C4/Circulation.pm,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- Circulation.pm      23 May 2007 16:19:40 -0000      1.27
+++ Circulation.pm      30 May 2007 09:12:36 -0000      1.28
@@ -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: Circulation.pm,v 1.27 2007/05/23 16:19:40 tipaul Exp $
+# $Id: Circulation.pm,v 1.28 2007/05/30 09:12:36 tipaul Exp $
 
 use strict;
 require Exporter;
@@ -45,7 +45,7 @@
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.27 $' =~ /\d+/g; shift(@v).".".join( 
"_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.28 $' =~ /\d+/g; shift(@v).".".join( 
"_", map { sprintf "%03d", $_ } @v ); };
 
 =head1 NAME
 
@@ -1598,7 +1598,7 @@
         if ( my $data2 = $sth2->fetchrow_hashref ) {
             $renews = $data2->{'renewalsallowed'};
         }
-        if ( $renews && $renews > $data1->{'renewals'} ) {
+        if ( $renews && $renews >= $data1->{'renewals'} ) {
             $renewokay = 1;
         }
         $sth2->finish;
@@ -1606,10 +1606,6 @@
         if ($resfound) {
             $renewokay = 0;
         }
-        ( $resfound, $resrec ) = C4::Reserves::CheckReserves($itemnumber);
-        if ($resfound) {
-            $renewokay = 0;
-        }
 
     }
     $sth1->finish;