From 910e404aad9576599298254b7e1b5c1245066b7a Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Thu, 17 Jun 2021 19:20:04 +0000 Subject: [PATCH] --- ayanova/devdocs/todo.txt | 15 +++++++++++++++ .../src/components/work-order-item-expenses.vue | 8 ++++---- ayanova/src/components/work-order-item-labors.vue | 6 +++--- ayanova/src/components/work-order-item-parts.vue | 6 +++--- .../src/components/work-order-item-travels.vue | 6 +++--- 5 files changed, 28 insertions(+), 13 deletions(-) diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt index d6f05b83..9246f045 100644 --- a/ayanova/devdocs/todo.txt +++ b/ayanova/devdocs/todo.txt @@ -1251,6 +1251,21 @@ build 110 Errors returned from server now properly displaying in both table and in controls Required field rules in each area now are properly pre-broken on new so user can see what needs to be filled in at minimum +- Workorder TaxCodeViz name standardization (case 3864) + in Labor and Travel renamed TaxCodeSaleViz to TaxCodeViz + in parts renamed TaxPartSaleViz to TaxCodeViz + in expense renamed ChargeTaxCodeViz to TaxCodeViz + +- Workorder expense line total calculation modification as per case 3864 using formula stated there: + "IF "ChargeToCustomer" = true then do below to get "LineTotalViz": , + If "ChargeTaxCodeId" has a value, then "LineTotalViz": = ( "ChargeAmount" + ((TaxA% * "ChargeAmount") + (TaxB% * "ChargeAmount")) + ELSE + If "ChargeTaxCodeId" does NOT have a value then "LineTotalViz": = ( "ChargeAmount" + "TaxPaid") + ELSE skip and "LineTotalViz" is empty" + + NOTE: no change to seeder so it sets it according to B in the case: + "B. "ChargeAmount" with a TaxCode selected " + - Service loaner form added cost fields to bring in line with other billable items on workorder diff --git a/ayanova/src/components/work-order-item-expenses.vue b/ayanova/src/components/work-order-item-expenses.vue index 6ee12eea..29108255 100644 --- a/ayanova/src/components/work-order-item-expenses.vue +++ b/ayanova/src/components/work-order-item-expenses.vue @@ -481,7 +481,7 @@ export default { taxCodeChange(newName) { this.value.items[this.activeWoItemIndex].expenses[ this.activeItemIndex - ].chargeTaxCodeViz = newName; + ].taxCodeViz = newName; }, newItem() { let newIndex = this.value.items[this.activeWoItemIndex].expenses.length; @@ -495,7 +495,7 @@ export default { chargeAmount: 0, taxPaid: 0, chargeTaxCodeId: null, - chargeTaxCodeViz: null, + taxCodeViz: null, reimburseUser: false, userId: null, userViz: null, @@ -646,7 +646,7 @@ export default { headers.push({ text: this.$ay.t("Tax"), align: "left", - value: "chargeTaxCodeViz" + value: "taxCodeViz" }); } @@ -714,7 +714,7 @@ export default { this.pvm.languageName, this.pvm.currencyName ), - chargeTaxCodeViz: x.chargeTaxCodeViz, + taxCodeViz: x.taxCodeViz, 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 f931fb33..6a2a7152 100644 --- a/ayanova/src/components/work-order-item-labors.vue +++ b/ayanova/src/components/work-order-item-labors.vue @@ -484,7 +484,7 @@ export default { taxCodeChange(newName) { this.value.items[this.activeWoItemIndex].labors[ this.activeItemIndex - ].TaxCodeViz = newName; + ].taxCodeViz = newName; }, newItem() { let newIndex = this.value.items[this.activeWoItemIndex].labors.length; @@ -775,7 +775,7 @@ export default { headers.push({ text: this.$ay.t("Tax"), align: "left", - value: "TaxCodeViz" + value: "taxCodeViz" }); } @@ -856,7 +856,7 @@ export default { this.pvm.languageName, this.pvm.currencyName ), - TaxCodeViz: x.TaxCodeViz, + taxCodeViz: x.taxCodeViz, priceOverride: window.$gz.locale.currencyLocalized( x.priceOverride, this.pvm.languageName, diff --git a/ayanova/src/components/work-order-item-parts.vue b/ayanova/src/components/work-order-item-parts.vue index c318b575..717a5ae0 100644 --- a/ayanova/src/components/work-order-item-parts.vue +++ b/ayanova/src/components/work-order-item-parts.vue @@ -476,7 +476,7 @@ export default { taxCodeChange(newName) { this.value.items[this.activeWoItemIndex].parts[ this.activeItemIndex - ].taxPartSaleViz = newName; + ].taxCodeViz = newName; }, newItem() { let newIndex = this.value.items[this.activeWoItemIndex].parts.length; @@ -717,7 +717,7 @@ export default { headers.push({ text: this.$ay.t("Tax"), align: "left", - value: "taxPartSaleViz" + value: "taxCodeViz" }); } @@ -787,7 +787,7 @@ export default { this.pvm.languageName, this.pvm.currencyName ), - taxPartSaleViz: x.taxPartSaleViz, + taxCodeViz: x.taxCodeViz, priceOverride: window.$gz.locale.currencyLocalized( x.priceOverride, this.pvm.languageName, diff --git a/ayanova/src/components/work-order-item-travels.vue b/ayanova/src/components/work-order-item-travels.vue index 44ed55af..99c7fbf5 100644 --- a/ayanova/src/components/work-order-item-travels.vue +++ b/ayanova/src/components/work-order-item-travels.vue @@ -484,7 +484,7 @@ export default { taxCodeChange(newName) { this.value.items[this.activeWoItemIndex].travels[ this.activeItemIndex - ].TaxCodeViz = newName; + ].taxCodeViz = newName; }, newItem() { let newIndex = this.value.items[this.activeWoItemIndex].travels.length; @@ -776,7 +776,7 @@ export default { headers.push({ text: this.$ay.t("Tax"), align: "left", - value: "TaxCodeViz" + value: "taxCodeViz" }); } @@ -857,7 +857,7 @@ export default { this.pvm.languageName, this.pvm.currencyName ), - TaxCodeViz: x.TaxCodeViz, + taxCodeViz: x.taxCodeViz, priceOverride: window.$gz.locale.currencyLocalized( x.priceOverride, this.pvm.languageName,