X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=acqui%2Ffinishreceive.pl;h=e80e3684411edef05932737c87d6bdaf33d04ca2;hb=refs%2Fheads%2Fkoha_ffzg;hp=565ac36d7260ad776a351c5c7d2cd9ad75e6f46e;hpb=a8c5497b8da7de25b7c4787ee5540e4e1b48704d;p=koha.git diff --git a/acqui/finishreceive.pl b/acqui/finishreceive.pl index 565ac36d72..e80e368441 100755 --- a/acqui/finishreceive.pl +++ b/acqui/finishreceive.pl @@ -7,30 +7,33 @@ # # 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 Modern::Perl; +use CGI qw ( -utf8 ); 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 Koha::Number::Price; +use Koha::Acquisition::Booksellers; +use Koha::Acquisition::Orders; + use List::MoreUtils qw/any/; my $input=new CGI; @@ -40,77 +43,101 @@ 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 $unitprice = $input->param('unitprice'); +my $replacementprice = $input->param('replacementprice'); +my $datereceived = $input->param('datereceived'), 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 $error_url_str; -my $ecost = $input->param('ecost'); -my $rrp = $input->param('rrp'); -my $note = $input->param("note"); +my $bookfund = $input->param("bookfund"); my $order = GetOrder($ordernumber); +my $new_ordernumber = $ordernumber; -#need old recievedate if we update the order, parcel.pl only shows the right parcel this way FIXME +#bug18723 regression fix +if (C4::Context->preference("CurrencyFormat") eq 'FR') { + if (rindex($unitprice, '.') ge 0) { + substr($unitprice, rindex($unitprice, '.'), 1, ','); + } + if (rindex($replacementprice,'.') ge 0) { + substr($replacementprice, rindex($replacementprice, '.'), 1, ','); + } +} + +$unitprice = Koha::Number::Price->new( $unitprice )->unformat(); +$replacementprice = Koha::Number::Price->new( $replacementprice )->unformat(); +my $order_obj = Koha::Acquisition::Orders->find( $ordernumber ); +my $basket = $order_obj->basket; + +#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') { + if ($basket->effective_create_items eq 'ordering') { @received_items = $input->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 ); + } + } } - $order->{rrp} = $rrp; - $order->{ecost} = $ecost; + $order->{order_internalnote} = $input->param("order_internalnote"); + $order->{tax_rate_on_receiving} = $input->param("tax_rate"); + $order->{replacementprice} = $replacementprice; $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} ); + + $order = C4::Acquisition::populate_order_with_prices( + { + order => $order, + booksellerid => $booksellerid, + receiving => 1 } - } + ); - my $new_ordernumber = $ordernumber; # save the quantity received. if ( $quantityrec > 0 ) { - ($datereceived, $new_ordernumber) = ModReceiveOrder( - $biblionumber, - $ordernumber, - $quantityrec, - $user, - $order->{unitprice}, - $order->{ecost}, - $invoiceno, - $order->{rrp}, - undef, - $datereceived, - \@received_items, + if ( $order_obj->subscriptionid ) { + # Quantity can only be modified if linked to a subscription + $order->{quantity} = $quantity; # quantityrec will be deduced from this value in ModReceiveOrder + } + ( $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'); + if ($basket->effective_create_items eq 'receiving') { + + 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; @@ -126,34 +153,96 @@ 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 ); } } +} +my $new_order_object = Koha::Acquisition::Orders->find( $new_ordernumber ); # FIXME we should not need to refetch it +my $items = $new_order_object->items; +while ( my $item = $items->next ) { + ModItem( + { + booksellerid => $booksellerid, + dateaccessioned => $datereceived, + datelastseen => $datereceived, + price => $unitprice, + replacementprice => $replacementprice, + replacementpricedate => $datereceived, + }, + $biblionumber, + $item->itemnumber, + ); } -update_item( $_ ) foreach GetItemnumbersFromOrder( $ordernumber ); -print $input->redirect("/cgi-bin/koha/acqui/parcel.pl?invoiceid=$invoiceid"); +# XXX KRT-4338 -- create barcode and stocknumber now! +use Data::Dump qw(dump); + +my @received_items = $input->param('items_to_receive'); +foreach my $itemnumber ( @received_items ) { + + my $dbh = C4::Context->dbh; -################################ End of script ################################ + $dbh->begin_work; -sub update_item { - my ( $itemnumber ) = @_; + my $sth = $dbh->prepare("select biblionumber,barcode,stocknumber,itype,homebranch from items where itemnumber = ?"); + $sth->execute( $itemnumber ); + + if ( $sth->rows != 1 ) { + die "ERROR: itemnumber $itemnumber have ", $sth->rows, " rows"; + } + + my ( $biblionumber, $barcode, $stocknumber, $itype, $homebranch ) = $sth->fetchrow_array; + warn "YYY got ", dump( $biblionumber, $barcode, $stocknumber, $itype, $homebranch ); + + next if $itype =~ /(BAZA|PER|CLA|PRE|RZB)/; + + if (! $barcode ) { + $sth = $dbh->prepare("select max(abs(barcode)) from items"); + $sth->execute; + $barcode = $sth->fetchrow; + $barcode++; + warn "# itemnumber: $itemnumber new barcode: $barcode"; + } + + my $year = DateTime->now->year; + + if (! $stocknumber && ( $homebranch eq 'FFZG' || $homebranch eq 'AKZG' ) ) { + + my $inventarna_knjiga = lc($homebranch) . '_inventarna_knjiga'; + + $sth = $dbh->prepare("select max(num) from $inventarna_knjiga where year = ?"); + $sth->execute($year); + + $stocknumber = $sth->fetchrow; # return null without any data + $stocknumber += 1; + + $sth = $dbh->prepare("insert into $inventarna_knjiga (year,num, biblionumber, itemnumber) values (?,?,?,?)"); + $sth->execute( $year, $stocknumber, $biblionumber, $itemnumber ); + + $stocknumber = "$year-$stocknumber"; + + $stocknumber = 'AK-' . $stocknumber if $homebranch eq 'AKZG'; + } + + warn "## itemnumber: $itemnumber barcode: $barcode stocknumber: $stocknumber\n"; + + $sth = $dbh->prepare("update items set barcode=?, stocknumber=? where itemnumber = ?"); + $sth->execute( $barcode, $stocknumber, $itemnumber ); + + $dbh->commit; - ModItem( { - booksellerid => $booksellerid, - dateaccessioned => $datereceived, - price => $unitprice, - replacementprice => $rrp, - replacementpricedate => $datereceived, - }, $biblionumber, $itemnumber ); } + +print $input->redirect("/cgi-bin/koha/acqui/parcel.pl?invoiceid=$invoiceid&sticky_filters=1");