Merged in hotfix/2021-05-31 (pull request #83)

Emergency hotfix for GST registrant.
2021-06-01 00:54:34 +00:00
parent 06c14d2742 7277688de4
commit 6f229a859b
2 changed files with 7 additions and 4 deletions
--- a/server/job/job-totals.js
+++ b/server/job/job-totals.js
@@ -428,8 +428,8 @@ function CalculateTaxesTotals(job, otherTotals) {
  ret.custPayable = {
    deductible: Dinero({ amount: (job.ded_amt || 0) * 100 }) || 0,
    federal_tax: job.ca_gst_registrant
-      ? job.ca_customer_gst !== 0
-        ? Dinero({ amount: job.ca_customer_gst * 100 })
+      ? job.ca_customer_gst !== 0 || job.ca_customer_gst !== null
+        ? Dinero({ amount: Math.round(job.ca_customer_gst * 100) })
        : ret.federal_tax
      : Dinero(),
    other_customer_amount: Dinero({