Auftragsschnellerfassung: Korrekturen für Währung/Wechselkurs

[mfinanz.git] / SL / Controller / Order.pm

diff --git a/SL/Controller/Order.pm b/SL/Controller/Order.pm
index 5363e18a94c8ef87f06970e319b65fe5a7df5083..17b88fde62cc255e0ac064cfb514e5f7313c696b 100644 (file)
--- a/SL/Controller/Order.pm
+++ b/SL/Controller/Order.pm
@@ -929,12 +929,13 @@ sub action_recalc_amounts_and_taxes {
 sub action_update_exchangerate {
   my ($self) = @_;
   my $data = {};
 sub action_update_exchangerate {
   my ($self) = @_;
   my $data = {};

-  if ($self->order->currency_id != $::instance_conf->get_currency_id) {
-    $data = {
-      currency_name => $self->order->currency->name,
-      exchangerate  => $self->order->exchangerate_as_number,
-    };
-  }
+
+  $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,
+  };
+

   $self->render(\SL::JSON::to_json($data), { type => 'json', process => 0 });
 }
 
   $self->render(\SL::JSON::to_json($data), { type => 'json', process => 0 });
 }
 


@@ -1372,7 +1373,7 @@ sub make_order {
 
   my $form_orderitems               = delete $::form->{order}->{orderitems};
   my $form_periodic_invoices_config = delete $::form->{order}->{periodic_invoices_config};
 
   my $form_orderitems               = delete $::form->{order}->{orderitems};
   my $form_periodic_invoices_config = delete $::form->{order}->{periodic_invoices_config};

-  my $exchangerate                  = delete $::form->{order}->{exchangerate};
+  my $exchangerate_as_null_number   = delete $::form->{order}->{exchangerate_as_null_number};

 
   $order->assign_attributes(%{$::form->{order}});
 
 
   $order->assign_attributes(%{$::form->{order}});
 


@@ -1382,7 +1383,7 @@ sub make_order {
   }
 
   # set exchangerate after transdate and currency_id
   }
 
   # set exchangerate after transdate and currency_id

-  $order->assign_attributes(exchangerate => $exchangerate);
+  $order->assign_attributes(exchangerate_as_null_number => $exchangerate_as_null_number) if $order->currency_id;

 
   # remove deleted items
   $self->item_ids_to_delete([]);
 
   # remove deleted items
   $self->item_ids_to_delete([]);