[Koha-cvs] CVS: koha/acqui finishreceive.pl,1.1.1.1.2.1,1.1.1.1.2.2

[Finlay Thompson]

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

Modified Files:
      Tag: rel-1-2
        finishreceive.pl 
Log Message:

merged in the version 1.5 from the main branch



Index: finishreceive.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/finishreceive.pl,v
retrieving revision 1.1.1.1.2.1
retrieving revision 1.1.1.1.2.2
diff -C2 -r1.1.1.1.2.1 -r1.1.1.1.2.2
*** finishreceive.pl    14 Jun 2002 21:20:27 -0000      1.1.1.1.2.1
--- finishreceive.pl    23 Aug 2002 01:56:04 -0000      1.1.1.1.2.2
***************
*** 15,19 ****
  my $user=$input->remote_user;
  #print $input->dump;
! my $biblio=$input->param('biblio');
  my $ordnum=$input->param('ordnum');
  my $quantrec=$input->param('quantityrec');
--- 15,19 ----
  my $user=$input->remote_user;
  #print $input->dump;
! my $biblionumber = $input->param('biblio');
  my $ordnum=$input->param('ordnum');
  my $quantrec=$input->param('quantityrec');
***************
*** 22,26 ****
  my $cost=$input->param('cost');
  my $invoiceno=$input->param('invoice');
- my $id=$input->param('id');
  my $bibitemno=$input->param('biblioitemnum');
  my $data=bibitemdata($bibitemno);
--- 22,25 ----
***************
*** 39,48 ****
  my $itemtype=$input->param('format');
  my $isbn=$input->param('ISBN');
! my $series=$input->param('Series');
! my $bookseller=$input->param('bookseller');
! $id=$bookseller;
! my $title=$input->param('title');
! my $author=$input->param('author');
! my $copyright=$input->param('copyright');
  
  if ($quantrec != 0){
--- 38,50 ----
  my $itemtype=$input->param('format');
  my $isbn=$input->param('ISBN');
! my $bookseller = $input->param('bookseller');
! my $id         = $bookseller;
! my $biblio = {
!     biblionumber  => $biblionumber,
!     title         => $input->param('title')?$input->param('title'):"",
!     author        => $input->param('author')?$input->param('author'):"",
!     copyrightdate => $input->param('copyright')?$input->param('copyright'):"",
!     series        => $input->param('Series')?$input->param('Series'):""
! }; # my $biblio
  
  if ($quantrec != 0){
***************
*** 61,72 ****
  #  print "$bibitemno";
    $class="Periodical";
!   $bibitemno=newbiblioitem($biblio,$itemtype,$isbn,$volinf,$class);
  #  print "here $bibitemno";
  }
  if ($quantity != 0){
!   
receiveorder($biblio,$ordnum,$quantrec,$user,$cost,$invoiceno,$bibitemno,$freight,$bookfund);
!   modbiblio($biblio,$title,$author,$copyright,$series);
!   
modbibitem($bibitemno,$itemtype,$isbn,$publisher,$pubdate,$class,$dewey,$subclass,$illus,$pages,$volinf,$notes,$size);
!   #print $notes;
    my $barcode=$input->param('barcode');
    my @barcodes;
--- 63,92 ----
  #  print "$bibitemno";
    $class="Periodical";
!   $bibitemno = &newbiblioitem({
!       biblionumber   => $biblionumber,
!       itemtype       => $itemtype?$itemtype:"",
!       isbn           => $isbn?$isbn:"",
!       volumeddesc    => $volinf?$volinf:"",
!       classification => $class?$class:"" });
  #  print "here $bibitemno";
  }
  if ($quantity != 0){
!   
receiveorder($biblionumber,$ordnum,$quantrec,$user,$cost,$invoiceno,$bibitemno,$freight,$bookfund);
!   modbiblio($biblio);
!   &modbibitem({
!       biblioitemnumber => $bibitemno,
!       itemtype         => $itemtype?$itemtype:"",
!       isbn             => $isbn?$isbn:"",
!       publisher        => $publisher?$publisher:"",
!       publicationyear  => $pubdate?$pubdate:"",
!       class            => $class?$class:"",
!       dewey            => $dewey?$dewey:"",
!       subclass         => $subclass?$subclass:"",
!       illus            => $illus?$illus:"",
!       pages            => $pages?$pages:"",
!       volumeddesc      => $volinf?$volinf:"",
!       notes            => $notes?$notes:"",
!       size             => $size?$size:"" });
! 
    my $barcode=$input->param('barcode');
    my @barcodes;
***************
*** 81,85 ****
    #  print $barcode;
    }
!   my 
($error)=makeitems($quantrec,$bibitemno,$biblio,$replacement,$cost,$bookseller,$branch,$loan,@barcodes);
    if ($error eq ''){
      if ($itemtype ne 'PER'){
--- 101,113 ----
    #  print $barcode;
    }
!   my ($error) = newitems({ biblioitemnumber => $bibitemno,
!                          biblionumber     => $biblionumber,
!                          replacementprice => $replacement,
!                          price            => $cost,
!                          booksellerid     => $bookseller,
!                          homebranch       => $branch,
!                          loan             => $loan },
!                        @barcodes);
! 
    if ($error eq ''){
      if ($itemtype ne 'PER'){
***************
*** 94,98 ****
  } else {
    print $input->header;
!   delorder($biblio,$ordnum);
         print $input->redirect("/acquisitions/");
  }
--- 122,126 ----
  } else {
    print $input->header;
!   delorder($biblionumber,$ordnum);
         print $input->redirect("/acquisitions/");
  }