X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=acqui%2Ffinishreceive.pl;h=71b13d60d0e3630f81e4f393e657c0d516df929c;hb=c0234dd9b9649063acf2617fecf5c6efda38a532;hp=41b28bce2f6c58f79962325603b46e810ea361b1;hpb=8dd5bb69de0b3cd1c9c2de77c13a2b2046c7997c;p=koha_gimpoz diff --git a/acqui/finishreceive.pl b/acqui/finishreceive.pl index 41b28bce2f..71b13d60d0 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. @@ -17,120 +16,102 @@ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR # A PARTICULAR PURPOSE. See the GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License along with -# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place, -# Suite 330, Boston, MA 02111-1307 USA +# You should have received a copy of the GNU General Public License along +# with Koha; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +use strict; +use warnings; +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; +use List::MoreUtils qw/any/; my $input=new CGI; - +my $flagsrequired = {acquisition => 'order_receive'}; +my ($loggedinuser, $cookie, $sessionID) = checkauth($input, 0, $flagsrequired, 'intranet'); my $user=$input->remote_user; -my $biblionumber = $input->param('biblio'); -my $ordnum=$input->param('ordnum'); -my $quantrec=$input->param('quantityrec'); +my $biblionumber = $input->param('biblionumber'); +my $biblioitemnumber=$input->param('biblioitemnumber'); +my $ordernumber=$input->param('ordernumber'); +my $origquantityrec=$input->param('origquantityrec'); +my $quantityrec=$input->param('quantityrec'); my $quantity=$input->param('quantity'); -my $notes=$input->param('notes'); -my $cost=$input->param('cost'); +my $unitprice=$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'}; - -my $size=$data->{'size'}; -my $illus=$data->{'illus'}; -my $pages=$data->{'pages'}; +my $datereceived=$input->param('datereceived'); 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 - -if ($quantrec != 0){ - $cost /= $quantrec; -} - 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; -} +my $supplierid = $input->param('supplierid'); +my $cnt=0; +my $error_url_str; +my $ecost = $input->param('ecost'); +my $note = $input->param("note"); -if ($itemtype =~ /PER/){ - $class="Periodical"; - $bibitemno = &newbiblioitem({ - biblionumber => $biblionumber, - itemtype => $itemtype?$itemtype:"", - isbn => $isbn?$isbn:"", - volumeddesc => $volinf?$volinf:"", - classification => $class?$class:"" }); +my %tplorder = ( 'quantity' => $input->param('quantity') || '', + 'quantityreceived' => $input->param('quantityrec') || '', + 'notes' => $input->param("note") || '', + 'rrp' => $input->param('rrp') || '', + 'ecost' => $input->param('ecost') || '', + 'unitprice' => $input->param('cost') || '', + ); +my $order = GetOrder($ordernumber); +if ( any { $order->{$_} ne $tplorder{$_} } qw(quantity quantityreceived notes rrp ecost unitprice) ) { + $order->{quantity} = $tplorder{quantity} if $tplorder{quantity}; + $order->{quantityreceived} = $tplorder{quantityreceived} if $tplorder{quantityreceived}; + $order->{notes} = $tplorder{notes} if $tplorder{notes}; + $order->{rrp} = $tplorder{rrp} if $tplorder{rrp}; + $order->{ecost} = $tplorder{ecost} if $tplorder{ecost}; + $order->{unitprice} = $tplorder{unitprice} if $tplorder{unitprice}; + ModOrder($order); } -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; + +#need old recievedate if we update the order, parcel.pl only shows the right parcel this way FIXME +if ($quantityrec > $origquantityrec ) { + # now, add items if applicable + if (C4::Context->preference('AcqCreateItem') eq 'receiving') { + my @tags = $input->param('tag'); + my @subfields = $input->param('subfield'); + my @field_values = $input->param('field_value'); + my @serials = $input->param('serial'); + my @itemid = $input->param('itemid'); + my @ind_tag = $input->param('ind_tag'); + my @indicator = $input->param('indicator'); + #Rebuilding ALL the data for items into a hash + # parting them on $itemid. + my %itemhash; + my $countdistinct; + my $range=scalar(@itemid); + for (my $i=0; $i<$range; $i++){ + unless ($itemhash{$itemid[$i]}){ + $countdistinct++; + } + push @{$itemhash{$itemid[$i]}->{'tags'}},$tags[$i]; + push @{$itemhash{$itemid[$i]}->{'subfields'}},$subfields[$i]; + push @{$itemhash{$itemid[$i]}->{'field_values'}},$field_values[$i]; + push @{$itemhash{$itemid[$i]}->{'ind_tag'}},$ind_tag[$i]; + push @{$itemhash{$itemid[$i]}->{'indicator'}},$indicator[$i]; + } + foreach my $item (keys %itemhash){ + my $xml = TransformHtmlToXml( $itemhash{$item}->{'tags'}, + $itemhash{$item}->{'subfields'}, + $itemhash{$item}->{'field_values'}, + $itemhash{$item}->{'ind_tag'}, + $itemhash{$item}->{'indicator'},'ITEM'); + my $record=MARC::Record::new_from_xml($xml, 'UTF-8'); + my ($biblionumber,$bibitemnum,$itemnumber) = AddItemFromMarc($record,$biblionumber); + } + } + + # save the quantity received. + if( $quantityrec > 0 ) { + $datereceived = ModReceiveOrder($biblionumber,$ordernumber, $quantityrec ,$user,$unitprice,$invoiceno,$freight,$replacement,undef,$datereceived); } -} else { - print $input->header; - delorder($biblionumber,$ordnum); - print $input->redirect("/acquisitions/"); } + print $input->redirect("/cgi-bin/koha/acqui/parcel.pl?invoice=$invoiceno&supplierid=$supplierid&freight=$freight&gst=$gst&datereceived=$datereceived$error_url_str");