From: Rolf Fluehmann Date: Thu, 9 Jun 2016 14:33:40 +0000 (+0200) Subject: added missing numberformat in java-script X-Git-Tag: release-3.4.1~43 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=030d9691420627f3af04f7408ba1975a6ce855d7;p=kivitendo-erp.git added missing numberformat in java-script --- diff --git a/js/common.js b/js/common.js index 43bb7de4d..b4784f4b1 100644 --- a/js/common.js +++ b/js/common.js @@ -1,6 +1,6 @@ function setupPoints(numberformat, wrongFormat) { - decpoint = numberformat.substring((numberformat.substring(1, 2).match(/\.|\,/) ? 5 : 4), (numberformat.substring(1, 2).match(/\.|\,/) ? 6 : 5)); - if (numberformat.substring(1, 2).match(/\.|\,/)) { + decpoint = numberformat.substring((numberformat.substring(1, 2).match(/\.|\,|\'/) ? 5 : 4), (numberformat.substring(1, 2).match(/\.|\,|\'/) ? 6 : 5)); + if (numberformat.substring(1, 2).match(/\.|\,|\'/)) { thpoint = numberformat.substring(1, 2); } else { @@ -44,6 +44,9 @@ function check_right_number_format(input_name) { if(thpoint && thpoint == '.'){ test_val = test_val.replace(/\./g, ''); } + if(thpoint && thpoint == "'"){ + test_val = test_val.replace(/\'/g, ''); + } if(decpoint && decpoint == ','){ test_val = test_val.replace(/,/g, '.'); }