[Koha-cvs] koha/C4 Circulation.pm

[Bruno Toumi]

CVSROOT:	/cvsroot/koha
Module name:	koha
Changes by:	Bruno Toumi <btoumi>	07/05/18 12:30:27

Modified files:
	C4             : Circulation.pm 

Log message:
	bug fix: add call of two function from Date::calc
	and  correction of wrong   variable name 

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

Patches:
Index: Circulation.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation.pm,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- Circulation.pm	11 May 2007 14:49:54 -0000	1.24
+++ Circulation.pm	18 May 2007 12:30:27 -0000	1.25
@@ -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.24 2007/05/11 14:49:54 btoumi Exp $
+# $Id: Circulation.pm,v 1.25 2007/05/18 12:30:27 btoumi Exp $
 
 use strict;
 require Exporter;
@@ -35,6 +35,8 @@
   Add_Delta_YM
   Add_Delta_DHMS
   Date_to_Days
+  Day_of_Week
+  Add_Delta_Days	
 );
 use POSIX qw(strftime);
 use C4::Branch; # GetBranches
@@ -43,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.24 $' =~ /\d+/g; shift(@v).".".join( "_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.25 $' =~ /\d+/g; shift(@v).".".join( "_", map { sprintf "%03d", $_ } @v ); };
 
 =head1 NAME
 
@@ -991,7 +993,7 @@
         if ($date) {
             $dateduef = $date;
         }
-	$dateduef=CheckValidDatedue($dateduef,$iteminformation->{'itemnumber'},$env->{'branchcode'});
+	$dateduef=CheckValidDatedue($dateduef,$item->{'itemnumber'},C4::Context->userenv->{'branch'});
        # if ReturnBeforeExpiry ON the datedue can't be after borrower expirydate
         if ( C4::Context->preference('ReturnBeforeExpiry')
             && $dateduef gt $borrower->{dateexpiry} )