diff --git a/client/src/components/job-detail-lines/job-lines.component.jsx b/client/src/components/job-detail-lines/job-lines.component.jsx
index 1b1964664..08834e7bb 100644
--- a/client/src/components/job-detail-lines/job-lines.component.jsx
+++ b/client/src/components/job-detail-lines/job-lines.component.jsx
@@ -162,7 +162,11 @@ export function JobLinesComponent({
       ellipsis: true,
       render: (text, record) => (
         <>
-          <CurrencyFormatter>{record.act_price}</CurrencyFormatter>
+          <CurrencyFormatter>
+            {record.db_ref === "900510" || record.db_ref === "900511"
+              ? record.prt_dsmk_m
+              : record.act_price}
+          </CurrencyFormatter>
           {record.prt_dsmk_p && record.prt_dsmk_p !== 0 ? (
             <span
               style={{ marginLeft: ".2rem" }}
diff --git a/client/src/components/jobs-available-table/jobs-available-table.container.jsx b/client/src/components/jobs-available-table/jobs-available-table.container.jsx
index 0aebfdaf0..767e28661 100644
--- a/client/src/components/jobs-available-table/jobs-available-table.container.jsx
+++ b/client/src/components/jobs-available-table/jobs-available-table.container.jsx
@@ -498,6 +498,12 @@ async function CheckTaxRates(estData, bodyshop) {
     ) {
       estData.joblines.data[index].tax_part = jl.lbr_tax;
     }
+
+    //Set markup lines and tax lines as taxable.
+    //900510 is a mark up. 900510 is a discount.
+    if (bodyshop.region_config === "CA_SK" && jl.db_ref === "900510") {
+      estData.joblines.data[index].tax_part = true;
+    }
   });
   //}
 }
diff --git a/server/job/job-totals.js b/server/job/job-totals.js
index 30f761840..4cae85d74 100644
--- a/server/job/job-totals.js
+++ b/server/job/job-totals.js
@@ -284,39 +284,54 @@ function CalculatePartsTotals(jobLines) {
             };
 
           default:
-            if (!value.part_type) return acc;
+            if (
+              !value.part_type &&
+              value.db_ref !== "900510" &&
+              value.db_ref !== "900511"
+            )
+              return acc;
             return {
               ...acc,
               parts: {
                 ...acc.parts,
                 prt_dsmk_total: acc.parts.prt_dsmk_total.add(
                   value.prt_dsmk_m && value.prt_dsmk_m !== 0
-                  ? Dinero({ amount: Math.round(value.prt_dsmk_m * 100) })
-                  : 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)
+                    ? Dinero({ amount: Math.round(value.prt_dsmk_m * 100) })
+                    : 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)
                 ),
-                list: {
-                  ...acc.parts.list,
-                  [value.part_type]:
-                    acc.parts.list[value.part_type] &&
-                    acc.parts.list[value.part_type].total
-                      ? {
-                          total: acc.parts.list[value.part_type].total.add(
-                            Dinero({
-                              amount: Math.round((value.act_price || 0) * 100),
-                            }).multiply(value.part_qty || 0)
-                          ),
-                        }
-                      : {
-                          total: Dinero({
-                            amount: Math.round((value.act_price || 0) * 100),
-                          }).multiply(value.part_qty || 0),
-                        },
-                },
+                ...(value.part_type
+                  ? {
+                      list: {
+                        ...acc.parts.list,
+                        [value.part_type]:
+                          acc.parts.list[value.part_type] &&
+                          acc.parts.list[value.part_type].total
+                            ? {
+                                total: acc.parts.list[
+                                  value.part_type
+                                ].total.add(
+                                  Dinero({
+                                    amount: Math.round(
+                                      (value.act_price || 0) * 100
+                                    ),
+                                  }).multiply(value.part_qty || 0)
+                                ),
+                              }
+                            : {
+                                total: Dinero({
+                                  amount: Math.round(
+                                    (value.act_price || 0) * 100
+                                  ),
+                                }).multiply(value.part_qty || 0),
+                              },
+                      },
+                    }
+                  : {}),
                 subtotal: acc.parts.subtotal
                   .add(
                     Dinero({
@@ -325,13 +340,13 @@ function CalculatePartsTotals(jobLines) {
                   )
                   .add(
                     value.prt_dsmk_m && value.prt_dsmk_m !== 0
-                    ? Dinero({ amount: Math.round(value.prt_dsmk_m * 100) })
-                    : 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)
+                      ? Dinero({ amount: Math.round(value.prt_dsmk_m * 100) })
+                      : 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)
                   ),
               },
             };
@@ -465,13 +480,13 @@ function CalculateTaxesTotals(job, otherTotals) {
             .multiply(val.part_qty || 0)
             .add(
               val.prt_dsmk_m && val.prt_dsmk_m !== 0
-              ? Dinero({ amount: Math.round(val.prt_dsmk_m * 100) })
-              : Dinero({
-                  amount: Math.round(val.act_price * 100),
-                })
-                  .multiply(val.part_qty || 0)
-                  .percentage(Math.abs(val.prt_dsmk_p || 0))
-                  .multiply(val.prt_dsmk_p > 0 ? 1 : -1)
+                ? Dinero({ amount: Math.round(val.prt_dsmk_m * 100) })
+                : Dinero({
+                    amount: Math.round(val.act_price * 100),
+                  })
+                    .multiply(val.part_qty || 0)
+                    .percentage(Math.abs(val.prt_dsmk_p || 0))
+                    .multiply(val.prt_dsmk_p > 0 ? 1 : -1)
             )
             .percentage(
               ((job.parts_tax_rates &&
@@ -481,6 +496,10 @@ function CalculateTaxesTotals(job, otherTotals) {
                   val.part_type.startsWith("PAG") &&
                   BackupGlassTax &&
                   BackupGlassTax.prt_tax_rt) ||
+                (!val.part_type &&
+                  val.db_ref === "900510" &&
+                  job.parts_tax_rates["PAN"] &&
+                  job.parts_tax_rates["PAN"].prt_tax_rt) ||
                 0) * 100
             )
         );