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

[Tumer Garip]

CVSROOT:	/sources/koha
Module name:	koha
Branch:		dev_week
Changes by:	Tumer Garip <tgarip1957>	06/07/10 19:17:31

Modified files:
	C4/Circulation : Circ2.pm 

Log message:
	removes Calendar dependency

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Circulation/Circ2.pm?cvsroot=koha&only_with_tag=dev_week&r1=1.87.2.14.2.1&r2=1.87.2.14.2.2

Patches:
Index: Circ2.pm
===================================================================
RCS file: /sources/koha/koha/C4/Circulation/Circ2.pm,v
retrieving revision 1.87.2.14.2.1
retrieving revision 1.87.2.14.2.2
diff -u -b -r1.87.2.14.2.1 -r1.87.2.14.2.2
--- Circ2.pm	28 May 2006 18:49:12 -0000	1.87.2.14.2.1
+++ Circ2.pm	10 Jul 2006 19:17:31 -0000	1.87.2.14.2.2
@@ -3,7 +3,7 @@
 
 package C4::Circulation::Circ2;
 
-# $Id: Circ2.pm,v 1.87.2.14.2.1 2006/05/28 18:49:12 tgarip1957 Exp $
+# $Id: Circ2.pm,v 1.87.2.14.2.2 2006/07/10 19:17:31 tgarip1957 Exp $
 
 #package to deal with Returns
 #written 3/11/99 by olwen at katipo.co.nz
@@ -35,9 +35,9 @@
 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 $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 @@
 	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];
 		
 	}