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

smart_service/masters/doctype/vehicle/vehicle.js

@@ -101,9 +101,8 @@ frappe.ui.form.on('Vehicle', {
             }
         }
 
-        var regex = /[!@#$%^&*()_+-\=\[\]{};'`"\\|.<>\/?]+/;
-            if (regex.test(frm.doc.display_order) === true) {
-                frappe.throw(__("<b>Display Order:</b> negative values not allowed."));
+        if (frm.doc.display_order <= 0) {
+            frappe.throw(__("<b>Display Order:</b> negative values or 0 not allowed."));
             frappe.validated = false;
         }
 

smart_service/masters/doctype/vehicle_segment/vehicle_segment.js

@@ -48,8 +48,8 @@ frappe.ui.form.on('Vehicle Segment', {
             frappe.throw(__("Just a <b>.</b> is not prescribed!"));
             frappe.validated = false;
         }
-        var regex = /[!@#$%^&*()_+-\=\[\]{};'`"\\|.<>\/?]+/;
-            if (regex.test(frm.doc.display_order) === true) {
+
+        if (frm.doc.display_order <= 0) {
             frappe.throw(__("<b>Display Order:</b> negative values not allowed."));
             frappe.validated = false;
         }