[Koha-cvs] CVS: koha/C4 Acquisitions.pm,1.11,1.12

[Paul POULAIN]

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

Modified Files:
        Acquisitions.pm 
Log Message:
Bugfixes : removes some hard coded trailing dates in select...



Index: Acquisitions.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Acquisitions.pm,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** Acquisitions.pm     13 May 2002 00:45:46 -0000      1.11
--- Acquisitions.pm     13 May 2002 20:22:24 -0000      1.12
***************
*** 215,218 ****
--- 215,222 ----
    }
    $query.=" group by aqorders.ordernumber";
+   my $input=new CGI;
+ print $input->header();
+ print $query;
+ die;
    my $sth=$dbh->prepare($query);
  #  print $query;
***************
*** 290,294 ****
    if ($supplier ne ''){
      $query.=" and aqorders.booksellerid='$supplier'";
!   } 
    $query.=" group by aqorders.ordernumber";
    my $sth=$dbh->prepare($query);
--- 294,298 ----
    if ($supplier ne ''){
      $query.=" and aqorders.booksellerid='$supplier'";
!   }
    $query.=" group by aqorders.ordernumber";
    my $sth=$dbh->prepare($query);
***************
*** 322,327 ****
    my $dbh=C4Connect;
    my $query="Select * from aqbookfund,aqbudget where aqbookfund.bookfundid
!   =aqbudget.bookfundid 
!   and aqbudget.startdate='2001=07-01' 
    group by aqbookfund.bookfundid order by bookfundname";
    my $sth=$dbh->prepare($query);
--- 326,330 ----
    my $dbh=C4Connect;
    my $query="Select * from aqbookfund,aqbudget where aqbookfund.bookfundid
!   =aqbudget.bookfundid
    group by aqbookfund.bookfundid order by bookfundname";
    my $sth=$dbh->prepare($query);
***************
*** 361,367 ****
    my $query="Select 
quantity,datereceived,freight,unitprice,listprice,ecost,quantityreceived,subscription
    from aqorders,aqorderbreakdown where bookfundid='$id' and 
!   aqorders.ordernumber=aqorderbreakdown.ordernumber and ((budgetdate >=
!   '2001-07-01' and budgetdate <'2002-07-01') or
!   (datereceived >= '2001-07-01' and datereceived < '2002-07-01'))
    and (datecancellationprinted is NULL or
    datecancellationprinted='0000-00-00')";
--- 364,368 ----
    my $query="Select 
quantity,datereceived,freight,unitprice,listprice,ecost,quantityreceived,subscription
    from aqorders,aqorderbreakdown where bookfundid='$id' and 
!   aqorders.ordernumber=aqorderbreakdown.ordernumber
    and (datecancellationprinted is NULL or
    datecancellationprinted='0000-00-00')";
***************
*** 626,630 ****
    my $data;
    my $bibitemnum;
-   
    $biblioitem->{'volume'}          = $dbh->quote($biblioitem->{'volume'});
    $biblioitem->{'number'}        = $dbh->quote($biblioitem->{'number'});
--- 627,630 ----
***************
*** 724,732 ****
    my $query="insert into aqorders (biblionumber,title,basketno,
    
quantity,listprice,booksellerid,entrydate,requisitionedby,authorisedby,notes,
!   
biblioitemnumber,rrp,ecost,gst,budgetdate,unitprice,subscription,booksellerinvoicenumber)
  
    values
    ($bibnum,'$title',$basket,$quantity,$listprice,'$supplier',now(),
!   '$who','$who','$notes',$bibitemnum,'$rrp','$ecost','$gst',$budget,'$cost',
    '$sub','$invoice')";
    my $sth=$dbh->prepare($query);
--- 724,732 ----
    my $query="insert into aqorders (biblionumber,title,basketno,
    
quantity,listprice,booksellerid,entrydate,requisitionedby,authorisedby,notes,
!   
biblioitemnumber,rrp,ecost,gst,unitprice,subscription,booksellerinvoicenumber)
  
    values
    ($bibnum,'$title',$basket,$quantity,$listprice,'$supplier',now(),
!   '$who','$who','$notes',$bibitemnum,'$rrp','$ecost','$gst','$cost',
    '$sub','$invoice')";
    my $sth=$dbh->prepare($query);