[Koha-cvs] CVS: koha/C4/Circulation Circ2.pm,1.88,1.89

[Paul POULAIN]

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

Modified Files:
	Circ2.pm 
Log Message:
merging 2.2 branch with head. Sorry for not making it before, many many commits done here

Index: Circ2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Circ2.pm,v
retrieving revision 1.88
retrieving revision 1.89
diff -C2 -r1.88 -r1.89
*** Circ2.pm	22 Feb 2005 22:40:15 -0000	1.88
--- Circ2.pm	1 Mar 2005 13:40:49 -0000	1.89
***************
*** 722,726 ****
  		$issuingimpossible{UNKNOWN_BARCODE} = 1;
  	}
! 	if ($iteminformation->{'notforloan'} == 1) {
  		$issuingimpossible{NOT_FOR_LOAN} = 1;
  	}
--- 722,726 ----
  		$issuingimpossible{UNKNOWN_BARCODE} = 1;
  	}
! 	if ($iteminformation->{'notforloan'} > 0) {
  		$issuingimpossible{NOT_FOR_LOAN} = 1;
  	}