[Koha-cvs] CVS: koha/C4/Circulation Circ2.pm,1.87.2.8,1.87.2.9

[Waylon Robertson]

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

Modified Files:
      Tag: rel_2_2
	Circ2.pm 
Log Message:
Bug 969: If you try to issue an item which has been made waiting for someone, and you
override the reserve, but don't indicate that the reserve should be cancelled,
the reserve is cancelled anyway. Fixed!

Index: Circ2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Circ2.pm,v
retrieving revision 1.87.2.8
retrieving revision 1.87.2.9
diff -C2 -r1.87.2.8 -r1.87.2.9
*** Circ2.pm	20 May 2005 19:06:02 -0000	1.87.2.8
--- Circ2.pm	31 May 2005 16:01:14 -0000	1.87.2.9
***************
*** 771,775 ****
  			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.
***************
*** 846,850 ****
  				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";
***************
*** 857,865 ****
  					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'});