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

@@ -4,6 +4,48 @@
       <gz-error :error-box-message="formState.errorBoxMessage"></gz-error>
       <v-form ref="form">
         <v-row>
+          <v-col cols="12" sm="6" lg="4" xl="3">
+            <gz-pick-list
+              :aya-type="ayaTypes().TaxCode"
+              :show-edit-icon="true"
+              v-model="obj.taxPartPurchaseId"
+              :readonly="formState.readOnly"
+              :label="$ay.t('GlobalTaxPartPurchaseID')"
+              ref="taxPartPurchaseId"
+              data-cy="taxPartPurchaseId"
+              :error-messages="form().serverErrors(this, `taxPartPurchaseId`)"
+              @input="fieldValueChanged(`taxPartPurchaseId`)"
+            ></gz-pick-list>
+          </v-col>
+
+          <v-col cols="12" sm="6" lg="4" xl="3">
+            <gz-pick-list
+              :aya-type="ayaTypes().TaxCode"
+              :show-edit-icon="true"
+              v-model="obj.taxRateSaleId"
+              :readonly="formState.readOnly"
+              :label="$ay.t('GlobalTaxRateSaleID')"
+              ref="taxRateSaleId"
+              data-cy="taxRateSaleId"
+              :error-messages="form().serverErrors(this, `taxRateSaleId`)"
+              @input="fieldValueChanged(`taxRateSaleId`)"
+            ></gz-pick-list>
+          </v-col>
+
+          <v-col cols="12" sm="6" lg="4" xl="3">
+            <gz-pick-list
+              :aya-type="ayaTypes().TaxCode"
+              :show-edit-icon="true"
+              v-model="obj.taxPartSaleId"
+              :readonly="formState.readOnly"
+              :label="$ay.t('GlobalTaxPartSaleID')"
+              ref="taxPartSaleId"
+              data-cy="taxPartSaleId"
+              :error-messages="form().serverErrors(this, `taxPartSaleId`)"
+              @input="fieldValueChanged(`taxPartSaleId`)"
+            ></gz-pick-list>
+          </v-col>
+
           <v-col cols="12" sm="6" lg="4" xl="3">
             <v-checkbox
               v-model="obj.searchCaseSensitiveOnly"
@@ -345,7 +387,10 @@ async function fetchTranslatedText(vm) {
     "PickListTemplates",
     "GlobalLogo",
     "GlobalUseInventory",
-    "GlobalSearchCaseSensitiveOnly"
+    "GlobalSearchCaseSensitiveOnly",
+    "GlobalTaxPartPurchaseID",
+    "GlobalTaxPartSaleID",
+    "GlobalTaxRateSaleID"
   ]);
 }
 </script>

ayanova/src/views/svc-contract.vue

@@ -17,17 +17,7 @@
               @input="fieldValueChanged('name')"
             ></v-text-field>
           </v-col>
-          <v-col cols="12" sm="6" lg="4" xl="3">
-            <v-checkbox
-              v-model="obj.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">
             <gz-duration-picker
               v-model="obj.responseTime"
@@ -480,7 +470,17 @@
               </template>
             </v-simple-table>
           </v-col>
-
+          <v-col cols="12" sm="6" lg="4" xl="3">
+            <v-checkbox
+              v-model="obj.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="form().showMe(this, 'AlertNotes')" cols="12">
             <v-textarea
               v-model="obj.alertNotes"