use C4::Context;
use C4::Acquisition;
use C4::Biblio;
-use C4::Bookseller;
use C4::Items;
use C4::Search;
-use Koha::Acquisition::Bookseller;
+use Koha::Number::Price;
+use Koha::Acquisition::Booksellers;
use List::MoreUtils qw/any/;
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 $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 $ecost = $input->param('ecost');
-my $rrp = $input->param('rrp');
-my $order_internalnote = $input->param("order_internalnote");
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
+$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);
}
}
- $order->{rrp} = $rrp;
- $order->{ecost} = $ecost;
+ $order->{order_internalnote} = $input->param("order_internalnote");
+ $order->{tax_rate_on_receiving} = $input->param("tax_rate");
$order->{unitprice} = $unitprice;
- my $bookseller = Koha::Acquisition::Bookseller->fetch({ id => $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
}
- }
+ );
# save the quantity received.
if ( $quantityrec > 0 ) {
- ($datereceived, $new_ordernumber) = ModReceiveOrder({
- biblionumber => $biblionumber,
- ordernumber => $ordernumber,
- quantityreceived => $quantityrec,
- user => $user,
- cost => $order->{unitprice},
- ecost => $order->{ecost},
- invoiceid => $invoiceid,
- rrp => $order->{rrp},
- budget_id => $bookfund,
- datereceived => $datereceived,
- received_items => \@received_items,
- order_internalnote => $order_internalnote,
- } );
+ ( $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;
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);
$order->add_item( $itemnumber );
{
booksellerid => $booksellerid,
dateaccessioned => $datereceived,
+ datelastseen => $datereceived,
price => $unitprice,
- replacementprice => $rrp,
+ replacementprice => $order->{rrp},
replacementpricedate => $datereceived,
},
$biblionumber,