# You should have received a copy of the GNU General Public License
# along with Koha; if not, see <http://www.gnu.org/licenses>.
-use strict;
-use warnings;
+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::Acquisition::Bookseller;
+use Koha::Number::Price;
+use Koha::Acquisition::Booksellers;
+use Koha::Acquisition::Orders;
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 $replacementprice = $input->param('replacementprice');
my $datereceived = $input->param('datereceived'),
my $invoiceid = $input->param('invoiceid');
my $invoice = GetInvoice($invoiceid);
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();
+$replacementprice = Koha::Number::Price->new( $replacementprice )->unformat();
+my $basket = Koha::Acquisition::Orders->find( $ordernumber )->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') {
- @received_items = $input->multi_param('items_to_receive');
+ 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);
}
$order->{order_internalnote} = $input->param("order_internalnote");
+ $order->{tax_rate_on_receiving} = $input->param("tax_rate");
+ $order->{replacementprice} = $replacementprice;
$order->{unitprice} = $unitprice;
- my $bookseller = Koha::Acquisition::Bookseller->fetch({ id => $booksellerid });
-
$order = C4::Acquisition::populate_order_with_prices(
{
order => $order,
}
# now, add items if applicable
- if (C4::Context->preference('AcqCreateItem') eq 'receiving') {
+ if ($basket->effective_create_items eq 'receiving') {
my @tags = $input->multi_param('tag');
my @subfields = $input->multi_param('subfield');
push @{$itemhash{$itemid[$i]}->{'ind_tag'}},$ind_tag[$i];
push @{$itemhash{$itemid[$i]}->{'indicator'}},$indicator[$i];
}
- my $order = Koha::Acquisition::Order->fetch({ ordernumber => $new_ordernumber });
+ my $new_order = Koha::Acquisition::Orders->find( $new_ordernumber );
foreach my $item (keys %itemhash){
my $xml = TransformHtmlToXml( $itemhash{$item}->{'tags'},
$itemhash{$item}->{'subfields'},
'ITEM' );
my $record=MARC::Record::new_from_xml($xml, 'UTF-8');
my (undef,$bibitemnum,$itemnumber) = AddItemFromMarc($record,$biblionumber);
- $order->add_item( $itemnumber );
+ $new_order->add_item( $itemnumber );
}
}
}
-ModItem(
- {
- booksellerid => $booksellerid,
- dateaccessioned => $datereceived,
- price => $unitprice,
- replacementprice => $order->{rrp},
- replacementpricedate => $datereceived,
- },
- $biblionumber,
- $_
-) foreach GetItemnumbersFromOrder($new_ordernumber);
+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,
+ );
+}
print $input->redirect("/cgi-bin/koha/acqui/parcel.pl?invoiceid=$invoiceid&sticky_filters=1");