X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=js%2Fcommon.js;h=d4d5ab7b9a266be6703beefc89ae974d898d6df5;hb=70e1559de935668f85affe8c2e73eaa45d3d1715;hp=f25a1595ffbb52786f4e11eb0be02a7291ddea50;hpb=5def52b0f6322414eb2a8f554b85e1320d230b2c;p=kivitendo-erp.git

diff --git a/js/common.js b/js/common.js
index f25a1595f..d4d5ab7b9 100644
--- a/js/common.js
+++ b/js/common.js
@@ -1,13 +1,13 @@
 
 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 {
     thpoint = null;
   }
-  wrongNumberformat = wrongFormat + " ( " + numberformat + " ) ";  
+  wrongNumberFormat = wrongFormat + " ( " + numberformat + " ) ";  
 }
 
 function setupDateFormat(setDateFormat, setWrongDateFormat) {
@@ -41,45 +41,58 @@ function set_longdescription_window(input_name) {
     "action=set_longdescription&" +
     "login=" +  encodeURIComponent(document.getElementsByName("login")[0].value)+ "&"+
     "password=" + encodeURIComponent(document.getElementsByName("password")[0].value) + "&" +
-    "path=" + encodeURIComponent(document.getElementsByName("path")[0].value) + "&" +
     "longdescription=" + escape(document.getElementsByName(input_name)[0].value) + "&" +
     "input_name=" + escape(input_name) + "&"
   window.open(url, "_new_generic", parm);
   }
 
 function check_right_number_format(input_name) {
-  var decnumbers = input_name.value.split(decpoint);
   if(thpoint) {
-    var thnumbers = input_name.value.split(thpoint);
-    if(thnumbers[thnumbers.length-1].match(/.+decpoint$/g)) {
-      thnumbers[thnumbers.length-1] = thnumbers[thnumbers.length-1].substring(thnumbers[thnumbers.length-1].length-1);
+    if(thpoint == ','){
+      var thnumbers = input_name.value.split(',');  
+      thnumbers[thnumbers.length-1] = thnumbers[thnumbers.length-1].substring((thnumbers[thnumbers.length-1].lastIndexOf(".") !== -1 ? thnumbers[thnumbers.length-1].lastIndexOf(".") : thnumbers[thnumbers.length-1].length), 0);
     }
-    if(thnumbers[thnumbers.length-1].match(/.+decpoint\d$/g)) {
-      thnumbers[thnumbers.length-1] = thnumbers[thnumbers.length-1].substring(thnumbers[thnumbers.length-1].length-2);
-    }  
-    if(thnumbers[thnumbers.length-1].match(/.+decpoint\d\d$/g)) {
-      thnumbers[thnumbers.length-1] = thnumbers[thnumbers.length-1].substring(thnumbers[thnumbers.length-1].length-3);
-    }  
-    for(var i = 1; i < thnumbers.length; i++) {
-      if(!thnumbers[i].match(/\d\d\d/g)) {
-        return show_alert_and_focus(input_name, wrongNumberFormat);
-      }
-      if(thnumbers[i].match(/.*decpoint.*|.*thpoint.*/g)) {
-        return show_alert_and_focus(input_name, wrongNumberFormat);
-      }
+    else{
+      var thnumbers = input_name.value.split('.');  
+      thnumbers[thnumbers.length-1] = thnumbers[thnumbers.length-1].substring((thnumbers[thnumbers.length-1].lastIndexOf(",") !== -1 ? thnumbers[thnumbers.length-1].lastIndexOf(",") : thnumbers[thnumbers.length-1].length), 0);
     }
-    if(decnumbers.length > 2 || (decnumbers.length > 1 ? (decnumbers[1].length > 2) : false)) {
+        
+    for(var i = 0; i < thnumbers.length; i++) {
+     if(i == 0 && thnumbers[i].length > 3) {
+      return show_alert_and_focus(input_name, wrongNumberFormat);
+     }
+     if(i > 0 && thnumbers[i].length != 3) {
+       return show_alert_and_focus(input_name, wrongNumberFormat);
+     }
+   }
+  }
+  if(decpoint == ',') {
+    var decnumbers = input_name.value.split(',');
+  }
+  else {
+    var decnumbers = input_name.value.split('.');
+  }
+  if(decnumbers.length == 2) {
+    if(decnumbers[1].length > 2)  {
       return show_alert_and_focus(input_name, wrongNumberFormat);
     }
   }
   else {
-    if(decnumbers.length > 1 || decnumbers[0].length > 2) {
+    if(decnumbers.length > 2) {
       return show_alert_and_focus(input_name, wrongNumberFormat);
     }
+    if(!thpoint) {
+      if(decnumbers[0].match(/\D/)) {
+        return show_alert_and_focus(input_name, wrongNumberFormat);
+      }
+    }
   }
 }
 
 function check_right_date_format(input_name) {
+  if(input_name.value == "") {
+    return true;
+  }
   var matching = new RegExp(dateFormat.replace(/\w/g, '\\d') + "\$","ig");
   if(!(dateFormat.lastIndexOf("y") == 3) && !matching.test(input_name.value)) {
     matching = new RegExp(dateFormat.replace(/\w/g, '\\d') + '\\d\\d\$', "ig");