diff --git a/ayanova/src/api/gzform.js b/ayanova/src/api/gzform.js
index ccc0be3b..2fa4550b 100644
--- a/ayanova/src/api/gzform.js
+++ b/ayanova/src/api/gzform.js
@@ -143,7 +143,9 @@ export default {
     if (vm.formState.loading) {
       return true;
     }
-
+    // if (ref == "Items.PartId") {
+    //   debugger;
+    // }
     let ctrl = getControl(vm, ref);
     if (typeof ctrl == "undefined") {
       // console.log("gzform:required rule - bailing due to undefined", ref);
@@ -169,17 +171,7 @@ export default {
     });
     return err;
   },
-  // ///////////////////////////////
-  // // REQUIRED STANDALONE
-  // // (used in translation form)
-  // requiredStandAlone(value, fieldName) {
-  //   return (
-  //     !!value ||
-  //     window.$gz.translation
-  //       .get("ErrorRequiredFieldEmpty")
-  //       .replace(/\{0\}/g, fieldName)
-  //   );
-  // },
+
   ///////////////////////////////
   // MAXLENGTH
   //
diff --git a/ayanova/src/components/pick-list.vue b/ayanova/src/components/pick-list.vue
index 89fe169e..e01737f6 100644
--- a/ayanova/src/components/pick-list.vue
+++ b/ayanova/src/components/pick-list.vue
@@ -11,6 +11,7 @@
       item-text="name"
       item-value="id"
       item-disabled="!active"
+      :rules="rules"
       :error-messages="errorMessages"
       :loading="fetching"
       :placeholder="$ay.t('Search')"
@@ -61,6 +62,7 @@ export default {
       type: Number,
       default: null
     },
+    rules: { type: Array, default: undefined },
     errorMessages: { type: Array, default: null },
     readonly: { type: Boolean, default: false },
     disabled: { type: Boolean, default: false },
diff --git a/ayanova/src/views/inv-purchase-order.vue b/ayanova/src/views/inv-purchase-order.vue
index ef47a896..64d907ae 100644
--- a/ayanova/src/views/inv-purchase-order.vue
+++ b/ayanova/src/views/inv-purchase-order.vue
@@ -221,12 +221,8 @@
             ></v-textarea>
           </v-col>
 
+          <!-- ################################ PURCHASE ORDER ITEMS LIST ############################### -->
           <v-col cols="12">
-            <!-- <span class="title">{{ $ay.t("PurchaseOrderItemList") }}</span>
-            <v-btn @click="getBackupStatus" class="mb-6">
-              <v-icon>$ayiSync</v-icon>
-            </v-btn> -->
-
             <v-data-table
               :headers="headerList"
               :items="itemList"
@@ -305,6 +301,7 @@
         :size="60"
       ></v-progress-circular>
     </template>
+    <!-- ########################## PURCHASE ORDER ITEM EDIT FORM  ###############################-->
     <template v-if="obj.items.length">
       <v-row justify="center">
         <v-dialog v-model="editPoItemDialog" persistent>
@@ -319,12 +316,14 @@
                 <v-col cols="12" sm="6" lg="4" xl="3">
                   <gz-pick-list
                     :aya-type="ayaTypes().Part"
+                    :allow-no-selection="false"
                     :show-edit-icon="true"
                     v-model="obj.items[editPoItemIndex].partId"
                     :readonly="formState.readOnly"
                     :label="$ay.t('Part')"
-                    ref="partId"
-                    data-cy="partId"
+                    ref="Items.PartId"
+                    data-cy="Items.PartId"
+                    :rules="[form().required(this, 'Items.PartId')]"
                   ></gz-pick-list>
                 </v-col>
                 <v-col cols="12" sm="6" lg="4" xl="3">
@@ -335,8 +334,8 @@
                     v-model="obj.items[editPoItemIndex].partWarehouseId"
                     :readonly="formState.readOnly"
                     :label="$ay.t('PartWarehouse')"
-                    ref="partWarehouseId"
-                    data-cy="partWarehouseId"
+                    ref="Items.PartWarehouseId"
+                    data-cy="Items.PartWarehouseId"
                   ></gz-pick-list>
                 </v-col>
                 <v-col cols="12" sm="6" lg="4" xl="3">
@@ -344,11 +343,11 @@
                     v-model="obj.items[editPoItemIndex].quantityOrdered"
                     :readonly="formState.readOnly"
                     :label="$ay.t('PurchaseOrderItemQuantityOrdered')"
