Merge branch 'release/2021-09-03' into feature/qbo

2021-09-03 11:24:42 -07:00
parent 54b46dd25e c11f182f83
commit 06480159e3
15 changed files with 13753 additions and 43898 deletions
--- a/server/accounting/qbxml/qbxml-receivables.js
+++ b/server/accounting/qbxml/qbxml-receivables.js
@@ -257,7 +257,9 @@ const generateInvoiceQbxml = (
      if (jobline.prt_dsmk_p && jobline.prt_dsmk_p !== 0) {
        // console.log("Have a part discount", jobline);
        DineroAmount = DineroAmount.add(
-          DineroAmount.percentage(jobline.prt_dsmk_p || 0)
+          DineroAmount.percentage(Math.abs(jobline.prt_dsmk_p || 0)).multiply(
+            jobline.prt_dsmk_p > 0 ? 1 : -1
+          )
        );
      }
      const account = responsibilityCenters.profits.find(