[Koha-cvs] CVS: koha/C4/Circulation Circ2.pm,1.87.2.5,1.87.2.6

[Paul POULAIN]

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

Modified Files:
      Tag: rel_2_2
	Circ2.pm 
Log Message:
bugfix : checking issuing rules under certain circumstances was buggy.

Index: Circ2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Circ2.pm,v
retrieving revision 1.87.2.5
retrieving revision 1.87.2.6
diff -C2 -r1.87.2.5 -r1.87.2.6
*** Circ2.pm	19 May 2005 22:12:00 -0000	1.87.2.5
--- Circ2.pm	20 May 2005 14:32:47 -0000	1.87.2.6
***************
*** 609,613 ****
  	$sth->execute($cat_borrower, $type, $branch_borrower);
  	my $result = $sth->fetchrow_hashref;
! # 	warn "==>".$result->{maxissueqty};
  	if (defined($result)) {
  		$sth2->execute($borrower->{'borrowernumber'}, "%$type%");
--- 609,613 ----
  	$sth->execute($cat_borrower, $type, $branch_borrower);
  	my $result = $sth->fetchrow_hashref;
! #	warn "==>".$result->{maxissueqty};
  	if (defined($result)) {
  		$sth2->execute($borrower->{'borrowernumber'}, "%$type%");
***************
*** 628,632 ****
  	if (defined($result)) {
  		$sth3->execute($borrower->{'borrowernumber'});
! 		my $alreadyissued = $sth2->fetchrow;
  		return ("c $alreadyissued / ".($result->{maxissueqty}+0)) if ($result->{'maxissueqty'} <= $alreadyissued);
  	}
--- 628,633 ----
  	if (defined($result)) {
  		$sth3->execute($borrower->{'borrowernumber'});
! 		my ($alreadyissued) = $sth3->fetchrow;
! 		warn "HERE : $alreadyissued / ($result->{maxissueqty} for $borrower->{'borrowernumber'}";
  		return ("c $alreadyissued / ".($result->{maxissueqty}+0)) if ($result->{'maxissueqty'} <= $alreadyissued);
  	}
***************
*** 644,648 ****
  	if (defined($result)) {
  		$sth3->execute($borrower->{'borrowernumber'});
! 		my $alreadyissued = $sth2->fetchrow;
  		return ("e $alreadyissued / ".($result->{maxissueqty}+0)) if ($result->{'maxissueqty'} <= $alreadyissued);
  	}
--- 645,649 ----
  	if (defined($result)) {
  		$sth3->execute($borrower->{'borrowernumber'});
! 		my $alreadyissued = $sth3->fetchrow;
  		return ("e $alreadyissued / ".($result->{maxissueqty}+0)) if ($result->{'maxissueqty'} <= $alreadyissued);
  	}
***************
*** 668,672 ****
  	if (defined($result)) {
  		$sth3->execute($borrower->{'borrowernumber'});
! 		my $alreadyissued = $sth2->fetchrow;
  		return ("h $alreadyissued / ".($result->{maxissueqty}+0)) if ($result->{'maxissueqty'} <= $alreadyissued);
  	}
--- 669,673 ----
  	if (defined($result)) {
  		$sth3->execute($borrower->{'borrowernumber'});
! 		my $alreadyissued = $sth3->fetchrow;
  		return ("h $alreadyissued / ".($result->{maxissueqty}+0)) if ($result->{'maxissueqty'} <= $alreadyissued);
  	}