[Koha-cvs] CVS: koha/C4 Acquisition.pm,1.9.2.1,1.9.2.2

[Paul POULAIN]

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

Modified Files:
      Tag: rel_2_2
	Acquisition.pm 
Log Message:
don't count cancelled lines in order number of lines

Index: Acquisition.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Acquisition.pm,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -C2 -r1.9.2.1 -r1.9.2.2
*** Acquisition.pm	17 Feb 2005 12:43:26 -0000	1.9.2.1
--- Acquisition.pm	25 Mar 2005 16:19:03 -0000	1.9.2.2
***************
*** 398,402 ****
  		left join borrowers on aqbasket.authorisedby=borrowers.borrowernumber
  		where booksellerid=? and (quantity > quantityreceived or
! 		quantityreceived is NULL)
  		group by basketno order by aqbasket.basketno");
  	$sth->execute($supplierid);
--- 398,402 ----
  		left join borrowers on aqbasket.authorisedby=borrowers.borrowernumber
  		where booksellerid=? and (quantity > quantityreceived or
! 		quantityreceived is NULL) and datecancellationprinted is NULL
  		group by basketno order by aqbasket.basketno");
  	$sth->execute($supplierid);