- The Great merge

Signed-off-by: Dave Richer <dave@imexsystems.ca>

server/job/job-totals.js

@@ -808,7 +808,7 @@ function CalculateTaxesTotals(job, otherTotals) {
                     )
                 );
             } else if (!val.part_type) {
-                //Do nothing for now.
+                                //Do nothing for now.
             } else {
                 const typeOfPart = val.part_type;
 
@@ -1043,7 +1043,7 @@ function CalculateTaxesTotals(job, otherTotals) {
         ); // THis is currently using the lbr tax rate from PFH not PFL.
     }
 
-    //console.log("Labor Tax Total", laborTaxTotal.toFormat());
+        //console.log("Labor Tax Total", laborTaxTotal.toFormat());
 
     let ret = {
         subtotal: subtotal,
@@ -1093,7 +1093,7 @@ function CalculateTaxesTotals(job, otherTotals) {
 exports.default = Totals;
 
 function DiscountNotAlreadyCounted(jobline, joblines) {
-    return false;
+      return false;
 }
 
 exports.DiscountNotAlreadyCounted = DiscountNotAlreadyCounted;