X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=acqui%2Ffinishreceive.pl;h=b8854a6220b5932a3635ad5d2f1a3c07f7e72a00;hb=3aeb1fc7e85e01cebf7ef726ea1d877b7b0edab6;hp=bb4818dd5aef6fc5cfc2c9c7831bff862084f363;hpb=659a4aab574e77e65d8e0eb604763f832a5c0574;p=koha.git diff --git a/acqui/finishreceive.pl b/acqui/finishreceive.pl index bb4818dd5a..b8854a6220 100755 --- a/acqui/finishreceive.pl +++ b/acqui/finishreceive.pl @@ -7,22 +7,22 @@ # # This file is part of Koha. # -# Koha is free software; you can redistribute it and/or modify it under the -# terms of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. +# Koha is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. # -# Koha is distributed in the hope that it will be useful, but WITHOUT ANY -# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR -# A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# Koha is distributed in the hope that it will be useful, but +# WITHOUT ANY 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., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# You should have received a copy of the GNU General Public License +# along with Koha; if not, see . use strict; use warnings; -use CGI; +use CGI qw ( -utf8 ); use C4::Auth; use C4::Output; use C4::Context; @@ -30,6 +30,11 @@ use C4::Acquisition; use C4::Biblio; use C4::Items; use C4::Search; + +use Koha::Number::Price; +use Koha::Acquisition::Booksellers; +use Koha::Acquisition::Orders; + use List::MoreUtils qw/any/; my $input=new CGI; @@ -37,50 +42,84 @@ my $flagsrequired = {acquisition => 'order_receive'}; checkauth($input, 0, $flagsrequired, 'intranet'); -my $user=$input->remote_user; -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 $unitprice=$input->param('cost'); -my $invoiceid = $input->param('invoiceid'); -my $invoice = GetInvoice($invoiceid); -my $invoiceno = $invoice->{invoicenumber}; -my $datereceived= $invoice->{shipmentdate}; -my $replacement=$input->param('rrp'); -my $gst=$input->param('gst'); -my $booksellerid = $input->param('booksellerid'); -my $cnt=0; -my $ecost = $input->param('ecost'); -my $note = $input->param("note"); - -#need old recievedate if we update the order, parcel.pl only shows the right parcel this way FIXME +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('unitprice'); +my $datereceived = $input->param('datereceived'), +my $invoiceid = $input->param('invoiceid'); +my $invoice = GetInvoice($invoiceid); +my $invoiceno = $invoice->{invoicenumber}; +my $booksellerid = $input->param('booksellerid'); +my $cnt = 0; +my $bookfund = $input->param("bookfund"); +my $order = GetOrder($ordernumber); +my $new_ordernumber = $ordernumber; + +$unitprice = Koha::Number::Price->new( $unitprice )->unformat(); + +#need old receivedate if we update the order, parcel.pl only shows the right parcel this way FIXME if ($quantityrec > $origquantityrec ) { my @received_items = (); if(C4::Context->preference('AcqCreateItem') eq 'ordering') { - @received_items = $input->param('items_to_receive'); + @received_items = $input->multi_param('items_to_receive'); + my @affects = split q{\|}, C4::Context->preference("AcqItemSetSubfieldsWhenReceived"); + if ( @affects ) { + my $frameworkcode = GetFrameworkCode($biblionumber); + my ( $itemfield ) = GetMarcFromKohaField( 'items.itemnumber', $frameworkcode ); + for my $in ( @received_items ) { + my $item = C4::Items::GetMarcItem( $biblionumber, $in ); + for my $affect ( @affects ) { + my ( $sf, $v ) = split q{=}, $affect, 2; + foreach ( $item->field($itemfield) ) { + $_->update( $sf => $v ); + } + } + C4::Items::ModItemFromMarc( $item, $biblionumber, $in ); + } + } } - my $new_ordernumber = $ordernumber; + $order->{order_internalnote} = $input->param("order_internalnote"); + $order->{tax_rate_on_receiving} = $input->param("tax_rate"); + $order->{unitprice} = $unitprice; + + $order = C4::Acquisition::populate_order_with_prices( + { + order => $order, + booksellerid => $booksellerid, + receiving => 1 + } + ); + # save the quantity received. if ( $quantityrec > 0 ) { - ($datereceived, $new_ordernumber) = ModReceiveOrder( - $biblionumber, $ordernumber, $quantityrec, $user, $unitprice, - $invoiceid, $replacement, undef, $datereceived, \@received_items); + ( $datereceived, $new_ordernumber ) = ModReceiveOrder( + { + biblionumber => $biblionumber, + order => $order, + quantityreceived => $quantityrec, + user => $user, + invoice => $invoice, + budget_id => $bookfund, + received_items => \@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'); + my @tags = $input->multi_param('tag'); + my @subfields = $input->multi_param('subfield'); + my @field_values = $input->multi_param('field_value'); + my @serials = $input->multi_param('serial'); + my @itemid = $input->multi_param('itemid'); + my @ind_tag = $input->multi_param('ind_tag'); + my @indicator = $input->multi_param('indicator'); #Rebuilding ALL the data for items into a hash # parting them on $itemid. my %itemhash; @@ -96,33 +135,32 @@ if ($quantityrec > $origquantityrec ) { push @{$itemhash{$itemid[$i]}->{'ind_tag'}},$ind_tag[$i]; push @{$itemhash{$itemid[$i]}->{'indicator'}},$indicator[$i]; } + my $new_order = Koha::Acquisition::Orders->find( $new_ordernumber ); foreach my $item (keys %itemhash){ my $xml = TransformHtmlToXml( $itemhash{$item}->{'tags'}, $itemhash{$item}->{'subfields'}, $itemhash{$item}->{'field_values'}, + $itemhash{$item}->{'indicator'}, $itemhash{$item}->{'ind_tag'}, - $itemhash{$item}->{'indicator'},'ITEM'); + 'ITEM' ); my $record=MARC::Record::new_from_xml($xml, 'UTF-8'); my (undef,$bibitemnum,$itemnumber) = AddItemFromMarc($record,$biblionumber); - NewOrderItem($itemnumber, $new_ordernumber); + $new_order->add_item( $itemnumber ); } } } -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( { +ModItem( + { booksellerid => $booksellerid, dateaccessioned => $datereceived, + datelastseen => $datereceived, price => $unitprice, - replacementprice => $replacement, + replacementprice => $order->{rrp}, replacementpricedate => $datereceived, - }, $biblionumber, $itemnumber ); -} + }, + $biblionumber, + $_ +) foreach GetItemnumbersFromOrder($new_ordernumber); + +print $input->redirect("/cgi-bin/koha/acqui/parcel.pl?invoiceid=$invoiceid&sticky_filters=1");