IO-1738 Remove PVRT from subtotal.
This commit is contained in:
@@ -452,7 +452,8 @@ function CalculateTaxesTotals(job, otherTotals) {
|
|||||||
const subtotal = otherTotals.parts.parts.subtotal
|
const subtotal = otherTotals.parts.parts.subtotal
|
||||||
.add(otherTotals.parts.sublets.subtotal)
|
.add(otherTotals.parts.sublets.subtotal)
|
||||||
.add(otherTotals.rates.subtotal) //No longer using just rates subtotal to include mapa/mash.
|
.add(otherTotals.rates.subtotal) //No longer using just rates subtotal to include mapa/mash.
|
||||||
.add(otherTotals.additional.total);
|
.add(otherTotals.additional.total)
|
||||||
|
.subtract(otherTotals.additional.pvrt);
|
||||||
// .add(Dinero({ amount: (job.towing_payable || 0) * 100 }))
|
// .add(Dinero({ amount: (job.towing_payable || 0) * 100 }))
|
||||||
// .add(Dinero({ amount: (job.storage_payable || 0) * 100 }));
|
// .add(Dinero({ amount: (job.storage_payable || 0) * 100 }));
|
||||||
|
|
||||||
@@ -522,7 +523,13 @@ function CalculateTaxesTotals(job, otherTotals) {
|
|||||||
|
|
||||||
let ret = {
|
let ret = {
|
||||||
subtotal: subtotal,
|
subtotal: subtotal,
|
||||||
federal_tax: subtotal.percentage((job.federal_tax_rate || 0) * 100),
|
federal_tax: subtotal
|
||||||
|
.percentage((job.federal_tax_rate || 0) * 100)
|
||||||
|
.add(
|
||||||
|
otherTotals.additional.pvrt.percentage(
|
||||||
|
(job.federal_tax_rate || 0) * 100
|
||||||
|
)
|
||||||
|
),
|
||||||
statePartsTax,
|
statePartsTax,
|
||||||
state_tax: statePartsTax
|
state_tax: statePartsTax
|
||||||
.add(
|
.add(
|
||||||
@@ -539,7 +546,8 @@ function CalculateTaxesTotals(job, otherTotals) {
|
|||||||
.add(
|
.add(
|
||||||
otherTotals.additional.storage.percentage((job.tax_str_rt || 0) * 100)
|
otherTotals.additional.storage.percentage((job.tax_str_rt || 0) * 100)
|
||||||
)
|
)
|
||||||
.add(additionalItemsTax),
|
.add(additionalItemsTax)
|
||||||
|
.add(otherTotals.additional.pvrt),
|
||||||
local_tax: subtotal.percentage((job.local_tax_rate || 0) * 100),
|
local_tax: subtotal.percentage((job.local_tax_rate || 0) * 100),
|
||||||
};
|
};
|
||||||
ret.total_repairs = ret.subtotal
|
ret.total_repairs = ret.subtotal
|
||||||
|
|||||||
Reference in New Issue
Block a user