Merge branch 'master' of http://65.1.227.215:3000/Administrator/smart_service

smart_service/transactions/doctype/system_mapping/system_mapping.js

@@ -42,24 +42,24 @@ frappe.ui.form.on('System Mapping', {
         frm.trigger('fnLoadmat_initial_values');
     },
     validate: function (frm) {
-        var regex = /[!@#$%^&*()_+\=\[\]{};'`~:"\\|.<>\/?]+/;
+        var regex = /[!@#$%^&*()_+\=\[\]{};'`~:"\\|,.<>\/?]+/;
         for (var i = 0; i < cur_frm.doc.system_sub_systems.length; i++) {
             if (regex.test(cur_frm.doc.system_sub_systems[i].rts) === true) {
-                frappe.throw(__("<b>RTS:</b> Only letters, numbers and <b> -,</b> are allowed."));
+                frappe.throw(__("<b>RTS:</b> Only letters, numbers and <b> -</b> are allowed."));
                 frappe.validated = false;
             } else if (cur_frm.doc.system_sub_systems[i].rts) {
                 if (cur_frm.doc.system_sub_systems[i].rts.includes("'")) {
-                    frappe.throw(__("<b>RTS:</b> Only letters, numbers and <b> -,</b> are allowed."));
+                    frappe.throw(__("<b>RTS:</b> Only letters, numbers and <b> -</b> are allowed."));
                     frappe.validated = false;
                 }
             }
 
             if (regex.test(cur_frm.doc.system_sub_systems[i].mat) === true) {
-                frappe.throw(__("<b>MAT:</b> Only letters, numbers and <b> -,</b> are allowed."));
+                frappe.throw(__("<b>MAT:</b> Only letters, numbers and <b> -</b> are allowed."));
                 frappe.validated = false;
             } else if (cur_frm.doc.system_sub_systems[i].mat) {
                 if (cur_frm.doc.system_sub_systems[i].mat.includes("'")) {
-                    frappe.throw(__("<b>MAT:</b> Only letters, numbers and <b> -,</b> are allowed."));
+                    frappe.throw(__("<b>MAT:</b> Only letters, numbers and <b> -</b> are allowed."));
                     frappe.validated = false;
                 }
             }
@@ -175,24 +175,24 @@ frappe.ui.form.on('System Mapping', {
         }
     },
     special_character: function(frm){
-        var regex = /[!@#$%^&*()_+\=\[\]{};'`~:"\\|.<>\/?]+/;
+        var regex = /[!@#$%^&*()_+\=\[\]{};'`~:"\\|,.<>\/?]+/;
         for (var i = 0; i < cur_frm.doc.system_sub_systems.length; i++) {
             if (regex.test(cur_frm.doc.system_sub_systems[i].rts) === true) {
-                frappe.throw(__("<b>RTS:</b> Only letters, numbers and <b> -,</b> are allowed."));
+                frappe.throw(__("<b>RTS:</b> Only letters, numbers and <b> -</b> are allowed."));
                 frappe.validated = false;
             } else if (cur_frm.doc.system_sub_systems[i].rts) {
                 if (cur_frm.doc.system_sub_systems[i].rts.includes("'")) {
-                    frappe.throw(__("<b>RTS:</b> Only letters, numbers and <b> -,</b> are allowed."));
+                    frappe.throw(__("<b>RTS:</b> Only letters, numbers and <b> -</b> are allowed."));
                     frappe.validated = false;
                 }
             }
 
             if (regex.test(cur_frm.doc.system_sub_systems[i].mat) === true) {
-                frappe.throw(__("<b>MAT:</b> Only letters, numbers and <b> -,</b> are allowed."));
+                frappe.throw(__("<b>MAT:</b> Only letters, numbers and <b> -</b> are allowed."));
                 frappe.validated = false;
             } else if (cur_frm.doc.system_sub_systems[i].mat) {
                 if (cur_frm.doc.system_sub_systems[i].mat.includes("'")) {
-                    frappe.throw(__("<b>MAT:</b> Only letters, numbers and <b> -,</b> are allowed."));
+                    frappe.throw(__("<b>MAT:</b> Only letters, numbers and <b> -</b> are allowed."));
                     frappe.validated = false;
                 }
             }

smart_service/transactions/doctype/variant_mapping/variant_mapping.js

@@ -45,7 +45,7 @@ frappe.ui.form.on('Variant Mapping', {
         }
     },
     validate: function(frm){
-        var regex = /[!@#$%^&*()_+\-=\[\]{};'`~:"\\|.<>\/?]+/;
+        var regex = /[!@#$%^&*()_+\-=\[\]{};'`~:"\\|,.<>\/?]+/;
 		if (regex.test(frm.doc.family_code) === true) {
 			frappe.throw(__("<b>Family Code:</b> Only letters and numbers are allowed."));
 			frappe.validated = false;