diff --git a/ayanova/src/components/work-order-item-outside-services.vue b/ayanova/src/components/work-order-item-outside-services.vue
index 380e083c..59961d52 100644
--- a/ayanova/src/components/work-order-item-outside-services.vue
+++ b/ayanova/src/components/work-order-item-outside-services.vue
@@ -79,13 +79,7 @@
           }}<v-icon right large>$ayiTrashRestoreAlt</v-icon></v-btn
         >
 
-        <v-col
-          v-if="form().showMe(this, 'WorkOrderItemOutsideServiceUnit')"
-          cols="12"
-          sm="6"
-          lg="4"
-          xl="3"
-        >
+        <v-col cols="12" sm="6" lg="4" xl="3">
           <gz-pick-list
             :ref="
               `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].unitId`
@@ -147,7 +141,7 @@
             :error-messages="
               form().serverErrors(
                 this,
-                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].vendorSentToId`
+                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].WorkOrderItemOutsideServiceVendorSentToID`
               )
             "
             @input="
@@ -180,7 +174,7 @@
             :error-messages="
               form().serverErrors(
                 this,
-                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].rmaNumber`
+                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].WorkOrderItemOutsideServiceRMANumber`
               )
             "
             data-cy="outsideServices.rma"
@@ -214,13 +208,17 @@
             :error-messages="
               form().serverErrors(
                 this,
-                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].repairCost`
+                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].WorkOrderItemOutsideServiceRepairCost`
               )
             "
             :rules="[
               form().decimalValid(
                 this,
                 `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].repairCost`
+              ),
+              form().required(
+                this,
+                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].repairCost`
               )
             ]"
             @input="
@@ -254,13 +252,17 @@
             :error-messages="
               form().serverErrors(
                 this,
-                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].repairPrice`
+                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].WorkOrderItemOutsideServiceRepairPrice`
               )
             "
             :rules="[
               form().decimalValid(
                 this,
                 `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].repairPrice`
+              ),
+              form().required(
+                this,
+                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].repairPrice`
               )
             ]"
             @input="
@@ -297,7 +299,7 @@
             :error-messages="
               form().serverErrors(
                 this,
-                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].vendorSentViaId`
+                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].WorkOrderItemOutsideServiceVendorSentViaID`
               )
             "
             @input="
@@ -332,7 +334,7 @@
             :error-messages="
               form().serverErrors(
                 this,
-                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].trackingNumber`
+                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].WorkOrderItemOutsideServiceTrackingNumber`
               )
             "
             data-cy="outsideServices.trackingNumber"
@@ -366,13 +368,17 @@
             :error-messages="
               form().serverErrors(
                 this,
-                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].shippingCost`
+                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].WorkOrderItemOutsideServiceShippingCost`
               )
             "
             :rules="[
               form().decimalValid(
                 this,
                 `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].shippingCost`
+              ),
+              form().required(
+                this,
+                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].shippingCost`
               )
             ]"
             @input="
@@ -406,13 +412,17 @@
             :error-messages="
               form().serverErrors(
                 this,
-                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].shippingPrice`
+                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].WorkOrderItemOutsideServiceShippingPrice`
               )
             "
             :rules="[
               form().decimalValid(
                 this,
                 `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].shippingPrice`
+              ),
+              form().required(
+                this,
+                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].shippingPrice`
               )
             ]"
             @input="
@@ -445,7 +455,7 @@
             :error-messages="
               form().serverErrors(
                 this,
-                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].sentDate`
+                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].WorkOrderItemOutsideServiceDateSent`
               )
             "
             @input="
@@ -478,7 +488,7 @@
             :error-messages="
               form().serverErrors(
                 this,
-                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].etaDate`
+                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].WorkOrderItemOutsideServiceDateETA`
               )
             "
             @input="
@@ -511,7 +521,7 @@
             :error-messages="
               form().serverErrors(
                 this,
-                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].returnDate`
+                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].WorkOrderItemOutsideServiceDateReturned`
               )
             "
             @input="
@@ -546,7 +556,7 @@
             :error-messages="
               form().serverErrors(
                 this,
-                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].taxCodeId`
+                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].WorkOrderItemOutsideServiceTaxCode`
               )
             "
             @input="
@@ -576,7 +586,7 @@
             :error-messages="
               form().serverErrors(
                 this,
-                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].notes`
+                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].WorkOrderItemOutsideServiceNotes`
               )
             "
             data-cy="outsideServices.notes"
@@ -641,13 +651,11 @@ export default {
     headerList: function() {
       const headers = [];
 
-      if (this.form().showMe(this, "WorkOrderItemOutsideServiceUnit")) {
-        headers.push({
-          text: this.$ay.t("Unit"),
-          align: "left",
-          value: "unitViz"
-        });
-      }
+      headers.push({
+        text: this.$ay.t("Unit"),
+        align: "left",
+        value: "unitViz"
+      });
 
       if (
         this.form().showMe(this, "WorkOrderItemOutsideServiceVendorSentToID")