Merge branch 'release/2021-09-10' into feature/cdk-cert

server/accounting/qbxml/qbxml-receivables.js

@@ -294,11 +294,7 @@ const generateInvoiceQbxml = (
       }
     }
     //  Labor Lines
-    if (
-      jobline.profitcenter_labor &&
-      jobline.mod_lb_hrs &&
-      jobline.mod_lb_hrs > 0
-    ) {
+    if (jobline.profitcenter_labor && jobline.mod_lb_hrs) {
       const DineroAmount = Dinero({
         amount: Math.round(
           jobs_by_pk[`rate_${jobline.mod_lbr_ty.toLowerCase()}`] * 100

server/job/job-totals.js

@@ -242,7 +242,16 @@ function CalculatePartsTotals(jobLines) {
                 subtotal: acc.sublets.subtotal.add(
                   Dinero({
                     amount: Math.round(value.act_price * 100),
-                  }).multiply(value.part_qty || 0)
+                  })
+                    .multiply(value.part_qty || 0)
+                    .add(
+                      Dinero({
+                        amount: Math.round(value.act_price * 100),
+                      })
+                        .multiply(value.part_qty || 0)
+                        .percentage(Math.abs(value.prt_dsmk_p || 0))
+                        .multiply(value.prt_dsmk_p > 0 ? 1 : -1)
+                    )
                 ),
               },
             };
@@ -306,6 +315,7 @@ function CalculatePartsTotals(jobLines) {
         },
         sublets: {
           subtotal: Dinero({ amount: 0 }),
+
           total: Dinero({ amount: 0 }),
         },
       }