[Koha-cvs] CVS: koha/C4/Circulation Circ2.pm,1.59,1.60

[Chris Cormack]

Update of /cvsroot/koha/koha/C4/Circulation
In directory sc8-pr-cvs1:/tmp/cvs-serv4684/C4/Circulation

Modified Files:
	Circ2.pm 
Log Message:
Fix for bug 293


Index: Circ2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Circ2.pm,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -r1.59 -r1.60
*** Circ2.pm	20 Jun 2003 12:48:09 -0000	1.59
--- Circ2.pm	24 Jul 2003 09:17:42 -0000	1.60
***************
*** 685,689 ****
  						CancelReserve(0, $res->{'itemnumber'}, $res->{'borrowernumber'});
  					}
! 				}
  			} elsif ($restype eq "Reserved") {
  				# The item is on reserve for someone else.
--- 685,690 ----
  						CancelReserve(0, $res->{'itemnumber'}, $res->{'borrowernumber'});
  					}
! 
! }
  			} elsif ($restype eq "Reserved") {
  				# The item is on reserve for someone else.
***************
*** 695,698 ****
--- 696,704 ----
  					$question="Reserved for $resborrower->{'firstname'} $resborrower->{'surname'} ($resborrower->{'cardnumber'}) since $res->{'reservedate'} \nAllow issue?";
  					$defaultanswer='N';
+ 					if ($responses->{6} eq 'Y') {
+ 					   my $tobrcd = ReserveWaiting($res->{'itemnumber'}, $res->{'borrowernumber'});
+ 					   transferbook($tobrcd,$barcode, 1);
+ 					   $message = "Item should now be waiting at $branchname";
+                                         }
  					last SWITCH;
  				} elsif ($responses->{5} eq 'N') {