From 18475d6fe2a60f009c02d8f1fb55e0dce96d4b0a Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Mon, 22 Feb 2021 19:08:22 +0000
Subject: [PATCH]

---
 ayanova/src/views/inv-purchase-order.vue | 43 ++++++++++++------------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/ayanova/src/views/inv-purchase-order.vue b/ayanova/src/views/inv-purchase-order.vue
index 0adcc03c..ef47a896 100644
--- a/ayanova/src/views/inv-purchase-order.vue
+++ b/ayanova/src/views/inv-purchase-order.vue
@@ -416,7 +416,7 @@
 
                 <v-col cols="12" sm="6" lg="4" xl="3">
                   <gz-pick-list
-                    v-if="form().showMe(this, 'TaxCode')"
+                    v-if="form().showMe(this, 'Items.PurchaseTaxCodeId')"
                     :aya-type="ayaTypes().TaxCode"
                     :show-edit-icon="true"
                     v-model="obj.items[editPoItemIndex].purchaseTaxCodeId"
@@ -432,12 +432,7 @@
                 </v-col>
 
                 <v-col
-                  v-if="
-                    form().showMe(
-                      this,
-                      'Items.PurchaseOrderItemVendorPartNumber'
-                    )
-                  "
+                  v-if="form().showMe(this, 'Items.VendorPartNumber')"
                   cols="12"
                   sm="6"
                   lg="4"
@@ -688,7 +683,7 @@ export default {
         });
       }
 
-      if (vm.obj.hasTaxes) {
+      if (vm.obj.hasTaxes && vm.form().showMe(vm, "Items.PurchaseTaxCodeId")) {
         headers.push({
           text: vm.$ay.t("TaxCode"),
           align: "left",
@@ -702,7 +697,7 @@ export default {
         value: "displayNetTotal"
       });
 
-      if (vm.obj.hasTaxes) {
+      if (vm.obj.hasTaxes && vm.form().showMe(vm, "Items.PurchaseTaxCodeId")) {
         headers.push({
           text: vm.$ay.t("TaxCodeTaxA"),
           align: "right",
@@ -722,7 +717,10 @@ export default {
         value: "displayLineTotal"
       });
 
-      if (vm.obj.hasVendorNumber) {
+      if (
+        vm.obj.hasVendorNumber &&
+        vm.form().showMe(vm, "Items.VendorPartNumber")
+      ) {
         headers.push({
           text: vm.$ay.t("PurchaseOrderItemVendorPartNumber"),
           align: "left",
@@ -731,17 +729,20 @@ export default {
       }
 
       if (vm.obj.hasPartRequest) {
-        headers.push({
-          text: vm.$ay.t("PurchaseOrderItemPartRequestedByID"),
-          align: "left",
-          value: "displayRequestUser"
-        });
-
-        headers.push({
-          text: vm.$ay.t("PurchaseOrderItemWorkOrderNumber"),
-          align: "left",
-          value: "displayRequestWorkorder"
-        });
+        if (vm.form().showMe(vm, "Items.PartRequestedById")) {
+          headers.push({
+            text: vm.$ay.t("PurchaseOrderItemPartRequestedByID"),
+            align: "left",
+            value: "displayRequestUser"
+          });
+        }
+        if (vm.form().showMe(vm, "Items.WorkorderItemPartRequestId")) {
+          headers.push({
+            text: vm.$ay.t("PurchaseOrderItemWorkOrderNumber"),
+            align: "left",
+            value: "displayRequestWorkorder"
+          });
+        }
       }
 
       if (!vm.formState.readOnly) {