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

[Paul POULAIN]

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

Modified Files:
      Tag: rel_2_2
        Circ2.pm 
Log Message:
managing ReturnBeforeExpiry flag.
If set in preferences, the return date can't be after the borrower expiry date.

Index: Circ2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Circ2.pm,v
retrieving revision 1.87.2.9
retrieving revision 1.87.2.10
diff -C2 -r1.87.2.9 -r1.87.2.10
*** Circ2.pm    31 May 2005 16:01:14 -0000      1.87.2.9
--- Circ2.pm    1 Aug 2005 15:17:35 -0000       1.87.2.10
***************
*** 880,883 ****
--- 880,887 ----
                        $dateduef=$date;
                }
+               # if ReturnBeforeExpiry ON the datedue can't be after borrower 
expirydate
+               if (C4::Context->preference('ReturnBeforeExpiry') && $dateduef 
gt $borrower->{expiry}) {
+                       $dateduef=$borrower->{expiry};
+               }
                $sth->execute($borrower->{'borrowernumber'}, 
$iteminformation->{'itemnumber'}, $dateduef, $env->{'branchcode'});
                $sth->finish;