[Koha-cvs] CVS: koha/C4/Circulation Circ2.pm,1.66,1.67

[Paul POULAIN]

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

Modified Files:
	Circ2.pm 
Log Message:
synch'ing 2.0.0 branch and head

Index: Circ2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Circ2.pm,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -r1.66 -r1.67
*** Circ2.pm	19 Dec 2003 14:44:46 -0000	1.66
--- Circ2.pm	11 Feb 2004 08:40:10 -0000	1.67
***************
*** 635,639 ****
  					$noissue=1;
  				} else {
! 					$rejected=-1;
  					last SWITCH;
  				}
--- 635,639 ----
  					$noissue=1;
  				} else {
! 					$rejected="Item on issue to this borrower, and you have chosen not to renew";
  					last SWITCH;
  				}
***************
*** 669,673 ****
  				my $branches = getbranches();
  				my $branchname = $branches->{$res->{'branchcode'}}->{'branchname'};
! 				if ($responses->{2} eq '') {
  					$questionnumber=2;
  					# FIXME - Assumes HTML
--- 669,673 ----
  				my $branches = getbranches();
  				my $branchname = $branches->{$res->{'branchcode'}}->{'branchname'};
! 				if ($responses->{2} eq '' && $responses->{3} eq '') {
  					$questionnumber=2;
  					# FIXME - Assumes HTML
***************
*** 676,680 ****
  					last SWITCH;
  				} elsif ($responses->{2} eq 'N') {
! 					$rejected=-1;
  					last SWITCH;
  				} else {
--- 676,680 ----
  					last SWITCH;
  				} elsif ($responses->{2} eq 'N') {
! 					$rejected="Issue cancelled";
  					last SWITCH;
  				} else {