ayanova/src/views/adm-global-settings.vue

@@ -89,6 +89,17 @@
             ></gz-duration-picker>
           </v-col>
 
+          <v-col cols="12" sm="6" lg="4" xl="3">
+            <v-checkbox
+              v-model="obj.allowScheduleConflicts"
+              :readonly="formState.readOnly"
+              :label="$ay.t('GlobalAllowScheduleConflicts')"
+              ref="allowScheduleConflicts"
+              data-cy="allowScheduleConflicts"
+              @change="fieldValueChanged('allowScheduleConflicts')"
+            ></v-checkbox>
+          </v-col>
+
           <v-col cols="12" sm="6" lg="4" xl="3">
             <v-text-field
               v-model="obj.workLaborScheduleDefaultMinutes"
@@ -753,6 +764,7 @@ export default {
           taxPartSaleId: null,
           taxRateSaleId: null,
           workOrderCompleteByAge: "00:00:00",
+          allowScheduleConflicts: false,
           workOrderTravelDefaultMinutes: 0,
           workLaborScheduleDefaultMinutes: 0,
           customerDefaultWorkOrderReportId: null,
@@ -1036,7 +1048,8 @@ async function fetchTranslatedText(vm) {
     "CustomerSignature",
     "GlobalSignatureFooter",
     "GlobalSignatureHeader",
-    "GlobalSignatureTitle"
+    "GlobalSignatureTitle",
+    "GlobalAllowScheduleConflicts"
   ]);
 }
 </script>