This commit is contained in:
2021-06-17 19:20:04 +00:00
parent 461689ceac
commit 910e404aad
5 changed files with 28 additions and 13 deletions

View File

@@ -1251,6 +1251,21 @@ build 110
Errors returned from server now properly displaying in both table and in controls 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 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 - Service loaner form added cost fields to bring in line with other billable items on workorder

View File

@@ -481,7 +481,7 @@ export default {
taxCodeChange(newName) { taxCodeChange(newName) {
this.value.items[this.activeWoItemIndex].expenses[ this.value.items[this.activeWoItemIndex].expenses[
this.activeItemIndex this.activeItemIndex
].chargeTaxCodeViz = newName; ].taxCodeViz = newName;
}, },
newItem() { newItem() {
let newIndex = this.value.items[this.activeWoItemIndex].expenses.length; let newIndex = this.value.items[this.activeWoItemIndex].expenses.length;
@@ -495,7 +495,7 @@ export default {
chargeAmount: 0, chargeAmount: 0,
taxPaid: 0, taxPaid: 0,
chargeTaxCodeId: null, chargeTaxCodeId: null,
chargeTaxCodeViz: null, taxCodeViz: null,
reimburseUser: false, reimburseUser: false,
userId: null, userId: null,
userViz: null, userViz: null,
@@ -646,7 +646,7 @@ export default {
headers.push({ headers.push({
text: this.$ay.t("Tax"), text: this.$ay.t("Tax"),
align: "left", align: "left",
value: "chargeTaxCodeViz" value: "taxCodeViz"
}); });
} }
@@ -714,7 +714,7 @@ export default {
this.pvm.languageName, this.pvm.languageName,
this.pvm.currencyName this.pvm.currencyName
), ),
chargeTaxCodeViz: x.chargeTaxCodeViz, taxCodeViz: x.taxCodeViz,
taxAViz: window.$gz.locale.currencyLocalized( taxAViz: window.$gz.locale.currencyLocalized(
x.taxAViz, x.taxAViz,
this.pvm.languageName, this.pvm.languageName,

View File

@@ -484,7 +484,7 @@ export default {
taxCodeChange(newName) { taxCodeChange(newName) {
this.value.items[this.activeWoItemIndex].labors[ this.value.items[this.activeWoItemIndex].labors[
this.activeItemIndex this.activeItemIndex
].TaxCodeViz = newName; ].taxCodeViz = newName;
}, },
newItem() { newItem() {
let newIndex = this.value.items[this.activeWoItemIndex].labors.length; let newIndex = this.value.items[this.activeWoItemIndex].labors.length;
@@ -775,7 +775,7 @@ export default {
headers.push({ headers.push({
text: this.$ay.t("Tax"), text: this.$ay.t("Tax"),
align: "left", align: "left",
value: "TaxCodeViz" value: "taxCodeViz"
}); });
} }
@@ -856,7 +856,7 @@ export default {
this.pvm.languageName, this.pvm.languageName,
this.pvm.currencyName this.pvm.currencyName
), ),
TaxCodeViz: x.TaxCodeViz, taxCodeViz: x.taxCodeViz,
priceOverride: window.$gz.locale.currencyLocalized( priceOverride: window.$gz.locale.currencyLocalized(
x.priceOverride, x.priceOverride,
this.pvm.languageName, this.pvm.languageName,

View File

@@ -476,7 +476,7 @@ export default {
taxCodeChange(newName) { taxCodeChange(newName) {
this.value.items[this.activeWoItemIndex].parts[ this.value.items[this.activeWoItemIndex].parts[
this.activeItemIndex this.activeItemIndex
].taxPartSaleViz = newName; ].taxCodeViz = newName;
}, },
newItem() { newItem() {
let newIndex = this.value.items[this.activeWoItemIndex].parts.length; let newIndex = this.value.items[this.activeWoItemIndex].parts.length;
@@ -717,7 +717,7 @@ export default {
headers.push({ headers.push({
text: this.$ay.t("Tax"), text: this.$ay.t("Tax"),
align: "left", align: "left",
value: "taxPartSaleViz" value: "taxCodeViz"
}); });
} }
@@ -787,7 +787,7 @@ export default {
this.pvm.languageName, this.pvm.languageName,
this.pvm.currencyName this.pvm.currencyName
), ),
taxPartSaleViz: x.taxPartSaleViz, taxCodeViz: x.taxCodeViz,
priceOverride: window.$gz.locale.currencyLocalized( priceOverride: window.$gz.locale.currencyLocalized(
x.priceOverride, x.priceOverride,
this.pvm.languageName, this.pvm.languageName,

View File

@@ -484,7 +484,7 @@ export default {
taxCodeChange(newName) { taxCodeChange(newName) {
this.value.items[this.activeWoItemIndex].travels[ this.value.items[this.activeWoItemIndex].travels[
this.activeItemIndex this.activeItemIndex
].TaxCodeViz = newName; ].taxCodeViz = newName;
}, },
newItem() { newItem() {
let newIndex = this.value.items[this.activeWoItemIndex].travels.length; let newIndex = this.value.items[this.activeWoItemIndex].travels.length;
@@ -776,7 +776,7 @@ export default {
headers.push({ headers.push({
text: this.$ay.t("Tax"), text: this.$ay.t("Tax"),
align: "left", align: "left",
value: "TaxCodeViz" value: "taxCodeViz"
}); });
} }
@@ -857,7 +857,7 @@ export default {
this.pvm.languageName, this.pvm.languageName,
this.pvm.currencyName this.pvm.currencyName
), ),
TaxCodeViz: x.TaxCodeViz, taxCodeViz: x.taxCodeViz,
priceOverride: window.$gz.locale.currencyLocalized( priceOverride: window.$gz.locale.currencyLocalized(
x.priceOverride, x.priceOverride,
this.pvm.languageName, this.pvm.languageName,