From c85ab505bcc0e27b4bd8aa8d8930a8bad70bc1c9 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Fri, 21 May 2021 21:06:50 +0000
Subject: [PATCH]

---
 .../components/work-order-item-expenses.vue   | 36 -------------------
 .../src/components/work-order-item-labors.vue | 35 +++++++-----------
 2 files changed, 12 insertions(+), 59 deletions(-)

diff --git a/ayanova/src/components/work-order-item-expenses.vue b/ayanova/src/components/work-order-item-expenses.vue
index 1963a4d3..06214ba3 100644
--- a/ayanova/src/components/work-order-item-expenses.vue
+++ b/ayanova/src/components/work-order-item-expenses.vue
@@ -636,22 +636,6 @@ export default {
         });
       }
 
-      if (this.form().showMe(this, "ExpenseTaxAPct")) {
-        headers.push({
-          text: this.$ay.t("TaxCodeTaxA"),
-          align: "right",
-          value: "taxAPct"
-        });
-      }
-
-      if (this.form().showMe(this, "ExpenseTaxBPct")) {
-        headers.push({
-          text: this.$ay.t("TaxCodeTaxB"),
-          align: "right",
-          value: "taxBPct"
-        });
-      }
-
       if (this.form().showMe(this, "ExpenseTaxAViz")) {
         headers.push({
           text: this.$ay.t("TaxAAmt"),
@@ -668,14 +652,6 @@ export default {
         });
       }
 
-      if (this.form().showMe(this, "ExpenseTaxOnTax")) {
-        headers.push({
-          text: this.$ay.t("TaxCodeTaxOnTax"),
-          align: "center",
-          value: "taxOnTax"
-        });
-      }
-
       if (this.form().showMe(this, "ExpenseLineTotalViz")) {
         headers.push({
           text: this.$ay.t("LineTotal"),
@@ -724,18 +700,6 @@ export default {
             this.pvm.languageName,
             this.pvm.currencyName
           ),
-          taxName: x.taxName,
-          taxAPct:
-            window.$gz.locale.decimalLocalized(
-              x.taxAPct,
-              this.pvm.languageName
-            ) + "%",
-          taxBPct:
-            window.$gz.locale.decimalLocalized(
-              x.taxBPct,
-              this.pvm.languageName
-            ) + "%",
-          taxOnTax: x.taxOnTax,
           taxAViz: window.$gz.locale.currencyLocalized(
             x.taxAViz,
             this.pvm.languageName,
diff --git a/ayanova/src/components/work-order-item-labors.vue b/ayanova/src/components/work-order-item-labors.vue
index 8486bab7..e4036722 100644
--- a/ayanova/src/components/work-order-item-labors.vue
+++ b/ayanova/src/components/work-order-item-labors.vue
@@ -723,7 +723,7 @@ export default {
         });
       }
 
-      if (this.form().showMe(this, "LaborCost")) {
+      if (this.form().showMe(this, "LaborCostViz")) {
         headers.push({
           text: this.$ay.t("Cost"),
           align: "right",
@@ -731,7 +731,7 @@ export default {
         });
       }
 
-      if (this.form().showMe(this, "LaborListPrice")) {
+      if (this.form().showMe(this, "LaborListPriceViz")) {
         headers.push({
           text: this.$ay.t("ListPrice"),
           align: "right",
@@ -739,7 +739,7 @@ export default {
         });
       }
 
-      if (this.form().showMe(this, "LaborPrice")) {
+      if (this.form().showMe(this, "LaborPriceViz")) {
         headers.push({
           text: this.$ay.t("PriceOverride"),
           align: "right",
@@ -747,7 +747,7 @@ export default {
         });
       }
 
-      if (this.form().showMe(this, "LaborPrice")) {
+      if (this.form().showMe(this, "LaborPriceViz")) {
         headers.push({
           text: this.$ay.t("Price"),
           align: "right",
@@ -755,13 +755,13 @@ export default {
         });
       }
 
-      // if (this.form().showMe(this, "WorkOrderItemLaborTaxRateSaleID")) {
-      //   headers.push({
-      //     text: this.$ay.t("Tax"),
-      //     align: "left",
-      //     value: "taxName"
-      //   });
-      // }
+      if (this.form().showMe(this, "WorkOrderItemLaborTaxRateSaleID")) {
+        headers.push({
+          text: this.$ay.t("Tax"),
+          align: "left",
+          value: "taxCodeSaleViz"
+        });
+      }
 
       // if (this.form().showMe(this, "LaborTaxAPct")) {
       //   headers.push({
@@ -864,18 +864,7 @@ export default {
             this.pvm.languageName,
             this.pvm.currencyName
           ),
-          // taxName: x.taxName,
-          // taxAPct:
-          //   window.$gz.locale.decimalLocalized(
-          //     x.taxAPct,
-          //     this.pvm.languageName
-          //   ) + "%",
-          // taxBPct:
-          //   window.$gz.locale.decimalLocalized(
-          //     x.taxBPct,
-          //     this.pvm.languageName
-          //   ) + "%",
-          // taxOnTax: x.taxOnTax,
+          taxCodeSaleViz: x.taxCodeSaleViz,
           priceOverride: window.$gz.locale.currencyLocalized(
             x.priceOverride,
             this.pvm.languageName,