diff --git a/ayanova/src/components/work-order-item-outside-services.vue b/ayanova/src/components/work-order-item-outside-services.vue
index bdfa96c1..300b5fa7 100644
--- a/ayanova/src/components/work-order-item-outside-services.vue
+++ b/ayanova/src/components/work-order-item-outside-services.vue
@@ -412,11 +412,8 @@
           ></gz-currency>
         </v-col>
 
-
- <v-col
-          v-if="
-            form().showMe(this, 'WorkOrderItemOutsideServiceDateSent')
-          "
+        <v-col
+          v-if="form().showMe(this, 'WorkOrderItemOutsideServiceDateSent')"
           cols="12"
           sm="6"
           lg="4"
@@ -448,10 +445,8 @@
           ></gz-date-time-picker>
         </v-col>
 
-         <v-col
-          v-if="
-            form().showMe(this, 'WorkOrderItemOutsideServiceDateETA')
-          "
+        <v-col
+          v-if="form().showMe(this, 'WorkOrderItemOutsideServiceDateETA')"
           cols="12"
           sm="6"
           lg="4"
@@ -483,10 +478,8 @@
           ></gz-date-time-picker>
         </v-col>
 
-         <v-col
-          v-if="
-            form().showMe(this, 'WorkOrderItemOutsideServiceDateReturned')
-          "
+        <v-col
+          v-if="form().showMe(this, 'WorkOrderItemOutsideServiceDateReturned')"
           cols="12"
           sm="6"
           lg="4"
@@ -518,226 +511,8 @@
           ></gz-date-time-picker>
         </v-col>
 
-
-        #####################################################################################
-        #####################################################################################
-        #####################################################################################
-        #####################################################################################
-        #####################################################################################
-        #####################################################################################
-       
-
         <v-col
