X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=acqui%2Ffinishreceive.pl;h=c9a112edad8ecb2ad4854c2d8b18e7d2160bca97;hb=49b3ba7299dd8800d07334111139255ca400ffc6;hp=1945060ae98ac9892a14403dbd68c77f60d8c45f;hpb=323642f5a1f308e162cffb00fde677ee213e2eb7;p=koha.git diff --git a/acqui/finishreceive.pl b/acqui/finishreceive.pl index 1945060ae9..c9a112edad 100755 --- a/acqui/finishreceive.pl +++ b/acqui/finishreceive.pl @@ -3,7 +3,6 @@ #script to add a new item and to mark orders as received #written 1/3/00 by chris@katipo.co.nz - # Copyright 2000-2002 Katipo Communications # # This file is part of Koha. @@ -21,116 +20,83 @@ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place, # Suite 330, Boston, MA 02111-1307 USA +use strict; +# use warnings; # FIXME +use CGI; +use C4::Auth; use C4::Output; -use C4::Catalogue; +use C4::Context; +use C4::Acquisition; use C4::Biblio; -use CGI; +use C4::Items; use C4::Search; -my $input=new CGI; +my $input = new CGI; +my $flagsrequired = { acquisition => 1 }; +my ($loggedinuser, $cookie, $sessionID) = checkauth($input, 0, $flagsrequired, 'intranet'); +my $user = $input->remote_user; # FIXME: surely outmoded now +my $biblionumber = $input->param('biblionumber'); +my $biblioitemnumber = $input->param('biblioitemnumber'); +my $ordnum = $input->param('ordnum'); +my $origquantityrec = $input->param('origquantityrec'); +my $quantityrec = $input->param('quantityrec'); +my $quantity = $input->param('quantity'); +my $cost = $input->param('cost'); +my $invoiceno = $input->param('invoice'); +my $datereceived = $input->param('datereceived'); +my $replacement = $input->param('rrp'); +my $gst = $input->param('gst'); +my $freight = $input->param('freight'); +my $supplierid = $input->param('supplierid'); +my @branch = $input->param('homebranch'); +my @barcode = $input->param('barcode'); +my @ccode = $input->param('ccode'); +my @itemtype = $input->param('itemtype'); +my @location = $input->param('location'); +my @enumchron = $input->param('volinf'); +my $cnt = 0; +my $error_url_str; -my $user=$input->remote_user; -my $biblionumber = $input->param('biblio'); -my $ordnum=$input->param('ordnum'); -my $quantrec=$input->param('quantityrec'); -my $quantity=$input->param('quantity'); -my $notes=$input->param('notes'); -my $cost=$input->param('cost'); -my $invoiceno=$input->param('invoice'); -my $bibitemno=$input->param('biblioitemnum'); -my $data=bibitemdata($bibitemno); -my $publisher=$data->{'publishercode'}; -my $pubdate=$data->{'publicationdate'}; -my $class=$data->{'classification'}; -my $dewey=$data->{'dewey'}; -my $subclass=$data->{'subclass'}; +if ($quantityrec > $origquantityrec) { + foreach my $bc (@barcode) { + if ($bc) { + my $item_hash = { + "items.replacementprice" => $replacement, + "items.price" => $cost, + "items.booksellerid" => $supplierid, + "items.homebranch" => $branch[$cnt], + "items.holdingbranch" => $branch[$cnt], + "items.barcode" => $barcode[$cnt], + "items.ccode" => $ccode[$cnt], + "items.itype" => $itemtype[$cnt], + "items.location" => $location[$cnt], + "items.enumchron" => $enumchron[$cnt], # FIXME : No integration here with serials module. + "items.loan" => 0, + }; + $item_hash->{'items.cn_source'} = C4::Context->preference('DefaultClassificationSource') if (C4::Context->preference('DefaultClassificationSource')); -my $size=$data->{'size'}; -my $illus=$data->{'illus'}; -my $pages=$data->{'pages'}; -my $replacement=$input->param('rrp'); -my $branch=$input->param('branch'); -my $bookfund=$input->param('bookfund'); -my $itemtype=$input->param('format'); -my $isbn=$input->param('ISBN'); -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 + # FIXME : cn_sort is populated by Items::_set_derived_columns_for_add , which is never called with AddItemFromMarc . Bug 2403 + my $itemRecord = TransformKohaToMarc($item_hash); + $cnt++; + $item_hash = TransformMarcToKoha(undef, $itemRecord, '', 'items'); -if ($quantrec != 0){ - $cost /= $quantrec; -} + # FIXME: possible race condition. duplicate barcode check should happen in AddItem, but for now we have to do it here. + my %err = CheckItemPreSave($item_hash); + if (%err) { + for my $err_cnd (keys %err) { + $error_url_str .= "&error=" . $err_cnd . "&error_param=" . $err{$err_cnd}; + } + $quantityrec--; + } else { + AddItemFromMarc($itemRecord, $biblionumber); + } + } + } -my $gst=$input->param('gst'); -my $freight=$input->param('freight'); -my $volinf=$input->param('volinf'); -my $id = $input->param('id'); -my $loan=0; -if ($itemtype =~ /REF/){ - $loan=1; + # save the quantity received. + if ($quantityrec > 0) { + $datereceived = ModReceiveOrder($biblionumber, $ordnum, $quantityrec, $user, $cost, $invoiceno, $freight, $replacement, undef, $datereceived); + } } +print $input->redirect("/cgi-bin/koha/acqui/parcel.pl?invoice=$invoiceno&supplierid=$supplierid&freight=$freight&gst=$gst&datereceived=$datereceived$error_url_str"); -if ($itemtype =~ /PER/){ - $class="Periodical"; - $bibitemno = &newbiblioitem({ - biblionumber => $biblionumber, - itemtype => $itemtype?$itemtype:"", - isbn => $isbn?$isbn:"", - volumeddesc => $volinf?$volinf:"", - classification => $class?$class:"" }); -} -if ($quantity != 0){ -# warn "receive : $biblionumber,$ordnum,$quantrec,$user,$cost,$invoiceno,$bibitemno,$freight,$bookfund"; - receiveorder($biblionumber,$ordnum,$quantrec,$user,$cost,$invoiceno,$bibitemno,$freight,$bookfund); - modbiblio($biblio); - &modbibitem({ - biblioitemnumber => $bibitemno, - biblionumber => $biblionumber, - 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; -# if ($barcode =~ /\,/){ - @barcodes=split(/\,| |\|/,$barcode); -# }elsif ($barcode =~ /\|/){ -# @barcodes=split(/\|/,$barcode); -# } else { -# $barcodes[0]=$barcode; -# } - my ($error) = newitems({ biblioitemnumber => $bibitemno, - biblionumber => $biblionumber, - replacementprice => $replacement, - price => $cost, - booksellerid => $id, - homebranch => $branch, - loan => $loan }, - @barcodes); - if ($error eq ''){ - if ($itemtype ne 'PER'){ - print $input->redirect("/cgi-bin/koha/acqui/receive.pl?invoice=$invoiceno&id=$id&freight=$freight&gst=$gst"); - } else { - print $input->redirect("/acquisitions/"); - } - } else { - print $input->header; - print $error; - } -} else { - print $input->header; - delorder($biblionumber,$ordnum); - print $input->redirect("/acquisitions/"); -}