From: Andreas Rudin <andreas.rudin@revamp-it.ch>
Date: Tue, 3 Dec 2019 22:06:43 +0000 (+0100)
Subject: parse_amount ersetzt durch kivi.parse_amount, " statt ' bei Zahlenformat
X-Git-Tag: release-3.5.6.1~419
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=ff65252d0411887fa595bd4133010c44ce85e928;p=kivitendo-erp.git

parse_amount ersetzt durch kivi.parse_amount, " statt ' bei Zahlenformat

1) Unnoetig doppelte Funktion gelöscht
2) [% MYCONFIG.numberformat %] darf nicht in einfache Hochkommas gesetzt
   werden, da dies beim Zahlenformat 1'000.00 zu Fehlern führt.
---

diff --git a/templates/webpages/generic/calculate_qty.html b/templates/webpages/generic/calculate_qty.html
index bd347aa81..9accc9065 100644
--- a/templates/webpages/generic/calculate_qty.html
+++ b/templates/webpages/generic/calculate_qty.html
@@ -35,10 +35,10 @@
  <script type="text/javascript">
    function calculate_qty() {
 [%- FOREACH row = VARIABLES %]
-     var [% row.name %] = parse_amount('[% MYCONFIG.numberformat %]', $('#calc_qty_form_id #[% row.name %]').val());
+     var [% row.name %] = kivi.parse_amount($('#calc_qty_form_id #[% row.name %]').val());
 [%- END %]
      var result = [% formel %];
-     result = number_format(result, 2, '[% MYCONFIG.numberformat %]');
+     result = number_format(result, 2, "[% MYCONFIG.numberformat %]");
      if (document.CalcQtyForm.input_id.value) {
        document.getElementById(document.CalcQtyForm.input_id.value).value = result;
      } else {
@@ -47,14 +47,6 @@
      $('#calc_qty_dialog').dialog('close');
    }
 
-   function parse_amount(numberformat, amount) {
-     if (numberformat == '1.000,00' || numberformat == '1000,00')
-       amount = amount.replace(/\./g, "").replace(/,/, ".");
-     if (numberformat == "1'000.00")
-       amount = amount.replace(/\'/g, '');
-     return amount.replace(/,/g, '');
-   }
-
    function number_format(number, precision, numberformat) {
      number = Math.round( number * Math.pow(10, precision) ) / Math.pow(10, precision);
      var nf     = numberformat.replace(/\d/g, '').split('').reverse();