[Koha-cvs] CVS: koha/C4/Circulation Circ2.pm,1.93,1.94 Fines.pm,1.10,1.11

[Paul POULAIN]

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

Modified Files:
	Circ2.pm Fines.pm 
Log Message:
synch'ing 2.2 and head

Index: Circ2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Circ2.pm,v
retrieving revision 1.93
retrieving revision 1.94
diff -C2 -r1.93 -r1.94
*** Circ2.pm	15 May 2005 04:34:09 -0000	1.93
--- Circ2.pm	20 Jun 2005 14:10:30 -0000	1.94
***************
*** 609,613 ****
  	$sth->execute($cat_borrower, $type, $branch_borrower);
  	my $result = $sth->fetchrow_hashref;
! # 	warn "==>".$result->{maxissueqty};
  	if (defined($result)) {
  		$sth2->execute($borrower->{'borrowernumber'}, "%$type%");
--- 609,613 ----
  	$sth->execute($cat_borrower, $type, $branch_borrower);
  	my $result = $sth->fetchrow_hashref;
! #	warn "==>".$result->{maxissueqty};
  	if (defined($result)) {
  		$sth2->execute($borrower->{'borrowernumber'}, "%$type%");
***************
*** 628,632 ****
  	if (defined($result)) {
  		$sth3->execute($borrower->{'borrowernumber'});
! 		my $alreadyissued = $sth2->fetchrow;
  		return ("c $alreadyissued / ".($result->{maxissueqty}+0)) if ($result->{'maxissueqty'} <= $alreadyissued);
  	}
--- 628,633 ----
  	if (defined($result)) {
  		$sth3->execute($borrower->{'borrowernumber'});
! 		my ($alreadyissued) = $sth3->fetchrow;
! 		warn "HERE : $alreadyissued / ($result->{maxissueqty} for $borrower->{'borrowernumber'}";
  		return ("c $alreadyissued / ".($result->{maxissueqty}+0)) if ($result->{'maxissueqty'} <= $alreadyissued);
  	}
***************
*** 644,648 ****
  	if (defined($result)) {
  		$sth3->execute($borrower->{'borrowernumber'});
! 		my $alreadyissued = $sth2->fetchrow;
  		return ("e $alreadyissued / ".($result->{maxissueqty}+0)) if ($result->{'maxissueqty'} <= $alreadyissued);
  	}
--- 645,649 ----
  	if (defined($result)) {
  		$sth3->execute($borrower->{'borrowernumber'});
! 		my $alreadyissued = $sth3->fetchrow;
  		return ("e $alreadyissued / ".($result->{maxissueqty}+0)) if ($result->{'maxissueqty'} <= $alreadyissued);
  	}
***************
*** 668,672 ****
  	if (defined($result)) {
  		$sth3->execute($borrower->{'borrowernumber'});
! 		my $alreadyissued = $sth2->fetchrow;
  		return ("h $alreadyissued / ".($result->{maxissueqty}+0)) if ($result->{'maxissueqty'} <= $alreadyissued);
  	}
--- 669,673 ----
  	if (defined($result)) {
  		$sth3->execute($borrower->{'borrowernumber'});
! 		my $alreadyissued = $sth3->fetchrow;
  		return ("h $alreadyissued / ".($result->{maxissueqty}+0)) if ($result->{'maxissueqty'} <= $alreadyissued);
  	}
***************
*** 699,702 ****
--- 700,706 ----
  		$issuingimpossible{DEBARRED} = 1;
  	}
+ 	if (&Date_Cmp(&ParseDate($borrower->{expiry}),&ParseDate("today"))<0) {
+ 		$issuingimpossible{EXPIRED} = 1;
+ 	}
  #
  # BORROWER STATUS
***************
*** 767,771 ****
  			my $branchname = $branches->{$res->{'branchcode'}}->{'branchname'};
  			$needsconfirmation{RESERVE_WAITING} = "$resborrower->{'firstname'} $resborrower->{'surname'} ($resborrower->{'cardnumber'}, $branchname)";
! 			CancelReserve(0, $res->{'itemnumber'}, $res->{'borrowernumber'});
  		} elsif ($restype eq "Reserved") {
  			# The item is on reserve for someone else.
--- 771,775 ----
  			my $branchname = $branches->{$res->{'branchcode'}}->{'branchname'};
  			$needsconfirmation{RESERVE_WAITING} = "$resborrower->{'firstname'} $resborrower->{'surname'} ($resborrower->{'cardnumber'}, $branchname)";
! 			# CancelReserve(0, $res->{'itemnumber'}, $res->{'borrowernumber'}); Doesn't belong in a checking subroutine.
  		} elsif ($restype eq "Reserved") {
  			# The item is on reserve for someone else.
***************
*** 842,846 ****
  				my $branches = getbranches();
  				my $branchname = $branches->{$res->{'branchcode'}}->{'branchname'};
! 				CancelReserve(0, $res->{'itemnumber'}, $res->{'borrowernumber'});
  			} elsif ($restype eq "Reserved") {
  				warn "Reserved";
--- 846,852 ----
  				my $branches = getbranches();
  				my $branchname = $branches->{$res->{'branchcode'}}->{'branchname'};
!                 if ($cancelreserve){
!     				CancelReserve(0, $res->{'itemnumber'}, $res->{'borrowernumber'});
!                 }
  			} elsif ($restype eq "Reserved") {
  				warn "Reserved";
***************
*** 853,861 ****
  					CancelReserve(0, $res->{'itemnumber'}, $res->{'borrowernumber'});
  					# also cancel reserve on biblio related to this item
! 					my $st_Fbiblio = $dbh->prepare("select biblionumber from items where itemnumber=?");
! 					$st_Fbiblio->execute($res->{'itemnumber'});
! 					my $biblionumber = $st_Fbiblio->fetchrow;
! 					CancelReserve($biblionumber,0,$res->{'borrowernumber'});
! 					warn "CancelReserve $res->{'itemnumber'}, $res->{'borrowernumber'}";
  				} else {
  # 					my $tobrcd = ReserveWaiting($res->{'itemnumber'}, $res->{'borrowernumber'});
--- 859,867 ----
  					CancelReserve(0, $res->{'itemnumber'}, $res->{'borrowernumber'});
  					# also cancel reserve on biblio related to this item
! 					#my $st_Fbiblio = $dbh->prepare("select biblionumber from items where itemnumber=?");
! 					#$st_Fbiblio->execute($res->{'itemnumber'});
! 					#my $biblionumber = $st_Fbiblio->fetchrow;
! 					#CancelReserve($biblionumber,0,$res->{'borrowernumber'});
! 					#warn "CancelReserve $res->{'itemnumber'}, $res->{'borrowernumber'}";
  				} else {
  # 					my $tobrcd = ReserveWaiting($res->{'itemnumber'}, $res->{'borrowernumber'});
***************
*** 1619,1622 ****
--- 1625,1637 ----
  		}
  		$sth2->finish;
+ 		my ($resfound, $resrec) = CheckReserves($itemno);
+ 		if ($resfound) {
+ 			$renewokay = 0;
+ 		}
+ 		my ($resfound, $resrec) = CheckReserves($itemno);
+                 if ($resfound) {
+                         $renewokay = 0;
+                 }
+ 
  	}
  	$sth1->finish;

Index: Fines.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Fines.pm,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** Fines.pm	1 Mar 2005 03:08:00 -0000	1.10
--- Fines.pm	20 Jun 2005 14:10:31 -0000	1.11
***************
*** 152,157 ****
    biblioitems.itemtype=itemtypes.itemtype and
    categoryitem.itemtype=itemtypes.itemtype and
!   categoryitem.categorycode=? and
!   (items.itemlost <> 1 or items.itemlost is NULL)");
  #  print $query;
    $sth->execute($itemnumber,$bortype);
--- 152,156 ----
    biblioitems.itemtype=itemtypes.itemtype and
    categoryitem.itemtype=itemtypes.itemtype and
!   categoryitem.categorycode=? and (items.itemlost <> 1 or items.itemlost is NULL)");
  #  print $query;
    $sth->execute($itemnumber,$bortype);