From dc89fd52864f1778e4aded439e0765b1422879ce Mon Sep 17 00:00:00 2001 From: Waldemar Toews Date: Wed, 24 Sep 2014 09:47:48 +0200 Subject: [PATCH] =?utf8?q?BUG-Fix:=20Kreditorenbuchungen:=20W=C3=A4hrung?= =?utf8?q?=20wird=20nicht=20=C3=BCbernommen.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Es werden IMMER die Währungeinstellungen vom Lieferanten genommen. Variable currency wird beim Hollen der Lieferanten-Daten überschrieben. Den Variablen-Wert vom Stammdaten-Hollen gesichert und danach zurückgeschrieben. --- bin/mozilla/ar.pl | 3 +++ templates/webpages/ar/form_header.html | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl index 7952be3a5..b16d11f9f 100644 --- a/bin/mozilla/ar.pl +++ b/bin/mozilla/ar.pl @@ -272,6 +272,9 @@ sub form_header { $form->{forex} = $form->check_exchangerate( \%myconfig, $form->{currency}, $form->{transdate}, 'buy'); $form->{exchangerate} = $form->{forex} if $form->{forex}; + # format exchangerate + $form->{exchangerate} = $form->{exchangerate} ? $form->format_amount(\%myconfig, $form->{exchangerate}) : ''; + $rows = max 2, $form->numtextrows($form->{notes}, 50); my @old_project_ids = grep { $_ } map { $form->{"project_id_$_"} } 1..$form->{rowcount}; diff --git a/templates/webpages/ar/form_header.html b/templates/webpages/ar/form_header.html index 2c9870fe2..fe9c18de8 100644 --- a/templates/webpages/ar/form_header.html +++ b/templates/webpages/ar/form_header.html @@ -99,7 +99,7 @@ [% L.hidden_tag('forex', forex) %] [% IF show_exch %] [% 'Exchangerate' | $T8 %] - [%- IF forex %][% L.hidden_tag('exchangerate', LxERP.format_amount(exchangerate, 2)) %][% LxERP.format_amount(exchangerate, 2) %][%- ELSE %][% L.input_tag('exchangerate', LxERP.format_amount(exchangerate, 2), size=10) %][%- END %] +- [%- IF forex %][% L.hidden_tag('exchangerate', LxERP.format_amount(exchangerate, 2)) %][% LxERP.format_amount(exchangerate, 2) %][%- ELSE %][% L.input_tag('exchangerate', LxERP.format_amount(exchangerate, 2), size=10) %][%- END %] [% END %] [% department_html %] -- 2.20.1