From 066f395a40c52cd9fd0838666209b0d534a98ff8 Mon Sep 17 00:00:00 2001
From: Patrick Fic <snaptsoft@gmail.com>
Date: Tue, 15 Feb 2022 13:41:35 -0800
Subject: [PATCH] IO-1738 Remove PVRT from subtotal.

---
 server/job/job-totals.js | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/server/job/job-totals.js b/server/job/job-totals.js
index 57fe94c87..b0a9cfed1 100644
--- a/server/job/job-totals.js
+++ b/server/job/job-totals.js
@@ -452,7 +452,8 @@ function CalculateTaxesTotals(job, otherTotals) {
   const subtotal = otherTotals.parts.parts.subtotal
     .add(otherTotals.parts.sublets.subtotal)
     .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.storage_payable || 0) * 100 }));
 
@@ -522,7 +523,13 @@ function CalculateTaxesTotals(job, otherTotals) {
 
   let ret = {
     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,
     state_tax: statePartsTax
       .add(
@@ -539,7 +546,8 @@ function CalculateTaxesTotals(job, otherTotals) {
       .add(
         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),
   };
   ret.total_repairs = ret.subtotal