Additional changes for CCC calculations.

2023-01-19 08:58:23 -08:00
parent 392b405978
commit cccd007ba6
10 changed files with 242 additions and 103 deletions
--- a/client/src/components/job-calculate-totals/job-calculate-totals.component.jsx
+++ b/client/src/components/job-calculate-totals/job-calculate-totals.component.jsx
@@ -11,37 +11,46 @@ export default function JobCalculateTotals({ job, disabled }) {
  const [updateJob] = useMutation(UPDATE_JOB);

  const handleCalculate = async () => {
-    setLoading(true);
-    const newTotals = (
-      await Axios.post("/job/totals", {
-        job: job,
-      })
-    ).data;
+    try {
+      setLoading(true);
+      const newTotals = (
+        await Axios.post("/job/totals", {
+          job: job,
+        })
+      ).data;

-    const result = await updateJob({
-      refetchQueries: ["GET_JOB_BY_PK"],
-      awaitRefetchQueries: true,
-      variables: {
-        jobId: job.id,
-        job: {
-          job_totals: newTotals,
-          clm_total: Dinero(newTotals.totals.total_repairs).toFormat("0.00"),
-          owner_owing: Dinero(newTotals.totals.custPayable.total).toFormat(
-            "0.00"
-          ),
+      const result = await updateJob({
+        refetchQueries: ["GET_JOB_BY_PK"],
+        awaitRefetchQueries: true,
+        variables: {
+          jobId: job.id,
+          job: {
+            job_totals: newTotals,
+            clm_total: Dinero(newTotals.totals.total_repairs).toFormat("0.00"),
+            owner_owing: Dinero(newTotals.totals.custPayable.total).toFormat(
+              "0.00"
+            ),
+          },
        },
-      },
-    });
-    if (!!!result.errors) {
-      notification["success"]({ message: t("jobs.successes.updated") });
-    } else {
+      });
+      if (!!!result.errors) {
+        notification["success"]({ message: t("jobs.successes.updated") });
+      } else {
+        notification["error"]({
+          message: t("jobs.errors.updating", {
+            error: JSON.stringify(result.errors),
+          }),
+        });
+      }
+    } catch (error) {
      notification["error"]({
        message: t("jobs.errors.updating", {
-          error: JSON.stringify(result.errors),
+          error: JSON.stringify(error),
        }),
      });
+    } finally {
+      setLoading(false);
    }
-    setLoading(false);
  };

  return (
--- a/client/src/components/job-totals-table/job-totals.table.labor.component.jsx
+++ b/client/src/components/job-totals-table/job-totals.table.labor.component.jsx
@@ -124,8 +124,7 @@ export default function JobTotalsTableLabor({ job }) {
                {t("jobs.labels.mapa")}
                {job.materials &&
                  job.materials.mapa &&
-                  job.materials.mapa.cal_maxdlr &&
-                  job.materials.mapa.cal_maxdlr > 0 &&
+                  job.materials.mapa.cal_maxdlr !== undefined &&
                  t("jobs.labels.threshhold", {
                    amount: job.materials.mapa.cal_maxdlr,
                  })}
@@ -149,8 +148,7 @@ export default function JobTotalsTableLabor({ job }) {
                {t("jobs.labels.mash")}
                {job.materials &&
                  job.materials.mash &&
-                  job.materials.mash.cal_maxdlr &&
-                  job.materials.mash.cal_maxdlr > 0 &&
+                  job.materials.mash.cal_maxdlr !== undefined &&
                  t("jobs.labels.threshhold", {
                    amount: job.materials.mash.cal_maxdlr,
                  })}
--- a/client/src/components/job-totals-table/job-totals.table.parts.component.jsx
+++ b/client/src/components/job-totals-table/job-totals.table.parts.component.jsx
@@ -1,5 +1,6 @@
-import { Table } from "antd";
+import { Alert, Table } from "antd";
 import Dinero from "dinero.js";
+import { object } from "prop-types";
 import React, { useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { alphaSort } from "../../utils/sorters";
@@ -11,6 +12,24 @@ export default function JobTotalsTableParts({ job }) {
    filteredInfo: {},
  });

+  const insuranceAdjustments = useMemo(() => {
+    const adjs = [];
+    Object.keys(job.job_totals.parts.adjustments).forEach((key) => {
+      if (Dinero(job.job_totals.parts.adjustments[key]).getAmount() !== 0) {
+        adjs.push({
+          id: key,
+          amount: Dinero(job.job_totals.parts.adjustments[key]),
+        });
+      }
+    });
+
+    return adjs;
+  }, [job.job_totals.parts.adjustments]);
+  console.log(
+    "🚀 ~ file: job-totals.table.parts.component.jsx:16 ~ insuranceAdjustments ~ insuranceAdjustments",
+    insuranceAdjustments
+  );
+
  const data = useMemo(() => {
    return Object.keys(job.job_totals.parts.parts.list)
      .filter(
@@ -74,11 +93,11 @@ export default function JobTotalsTableParts({ job }) {
            <Table.Summary.Cell>
              {t("jobs.labels.prt_dsmk_total")}
            </Table.Summary.Cell>
-
            <Table.Summary.Cell align="right">
              {Dinero(job.job_totals.parts.parts.prt_dsmk_total).toFormat()}
            </Table.Summary.Cell>
          </Table.Summary.Row>
+
          <Table.Summary.Row>
            <Table.Summary.Cell>
              <strong>{t("jobs.labels.partstotal")}</strong>
@@ -90,6 +109,24 @@ export default function JobTotalsTableParts({ job }) {
              </strong>
            </Table.Summary.Cell>
          </Table.Summary.Row>
+          {insuranceAdjustments.length > 0 && (
+            <Table.Summary.Row>
+              <Table.Summary.Cell colSpan={24}>
+                {t("jobs.labels.profileadjustments")}
+              </Table.Summary.Cell>
+            </Table.Summary.Row>
+          )}
+          {insuranceAdjustments.map((adj, idx) => (
+            <Table.Summary.Row key={idx}>
+              <Table.Summary.Cell>
+                {t(`jobs.fields.${adj.id.toLowerCase()}`)}
+              </Table.Summary.Cell>
+
+              <Table.Summary.Cell align="right">
+                {adj.amount.toFormat()}
+              </Table.Summary.Cell>
+            </Table.Summary.Row>
+          ))}
        </>
      )}
    />
--- a/client/src/components/jobs-available-table/jobs-available-table.container.jsx
+++ b/client/src/components/jobs-available-table/jobs-available-table.container.jsx
@@ -516,6 +516,17 @@ async function CheckTaxRates(estData, bodyshop) {
 }

 async function ResolveCCCLineIssues(estData, bodyshop) {
+  //Find all misc amounts, populate them to the act price.
+  //TODO Ensure that this doesnt get violated
+  //This needs to be done before cleansing unq_seq since some misc prices could move over.
+  estData.joblines.data.forEach((line) => {
+    if (line.misc_amt && line.misc_amt > 0) {
+      line.act_price = line.misc_amt;
+      line.part_type = "PAS";
+      line.tax_part = line.misc_tax;
+    }
+  });
+
  //Generate the list of duplicated UNQ_SEQ that will feed into the next section to scrub the lines.
  const unqSeqHash = _.groupBy(estData.joblines.data, "unq_seq");
  const duplicatedUnqSeq = Object.keys(unqSeqHash).filter(
@@ -537,14 +548,4 @@ async function ResolveCCCLineIssues(estData, bodyshop) {
      db_price: null,
    };
  });
-
-  //Find all misc amounts, populate them to the act price.
-  //TODO Ensure that this doesnt get violated
-  estData.joblines.data.forEach((line) => {
-    if (line.misc_amt && line.misc_amt > 0) {
-      line.act_price = line.misc_amt;
-      line.part_type = "PAS";
-      line.tax_part = line.misc_tax;
-    }
-  });
 }
--- a/client/src/components/jobs-detail-rates/jobs-detail-rates.parts.component.jsx
+++ b/client/src/components/jobs-detail-rates/jobs-detail-rates.parts.component.jsx
@@ -29,7 +29,7 @@ export function JobsDetailRatesParts({
            label={t("jobs.fields.parts_tax_rates.prt_discp")}
            name={["parts_tax_rates", "PAA", "prt_discp"]}
          >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={2} disabled={jobRO} />
          </Form.Item>
          <Form.Item
            label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -42,7 +42,7 @@ export function JobsDetailRatesParts({
            label={t("jobs.fields.parts_tax_rates.prt_mkupp")}
            name={["parts_tax_rates", "PAA", "prt_mkupp"]}
          >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={2} disabled={jobRO} />
          </Form.Item>
          <Form.Item
            label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -68,7 +68,7 @@ export function JobsDetailRatesParts({
                    },
                  ]}
                >
-                  <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+                  <InputNumber min={0} max={100} precision={2} disabled={jobRO} />
                </Form.Item>
              );
            }}
@@ -79,7 +79,7 @@ export function JobsDetailRatesParts({
            label={t("jobs.fields.parts_tax_rates.prt_discp")}
            name={["parts_tax_rates", "PAC", "prt_discp"]}
          >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={2} disabled={jobRO} />
          </Form.Item>
          <Form.Item
            label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -92,7 +92,7 @@ export function JobsDetailRatesParts({
            label={t("jobs.fields.parts_tax_rates.prt_mkupp")}
            name={["parts_tax_rates", "PAC", "prt_mkupp"]}
          >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={2} disabled={jobRO} />
          </Form.Item>
          <Form.Item
            label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -118,7 +118,7 @@ export function JobsDetailRatesParts({
                    },
                  ]}
                >
-                  <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+                  <InputNumber min={0} max={100} precision={2} disabled={jobRO} />
                </Form.Item>
              );
            }}
@@ -129,7 +129,7 @@ export function JobsDetailRatesParts({
            label={t("jobs.fields.parts_tax_rates.prt_discp")}
            name={["parts_tax_rates", "PAL", "prt_discp"]}
          >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={2} disabled={jobRO} />
          </Form.Item>
          <Form.Item
            label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -142,7 +142,7 @@ export function JobsDetailRatesParts({
            label={t("jobs.fields.parts_tax_rates.prt_mkupp")}
            name={["parts_tax_rates", "PAL", "prt_mkupp"]}
          >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={2} disabled={jobRO} />
          </Form.Item>
          <Form.Item
            label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -168,7 +168,7 @@ export function JobsDetailRatesParts({
                    },
                  ]}
                >
-                  <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+                  <InputNumber min={0} max={100} precision={2} disabled={jobRO} />
                </Form.Item>
              );
            }}
@@ -179,7 +179,7 @@ export function JobsDetailRatesParts({
            label={t("jobs.fields.parts_tax_rates.prt_discp")}
            name={["parts_tax_rates", "PAG", "prt_discp"]}
          >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={2} disabled={jobRO} />
          </Form.Item>
          <Form.Item
            label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -192,7 +192,7 @@ export function JobsDetailRatesParts({
            label={t("jobs.fields.parts_tax_rates.prt_mkupp")}
            name={["parts_tax_rates", "PAG", "prt_mkupp"]}
          >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={2} disabled={jobRO} />
          </Form.Item>
          <Form.Item
            label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -218,7 +218,7 @@ export function JobsDetailRatesParts({
                    },
                  ]}
                >
-                  <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+                  <InputNumber min={0} max={100} precision={2} disabled={jobRO} />
                </Form.Item>
              );
            }}
@@ -229,7 +229,7 @@ export function JobsDetailRatesParts({
            label={t("jobs.fields.parts_tax_rates.prt_discp")}
            name={["parts_tax_rates", "PAM", "prt_discp"]}
          >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={2} disabled={jobRO} />
          </Form.Item>
          <Form.Item
            label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -242,7 +242,7 @@ export function JobsDetailRatesParts({
            label={t("jobs.fields.parts_tax_rates.prt_mkupp")}
            name={["parts_tax_rates", "PAM", "prt_mkupp"]}
          >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={2} disabled={jobRO} />
          </Form.Item>
          <Form.Item
            label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -268,7 +268,7 @@ export function JobsDetailRatesParts({
                    },
                  ]}
                >
-                  <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+                  <InputNumber min={0} max={100} precision={2} disabled={jobRO} />
                </Form.Item>
              );
            }}
@@ -279,7 +279,7 @@ export function JobsDetailRatesParts({
            label={t("jobs.fields.parts_tax_rates.prt_discp")}
            name={["parts_tax_rates", "PAN", "prt_discp"]}
          >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={2} disabled={jobRO} />
          </Form.Item>
          <Form.Item
            label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -292,7 +292,7 @@ export function JobsDetailRatesParts({
            label={t("jobs.fields.parts_tax_rates.prt_mkupp")}
            name={["parts_tax_rates", "PAN", "prt_mkupp"]}
          >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={2} disabled={jobRO} />
          </Form.Item>
          <Form.Item
            label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -318,7 +318,7 @@ export function JobsDetailRatesParts({
                    },
                  ]}
                >
-                  <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+                  <InputNumber min={0} max={100} precision={2} disabled={jobRO} />
                </Form.Item>
              );
            }}
@@ -329,7 +329,7 @@ export function JobsDetailRatesParts({
            label={t("jobs.fields.parts_tax_rates.prt_discp")}
            name={["parts_tax_rates", "PAO", "prt_discp"]}
          >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={2} disabled={jobRO} />
          </Form.Item>
          <Form.Item
            label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -342,7 +342,7 @@ export function JobsDetailRatesParts({
            label={t("jobs.fields.parts_tax_rates.prt_mkupp")}
            name={["parts_tax_rates", "PAO", "prt_mkupp"]}
          >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={2} disabled={jobRO} />
          </Form.Item>
          <Form.Item
            label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -368,7 +368,7 @@ export function JobsDetailRatesParts({
                    },
                  ]}
                >
-                  <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+                  <InputNumber min={0} max={100} precision={2} disabled={jobRO} />
                </Form.Item>
              );
            }}
@@ -379,7 +379,7 @@ export function JobsDetailRatesParts({
            label={t("jobs.fields.parts_tax_rates.prt_discp")}
            name={["parts_tax_rates", "PAP", "prt_discp"]}
          >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={2} disabled={jobRO} />
          </Form.Item>
          <Form.Item
            label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -392,7 +392,7 @@ export function JobsDetailRatesParts({
            label={t("jobs.fields.parts_tax_rates.prt_mkupp")}
            name={["parts_tax_rates", "PAP", "prt_mkupp"]}
          >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={2} disabled={jobRO} />
          </Form.Item>
          <Form.Item
            label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -418,7 +418,7 @@ export function JobsDetailRatesParts({
                    },
                  ]}
                >
-                  <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+                  <InputNumber min={0} max={100} precision={2} disabled={jobRO} />
                </Form.Item>
              );
            }}
@@ -429,7 +429,7 @@ export function JobsDetailRatesParts({
            label={t("jobs.fields.parts_tax_rates.prt_discp")}
            name={["parts_tax_rates", "PAR", "prt_discp"]}
          >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={2} disabled={jobRO} />
          </Form.Item>
          <Form.Item
            label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -442,7 +442,7 @@ export function JobsDetailRatesParts({
            label={t("jobs.fields.parts_tax_rates.prt_mkupp")}
            name={["parts_tax_rates", "PAR", "prt_mkupp"]}
          >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={2} disabled={jobRO} />
          </Form.Item>
          <Form.Item
            label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -468,7 +468,7 @@ export function JobsDetailRatesParts({
                    },
                  ]}
                >
-                  <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+                  <InputNumber min={0} max={100} precision={2} disabled={jobRO} />
                </Form.Item>
              );
            }}
@@ -479,7 +479,7 @@ export function JobsDetailRatesParts({
            label={t("jobs.fields.parts_tax_rates.prt_discp")}
            name={["parts_tax_rates", "PAS", "prt_discp"]}
          >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={2} disabled={jobRO} />
          </Form.Item>
          <Form.Item
            label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -492,7 +492,7 @@ export function JobsDetailRatesParts({
            label={t("jobs.fields.parts_tax_rates.prt_mkupp")}
            name={["parts_tax_rates", "PAS", "prt_mkupp"]}
          >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={2} disabled={jobRO} />
          </Form.Item>
          <Form.Item
            label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -518,7 +518,7 @@ export function JobsDetailRatesParts({
                    },
                  ]}
                >
-                  <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+                  <InputNumber min={0} max={100} precision={2} disabled={jobRO} />
                </Form.Item>
              );
            }}
@@ -529,7 +529,7 @@ export function JobsDetailRatesParts({
            label={t("jobs.fields.parts_tax_rates.prt_discp")}
            name={["parts_tax_rates", "PASL", "prt_discp"]}
          >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={2} disabled={jobRO} />
          </Form.Item>
          <Form.Item
            label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -542,7 +542,7 @@ export function JobsDetailRatesParts({
            label={t("jobs.fields.parts_tax_rates.prt_mkupp")}
            name={["parts_tax_rates", "PASL", "prt_mkupp"]}
          >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={2} disabled={jobRO} />
          </Form.Item>
          <Form.Item
            label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -568,7 +568,7 @@ export function JobsDetailRatesParts({
                    },
                  ]}
                >
-                  <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+                  <InputNumber min={0} max={100} precision={2} disabled={jobRO} />
                </Form.Item>
              );
            }}
@@ -579,7 +579,7 @@ export function JobsDetailRatesParts({
            label={t("jobs.fields.parts_tax_rates.prt_discp")}
            name={["parts_tax_rates", "CCDR", "prt_discp"]}
          >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={2} disabled={jobRO} />
          </Form.Item>
          <Form.Item
            label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -592,7 +592,7 @@ export function JobsDetailRatesParts({
            label={t("jobs.fields.parts_tax_rates.prt_mkupp")}
            name={["parts_tax_rates", "CCDR", "prt_mkupp"]}
          >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={2} disabled={jobRO} />
          </Form.Item>
          <Form.Item
            label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -605,7 +605,7 @@ export function JobsDetailRatesParts({
            label={t("jobs.fields.parts_tax_rates.prt_tax_rt")}
            name={["parts_tax_rates", "CCDR", "prt_tax_rt"]}
          >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={2} disabled={jobRO} />
          </Form.Item>
        </LayoutFormRow>
        <LayoutFormRow header={t("joblines.fields.part_types.CCF")}>
@@ -613,7 +613,7 @@ export function JobsDetailRatesParts({
            label={t("jobs.fields.parts_tax_rates.prt_discp")}
            name={["parts_tax_rates", "CCF", "prt_discp"]}
          >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={2} disabled={jobRO} />
          </Form.Item>
          <Form.Item
            label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -626,7 +626,7 @@ export function JobsDetailRatesParts({
            label={t("jobs.fields.parts_tax_rates.prt_mkupp")}
            name={["parts_tax_rates", "CCF", "prt_mkupp"]}
          >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={2} disabled={jobRO} />
          </Form.Item>
          <Form.Item
            label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -639,7 +639,7 @@ export function JobsDetailRatesParts({
            label={t("jobs.fields.parts_tax_rates.prt_tax_rt")}
            name={["parts_tax_rates", "CCF", "prt_tax_rt"]}
          >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={2} disabled={jobRO} />
          </Form.Item>
        </LayoutFormRow>
        <LayoutFormRow header={t("joblines.fields.part_types.CCM")}>
@@ -647,7 +647,7 @@ export function JobsDetailRatesParts({
            label={t("jobs.fields.parts_tax_rates.prt_discp")}
            name={["parts_tax_rates", "CCM", "prt_discp"]}
          >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={2} disabled={jobRO} />
          </Form.Item>
          <Form.Item
            label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -660,7 +660,7 @@ export function JobsDetailRatesParts({
            label={t("jobs.fields.parts_tax_rates.prt_mkupp")}
            name={["parts_tax_rates", "CCM", "prt_mkupp"]}
          >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={2} disabled={jobRO} />
          </Form.Item>
          <Form.Item
            label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -673,7 +673,7 @@ export function JobsDetailRatesParts({
            label={t("jobs.fields.parts_tax_rates.prt_tax_rt")}
            name={["parts_tax_rates", "CCM", "prt_tax_rt"]}
          >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={2} disabled={jobRO} />
          </Form.Item>
        </LayoutFormRow>
        <LayoutFormRow header={t("joblines.fields.part_types.CCC")}>
@@ -681,7 +681,7 @@ export function JobsDetailRatesParts({
            label={t("jobs.fields.parts_tax_rates.prt_discp")}
            name={["parts_tax_rates", "CCC", "prt_discp"]}
          >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={2} disabled={jobRO} />
          </Form.Item>
          <Form.Item
            label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -694,7 +694,7 @@ export function JobsDetailRatesParts({
            label={t("jobs.fields.parts_tax_rates.prt_mkupp")}
            name={["parts_tax_rates", "CCC", "prt_mkupp"]}
          >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={2} disabled={jobRO} />
          </Form.Item>
          <Form.Item
            label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -707,7 +707,7 @@ export function JobsDetailRatesParts({
            label={t("jobs.fields.parts_tax_rates.prt_tax_rt")}
            name={["parts_tax_rates", "CCC", "prt_tax_rt"]}
          >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={2} disabled={jobRO} />
          </Form.Item>
        </LayoutFormRow>
        <LayoutFormRow header={t("joblines.fields.part_types.CCD")}>
@@ -715,7 +715,7 @@ export function JobsDetailRatesParts({
            label={t("jobs.fields.parts_tax_rates.prt_discp")}
            name={["parts_tax_rates", "CCD", "prt_discp"]}
          >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={2} disabled={jobRO} />
          </Form.Item>
          <Form.Item
            label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -728,7 +728,7 @@ export function JobsDetailRatesParts({
            label={t("jobs.fields.parts_tax_rates.prt_mkupp")}
            name={["parts_tax_rates", "CCD", "prt_mkupp"]}
          >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={2} disabled={jobRO} />
          </Form.Item>
          <Form.Item
            label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -741,39 +741,39 @@ export function JobsDetailRatesParts({
            label={t("jobs.fields.parts_tax_rates.prt_tax_rt")}
            name={["parts_tax_rates", "CCD", "prt_tax_rt"]}
          >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={2} disabled={jobRO} />
          </Form.Item>
        </LayoutFormRow>
        <LayoutFormRow>
          <Form.Item label={t("jobs.fields.tax_tow_rt")} name="tax_tow_rt">
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={2} disabled={jobRO} />
          </Form.Item>
          <Form.Item label={t("jobs.fields.tax_str_rt")} name="tax_str_rt">
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={2} disabled={jobRO} />
          </Form.Item>
          <Form.Item
            label={t("jobs.fields.tax_paint_mat_rt")}
            name="tax_paint_mat_rt"
          >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={2} disabled={jobRO} />
          </Form.Item>
          <Form.Item
            label={t("jobs.fields.tax_shop_mat_rt")}
            name="tax_shop_mat_rt"
          >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={2} disabled={jobRO} />
          </Form.Item>
          <Form.Item label={t("jobs.fields.tax_sub_rt")} name="tax_sub_rt">
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={2} disabled={jobRO} />
          </Form.Item>
          <Form.Item label={t("jobs.fields.tax_lbr_rt")} name="tax_lbr_rt">
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={2} disabled={jobRO} />
          </Form.Item>
          <Form.Item
            label={t("jobs.fields.tax_levies_rt")}
            name="tax_levies_rt"
          >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={2} disabled={jobRO} />
          </Form.Item>
        </LayoutFormRow>
      </Collapse.Panel>
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -1694,6 +1694,7 @@
 					"partstotal": "This is the total of all parts and sublet amounts on the vehicle (some of these may require an in-house invoice).<br/>\nItems such as shop and paint materials, labor online lines, etc. are not included in this total.",
 					"totalreturns": "The total <b>retail</b> amount of returns created for this job."
 				},
+				"profileadjustments": "Profile Disc./Mkup (Already included above)",
 				"prt_dsmk_total": "Line Item Adjustment",
 				"rates": "Rates",
 				"rates_subtotal": "All Rates Subtotal",
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -1694,6 +1694,7 @@
 					"partstotal": "",
 					"totalreturns": ""
 				},
+				"profileadjustments": "",
 				"prt_dsmk_total": "",
 				"rates": "Tarifas",
 				"rates_subtotal": "",
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -1694,6 +1694,7 @@
 					"partstotal": "",
 					"totalreturns": ""
 				},
+				"profileadjustments": "",
 				"prt_dsmk_total": "",
 				"rates": "Les taux",
 				"rates_subtotal": "",