diff --git a/ayanova/src/components/work-order-item-tasks.vue b/ayanova/src/components/work-order-item-tasks.vue
index d11cfb96..de203ced 100644
--- a/ayanova/src/components/work-order-item-tasks.vue
+++ b/ayanova/src/components/work-order-item-tasks.vue
@@ -112,6 +112,58 @@
           ></v-text-field>
         </v-col>
 
+        <v-col
+          v-if="
+            form().showMe(
+              this,
+              'WorkOrderItemTaskWorkOrderItemTaskCompletionType'
+            )
+          "
+          cols="12"
+          sm="6"
+          lg="4"
+          xl="3"
+        >
+          <v-select
+            v-model="
+              value.items[activeWoItemIndex].tasks[activeItemIndex].status
+            "
+            :items="pvm.selectLists.woItemTaskCompletionTypes"
+            item-text="name"
+            item-value="id"
+            :readonly="formState.readOnly || isDeleted"
+            :disabled="isDeleted"
+            :label="$ay.t('WorkOrderItemTaskWorkOrderItemTaskCompletionType')"
+            :ref="
+              `Items[${activeWoItemIndex}].tasks[
+              ${activeItemIndex}
+            ].status`
+            "
+            data-cy="usertype"
+            :rules="[
+              form().integerValid(
+                this,
+                `Items[${activeWoItemIndex}].tasks[
+              ${activeItemIndex}
+            ].status`
+              )
+            ]"
+            :error-messages="
+              form().serverErrors(
+                this,
+                `Items[${activeWoItemIndex}].tasks[
+              ${activeItemIndex}
+            ].status`
+              )
+            "
+            @input="
+              fieldValueChanged(`Items[${activeWoItemIndex}].tasks[
+              ${activeItemIndex}
+            ].status`)
+            "
+          ></v-select>
+        </v-col>
+
         <v-col
           v-if="form().showMe(this, 'WorkOrderItemTaskUser')"
           cols="12"
@@ -182,298 +234,30 @@
           ></gz-date-time-picker>
         </v-col>
 
