diff --git a/ayanova/src/views/inv-purchase-order.vue b/ayanova/src/views/inv-purchase-order.vue
index 04f1d27f..7bcedabc 100644
--- a/ayanova/src/views/inv-purchase-order.vue
+++ b/ayanova/src/views/inv-purchase-order.vue
@@ -329,6 +329,9 @@
                 </v-col>
                  <v-col cols="12" sm="6" lg="4" xl="3">
                   <gz-pick-list
+                    v-if="
+                   obj.hasSelectableWarehouses
+                  "
                     :aya-type="ayaTypes().PartWarehouse"
                     :show-edit-icon="true"
                     v-model="obj.items[editPoItemIndex].partWarehouseId"
@@ -544,7 +547,7 @@ export default {
         value: "displayPartNumber"
       });
 
-      if (vm.obj.displayWarehouses) {
+      if (vm.obj.hasSelectableWarehouses) {
         headers.push({
           text: vm.$ay.t("PartWarehouse"),
           align: "left",
@@ -557,7 +560,7 @@ export default {
         value: "quantityOrdered"
       });
 
-      if (vm.obj.displayReceived) {
+      if (vm.obj.hasReceipt) {
         headers.push({
           text: vm.$ay.t("PurchaseOrderItemQuantityReceived"),
           align: "right",
@@ -576,7 +579,7 @@ export default {
         value: "purchaseOrderCost"
       });
 
-      if (vm.obj.displayReceived) {
+      if (vm.obj.hasReceipt) {
         headers.push({
           text: vm.$ay.t("PurchaseOrderReceiptItemReceiptCost"),
           align: "right",
@@ -584,7 +587,7 @@ export default {
         });
       }
 
-      if (vm.obj.displayTaxes) {
+      if (vm.obj.hasTaxes) {
         headers.push({
           text: vm.$ay.t("TaxCode"),
           align: "left",
@@ -598,7 +601,7 @@ export default {
         value: "displayNetTotal"
       });
 
-      if (vm.obj.displayTaxes) {
+      if (vm.obj.hasTaxes) {
         headers.push({
           text: vm.$ay.t("TaxCodeTaxA"),
           align: "right",
@@ -618,7 +621,7 @@ export default {
         value: "displayLineTotal"
       });
 
-      if (vm.obj.displayVendorNumber) {
+      if (vm.obj.hasVendorNumber) {
         headers.push({
           text: vm.$ay.t("PurchaseOrderItemVendorPartNumber"),
           align: "left",
@@ -626,7 +629,7 @@ export default {
         });
       }
 
-      if (vm.obj.displayPartRequest) {
+      if (vm.obj.hasPartRequest) {
         headers.push({
           text: vm.$ay.t("PurchaseOrderItemPartRequestedByID"),
           align: "left",