-                    ref="quantityOrdered"
-                    data-cy="quantityOrdered"
+                    ref="Items.QuantityOrdered"
+                    data-cy="Items.QuantityOrdered"
                     :rules="[
-                      form().decimalValid(this, 'quantityOrdered'),
-                      form().required(this, 'quantityOrdered')
+                      form().decimalValid(this, 'Items.QuantityOrdered'),
+                      form().required(this, 'Items.QuantityOrdered')
                     ]"
                   ></gz-decimal>
                 </v-col>
@@ -358,11 +357,11 @@
                     v-model="obj.items[editPoItemIndex].quantityReceived"
                     :readonly="formState.readOnly"
                     :label="$ay.t('PurchaseOrderItemQuantityReceived')"
-                    ref="quantityReceived"
-                    data-cy="quantityReceived"
+                    ref="Items.QuantityReceived"
+                    data-cy="Items.QuantityReceived"
                     :rules="[
-                      form().decimalValid(this, 'quantityReceived'),
-                      form().required(this, 'quantityReceived')
+                      form().decimalValid(this, 'Items.QuantityReceived'),
+                      form().required(this, 'Items.QuantityReceived')
                     ]"
                   ></gz-decimal>
                 </v-col>
@@ -378,7 +377,7 @@
                     :label="$ay.t('PurchaseOrderReceiptReceivedDate')"
                     v-model="obj.items[editPoItemIndex].receivedDate"
                     :readonly="formState.readOnly"
-                    ref="receivedDate"
+                    ref="Items.ReceivedDate"
                     :error-messages="
                       form().serverErrors(this, 'Items.ReceivedDate')
                     "
@@ -391,11 +390,11 @@
                     v-model="obj.items[editPoItemIndex].purchaseOrderCost"
                     :readonly="formState.readOnly"
                     :label="$ay.t('PurchaseOrderItemPurchaseOrderCost')"
-                    ref="purchaseOrderCost"
-                    data-cy="purchaseOrderCost"
+                    ref="Items.PurchaseOrderCost"
+                    data-cy="Items.PurchaseOrderCost"
                     :rules="[
-                      form().decimalValid(this, 'purchaseOrderCost'),
-                      form().required(this, 'purchaseOrderCost')
+                      form().decimalValid(this, 'Items.PurchaseOrderCost'),
+                      form().required(this, 'Items.PurchaseOrderCost')
                     ]"
                   ></gz-currency>
                 </v-col>
@@ -405,8 +404,8 @@
                     v-model="obj.items[editPoItemIndex].receivedCost"
                     :readonly="formState.readOnly"
                     :label="$ay.t('PurchaseOrderReceiptItemReceiptCost')"
-                    ref="receivedCost"
-                    data-cy="receivedCost"
+                    ref="Items.ReceivedCost"
+                    data-cy="Items.ReceivedCost"
                     :rules="[
                       form().decimalValid(this, 'Items.ReceivedCost'),
                       form().required(this, 'Items.ReceivedCost')
@@ -422,8 +421,8 @@
                     v-model="obj.items[editPoItemIndex].purchaseTaxCodeId"
                     :readonly="formState.readOnly"
                     :label="$ay.t('TaxCode')"
-                    ref="purchaseTaxCodeId"
-                    data-cy="purchaseTaxCodeId"
+                    ref="Items.PurchaseTaxCodeId"
+                    data-cy="Items.PurchaseTaxCodeId"
                     :error-messages="
                       form().serverErrors(this, 'Items.PurchaseTaxCodeId')
                     "
@@ -442,10 +441,10 @@
                     v-model="obj.items[editPoItemIndex].vendorPartNumber"
                     :readonly="formState.readOnly"
                     :clearable="!formState.readOnly"
-                    @click:clear="fieldValueChanged('vendorPartNumber')"
+                    @click:clear="fieldValueChanged('Items.VendorPartNumber')"
                     :label="$ay.t('PurchaseOrderItemVendorPartNumber')"
-                    ref="vendorPartNumber"
-                    data-cy="vendorPartNumber"
+                    ref="Items.VendorPartNumber"
+                    data-cy="Items.VendorPartNumber"
                     :error-messages="
                       form().serverErrors(this, 'Items.VendorPartNumber')
                     "
@@ -453,7 +452,7 @@
                   ></v-text-field>
                 </v-col>
               </v-row>
-              {{ obj.items[editPoItemIndex] }}
+              <!-- {{ obj.items[editPoItemIndex] }} -->
             </v-card-text>
             <v-card-actions>
               <v-spacer></v-spacer>