-          v-if="
-            form().showMe(this, 'WorkOrderItemOutsideServiceServiceStopDate')
-          "
-          cols="12"
-          sm="6"
-          lg="4"
-          xl="3"
-        >
-          <gz-date-time-picker
-            :label="$ay.t('WorkOrderItemOutsideServiceServiceStopDate')"
-            v-model="
-              value.items[activeWoItemIndex].outsideServices[activeItemIndex]
-                .serviceStopDate
-            "
-            :readonly="formState.readOnly"
-            :disabled="isDeleted"
-            :ref="
-              `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].serviceStopDate`
-            "
-            data-cy="serviceStopDate"
-            :rules="[
-              form().datePrecedence(
-                this,
-                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].serviceStartDate`,
-                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].serviceStopDate`
-              )
-            ]"
-            :error-messages="
-              form().serverErrors(
-                this,
-                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].serviceStopDate`
-              )
-            "
-            @input="
-              fieldValueChanged(
-                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].serviceStopDate`
-              )
-            "
-          ></gz-date-time-picker>
-        </v-col>
-
-        <v-col
-          v-if="
-            form().showMe(
-              this,
-              'WorkOrderItemOutsideServiceServiceRateQuantity'
-            )
-          "
-          cols="12"
-          sm="6"
-          lg="4"
-          xl="3"
-        >
-          <gz-decimal
-            v-model="
-              value.items[activeWoItemIndex].outsideServices[activeItemIndex]
-                .serviceRateQuantity
-            "
-            :readonly="formState.readOnly || isDeleted"
-            :disabled="isDeleted"
-            :label="$ay.t('WorkOrderItemOutsideServiceServiceRateQuantity')"
-            :ref="
-              `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].serviceRateQuantity`
-            "
-            data-cy="outsideServiceServiceRateQuantity"
-            :error-messages="
-              form().serverErrors(
-                this,
-                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].serviceRateQuantity`
-              )
-            "
-            :rules="[
-              form().decimalValid(
-                this,
-                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].serviceRateQuantity`
-              ),
-              form().required(
-                this,
-                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].serviceRateQuantity`
-              )
-            ]"
-            @input="
-              fieldValueChanged(`Items[${activeWoItemIndex}].outsideServices[
-              ${activeItemIndex}
-            ].serviceRateQuantity`)
-            "
-          ></gz-decimal>
-        </v-col>
-
-        <v-col
-          v-if="form().showMe(this, 'WorkOrderItemOutsideServiceServiceRateID')"
-          cols="12"
-          sm="6"
-          lg="4"
-          xl="3"
-        >
-          <gz-pick-list
-            :aya-type="$ay.ayt().ServiceRate"
-            :variant="'contractid:' + value.contractId"
-            :show-edit-icon="true"
-            v-model="
-              value.items[activeWoItemIndex].outsideServices[activeItemIndex]
-                .serviceRateId
-            "
-            :readonly="formState.readOnly || isDeleted"
-            :disabled="isDeleted"
-            :label="$ay.t('WorkOrderItemOutsideServiceServiceRateID')"
-            :ref="
-              `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].serviceRateId`
-            "
-            data-cy="outsideServices.serviceRateId"
-            :error-messages="
-              form().serverErrors(
-                this,
-                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].serviceRateId`
-              )
-            "
-            @input="
-              fieldValueChanged(
-                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].serviceRateId`
-              )
-            "
-            @update:name="rateChange"
-          ></gz-pick-list>
-        </v-col>
-
-        <v-col
-          v-if="form().showMe(this, 'WorkOrderItemOutsideServiceUserID')"
-          cols="12"
-          sm="6"
-          lg="4"
-          xl="3"
-        >
-          <gz-pick-list
-            :aya-type="$ay.ayt().User"
-            variant="tech"
-            :show-edit-icon="true"
-            v-model="
-              value.items[activeWoItemIndex].outsideServices[activeItemIndex]
-                .userId
-            "
-            :readonly="formState.readOnly || isDeleted"
-            :disabled="isDeleted"
-            :label="$ay.t('WorkOrderItemOutsideServiceUserID')"
-            :ref="
-              `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].userId`
-            "
-            data-cy="outsideServices.userid"
-            :error-messages="
-              form().serverErrors(
-                this,
-                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].userId`
-              )
-            "
-            @input="
-              fieldValueChanged(
-                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].userId`
-              )
-            "
-            @update:name="userChange"
-          ></gz-pick-list>
-        </v-col>
-
-        <v-col
-          v-if="
-            form().showMe(this, 'WorkOrderItemOutsideServiceNoChargeQuantity')
-          "
-          cols="12"
-          sm="6"
-          lg="4"
-          xl="3"
-        >
-          <gz-decimal
-            v-model="
-              value.items[activeWoItemIndex].outsideServices[activeItemIndex]
-                .noChargeQuantity
-            "
-            :readonly="formState.readOnly || isDeleted"
-            :disabled="isDeleted"
-            :label="$ay.t('WorkOrderItemOutsideServiceNoChargeQuantity')"
-            :ref="
-              `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].noChargeQuantity`
-            "
-            data-cy="outsideServiceNoChargeQuantity"
-            :error-messages="
-              form().serverErrors(
-                this,
-                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].noChargeQuantity`
-              )
-            "
-            :rules="[
-              form().decimalValid(
-                this,
-                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].noChargeQuantity`
-              ),
-              form().required(
-                this,
-                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].noChargeQuantity`
-              )
-            ]"
-            @input="
-              fieldValueChanged(`Items[${activeWoItemIndex}].outsideServices[
-              ${activeItemIndex}
-            ].noChargeQuantity`)
-            "
-          ></gz-decimal>
-        </v-col>
-
-        <v-col
-          v-if="form().showMe(this, 'WorkOrderItemOutsideServiceTaxRateSaleID')"
+          v-if="form().showMe(this, 'WorkOrderItemOutsideServiceTaxCode')"
           cols="12"
           sm="6"
           lg="4"
@@ -748,24 +523,24 @@
             :show-edit-icon="true"
             v-model="
               value.items[activeWoItemIndex].outsideServices[activeItemIndex]
-                .taxCodeSaleId
+                .taxCodeId
             "
             :readonly="formState.readOnly || isDeleted"
             :disabled="isDeleted"
-            :label="$ay.t('WorkOrderItemOutsideServiceTaxRateSaleID')"
+            :label="$ay.t('TaxCode')"
             :ref="
