From c4a045af6606109317782780e0caafa48c1e7895 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bernd=20Ble=C3=9Fmann?= Date: Fri, 5 Jun 2020 18:52:47 +0200 Subject: [PATCH] Auftrags-Controller: Wechselkurs: Kosmetik / POD update --- SL/Controller/Order.pm | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/SL/Controller/Order.pm b/SL/Controller/Order.pm index d40d2eb47..caa3f918d 100644 --- a/SL/Controller/Order.pm +++ b/SL/Controller/Order.pm @@ -930,9 +930,8 @@ sub action_recalc_amounts_and_taxes { sub action_update_exchangerate { my ($self) = @_; - my $data = {}; - $data = { + my $data = { is_standard => $self->order->currency_id == $::instance_conf->get_currency_id, currency_name => $self->order->currency->name, exchangerate => $self->order->exchangerate_as_null_number, @@ -1374,9 +1373,9 @@ sub make_order { setup_order_from_cv($order); } - my $form_orderitems = delete $::form->{order}->{orderitems}; - my $form_periodic_invoices_config = delete $::form->{order}->{periodic_invoices_config}; - my $exchangerate_as_null_number = delete $::form->{order}->{exchangerate_as_null_number}; + my $form_orderitems = delete $::form->{order}->{orderitems}; + my $form_periodic_invoices_config = delete $::form->{order}->{periodic_invoices_config}; + my $form_exchangerate_as_null_number = delete $::form->{order}->{exchangerate_as_null_number}; $order->assign_attributes(%{$::form->{order}}); @@ -1386,7 +1385,7 @@ sub make_order { } # set exchangerate after transdate and currency_id - $order->assign_attributes(exchangerate_as_null_number => $exchangerate_as_null_number) if $order->currency_id; + $order->assign_attributes(exchangerate_as_null_number => $form_exchangerate_as_null_number) if $order->currency_id; # remove deleted items $self->item_ids_to_delete([]); @@ -2125,8 +2124,6 @@ java script functions =item * testing -=item * currency - =item * credit limit =item * more workflows (quotation, rfq) -- 2.20.1