From: Bernd Bleßmann <bernd@kivitendo-premium.de>
Date: Mon, 27 Jul 2020 13:30:24 +0000 (+0200)
Subject: Auftrags-Controller: Währung in make_order setzen
X-Git-Tag: release-3.5.6.1~97
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=7cac5eaa6eb9d3236d1359f7bff8474d9960b64c;p=kivitendo-erp.git

Auftrags-Controller: Währung in make_order setzen
---

diff --git a/SL/Controller/Order.pm b/SL/Controller/Order.pm
index f06f06e03..d40d2eb47 100644
--- a/SL/Controller/Order.pm
+++ b/SL/Controller/Order.pm
@@ -1364,8 +1364,9 @@ sub make_order {
   # order here solves this problem.
   my $order;
   $order   = SL::DB::Order->new(id => $::form->{id})->load(with => [ 'orderitems', 'orderitems.part' ]) if $::form->{id};
-  $order ||= SL::DB::Order->new(orderitems => [],
-                                quotation  => (any { $self->type eq $_ } (sales_quotation_type(), request_quotation_type())));
+  $order ||= SL::DB::Order->new(orderitems  => [],
+                                quotation   => (any { $self->type eq $_ } (sales_quotation_type(), request_quotation_type())),
+                                currency_id => $::instance_conf->get_currency_id());
 
   my $cv_id_method = $self->cv . '_id';
   if (!$::form->{id} && $::form->{$cv_id_method}) {
@@ -1528,8 +1529,6 @@ sub setup_order_from_cv {
 sub recalc {
   my ($self) = @_;
 
-  $self->order->currency_id($::instance_conf->get_currency_id()) unless $self->order->currency_id;
-
   my %pat = $self->order->calculate_prices_and_taxes();
 
   $self->{taxes} = [];