[Koha-cvs] CVS: koha/C4 SearchMarc.pm,1.36.2.6,1.36.2.7

[Paul POULAIN]

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

Modified Files:
      Tag: rel_2_2
	SearchMarc.pm 
Log Message:
* setting not for loan on item if itemtype is not for loan
* removing "not reservable" for not for loan items (the info is in the previous column)
* setting "request" button to css=button as all other buttons !

Index: SearchMarc.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/SearchMarc.pm,v
retrieving revision 1.36.2.6
retrieving revision 1.36.2.7
diff -C2 -r1.36.2.6 -r1.36.2.7
*** SearchMarc.pm	7 Mar 2005 09:49:06 -0000	1.36.2.6
--- SearchMarc.pm	18 Mar 2005 08:51:26 -0000	1.36.2.7
***************
*** 389,393 ****
  			$lineCN{location} = $item->{location};
  			$lineCN{date_due} = format_date($date_due);
! 			$lineCN{notforloan} = $notforloanstatus{$item->{notforloan}} if ($item->{notforloan});
  			$notforloan=0 unless ($item->{notforloan} or $item->{wthdrawn} or $item->{itemlost});
  			push @CNresults,\%lineCN;
--- 389,394 ----
  			$lineCN{location} = $item->{location};
  			$lineCN{date_due} = format_date($date_due);
! 			$lineCN{notforloan} = $notforloanstatus{$line->{notforloan}} if ($line->{notforloan}); # setting not forloan if itemtype is not for loan
! 			$lineCN{notforloan} = $notforloanstatus{$item->{notforloan}} if ($item->{notforloan}); # setting not forloan it this item is not for loan
  			$notforloan=0 unless ($item->{notforloan} or $item->{wthdrawn} or $item->{itemlost});
  			push @CNresults,\%lineCN;