-        ------------------------#####################--------------------------
-
-        <v-col
-          v-if="form().showMe(this, 'WorkOrderItemExpenseName')"
-          cols="12"
-          sm="6"
-          lg="4"
-          xl="3"
-        >
-          <v-text-field
-            v-model="value.items[activeWoItemIndex].tasks[activeItemIndex].name"
-            :readonly="formState.readOnly"
-            :disabled="isDeleted"
-            :label="$ay.t('WorkOrderItemExpenseName')"
-            :ref="
-              `Items[${activeWoItemIndex}].tasks[
-              ${activeItemIndex}
-            ].name`
-            "
-            :error-messages="
-              form().serverErrors(
-                this,
-                `Items[${activeWoItemIndex}].tasks[
-              ${activeItemIndex}
-            ].name`
-              )
-            "
-            @input="
-              fieldValueChanged(`Items[${activeWoItemIndex}].tasks[
-              ${activeItemIndex}
-            ].name`)
-            "
-          ></v-text-field>
-        </v-col>
-
-        <v-col
-          v-if="form().showMe(this, 'WorkOrderItemExpenseTotalCost')"
-          cols="12"
-          sm="6"
-          lg="4"
-          xl="3"
-        >
-          <gz-currency
-            v-model="
-              value.items[activeWoItemIndex].tasks[activeItemIndex].totalCost
-            "
-            :readonly="formState.readOnly || isDeleted"
-            :disabled="isDeleted"
-            :label="$ay.t('WorkOrderItemExpenseTotalCost')"
-            :ref="
-              `Items[${activeWoItemIndex}].tasks[${activeItemIndex}].totalCost`
-            "
-            data-cy="expenseTotalCost"
-            :error-messages="
-              form().serverErrors(
-                this,
-                `Items[${activeWoItemIndex}].tasks[${activeItemIndex}].totalCost`
-              )
-            "
-            :rules="[
-              form().decimalValid(
-                this,
-                `Items[${activeWoItemIndex}].tasks[${activeItemIndex}].totalCost`
-              ),
-              form().required(
-                this,
-                `Items[${activeWoItemIndex}].tasks[${activeItemIndex}].totalCost`
-              )
-            ]"
-            @input="
-              fieldValueChanged(`Items[${activeWoItemIndex}].tasks[
-              ${activeItemIndex}
-            ].totalCost`)
-            "
-          ></gz-currency>
-        </v-col>
-
-        <v-col
-          v-if="form().showMe(this, 'WorkOrderItemExpenseChargeAmount')"
-          cols="12"
-          sm="6"
-          lg="4"
-          xl="3"
-        >
-          <gz-currency
-            v-model="
-              value.items[activeWoItemIndex].tasks[activeItemIndex].chargeAmount
-            "
-            :readonly="formState.readOnly || isDeleted"
-            :disabled="isDeleted"
-            :label="$ay.t('WorkOrderItemExpenseChargeAmount')"
-            :ref="
-              `Items[${activeWoItemIndex}].tasks[${activeItemIndex}].chargeAmount`
-            "
-            data-cy="expenseChargeAmount"
-            :error-messages="
-              form().serverErrors(
-                this,
-                `Items[${activeWoItemIndex}].tasks[${activeItemIndex}].chargeAmount`
-              )
-            "
-            :rules="[
-              form().decimalValid(
-                this,
-                `Items[${activeWoItemIndex}].tasks[${activeItemIndex}].chargeAmount`
-              ),
-              form().required(
-                this,
-                `Items[${activeWoItemIndex}].tasks[${activeItemIndex}].chargeAmount`
-              )
-            ]"
-            @input="
-              fieldValueChanged(`Items[${activeWoItemIndex}].tasks[
-              ${activeItemIndex}
-            ].chargeAmount`)
-            "
-          ></gz-currency>
-        </v-col>
-
-        <v-col
-          v-if="form().showMe(this, 'WorkOrderItemExpenseChargeToCustomer')"
-          cols="12"
-          sm="6"
-          lg="4"
-          xl="3"
-        >
-          <v-checkbox
-            v-model="
-              value.items[activeWoItemIndex].tasks[activeItemIndex]
-                .chargeToCustomer
-            "
-            :readonly="formState.readOnly"
-            :disabled="isDeleted"
-            :label="$ay.t('WorkOrderItemExpenseChargeToCustomer')"
-            :ref="
-              `Items[${activeWoItemIndex}].tasks[${activeItemIndex}].chargeToCustomer`
-            "
-            data-cy="chargeToCustomer"
-            :error-messages="
-              form().serverErrors(
-                this,
-                `Items[${activeWoItemIndex}].tasks[${activeItemIndex}].chargeToCustomer`
-              )
-            "
-            @change="
-              fieldValueChanged(`Items[${activeWoItemIndex}].tasks[
-              ${activeItemIndex}
-            ].chargeToCustomer`)
-            "
-          ></v-checkbox>
-        </v-col>
-
-        <v-col
-          v-if="form().showMe(this, 'WorkOrderItemExpenseTaxPaid')"
-          cols="12"
-          sm="6"
-          lg="4"
-          xl="3"
-        >
-          <gz-currency
-            v-model="
-              value.items[activeWoItemIndex].tasks[activeItemIndex].taxPaid
-            "
-            :readonly="formState.readOnly || isDeleted"
-            :disabled="isDeleted"
-            :label="$ay.t('WorkOrderItemExpenseTaxPaid')"
-            :ref="
-              `Items[${activeWoItemIndex}].tasks[${activeItemIndex}].taxPaid`
-            "
-            data-cy="expenseTaxPaid"
-            :error-messages="
-              form().serverErrors(
-                this,
-                `Items[${activeWoItemIndex}].tasks[${activeItemIndex}].taxPaid`
-              )
-            "
-            :rules="[
-              form().decimalValid(
-                this,
-                `Items[${activeWoItemIndex}].tasks[${activeItemIndex}].taxPaid`
-              ),
-              form().required(
-                this,
-                `Items[${activeWoItemIndex}].tasks[${activeItemIndex}].taxPaid`
-              )
-            ]"
-            @input="
-              fieldValueChanged(`Items[${activeWoItemIndex}].tasks[
-              ${activeItemIndex}
-            ].taxPaid`)
-            "
-          ></gz-currency>
-        </v-col>
-
-        <v-col
-          v-if="form().showMe(this, 'WorkOrderItemExpenseChargeTaxCodeID')"
-          cols="12"
-          sm="6"
-          lg="4"
-          xl="3"
-        >
-          <gz-pick-list
-            :aya-type="$ay.ayt().TaxCode"
-            :show-edit-icon="true"
-            v-model="
-              value.items[activeWoItemIndex].tasks[activeItemIndex]
-                .chargeTaxCodeId
-            "
-            :readonly="formState.readOnly || isDeleted"
-            :disabled="isDeleted"
-            :label="$ay.t('WorkOrderItemExpenseChargeTaxCodeID')"
-            :ref="
-              `Items[${activeWoItemIndex}].tasks[${activeItemIndex}].chargeTaxCodeId`
-            "
-            data-cy="expenseChargeTaxCode"
-            :error-messages="
-              form().serverErrors(
-                this,
-                `Items[${activeWoItemIndex}].tasks[${activeItemIndex}].chargeTaxCodeId`
-              )
-            "
-            @input="
-              fieldValueChanged(
-                `Items[${activeWoItemIndex}].tasks[${activeItemIndex}].chargeTaxCodeId`
-              )
-            "
-            @update:name="statusChange"
-          ></gz-pick-list>
-        </v-col>
-
-        <v-col
-          v-if="form().showMe(this, 'WorkOrderItemExpenseReimburseUser')"
-          cols="12"
-          sm="6"
-          lg="4"
-          xl="3"
-        >
-          <v-checkbox
-            v-model="
-              value.items[activeWoItemIndex].tasks[activeItemIndex]
-                .reimburseUser
-            "
-            :readonly="formState.readOnly"
-            :disabled="isDeleted"
-            :label="$ay.t('WorkOrderItemExpenseReimburseUser')"
-            :ref="
-              `Items[${activeWoItemIndex}].tasks[${activeItemIndex}].reimburseUser`
-            "
-            data-cy="expenseReimburseUser"
-            :error-messages="
-              form().serverErrors(
-                this,
-                `Items[${activeWoItemIndex}].tasks[${activeItemIndex}].reimburseUser`
-              )
-            "
-            @change="
-              fieldValueChanged(`Items[${activeWoItemIndex}].tasks[
-              ${activeItemIndex}
-            ].reimburseUser`)
-            "
-          ></v-checkbox>
-        </v-col>
-
-        <v-col
-          v-if="form().showMe(this, 'WorkOrderItemExpenseDescription')"
-          cols="12"
-        >
+        <v-col v-if="form().showMe(this, 'WorkOrderItemTaskTaskID')" cols="12">
           <v-textarea
