c7f47ea36a
This fixes the regression that multiplies the amount entered by 100 when CurrencyFormat is set to FR. It replaces the last dot with a comma before dealing with the value of ActualCost and ReplacementCost. Test Plan: a)Replicate the issue: 0- Set CurrencyFormat to FR 1- Go to Acquisitions 2- Search for a Vendor 3- Click on "New basket" 4- Give basket a name and click "Save" 5- Click on "Add to basket" 6- Add an order through preferred method 7- In Accounting details, enter a vendor price with dot decimal (i.e. 19.44) 8- Save your order line 9- Click on "Close this basket" 10- Confirm closing of basket by clicking on "Yes, close" 11- Click on "Receive shipment" 12- Enter an invoice number and click "Next" 13- Click on "Receive" to the right of your order 14- In Accounting details, notice the Actual cost is written with a decimal dot. 15- Change the Actual cost, using a dot decimal (i.e 20.99) 16- Receive the order 17- Click on "Save" 18- In "Already received" notice the price is multiplied by 100 (i.e. 2099,00) 19- Click on "Cancel receipt" 20- Click on "Receive" to the right of your order 21- In Accounting details, change the Actual cost, using a comma decimal (i.e. 20,99) 22- Receive the order 23- Click on "Save" 24- In "Already received", notice the price is correct. b)Apply the patch c)Test the patch: 1- Click on "Cancel receipt" 2- Click on "Receive to the right of your order 3- Change the Actual cost/Replacement cost, using a dot decimal (21.99) 4- Receive the order 5- Click on "Save" 6- Notice that the Actual cost and the Replacement cost use commas 7- Change the Actual cost, using a comma decimal (21,99) 8- Click on "Save" 9- In "Already received", notice the price is still correct. Signed-off-by: Victor Grousset <victor.grousset@biblibre.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
188 lines
7.3 KiB
Perl
Executable file
188 lines
7.3 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
#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.
|
|
#
|
|
# 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.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with Koha; if not, see <http://www.gnu.org/licenses>.
|
|
|
|
use Modern::Perl;
|
|
use CGI qw ( -utf8 );
|
|
use C4::Auth;
|
|
use C4::Output;
|
|
use C4::Context;
|
|
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;
|
|
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('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 $booksellerid = $input->param('booksellerid');
|
|
my $cnt = 0;
|
|
my $bookfund = $input->param("bookfund");
|
|
my $order = GetOrder($ordernumber);
|
|
my $new_ordernumber = $ordernumber;
|
|
|
|
#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 ($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->{order_internalnote} = $input->param("order_internalnote");
|
|
$order->{tax_rate_on_receiving} = $input->param("tax_rate");
|
|
$order->{replacementprice} = $replacementprice;
|
|
$order->{unitprice} = $unitprice;
|
|
|
|
$order = C4::Acquisition::populate_order_with_prices(
|
|
{
|
|
order => $order,
|
|
booksellerid => $booksellerid,
|
|
receiving => 1
|
|
}
|
|
);
|
|
|
|
# save the quantity received.
|
|
if ( $quantityrec > 0 ) {
|
|
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 ($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;
|
|
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];
|
|
}
|
|
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'},
|
|
'ITEM' );
|
|
my $record=MARC::Record::new_from_xml($xml, 'UTF-8');
|
|
my (undef,$bibitemnum,$itemnumber) = AddItemFromMarc($record,$biblionumber);
|
|
$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,
|
|
);
|
|
}
|
|
|
|
print $input->redirect("/cgi-bin/koha/acqui/parcel.pl?invoiceid=$invoiceid&sticky_filters=1");
|