Währung in Verkaufs-/Einkaufsrechnungj

In der Verkaufsrechnung traten noch einige Fehler auf, wenn man
ausländische Währungen angegeben hat. Wechselkurse wurden als Null
angezeigt und es gab kein Eingabefeld, wenn der Wechselkurs an einem
Datum noch nicht in der Datenbank vorhanden war. In Eingabefelder
eingegebene Werte wurden ignoriert.

In der Einkaufsrechnung traten ähnliche Fehler auf. Hier wurde nicht
einmal ein Wechselkurs angezeigt, obwohl Standardwährung und in der
Rechnung verwendete Währung nicht übereinstimmen.

diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl
index 7d5c36ab65b056189b929e8dbe9ec122e80661b1..f909d86f6350fad78abedc1d64c2537af1576147 100644 (file)
--- a/bin/mozilla/ir.pl
+++ b/bin/mozilla/ir.pl
@@ -316,7 +316,8 @@ sub form_header {
   my @values = map { $_       } @{ $form->{ALL_CURRENCIES} };
   my %labels = map { $_ => $_ } @{ $form->{ALL_CURRENCIES} };
   $form->{currency}            = $form->{defaultcurrency} unless $form->{currency};
-  $TMPL_VAR{show_exchangerate} = $form->{currency} ne $form->{defaultcurrency};
+  # show_exchangerate is also later needed in another template
+  $form->{show_exchangerate} = $form->{currency} ne $form->{defaultcurrency};
   $TMPL_VAR{currencies}        = NTI($cgi->popup_menu('-name' => 'currency', '-default' => $form->{"currency"},
                                                       '-values' => \@values, '-labels' => \%labels,
                                                       '-onchange' => "document.getElementById('update_button').click();"

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index 4716f60e3787faae2bb4bcefb7fa409a4166cbc1..56162d5439f2968d31ff39f0dcf137c394c5d27e 100644 (file)
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -517,6 +517,9 @@ sub update {
   for my $i (1 .. $form->{paidaccounts}) {
     next unless $form->{"paid_$i"};
     map { $form->{"${_}_$i"} = $form->parse_amount(\%myconfig, $form->{"${_}_$i"}) } qw(paid exchangerate);
+    if (!$form->{"forex_$i"}) {   #read exchangerate from input field (not hidden)
+      $form->{exchangerate} = $form->{"exchangerate_$i"};
+    } 
     $form->{"forex_$i"}        = $form->check_exchangerate(\%myconfig, $form->{currency}, $form->{"datepaid_$i"}, 'buy');
     $form->{"exchangerate_$i"} = $form->{"forex_$i"} if $form->{"forex_$i"};
   }

diff --git a/templates/webpages/ir/_payments.html b/templates/webpages/ir/_payments.html
index 1677219d460678d9bb55b30653ce500ee121b585..6d7db5ea0f77eba2766d4a312d9ca31cbaf73137 100644 (file)
--- a/templates/webpages/ir/_payments.html
+++ b/templates/webpages/ir/_payments.html
@@ -75,9 +75,9 @@
      <td align="center">
   [% SET forex        = 'forex_'        _ i %]
   [% SET exchangerate = 'exchangerate_' _ i %]
-  [% IF forex %]
+  [% IF $forex %]
         <input type="hidden" name="exchangerate_[% i %]" value="[% LxERP.format_amount($exchangerate, 2) %]">
-        [% LxERP.format_amount(exchangerate, 2) %]
+        [% LxERP.format_amount($forex, 2) %]
   [% ELSE %]
      [% IF $changeable %]
         <input name="exchangerate_[% i %]" size="10" value="[% LxERP.format_amount($exchangerate, 2, 1) %]">
@@ -86,7 +86,7 @@
         [% LxERP.format_amount($exchangerate, 2, 1) %]
      [% END %]
   [% END %]
-        <input type="hidden" name="forex_[% i %]" value="[% $forex %]">;
+        <input type="hidden" name="forex_[% i %]" value="[% $forex %]">
      </td>
 [% END %]
 

diff --git a/templates/webpages/is/_payments.html b/templates/webpages/is/_payments.html
index a872215029ef41a9f8aff06ad131cada7726fefb..41b0186155ca7d1c79e9b60c54ceced8ae9ac1b5 100644 (file)
--- a/templates/webpages/is/_payments.html
+++ b/templates/webpages/is/_payments.html
@@ -78,7 +78,7 @@
      <td align="center">
   [% SET forex        = 'forex_'        _ i %]
   [% SET exchangerate = 'exchangerate_' _ i %]
-  [% IF forex %]
+  [% IF $forex %]
         <input type="hidden" name="exchangerate_[% i %]" value="[% LxERP.format_amount($exchangerate, 2) %]">
         [% LxERP.format_amount($forex, 2) %]
   [% ELSE %]