[Koha-cvs] CVS: koha/C4/Circulation Circ2.pm,1.65.2.1,1.65.2.2

[Chris Cormack]

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

Modified Files:
      Tag: rel_2_0
	Circ2.pm 
Log Message:
Fix for bug 293, this should be all fixed now



Index: Circ2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Circ2.pm,v
retrieving revision 1.65.2.1
retrieving revision 1.65.2.2
diff -C2 -r1.65.2.1 -r1.65.2.2
*** Circ2.pm	19 Dec 2003 14:44:20 -0000	1.65.2.1
--- Circ2.pm	22 Jan 2004 00:37:09 -0000	1.65.2.2
***************
*** 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