[Koha-cvs] CVS: koha/C4 Catalogue.pm,1.41,1.42

[Paul POULAIN]

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

Modified Files:
	Catalogue.pm 
Log Message:
Adding 2 new fields, called "sort1" and "sort2"
They can be used for sorting & statistics reasons by the library.

Index: Catalogue.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Catalogue.pm,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -r1.41 -r1.42
*** Catalogue.pm	15 Mar 2004 14:32:40 -0000	1.41
--- Catalogue.pm	2 Jul 2004 15:55:06 -0000	1.42
***************
*** 175,179 ****
  #'
  sub neworder {
!   my ($bibnum,$title,$ordnum,$basket,$quantity,$listprice,$supplier,$who,$notes,$bookfund,$bibitemnum,$rrp,$ecost,$gst,$budget,$cost,$sub,$invoice)=@_;
    if ($budget eq 'now'){
      $budget="now()";
--- 175,179 ----
  #'
  sub neworder {
!   my ($bibnum,$title,$ordnum,$basket,$quantity,$listprice,$supplier,$who,$notes,$bookfund,$bibitemnum,$rrp,$ecost,$gst,$budget,$cost,$sub,$invoice,$sort1,$sort2)=@_;
    if ($budget eq 'now'){
      $budget="now()";
***************
*** 189,197 ****
    my $sth=$dbh->prepare("insert into aqorders (biblionumber,title,basketno,
    quantity,listprice,booksellerid,entrydate,requisitionedby,authorisedby,notes,
!   biblioitemnumber,rrp,ecost,gst,unitprice,subscription,booksellerinvoicenumber)
!   values (?,?,?,?,?,?,now(),?,?,?,?,?,?,?,?,?,?)");
    $sth->execute($bibnum,$title,$basket,$quantity,$listprice,$supplier,
    $who,$who,$notes,$bibitemnum,$rrp,$ecost,$gst,$cost,
!   $sub,$invoice);
    $sth->finish;
    $sth=$dbh->prepare("select * from aqorders where
--- 189,197 ----
    my $sth=$dbh->prepare("insert into aqorders (biblionumber,title,basketno,
    quantity,listprice,booksellerid,entrydate,requisitionedby,authorisedby,notes,
!   biblioitemnumber,rrp,ecost,gst,unitprice,subscription,booksellerinvoicenumber,sort1,sort2)
!   values (?,?,?,?,?,?,now(),?,?,?,?,?,?,?,?,?,?,?,?)");
    $sth->execute($bibnum,$title,$basket,$quantity,$listprice,$supplier,
    $who,$who,$notes,$bibitemnum,$rrp,$ecost,$gst,$cost,
!   $sub,$invoice,$sort1,$sort2);
    $sth->finish;
    $sth=$dbh->prepare("select * from aqorders where
***************
*** 253,265 ****
  #'
  sub modorder {
!   my ($title,$ordnum,$quantity,$listprice,$bibnum,$basketno,$supplier,$who,$notes,$bookfund,$bibitemnum,$rrp,$ecost,$gst,$budget,$cost,$invoice)=@_;
    my $dbh = C4::Context->dbh;
    my $sth=$dbh->prepare("update aqorders set title=?,
    quantity=?,listprice=?,basketno=?,
    rrp=?,ecost=?,unitprice=?,
!   booksellerinvoicenumber=?
    where
    ordernumber=? and biblionumber=?");
!   $sth->execute($title,$quantity,$listprice,$basketno,$rrp,$ecost,$cost,$invoice,$ordnum,$bibnum);
    $sth->finish;
    $sth=$dbh->prepare("update aqorderbreakdown set bookfundid=? where
--- 253,266 ----
  #'
  sub modorder {
!   my ($title,$ordnum,$quantity,$listprice,$bibnum,$basketno,$supplier,$who,$notes,$bookfund,$bibitemnum,$rrp,$ecost,$gst,$budget,$cost,$invoice,$sort1,$sort2)=@_;
    my $dbh = C4::Context->dbh;
    my $sth=$dbh->prepare("update aqorders set title=?,
    quantity=?,listprice=?,basketno=?,
    rrp=?,ecost=?,unitprice=?,
!   booksellerinvoicenumber=?,
!   sort1=?, sort2=?
    where
    ordernumber=? and biblionumber=?");
!   $sth->execute($title,$quantity,$listprice,$basketno,$rrp,$ecost,$cost,$invoice,$sort1,$sort2,$ordnum,$bibnum);
    $sth->finish;
    $sth=$dbh->prepare("update aqorderbreakdown set bookfundid=? where