-            v-model="
-              value.items[activeWoItemIndex].tasks[activeItemIndex].description
-            "
+            v-model="value.items[activeWoItemIndex].tasks[activeItemIndex].task"
             :readonly="formState.readOnly"
             :disabled="isDeleted"
-            :label="$ay.t('WorkOrderItemExpenseDescription')"
+            :label="$ay.t('WorkOrderItemTaskTaskID')"
             :error-messages="
               form().serverErrors(
                 this,
                 `Items[${activeWoItemIndex}].tasks[
               ${activeItemIndex}
-            ].description`
+            ].task`
               )
             "
             :ref="
               `Items[${activeWoItemIndex}].tasks[
               ${activeItemIndex}
-            ].description`
+            ].task`
             "
             data-cy="expenseDescription"
             @input="
               fieldValueChanged(`Items[${activeWoItemIndex}].tasks[
               ${activeItemIndex}
-            ].description`)
+            ].task`)
             "
             auto-grow
           ></v-textarea>
diff --git a/ayanova/src/views/svc-workorder.vue b/ayanova/src/views/svc-workorder.vue
index 806513f0..3e5777ae 100644
--- a/ayanova/src/views/svc-workorder.vue
+++ b/ayanova/src/views/svc-workorder.vue
@@ -182,7 +182,8 @@ export default {
         wostatus: [],
         allowedwostatus: [],
         woItemPriorities: [],
-        woItemStatus: []
+        woItemStatus: [],
+        woItemTaskCompletionTypes: []
       },
       subRights: {
         items: {
@@ -1499,6 +1500,11 @@ async function populateSelectionLists(vm) {
     vm.selectLists.woItemPriorities = res.data;
   }
 
+  await window.$gz.enums.fetchEnumList("WorkorderItemTaskCompletionType"); //prefetch
+  vm.selectLists.woItemTaskCompletionTypes = window.$gz.enums.getSelectionList(
+    "WorkorderItemTaskCompletionType"
+  );
+
   //---------
   /*