-              `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].taxCodeSaleId`
+              `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].taxCodeId`
             "
             data-cy="outsideServiceTaxCodeSaleId"
             :error-messages="
               form().serverErrors(
                 this,
-                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].taxCodeSaleId`
+                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].taxCodeId`
               )
             "
             @input="
               fieldValueChanged(
-                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].taxCodeSaleId`
+                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].taxCodeId`
               )
             "
             @update:name="taxCodeChange"
@@ -773,77 +548,35 @@
         </v-col>
 
         <v-col
-          v-if="form().showMe(this, 'OutsideServicePriceOverride')"
-          cols="12"
-          sm="6"
-          lg="4"
-          xl="3"
-        >
-          <gz-currency
-            v-model="
-              value.items[activeWoItemIndex].outsideServices[activeItemIndex]
-                .priceOverride
-            "
-            can-clear
-            :readonly="formState.readOnly || isDeleted"
-            :disabled="isDeleted"
-            :label="$ay.t('PriceOverride')"
-            :ref="
-              `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].priceOverride`
-            "
-            data-cy="outsideServicepriceoverride"
-            :error-messages="
-              form().serverErrors(
-                this,
-                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].priceOverride`
-              )
-            "
-            :rules="[
-              form().decimalValid(
-                this,
-                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].priceOverride`
-              )
-            ]"
-            @input="
-              fieldValueChanged(`Items[${activeWoItemIndex}].outsideServices[
-              ${activeItemIndex}
-            ].priceOverride`)
-            "
-          ></gz-currency>
-        </v-col>
-
-        <v-col
-          v-if="
-            form().showMe(this, 'WorkOrderItemOutsideServiceServiceDetails')
-          "
+          v-if="form().showMe(this, 'WorkOrderItemOutsideServiceNotes')"
           cols="12"
         >
           <v-textarea
             v-model="
               value.items[activeWoItemIndex].outsideServices[activeItemIndex]
-                .serviceDetails
+                .notes
             "
             :readonly="formState.readOnly"
             :disabled="isDeleted"
-            :label="$ay.t('WorkOrderItemOutsideServiceServiceDetails')"
+            :label="$ay.t('WorkOrderItemOutsideServiceNotes')"
             :error-messages="
               form().serverErrors(
                 this,
                 `Items[${activeWoItemIndex}].outsideServices[
               ${activeItemIndex}
-            ].serviceDetails`
+            ].notes`
               )
             "
             :ref="
               `Items[${activeWoItemIndex}].outsideServices[
               ${activeItemIndex}
-            ].serviceDetails`
+            ].notes`
             "
-            data-cy="outsideServiceserviceDetails"
+            data-cy="outsideServiceNotes"
             @input="
               fieldValueChanged(`Items[${activeWoItemIndex}].outsideServices[
               ${activeItemIndex}
-            ].serviceDetails`)
+            ].notes`)
             "
             auto-grow
           ></v-textarea>
@@ -949,20 +682,25 @@ export default {
     }
   },
   methods: {
-    userChange(newName) {
-      this.value.items[this.activeWoItemIndex].outsideServices[
+    unitChange(newName) {
+      this.value.items[this.activeWoItemIndex].units[
         this.activeItemIndex
-      ].userViz = newName;
+      ].unitViz = newName;
     },
-    rateChange(newName) {
+    vendorSentToChange(newName) {
       this.value.items[this.activeWoItemIndex].outsideServices[
         this.activeItemIndex
-      ].serviceRateViz = newName;
+      ].vendorSentToViz = newName;
+    },
+    vendorSentViaChange(newName) {
+      this.value.items[this.activeWoItemIndex].outsideServices[
+        this.activeItemIndex
+      ].vendorSentViaViz = newName;
     },
     taxCodeChange(newName) {
       this.value.items[this.activeWoItemIndex].outsideServices[
         this.activeItemIndex
-      ].taxCodeSaleViz = newName;
+      ].taxCodeViz = newName;
     },
     newItem() {
       let newIndex = this.value.items[this.activeWoItemIndex].outsideServices