[Koha-cvs] CVS: koha/C4 Acquisition.pm,1.3,1.4

[Paul POULAIN]

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

Modified Files:
        Acquisition.pm 
Log Message:
bugfix for acquisitions

Index: Acquisition.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Acquisition.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Acquisition.pm      12 Aug 2004 14:36:29 -0000      1.3
--- Acquisition.pm      13 Sep 2004 15:21:59 -0000      1.4
***************
*** 389,396 ****
        my ($supplierid)address@hidden;
        my $dbh = C4::Context->dbh;
!       my $sth=$dbh->prepare("Select 
count(*),authorisedby,creationdate,aqbasket.basketno,closedate from aqorders 
left join aqbasket on
!       aqbasket.basketno=aqorders.basketno where booksellerid=? and (quantity 
> quantityreceived or
!       quantityreceived is NULL)
!       group by basketno order by aqbasket.basketno");
        $sth->execute($supplierid);
        my @results = ();
--- 389,400 ----
        my ($supplierid)address@hidden;
        my $dbh = C4::Context->dbh;
!       my $sth=$dbh->prepare("Select 
count(*),authorisedby,creationdate,aqbasket.basketno,
!               closedate,surname,firstname 
!               from aqorders 
!               left join aqbasket on aqbasket.basketno=aqorders.basketno 
!               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);
        my @results = ();
***************
*** 474,478 ****
    my $dbh = C4::Context->dbh;
    my @results = ();
!   my $sth=$dbh->prepare("Select * from aqorders,biblio,biblioitems where 
booksellerid=?
    and (cancelledby is NULL or cancelledby = '')
    and (quantityreceived < quantity or quantityreceived is NULL)
--- 478,483 ----
    my $dbh = C4::Context->dbh;
    my @results = ();
!   my $sth=$dbh->prepare("Select * from aqorders,biblio,biblioitems,aqbasket 
where aqbasket.basketno=aqorders.basketno
!   and booksellerid=?
    and (cancelledby is NULL or cancelledby = '')
    and (quantityreceived < quantity or quantityreceived is NULL)