From 7867cb4901491fb4b9807cfa45c3d34a48fe87fa Mon Sep 17 00:00:00 2001
From: tgarip1957 <tgarip1957>
Date: Mon, 10 Jul 2006 19:17:31 +0000
Subject: [PATCH] removes Calendar dependency

---
 C4/Circulation/Circ2.pm | 38 ++++++++++++++------------------------
 1 file changed, 14 insertions(+), 24 deletions(-)

diff --git a/C4/Circulation/Circ2.pm b/C4/Circulation/Circ2.pm
index c8c02fd092..0d67fa504d 100755
--- a/C4/Circulation/Circ2.pm
+++ b/C4/Circulation/Circ2.pm
@@ -35,9 +35,9 @@ use C4::Stats;
 use C4::Reserves2;
 use C4::Koha;
 use C4::Accounts;
-#use Date::Manip;
+use Date::Manip;
 use C4::Biblio;
-use C4::Calendar::Calendar;
+#use C4::Calendar::Calendar;
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 
 # set the version for version checking
@@ -1039,15 +1039,10 @@ my $error;
 	my $loanlength = getLoanLength($borrower->{'categorycode'},$iteminformation->{'itemtype'},$borrower->{'branchcode'});
 my @datearr;
 my $dateduef;
-my $daysMode = C4::Context->preference('useDaysMode');
-	
-		 @datearr = localtime();
-		$dateduef = (1900+$datearr[5])."-".($datearr[4]+1)."-".$datearr[3];
-		my $calendar = C4::Calendar::Calendar->new(branchcode => $borrower->{'branchcode'});
-		my ($yeardue, $monthdue, $daydue) = split /-/, $dateduef;
-		($daydue, $monthdue, $yeardue) = $calendar->addDate($daydue, $monthdue, $yeardue, $loanlength);
-		$dateduef = "$yeardue-".sprintf ("%0.2d", $monthdue)."-". sprintf("%0.2d",$daydue);
-	
+my $loanlength = getLoanLength($borrower->{'categorycode'},$iteminformation->{'itemtype'},$borrower->{'branchcode'});
+		my $datedue=time+($loanlength)*86400;
+		my @datearr = localtime($datedue);
+		my $dateduef = (1900+$datearr[5])."-".($datearr[4]+1)."-".$datearr[3];
 #warn "issue : ".$borrower->{borrowernumber}." / I : ".$iteminformation->{'itemnumber'};
 
 		if ($date) {
@@ -1905,22 +1900,17 @@ my @nowarr = localtime(time);
 	if ($issuedata<=$now){
 		
 	
-		
-		$datedue=$issuedata;
-		my $calendar = C4::Calendar::Calendar->new(branchcode => $borrower->{'branchcode'});
-		my ($yeardue, $monthdue, $daydue) = split /-/, $datedue;
-		($daydue, $monthdue, $yeardue) = $calendar->addDate($daydue, $monthdue, $yeardue, $loanlength);
-		$datedue = "$yeardue-".sprintf ("%0.2d", $monthdue)."-". sprintf("%0.2d",$daydue);
-		
+	my $loanlength = getLoanLength($borrower->{'categorycode'},$iteminformation->{'itemtype'},$borrower->{'branchcode'});
+		my $datedue=time+($loanlength)*86400;
+		my @datearr = localtime($datedue);
+		my $dateduef = (1900+$datearr[5])."-".($datearr[4]+1)."-".$datearr[3];
 		
 	}else{
 		
-		my  @datearr = localtime();
-		$datedue = (1900+$datearr[5])."-".($datearr[4]+1)."-".$datearr[3];
-		my $calendar = C4::Calendar::Calendar->new(branchcode => $borrower->{'branchcode'});
-		my ($yeardue, $monthdue, $daydue) = split /-/, $datedue;
-		($daydue, $monthdue, $yeardue) = $calendar->addDate($daydue, $monthdue, $yeardue, $loanlength);
-		$datedue = "$yeardue-".sprintf ("%0.2d", $monthdue)."-". sprintf("%0.2d",$daydue);
+		my $loanlength = getLoanLength($borrower->{'categorycode'},$iteminformation->{'itemtype'},$borrower->{'branchcode'});
+		my $datedue=time+($loanlength)*86400;
+		my @datearr = localtime($datedue);
+		my $dateduef = (1900+$datearr[5])."-".($datearr[4]+1)."-".$datearr[3];
 		
 	}