X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=acqui%2Ffinishreceive.pl;h=f9c85320e6633c8b7e37530e90f9794b342a49bb;hb=6bad4db6a76d719ad6ac7fec2d4c7ec87ec8aa95;hp=df3bc5e6546a4eac466013541127d34c1d01148a;hpb=0bb91c1624184c96fd9cb15fa9178f4b8cf06316;p=koha.git diff --git a/acqui/finishreceive.pl b/acqui/finishreceive.pl index df3bc5e654..f9c85320e6 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,71 +16,142 @@ # 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::Context; use C4::Acquisition; use C4::Biblio; +use C4::Bookseller; use C4::Items; use C4::Search; +use List::MoreUtils qw/any/; my $input=new CGI; -my $flagsrequired = { acquisition => 1}; -my ($loggedinuser, $cookie, $sessionID) = checkauth($input, 0, $flagsrequired, 'intranet'); -my $user=$input->remote_user; -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 $flagsrequired = {acquisition => 'order_receive'}; + +checkauth($input, 0, $flagsrequired, 'intranet'); +my $user = $input->remote_user; +my $biblionumber = $input->param('biblionumber'); +my $ordernumber = $input->param('ordernumber'); +my $origquantityrec = $input->param('origquantityrec'); +my $quantityrec = $input->param('quantityrec'); +my $quantity = $input->param('quantity'); +my $unitprice = $input->param('cost'); +my $invoiceid = $input->param('invoiceid'); +my $invoice = GetInvoice($invoiceid); +my $invoiceno = $invoice->{invoicenumber}; +my $datereceived = $invoice->{shipmentdate}; +my $booksellerid = $input->param('booksellerid'); +my $cnt = 0; +my $ecost = $input->param('ecost'); +my $rrp = $input->param('rrp'); +my $note = $input->param("note"); +my $order = GetOrder($ordernumber); + +#need old recievedate if we update the order, parcel.pl only shows the right parcel this way FIXME if ($quantityrec > $origquantityrec ) { - # save the quantity recieved. - $datereceived = ModReceiveOrder($biblionumber,$ordnum,$quantityrec,$user,$cost,$invoiceno,$freight,$replacement,undef,$datereceived); - # create items if the user has entered barcodes - # my @barcodes=split(/\,| |\|/,$barcode); - # foreach barcode provided, build the item MARC::Record and create the item - foreach my $bc (@barcode) { - my $itemRecord = TransformKohaToMarc({ - "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, }); - AddItemFromMarc($itemRecord,$biblionumber); - $cnt++; - } + my @received_items = (); + if(C4::Context->preference('AcqCreateItem') eq 'ordering') { + @received_items = $input->param('items_to_receive'); + } + + $order->{rrp} = $rrp; + $order->{ecost} = $ecost; + $order->{unitprice} = $unitprice; + my $bookseller = C4::Bookseller::GetBookSellerFromId($booksellerid); + if ( $bookseller->{listincgst} ) { + if ( not $bookseller->{invoiceincgst} ) { + $order->{rrp} = $order->{rrp} * ( 1 + $order->{gstrate} ); + $order->{ecost} = $order->{ecost} * ( 1 + $order->{gstrate} ); + $order->{unitprice} = $order->{unitprice} * ( 1 + $order->{gstrate} ); + } + } else { + if ( $bookseller->{invoiceincgst} ) { + $order->{rrp} = $order->{rrp} / ( 1 + $order->{gstrate} ); + $order->{ecost} = $order->{ecost} / ( 1 + $order->{gstrate} ); + $order->{unitprice} = $order->{unitprice} / ( 1 + $order->{gstrate} ); + } + } + + my $new_ordernumber = $ordernumber; + # save the quantity received. + if ( $quantityrec > 0 ) { + ($datereceived, $new_ordernumber) = ModReceiveOrder( + $biblionumber, + $ordernumber, + $quantityrec, + $user, + $order->{unitprice}, + $order->{ecost}, + $invoiceid, + $order->{rrp}, + undef, + $datereceived, + \@received_items, + ); + } + + # 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 (undef,$bibitemnum,$itemnumber) = AddItemFromMarc($record,$biblionumber); + NewOrderItem($itemnumber, $new_ordernumber); + } + } + +} + +update_item( $_ ) foreach GetItemnumbersFromOrder( $ordernumber ); + +print $input->redirect("/cgi-bin/koha/acqui/parcel.pl?invoiceid=$invoiceid"); + +################################ End of script ################################ + +sub update_item { + my ( $itemnumber ) = @_; + + ModItem( { + booksellerid => $booksellerid, + dateaccessioned => $datereceived, + price => $unitprice, + replacementprice => $rrp, + replacementpricedate => $datereceived, + }, $biblionumber, $itemnumber ); } - print $input->redirect("/cgi-bin/koha/acqui/parcel.pl?invoice=$invoiceno&supplierid=$supplierid&freight=$freight&gst=$gst&datereceived=$datereceived"); -#} else { -# print $input->header; -# #delorder($biblionumber,$ordnum); -# print $input->redirect("/acquisitions/"); -#}