diff --git a/ayanova/src/api/gzform.js b/ayanova/src/api/gzform.js
index 5724ea04..59cdbf2b 100644
--- a/ayanova/src/api/gzform.js
+++ b/ayanova/src/api/gzform.js
@@ -808,11 +808,6 @@ export default {
         return;
       }
 
-      //might be an indexed item
-      //this is what we're dealing with
-      // { "code": "2200", "details": [ { "message": "LT:PurchaseOrderReceiptItemQuantityReceivedErrorInvalid", "target": "Items[0].QuantityReceived", "error": "2203" } ], "message": "ErrorAPI2200" }
-      //let rowErrorTargetStart = `${collectionName}[${rowIndex}].`.toLowerCase();
-
       //# REMOVE SERVER ERRORS FOR THIS FIELD REF
       let targetRef = ref.toLowerCase();
 
@@ -877,19 +872,10 @@ export default {
       //---------------
     }); //next tick end
   },
-  ////////////////////////////////////
-  //  set calling form Valid state
-  //
-  // {vm:vm,dirty:bool | undefined,
-  //  valid:bool | undefined,
-  //  loading:bool | undefined}
-  //
+
   setFormState(newState) {
     //this returns a promise so any function that needs to wait for this can utilize that
-    // if (newState.valid != null && newState.valid == false) {
-    //   console.trace(newState);
-    //   // debugger;
-    // }
+
     return Vue.nextTick(function() {
       if (newState.valid != null) {
         newState.vm.formState.valid = newState.valid;
diff --git a/ayanova/src/views/inv-purchase-order.vue b/ayanova/src/views/inv-purchase-order.vue
index fccb0f67..d62b0dfd 100644
--- a/ayanova/src/views/inv-purchase-order.vue
+++ b/ayanova/src/views/inv-purchase-order.vue
@@ -236,14 +236,6 @@
               dense
               :item-class="poItemsRowClasses"
             >
-              <!-- <template v-slot:top>
-                <div class="mb-4 ml-4">
-                  <span class="title">{{
-                    $ay.t("PurchaseOrderItemList")
-                  }}</span>
-                </div>
-              </template> -->
-
               <template v-slot:top>
                 <v-col cols="12">
                   <v-menu offset-y v-if="rights.change">
@@ -352,11 +344,7 @@
       <v-row justify="center">
         <v-dialog v-model="editPoItemDialog">
           <v-card>
-            <v-card-title>
-              <!-- <span class="headline">{{
-                $ay.t("PurchaseOrderReceiptItemPurchaseOrderItemID")
-              }}</span> -->
-            </v-card-title>
+            <v-card-title> </v-card-title>
             <v-card-text>
               <v-row>
                 <v-col cols="12" sm="6" lg="4" xl="3">
@@ -370,18 +358,40 @@
                     ref="Items.PartId"
                     data-cy="Items.PartId"
                     :rules="[form().required(this, 'Items.PartId')]"
+                    :error-messages="
+                      form().serverErrors(
+                        this,
+                        `Items[${editPoItemIndex}].PartId`
+                      )
+                    "
+                    @input="
+                      fieldValueChanged(`Items[${editPoItemIndex}].PartId`)
+                    "
                   ></gz-pick-list>
                 </v-col>
                 <v-col cols="12" sm="6" lg="4" xl="3">
                   <gz-pick-list
                     v-if="obj.hasSelectableWarehouses"
                     :aya-type="ayaTypes().PartWarehouse"
+                    :allow-no-selection="false"
                     :show-edit-icon="true"
                     v-model="obj.items[editPoItemIndex].partWarehouseId"
                     :readonly="formState.readOnly"
                     :label="$ay.t('PartWarehouse')"
                     ref="Items.PartWarehouseId"
                     data-cy="Items.PartWarehouseId"
+                    :rules="[form().required(this, 'Items.PartWarehouseId')]"
+                    :error-messages="
+                      form().serverErrors(
+                        this,
+                        `Items[${editPoItemIndex}].PartWarehouseId`
+                      )
+                    "
+                    @input="
+                      fieldValueChanged(
+                        `Items[${editPoItemIndex}].PartWarehouseId`
+                      )
+                    "
                   ></gz-pick-list>
                 </v-col>
                 <v-col cols="12" sm="6" lg="4" xl="3">
@@ -391,10 +401,21 @@
                     :label="$ay.t('PurchaseOrderItemQuantityOrdered')"
                     ref="Items.QuantityOrdered"
                     data-cy="Items.QuantityOrdered"
+                    :error-messages="
+                      form().serverErrors(
+                        this,
+                        `Items[${editPoItemIndex}].QuantityOrdered`
+                      )
+                    "
                     :rules="[
                       form().decimalValid(this, 'Items.QuantityOrdered'),
                       form().required(this, 'Items.QuantityOrdered')
                     ]"
+                    @input="
+                      fieldValueChanged(
+                        `Items[${editPoItemIndex}].QuantityOrdered`
+                      )
+                    "
                   ></gz-decimal>
                 </v-col>
 
@@ -436,9 +457,16 @@
                     :readonly="formState.readOnly"
                     ref="Items.ReceivedDate"
                     :error-messages="
-                      form().serverErrors(this, 'Items.ReceivedDate')
+                      form().serverErrors(
+                        this,
+                        `Items[${editPoItemIndex}].ReceivedDate`
+                      )
+                    "
+                    @input="
+                      fieldValueChanged(
+                        `Items[${editPoItemIndex}].ReceivedDate`
+                      )
                     "
-                    @input="fieldValueChanged('Items.ReceivedDate')"
                   ></gz-date-time-picker>
                 </v-col>
 
@@ -454,9 +482,16 @@
                       form().required(this, 'Items.PurchaseOrderCost')
                     ]"
                     :error-messages="
-                      form().serverErrors(this, 'Items.PurchaseOrderCost')
+                      form().serverErrors(
+                        this,
+                        `Items[${editPoItemIndex}].PurchaseOrderCost`
+                      )
+                    "
+                    @input="
+                      fieldValueChanged(
+                        `Items[${editPoItemIndex}].PurchaseOrderCost`
+                      )
                     "
-                    @input="fieldValueChanged('Items.ReceivedDate')"
                   ></gz-currency>
                 </v-col>
 
@@ -472,9 +507,16 @@
                       form().required(this, 'Items.ReceivedCost')
                     ]"
                     :error-messages="
-                      form().serverErrors(this, 'Items.ReceivedCost')
+                      form().serverErrors(
+                        this,
+                        `Items[${editPoItemIndex}].ReceivedCost`
+                      )
+                    "
+                    @input="
+                      fieldValueChanged(
+                        `Items[${editPoItemIndex}].ReceivedCost`
+                      )
                     "
-                    @input="fieldValueChanged('Items.ReceivedCost')"
                   ></gz-currency>
                 </v-col>
 
@@ -489,9 +531,16 @@
                     ref="Items.PurchaseTaxCodeId"
                     data-cy="Items.PurchaseTaxCodeId"
                     :error-messages="
-                      form().serverErrors(this, 'Items.PurchaseTaxCodeId')
+                      form().serverErrors(
+                        this,
+                        `Items[${editPoItemIndex}].PurchaseTaxCodeId`
+                      )
+                    "
+                    @input="
+                      fieldValueChanged(
+                        `Items[${editPoItemIndex}].PurchaseTaxCodeId`
+                      )
                     "
-                    @input="fieldValueChanged('Items.PurchaseTaxCodeId')"
                   ></gz-pick-list>
                 </v-col>
 
@@ -511,9 +560,16 @@
                     ref="Items.VendorPartNumber"
                     data-cy="Items.VendorPartNumber"
                     :error-messages="
-                      form().serverErrors(this, 'Items.VendorPartNumber')
+                      form().serverErrors(
+                        this,
+                        `Items[${editPoItemIndex}].VendorPartNumber`
+                      )
+                    "
+                    @input="
+                      fieldValueChanged(
+                        `Items[${editPoItemIndex}].VendorPartNumber`
+                      )
                     "
-                    @input="fieldValueChanged('Items.VendorPartNumber')"
                   ></v-text-field>
                 </v-col>
               </v-row>