[Koha-cvs] CVS: koha/C4 Acquisitions.pm,1.14,1.15

[Paul POULAIN]

Update of /cvsroot/koha/koha/C4
In directory usw-pr-cvs1:/tmp/cvs-serv3001

Modified Files:
        Acquisitions.pm 
Log Message:
* getallorders now returns only not fully recieved orders



Index: Acquisitions.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Acquisitions.pm,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** Acquisitions.pm     14 May 2002 04:12:52 -0000      1.14
--- Acquisitions.pm     14 May 2002 09:12:43 -0000      1.15
***************
*** 128,132 ****
    my $dbh=C4Connect;
    my $query="Select * from aqorders,biblio,biblioitems where
!   booksellerinvoicenumber='$invoice' 
    and biblio.biblionumber=aqorders.biblionumber and 
biblioitems.biblioitemnumber=
    aqorders.biblioitemnumber group by 
aqorders.ordernumber,aqorders.biblioitemnumber";
--- 128,132 ----
    my $dbh=C4Connect;
    my $query="Select * from aqorders,biblio,biblioitems where
!   booksellerinvoicenumber='$invoice'
    and biblio.biblionumber=aqorders.biblionumber and 
biblioitems.biblioitemnumber=
    aqorders.biblioitemnumber group by 
aqorders.ordernumber,aqorders.biblioitemnumber";
***************
*** 150,156 ****
    my $query="Select * from aqorders,biblio,biblioitems where 
booksellerid='$supid'
    and (cancelledby is NULL or cancelledby = '')
!   and biblio.biblionumber=aqorders.biblionumber and 
biblioitems.biblioitemnumber=                    
!   aqorders.biblioitemnumber 
!   group by aqorders.biblioitemnumber 
    order by
    biblio.title";
--- 150,157 ----
    my $query="Select * from aqorders,biblio,biblioitems where 
booksellerid='$supid'
    and (cancelledby is NULL or cancelledby = '')
!   and (quantityreceived < quantity or quantityreceived is NULL)
!   and biblio.biblionumber=aqorders.biblionumber and 
biblioitems.biblioitemnumber=
!   aqorders.biblioitemnumber
!   group by aqorders.biblioitemnumber
    order by
    biblio.title";
***************
*** 201,205 ****
  and biblio.biblionumber=aqorders.biblionumber
  and ((datecancellationprinted is NULL)
! or (datecancellationprinted = '0000-00-00')
  and ((";
    my @data  = split(' ',$search);
--- 202,206 ----
  and biblio.biblionumber=aqorders.biblionumber
  and ((datecancellationprinted is NULL)
! or (datecancellationprinted = '0000-00-00'))
  and ((";
    my @data  = split(' ',$search);
***************
*** 209,213 ****
    }
    $query=~ s/ and $//;
!   $query.=" ) or biblioitems.isbn='$search' 
    or (aqorders.ordernumber='$search' and aqorders.biblionumber='$biblio')) ";
    if ($catview ne 'yes'){
--- 210,214 ----
    }
    $query=~ s/ and $//;
!   $query.=" ) or biblioitems.isbn='$search'
    or (aqorders.ordernumber='$search' and aqorders.biblionumber='$biblio')) ";
    if ($catview ne 'yes'){
***************
*** 216,220 ****
    $query.=" group by aqorders.ordernumber";
    my $sth=$dbh->prepare($query);
- #  print $query;
    $sth->execute;
    my $i=0;
--- 217,220 ----
***************
*** 623,626 ****
--- 623,627 ----
    my $data;
    my $bibitemnum;
+ 
    $biblioitem->{'volume'}          = $dbh->quote($biblioitem->{'volume'});
    $biblioitem->{'number'}        = $dbh->quote($biblioitem->{'number'});