ayanova/src/components/pm-header.vue

@@ -57,17 +57,6 @@
       </v-col>
 
       <!-- ##################################################################################### -->
-      <v-col cols="12" sm="6" lg="4" xl="3">
-        <v-checkbox
-          v-model="value.active"
-          :readonly="formState.readOnly"
-          :label="$ay.t('Active')"
-          ref="active"
-          data-cy="active"
-          :error-messages="form().serverErrors(this, 'active')"
-          @change="fieldValueChanged('active')"
-        ></v-checkbox>
-      </v-col>
 
       <v-col cols="12" sm="6" lg="4" xl="3">
         <v-row>
@@ -154,6 +143,7 @@
           :readonly="formState.readOnly"
           ref="nextServiceDate"
           data-cy="nextServiceDate"
+          :rules="[form().required(this, 'nextServiceDate')]"
           :error-messages="form().serverErrors(this, 'nextServiceDate')"
           @input="fieldValueChanged('nextServiceDate')"
         ></gz-date-time-picker>
@@ -171,6 +161,18 @@
         ></gz-date-time-picker>
       </v-col>
 
+      <v-col cols="12" sm="6" lg="4" xl="3">
+        <v-checkbox
+          v-model="value.active"
+          :readonly="formState.readOnly"
+          :label="$ay.t('Active')"
+          ref="active"
+          data-cy="active"
+          :error-messages="form().serverErrors(this, 'active')"
+          @change="fieldValueChanged('active')"
+        ></v-checkbox>
+      </v-col>
+
       <!-- ##################################################################################### -->
       <v-col
         v-if="

ayanova/src/views/svc-pm.vue

@@ -205,19 +205,21 @@ export default {
         wiki: null,
         customFields: "{}",
         tags: [],
+        stopGeneratingDate: null,
+        excludeDaysOfWeek: 96,
+        active: true,
+        nextServiceDate: null,
+        repeatUnit: 7,
+        generateBeforeUnit: 4,
+        repeatInterval: 1,
+        generateBeforeInterval: 14,
+        generateDate: null,
         customerId: 0, //part of rule breaking, flip to null on new triggers broken rule
         projectId: null,
         contractId: null,
         internalReferenceNumber: null,
         customerReferenceNumber: null,
         customerContactName: null,
-        fromPMId: null,
-        fromPMId: null,
-        fromCSRId: null,
-        serviceDate: null,
-        completeByDate: null,
-        durationToCompleted: "00:00:00",
-        invoiceNumber: null,
         onsite: true,
         customerSignature: null,
         customerSignatureName: null,
@@ -1714,7 +1716,7 @@ function generateMenu(vm) {
     readOnly: vm.formState.readOnly,
     hideCoreBizStandardOptions: vm.obj.userIsRestrictedType,
     hideSearch: vm.obj.userIsRestrictedType,
-    icon: "$ayiPencilAlt",
+    icon: "$ayiBusinessTime",
     title: "PM",
     helpUrl: "svc-pms",
     formData: {

ayanova/src/views/svc-quote.vue

@@ -2149,7 +2149,8 @@ async function fetchTranslatedText(vm) {
     "RecentWorkOrders",
     "WorkOrderGenerateUnit",
     "ApplyUnitContract",
-    "CustomerServiceRequest"
+    "CustomerServiceRequest",
+    "NewStatus"
   ]);
 }
 

ayanova/src/views/svc-workorder.vue

@@ -2351,7 +2351,8 @@ async function fetchTranslatedText(vm) {
     "WorkOrderFromPMID",
     "CustomerServiceRequest",
     "GenerateQuote",
-    "GeneratePM"
+    "GeneratePM",
+    "NewStatus"
   ]);
 }