Umwandlung von Angebot nach Auftrag hat nach Fehler verursacht, da gleiches Modul

[kivitendo-erp.git] / js / common.js

diff --git a/js/common.js b/js/common.js
index ffbcd43..b354d3c 100644 (file)
--- a/js/common.js
+++ b/js/common.js
@@ -34,6 +34,11 @@ function centerParms(width,height,extra) {
   return string;
 }
 
+function escape_more(s) {
+  s = escape(s);
+  return s.replace(/\+/g, '%2b');
+}
+
 function set_longdescription_window(input_name) {
   var parm = centerParms(600,500) + ",width=600,height=500,status=yes,scrollbars=yes";
   var name = document.getElementsByName(input_name)[0].value;
@@ -41,27 +46,33 @@ function set_longdescription_window(input_name) {
     "action=set_longdescription&" +
     "login=" +  encodeURIComponent(document.getElementsByName("login")[0].value)+ "&"+
     "password=" + encodeURIComponent(document.getElementsByName("password")[0].value) + "&" +
-    "longdescription=" + escape(document.getElementsByName(input_name)[0].value) + "&" +
-    "input_name=" + escape(input_name) + "&"
+    "longdescription=" + escape_more(document.getElementsByName(input_name)[0].value) + "&" +
+    "input_name=" + escape_more(input_name) + "&"
   window.open(url, "_new_generic", parm);
   }
 
 function check_right_number_format(input_name) {
-  if(thpoint) {
-    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);
-    }
-    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);
-    }
-        
-    for(var i = 1; i < thnumbers.length; i++) {
-     if(thnumbers[i].length !== 3) {
-       return show_alert_and_focus(input_name, wrongNumberFormat+thnumbers);
-     }
-   }
+//   if(thpoint) {
+//     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);
+//     }
+//     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);
+//     }
+//         
+//     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 == thpoint) {
+    return show_alert_and_focus(input_name, wrongNumberFormat);
   }
   if(decpoint == ',') {
     var decnumbers = input_name.value.split(',');
@@ -71,11 +82,11 @@ function check_right_number_format(input_name) {
   }
   if(decnumbers.length == 2) {
     if(decnumbers[1].length > 2)  {
-      return show_alert_and_focus(input_name, wrongNumberFormat + decnumbers);
+      return show_alert_and_focus(input_name, wrongNumberFormat);
     }
   }
   else {
-    if(decnumbers.length > 1 || decnumbers.length == 0) {
+    if(decnumbers.length > 2) {
       return show_alert_and_focus(input_name, wrongNumberFormat);
     }
     if(!thpoint) {
@@ -133,7 +144,7 @@ function getDateArray(input_name) {
 
 function show_alert_and_focus(input_name, errorMessage) {
   input_name.select();
-  alert(errorMessage + "\n\r\n\r--> " + input_name.value); //  + "\ndecpoint: " + decpoint + "\nthpoint: " + thpoint
+  alert(errorMessage + "\n\r\n\r--> " + input_name.value);
   input_name.focus();
   return false;
 }