[Koha-cvs] CVS: koha/C4/Circulation Circ2.pm,1.86,1.87

[Paul POULAIN]

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

Modified Files:
	Circ2.pm 
Log Message:
fix for :
http://bugs.koha.org/cgi-bin/bugzilla/show_bug.cgi?id=858

* added a button to cancel issue
* adding checkbox to cancel reserve on the book (checked by default)
* the cancelation reserve is done on reserves done for a given item or for any item

Nelsonville, pls test & confirm it's OK

Index: Circ2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Circ2.pm,v
retrieving revision 1.86
retrieving revision 1.87
diff -C2 -r1.86 -r1.87
*** Circ2.pm	29 Nov 2004 17:29:37 -0000	1.86
--- Circ2.pm	15 Dec 2004 10:47:09 -0000	1.87
***************
*** 801,805 ****
  #
  sub issuebook {
! 	my ($env,$borrower,$barcode,$date) = @_;
  	my $dbh = C4::Context->dbh;
  #	my ($borrower, $flags) = &getpatroninformation($env, $borrowernumber, 0);
--- 801,805 ----
  #
  sub issuebook {
! 	my ($env,$borrower,$barcode,$date,$cancelreserve) = @_;
  	my $dbh = C4::Context->dbh;
  #	my ($borrower, $flags) = &getpatroninformation($env, $borrowernumber, 0);
***************
*** 834,838 ****
--- 834,840 ----
  				# The item is on reserve to the current patron
  				FillReserve($res);
+ 				warn "FillReserve";
  			} elsif ($restype eq "Waiting") {
+ 				warn "Waiting";
  				# The item is on reserve and waiting, but has been
  				# reserved by some other patron.
***************
*** 842,851 ****
  				CancelReserve(0, $res->{'itemnumber'}, $res->{'borrowernumber'});
  			} elsif ($restype eq "Reserved") {
  				# The item is on reserve for someone else.
  				my ($resborrower, $flags)=getpatroninformation($env, $resbor,0);
  				my $branches = getbranches();
  				my $branchname = $branches->{$res->{'branchcode'}}->{'branchname'};
! 				my $tobrcd = ReserveWaiting($res->{'itemnumber'}, $res->{'borrowernumber'});
! 				transferbook($tobrcd,$barcode, 1);
  			}
  		}
--- 844,866 ----
  				CancelReserve(0, $res->{'itemnumber'}, $res->{'borrowernumber'});
  			} elsif ($restype eq "Reserved") {
+ 				warn "Reserved";
  				# The item is on reserve for someone else.
  				my ($resborrower, $flags)=getpatroninformation($env, $resbor,0);
  				my $branches = getbranches();
  				my $branchname = $branches->{$res->{'branchcode'}}->{'branchname'};
! 				if ($cancelreserve) {
! 					# cancel reserves on this item
! 					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'});
! 					transferbook($tobrcd,$barcode, 1);
! 					warn "transferbook";
! 				}
  			}
  		}