[Koha-cvs] CVS: koha/acqui addorder.pl,1.3.2.1,1.3.2.2

[Paul POULAIN]

Update of /cvsroot/koha/koha/acqui
In directory usw-pr-cvs1:/tmp/cvs-serv9189/acqui

Modified Files:
      Tag: rel-1-2
        addorder.pl 
Log Message:
merge of rel-1-2 and main branch


Index: addorder.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/addorder.pl,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -C2 -r1.3.2.1 -r1.3.2.2
*** addorder.pl 14 Jun 2002 21:20:27 -0000      1.3.2.1
--- addorder.pl 24 Jun 2002 14:15:14 -0000      1.3.2.2
***************
*** 41,45 ****
  my $ecost=$input->param('ecost');
  my $gst=$input->param('GST');
- #check to see if orderexists
  my $orderexists=$input->param('orderexists');
  
--- 41,44 ----
***************
*** 49,59 ****
    if ($existing eq 'no'){
      #if it doesnt create it
!     $bibnum = &newbiblio({ title     => $title,
!                          author    =>$author,
!                          copyright => $copyright });
      $bibitemnum = &newbiblioitem({ biblionumber => $bibnum,
!                                  itemtype     => $itemtype,
!                                  isben        => $isbn });
!     newsubtitle($bibnum);
      modbiblio($bibnum,$title,$author,$copyright,$series);
    } else {
--- 48,63 ----
    if ($existing eq 'no'){
      #if it doesnt create it
!     $bibnum = &newbiblio({ title     => $title?$title:"",
!                          author    => $author?$author:"",
!                          copyright => $copyright?$copyright:"",
!                                   series => $series?$series:"",
!                                    });
      $bibitemnum = &newbiblioitem({ biblionumber => $bibnum,
!                                  itemtype     => $itemtype?$itemtype:"",
!                                  isbn        => $isbn?$isbn:""
!                                                  });
!       if ($title) {
!               newsubtitle($bibnum,$title);
!       }
      modbiblio($bibnum,$title,$author,$copyright,$series);
    } else {
***************
*** 66,70 ****
      modbiblio($bibnum,$title,$author,$copyright,$series);
    }
!   if ($orderexists ne ''){
      
modorder($title,$ordnum,$quantity,$listprice,$bibnum,$basketno,$supplier,$who,$notes,$bookfund,$bibitemnum,$rrp,$ecost,$gst);
    }else {
--- 70,74 ----
      modbiblio($bibnum,$title,$author,$copyright,$series);
    }
!   if ($orderexists ne '') {
      
modorder($title,$ordnum,$quantity,$listprice,$bibnum,$basketno,$supplier,$who,$notes,$bookfund,$bibitemnum,$rrp,$ecost,$gst);
    }else {
***************
*** 72,77 ****
    }
  } else {
-   #print $input->header;
-   #print "del";
    $bibnum=$input->param('biblio');
    delorder($bibnum,$ordnum);
--- 76,79 ----
***************
*** 79,83 ****
  
  print $input->redirect("newbasket.pl?id=$supplier&basket=$basketno");
- #print $input->dump;
- #print endmenu('acquisitions');
- #print endpage();
--- 81,82 ----