[Koha-cvs] CVS: koha/C4/Circulation Circ2.pm,1.94,1.95

[Paul POULAIN]

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

Modified Files:
        Circ2.pm 
Log Message:
For instance, the return date does not rely on the borrower expiration date. A 
systempref will be added in Koha, to modify return date calculation schema :
* ReturnBeforeExpiry = yes => return date can't be after expiry date
* ReturnBeforeExpiry = no  => return date can be after expiry date 

Index: Circ2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Circ2.pm,v
retrieving revision 1.94
retrieving revision 1.95
diff -C2 -r1.94 -r1.95
*** Circ2.pm    20 Jun 2005 14:10:30 -0000      1.94
--- Circ2.pm    28 Jul 2005 08:38:17 -0000      1.95
***************
*** 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;