[Koha-cvs] koha/C4/Circulation Circ2.pm [rel_3_0]

[paul poulain]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         rel_3_0
Changes by:     paul poulain <tipaul>   07/01/04 13:10:40

Modified files:
        C4/Circulation : Circ2.pm 

Log message:
        the field name is dateexpiry & not expiry

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Circulation/Circ2.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.114.2.26&r2=1.114.2.27

Patches:
Index: Circ2.pm
===================================================================
RCS file: /sources/koha/koha/C4/Circulation/Circ2.pm,v
retrieving revision 1.114.2.26
retrieving revision 1.114.2.27
diff -u -b -r1.114.2.26 -r1.114.2.27
--- Circ2.pm    14 Dec 2006 15:41:53 -0000      1.114.2.26
+++ Circ2.pm    4 Jan 2007 13:10:39 -0000       1.114.2.27
@@ -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: Circ2.pm,v 1.114.2.26 2006/12/14 15:41:53 toins Exp $
+# $Id: Circ2.pm,v 1.114.2.27 2007/01/04 13:10:39 tipaul Exp $
 
 use strict;
 require Exporter;
@@ -40,7 +40,7 @@
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.114.2.26 $' =~ /\d+/g; 
shift(@v).".".join( "_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.114.2.27 $' =~ /\d+/g; 
shift(@v).".".join( "_", map { sprintf "%03d", $_ } @v ); };
 
 =head1 NAME
 
@@ -1328,9 +1328,9 @@
 
        # if ReturnBeforeExpiry ON the datedue can't be after borrower 
expirydate
         if ( C4::Context->preference('ReturnBeforeExpiry')
-            && $dateduef gt $borrower->{expiry} )
+            && $dateduef gt $borrower->{dateexpiry} )
         {
-            $dateduef = $borrower->{expiry};
+            $dateduef = $borrower->{dateexpiry};
         }
         $sth->execute(
             $borrower->{'borrowernumber'},