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

smart_service/masters/doctype/vehicle/vehicle.js

@@ -2,7 +2,8 @@
 // For license information, please see license.txt
 
 cur_frm.fields_dict['vehicle_segment'].get_query = function (doc, cdt, cdn) {
-    return {query:"smart_service.masters.doctype.vehicle.vehicle.vehicle_segment",
+    return {
+        query: "smart_service.masters.doctype.vehicle.vehicle.vehicle_segment",
     };
 };
 
@@ -121,7 +122,7 @@ frappe.ui.form.on('Vehicle', {
                         }, 5);
                     });
                 } else {
-                    if (frm.doc.display_order > vehicle_count){
+                    if (frm.doc.display_order >= vehicle_count) {
                         let display_vehicle_count = vehicle_count - 1;
                         msgprint('There are only ' + display_vehicle_count + ' vehicle(s)');
                         frappe.validated = false;

smart_service/masters/doctype/vehicle_segment/vehicle_segment.js

@@ -81,7 +81,7 @@ frappe.ui.form.on('Vehicle Segment', {
                         }, 5);
                     });
                 } else {
-                    if (frm.doc.display_order > vehicle_count){
+                    if (frm.doc.display_order >= vehicle_count){
                         let display_vehicle_count = vehicle_count - 1;
                         msgprint('There are only ' + display_vehicle_count + ' Vehicle Segment(s)');
                         frappe.validated = false;