Dinero Object

Signed-off-by: Allan Carr <allan.carr@thinkimex.com>

client/src/components/job-totals-table/job-totals.table.labor.component.jsx

@@ -3,8 +3,8 @@ import Dinero from "dinero.js";
 import React, { useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
-import { alphaSort } from "../../utils/sorters";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
+import { alphaSort } from "../../utils/sorters";
 
 export default function JobTotalsTableLabor({ job }) {
   const { t } = useTranslation();
@@ -56,16 +56,47 @@ export default function JobTotalsTableLabor({ job }) {
       sortOrder: state.sortedInfo.columnKey === "mod_lb_hrs" && state.sortedInfo.order,
       render: (text, record) => record.hours.toFixed(1)
     },
-    {
-      title: t("joblines.fields.total"),
-      dataIndex: "total",
-      key: "total",
-      align: "right",
-      sorter: (a, b) => a.total.amount - b.total.amount,
-      sortOrder: state.sortedInfo.columnKey === "total" && state.sortedInfo.order,
-
-      render: (text, record) => Dinero(record.total).toFormat()
-    }
+    ...InstanceRenderManager({
+      imex: {
+        title: t("joblines.fields.total"),
+        dataIndex: "total",
+        key: "total",
+        align: "right",
+        sorter: (a, b) => a.total.amount - b.total.amount,
+        sortOrder: state.sortedInfo.columnKey === "total" && state.sortedInfo.order,
+        render: (text, record) => Dinero(record.total).toFormat()
+      },
+      rome: [
+        {
+          title: t("joblines.fields.amount"),
+          dataIndex: "base",
+          key: "base",
+          align: "right",
+          sorter: (a, b) => a.base.amount - b.base.amount,
+          sortOrder: state.sortedInfo.columnKey === "base" && state.sortedInfo.order,
+          render: (text, record) => Dinero(record.base).toFormat()
+        },
+        {
+          title: t("joblines.fields.adjustment"),
+          dataIndex: "adjustment",
+          key: "adjustment",
+          align: "right",
+          sorter: (a, b) => a.adjustment.amount - b.adjustment.amount,
+          sortOrder: state.sortedInfo.columnKey === "adjustment" && state.sortedInfo.order,
+          render: (text, record) => Dinero(record.adjustment).toFormat()
+        },
+        {
+          title: t("joblines.fields.total"),
+          dataIndex: "total",
+          key: "total",
+          align: "right",
+          sorter: (a, b) => a.total.amount - b.total.amount,
+          sortOrder: state.sortedInfo.columnKey === "total" && state.sortedInfo.order,
+          render: (text, record) => Dinero(record.total).toFormat()
+        }
+      ],
+      promanager: "USE_ROME"
+    })
   ];
 
   const handleTableChange = (pagination, filters, sorter) => {
@@ -91,6 +122,16 @@ export default function JobTotalsTableLabor({ job }) {
             <Table.Summary.Cell>
               {(job.job_totals.rates.mapa.hours + job.job_totals.rates.mash.hours).toFixed(1)}
             </Table.Summary.Cell>
+            {InstanceRenderManager({
+              imex: null,
+              rome: (
+                <>
+                  <Table.Summary.Cell />
+                  <Table.Summary.Cell />
+                </>
+              ),
+              promanager: "USE_ROME"
+            })}
             <Table.Summary.Cell align="right">
               <strong>{Dinero(job.job_totals.rates.rates_subtotal).toFormat()}</strong>
             </Table.Summary.Cell>
@@ -122,7 +163,29 @@ export default function JobTotalsTableLabor({ job }) {
               <CurrencyFormatter>{job.job_totals.rates.mapa.rate}</CurrencyFormatter>
             </Table.Summary.Cell>
             <Table.Summary.Cell>{job.job_totals.rates.mapa.hours.toFixed(1)}</Table.Summary.Cell>
-            <Table.Summary.Cell align="right">{Dinero(job.job_totals.rates.mapa.total).toFormat()}</Table.Summary.Cell>
+            {InstanceRenderManager({
+              imex: (
+                <>
+                  <Table.Summary.Cell align="right">
+                    {Dinero(job.job_totals.rates.mapa.total).toFormat()}
+                  </Table.Summary.Cell>
+                </>
+              ),
+              rome: (
+                <>
+                  <Table.Summary.Cell align="right">
+                    {Dinero(job.job_totals.rates.mapa.base).toFormat()}
+                  </Table.Summary.Cell>
+                  <Table.Summary.Cell align="right">
+                    {Dinero(job.job_totals.rates.mapa.adjustment).toFormat()}
+                  </Table.Summary.Cell>
+                  <Table.Summary.Cell align="right">
+                    {Dinero(job.job_totals.rates.mapa.total).toFormat()}
+                  </Table.Summary.Cell>
+                </>
+              ),
+              promanager: "USE_ROME"
+            })}
           </Table.Summary.Row>
           <Table.Summary.Row>
             <Table.Summary.Cell>
@@ -151,7 +214,29 @@ export default function JobTotalsTableLabor({ job }) {
               <CurrencyFormatter>{job.job_totals.rates.mash.rate}</CurrencyFormatter>
             </Table.Summary.Cell>
             <Table.Summary.Cell>{job.job_totals.rates.mash.hours.toFixed(1)}</Table.Summary.Cell>
-            <Table.Summary.Cell align="right">{Dinero(job.job_totals.rates.mash.total).toFormat()}</Table.Summary.Cell>
+            {InstanceRenderManager({
+              imex: (
+                <>
+                  <Table.Summary.Cell align="right">
+                    {Dinero(job.job_totals.rates.mash.total).toFormat()}
+                  </Table.Summary.Cell>
+                </>
+              ),
+              rome: (
+                <>
+                  <Table.Summary.Cell align="right">
+                    {Dinero(job.job_totals.rates.mash.base).toFormat()}
+                  </Table.Summary.Cell>
+                  <Table.Summary.Cell align="right">
+                    {Dinero(job.job_totals.rates.mash.adjustment).toFormat()}
+                  </Table.Summary.Cell>
+                  <Table.Summary.Cell align="right">
+                    {Dinero(job.job_totals.rates.mash.total).toFormat()}
+                  </Table.Summary.Cell>
+                </>
+              ),
+              promanager: "USE_ROME"
+            })}
           </Table.Summary.Row>
           <Table.Summary.Row>
             <Table.Summary.Cell>
@@ -159,6 +244,16 @@ export default function JobTotalsTableLabor({ job }) {
             </Table.Summary.Cell>
             <Table.Summary.Cell />
             <Table.Summary.Cell />
+            {InstanceRenderManager({
+              imex: null,
+              rome: (
+                <>
+                  <Table.Summary.Cell />
+                  <Table.Summary.Cell />
+                </>
+              ),
+              promanager: "USE_ROME"
+            })}
             <Table.Summary.Cell align="right">
               <strong>{Dinero(job.job_totals.rates.subtotal).toFormat()}</strong>
             </Table.Summary.Cell>

client/src/components/jobs-detail-rates/jobs-detail-rates.labor.component.jsx

@@ -1,4 +1,4 @@
-import { Collapse, Form, Switch } from "antd";
+import { Collapse, Form, InputNumber, Switch } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -17,6 +17,9 @@ export function JobsDetailRatesLabor({ jobRO, expanded, required = true, form })
     <Collapse defaultActiveKey={expanded && "rates"}>
       <Collapse.Panel forceRender header={t("jobs.labels.cieca_pfl")} key="cieca_pfl">
         <LayoutFormRow header={t("joblines.fields.lbr_types.LAB")}>
+          <Form.Item label={t("jobs.fields.cieca_pfl.lbr_adjp")} name={["cieca_pfl", "LAB", "lbr_adjp"]}>
+            <InputNumber min={-100} max={100} precision={4} disabled={jobRO} />
+          </Form.Item>
           <Form.Item
             label={t("jobs.fields.cieca_pfl.lbr_tax_in")}
             name={["cieca_pfl", "LAB", "lbr_tax_in"]}
@@ -24,6 +27,24 @@ export function JobsDetailRatesLabor({ jobRO, expanded, required = true, form })
           >
             <Switch disabled={jobRO} />
           </Form.Item>
+          <Form.Item shouldUpdate>
+            {() => {
+              return (
+                <Form.Item
+                  label={t("jobs.fields.cieca_pfl.lbr_taxp")}
+                  name={["cieca_pfl", "LAB", "lbr_taxp"]}
+                  rules={[
+                    {
+                      required: form.getFieldValue(["cieca_pfl", "LAB", "lbr_tax_in"])
+                      //message: t("general.validation.required"),
+                    }
+                  ]}
+                >
+                  <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
+                </Form.Item>
+              );
+            }}
+          </Form.Item>
           <Form.Item
             label={t("jobs.fields.cieca_pfl.lbr_tx_in1")}
             name={["cieca_pfl", "LAB", "lbr_tx_in1"]}
@@ -61,6 +82,9 @@ export function JobsDetailRatesLabor({ jobRO, expanded, required = true, form })
           </Form.Item>
         </LayoutFormRow>
         <LayoutFormRow header={t("joblines.fields.lbr_types.LAD")}>
+          <Form.Item label={t("jobs.fields.cieca_pfl.lbr_adjp")} name={["cieca_pfl", "LAD", "lbr_adjp"]}>
+            <InputNumber min={-100} max={100} precision={4} disabled={jobRO} />
+          </Form.Item>
           <Form.Item
             label={t("jobs.fields.cieca_pfl.lbr_tax_in")}
             name={["cieca_pfl", "LAD", "lbr_tax_in"]}
@@ -68,6 +92,24 @@ export function JobsDetailRatesLabor({ jobRO, expanded, required = true, form })
           >
             <Switch disabled={jobRO} />
           </Form.Item>
+          <Form.Item shouldUpdate>
+            {() => {
+              return (
+                <Form.Item
+                  label={t("jobs.fields.cieca_pfl.lbr_taxp")}
+                  name={["cieca_pfl", "LAD", "lbr_taxp"]}
+                  rules={[
+                    {
+                      required: form.getFieldValue(["cieca_pfl", "LAD", "lbr_tax_in"])
+                      //message: t("general.validation.required"),
+                    }
+                  ]}
+                >
+                  <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
+                </Form.Item>
+              );
+            }}
+          </Form.Item>
           <Form.Item
             label={t("jobs.fields.cieca_pfl.lbr_tx_in1")}
             name={["cieca_pfl", "LAD", "lbr_tx_in1"]}
@@ -105,6 +147,9 @@ export function JobsDetailRatesLabor({ jobRO, expanded, required = true, form })
           </Form.Item>
         </LayoutFormRow>
         <LayoutFormRow header={t("joblines.fields.lbr_types.LAE")}>
+          <Form.Item label={t("jobs.fields.cieca_pfl.lbr_adjp")} name={["cieca_pfl", "LAE", "lbr_adjp"]}>
+            <InputNumber min={-100} max={100} precision={4} disabled={jobRO} />
+          </Form.Item>
           <Form.Item
             label={t("jobs.fields.cieca_pfl.lbr_tax_in")}
             name={["cieca_pfl", "LAE", "lbr_tax_in"]}
@@ -112,6 +157,24 @@ export function JobsDetailRatesLabor({ jobRO, expanded, required = true, form })
           >
             <Switch disabled={jobRO} />
           </Form.Item>
+          <Form.Item shouldUpdate>
+            {() => {
+              return (
+                <Form.Item
+                  label={t("jobs.fields.cieca_pfl.lbr_taxp")}
+                  name={["cieca_pfl", "LAE", "lbr_taxp"]}
+                  rules={[
+                    {
+                      required: form.getFieldValue(["cieca_pfl", "LAE", "lbr_tax_in"])
+                      //message: t("general.validation.required"),
+                    }
+                  ]}
+                >
+                  <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
+                </Form.Item>
+              );
+            }}
+          </Form.Item>
           <Form.Item
             label={t("jobs.fields.cieca_pfl.lbr_tx_in1")}
             name={["cieca_pfl", "LAE", "lbr_tx_in1"]}
@@ -149,6 +212,9 @@ export function JobsDetailRatesLabor({ jobRO, expanded, required = true, form })
           </Form.Item>
         </LayoutFormRow>
         <LayoutFormRow header={t("joblines.fields.lbr_types.LAF")}>
+          <Form.Item label={t("jobs.fields.cieca_pfl.lbr_adjp")} name={["cieca_pfl", "LAF", "lbr_adjp"]}>
+            <InputNumber min={-100} max={100} precision={4} disabled={jobRO} />
+          </Form.Item>
           <Form.Item
             label={t("jobs.fields.cieca_pfl.lbr_tax_in")}
             name={["cieca_pfl", "LAF", "lbr_tax_in"]}
@@ -156,6 +222,24 @@ export function JobsDetailRatesLabor({ jobRO, expanded, required = true, form })
           >
             <Switch disabled={jobRO} />
           </Form.Item>
+          <Form.Item shouldUpdate>
+            {() => {
+              return (
+                <Form.Item
+                  label={t("jobs.fields.cieca_pfl.lbr_taxp")}
+                  name={["cieca_pfl", "LAF", "lbr_taxp"]}
+                  rules={[
+                    {
+                      required: form.getFieldValue(["cieca_pfl", "LAF", "lbr_tax_in"])
+                      //message: t("general.validation.required"),
+                    }
+                  ]}
+                >
+                  <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
+                </Form.Item>
+              );
+            }}
+          </Form.Item>
           <Form.Item
             label={t("jobs.fields.cieca_pfl.lbr_tx_in1")}
             name={["cieca_pfl", "LAF", "lbr_tx_in1"]}
@@ -193,6 +277,9 @@ export function JobsDetailRatesLabor({ jobRO, expanded, required = true, form })
           </Form.Item>
         </LayoutFormRow>
         <LayoutFormRow header={t("joblines.fields.lbr_types.LAG")}>
+          <Form.Item label={t("jobs.fields.cieca_pfl.lbr_adjp")} name={["cieca_pfl", "LAG", "lbr_adjp"]}>
+            <InputNumber min={-100} max={100} precision={4} disabled={jobRO} />
+          </Form.Item>
           <Form.Item
             label={t("jobs.fields.cieca_pfl.lbr_tax_in")}
             name={["cieca_pfl", "LAG", "lbr_tax_in"]}
@@ -200,6 +287,24 @@ export function JobsDetailRatesLabor({ jobRO, expanded, required = true, form })
           >
             <Switch disabled={jobRO} />
           </Form.Item>
+          <Form.Item shouldUpdate>
+            {() => {
+              return (
+                <Form.Item
+                  label={t("jobs.fields.cieca_pfl.lbr_taxp")}
+                  name={["cieca_pfl", "LAG", "lbr_taxp"]}
+                  rules={[
+                    {
+                      required: form.getFieldValue(["cieca_pfl", "LAG", "lbr_tax_in"])
+                      //message: t("general.validation.required"),
+                    }
+                  ]}
+                >
+                  <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
+                </Form.Item>
+              );
+            }}
+          </Form.Item>
           <Form.Item
             label={t("jobs.fields.cieca_pfl.lbr_tx_in1")}
             name={["cieca_pfl", "LAG", "lbr_tx_in1"]}
@@ -237,6 +342,9 @@ export function JobsDetailRatesLabor({ jobRO, expanded, required = true, form })
           </Form.Item>
         </LayoutFormRow>
         <LayoutFormRow header={t("joblines.fields.lbr_types.LAM")}>
+          <Form.Item label={t("jobs.fields.cieca_pfl.lbr_adjp")} name={["cieca_pfl", "LAM", "lbr_adjp"]}>
+            <InputNumber min={-100} max={100} precision={4} disabled={jobRO} />
+          </Form.Item>
           <Form.Item
             label={t("jobs.fields.cieca_pfl.lbr_tax_in")}
             name={["cieca_pfl", "LAM", "lbr_tax_in"]}
@@ -244,6 +352,24 @@ export function JobsDetailRatesLabor({ jobRO, expanded, required = true, form })
           >
             <Switch disabled={jobRO} />
           </Form.Item>
+          <Form.Item shouldUpdate>
+            {() => {
+              return (
+                <Form.Item
+                  label={t("jobs.fields.cieca_pfl.lbr_taxp")}
+                  name={["cieca_pfl", "LAM", "lbr_taxp"]}
+                  rules={[
+                    {
+                      required: form.getFieldValue(["cieca_pfl", "LAM", "lbr_tax_in"])
+                      //message: t("general.validation.required"),
+                    }
+                  ]}
+                >
+                  <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
+                </Form.Item>
+              );
+            }}
+          </Form.Item>
           <Form.Item
             label={t("jobs.fields.cieca_pfl.lbr_tx_in1")}
             name={["cieca_pfl", "LAM", "lbr_tx_in1"]}
@@ -281,6 +407,9 @@ export function JobsDetailRatesLabor({ jobRO, expanded, required = true, form })
           </Form.Item>
         </LayoutFormRow>
         <LayoutFormRow header={t("joblines.fields.lbr_types.LAR")}>
+          <Form.Item label={t("jobs.fields.cieca_pfl.lbr_adjp")} name={["cieca_pfl", "LAR", "lbr_adjp"]}>
+            <InputNumber min={-100} max={100} precision={4} disabled={jobRO} />
+          </Form.Item>
           <Form.Item
             label={t("jobs.fields.cieca_pfl.lbr_tax_in")}
             name={["cieca_pfl", "LAR", "lbr_tax_in"]}
@@ -288,6 +417,24 @@ export function JobsDetailRatesLabor({ jobRO, expanded, required = true, form })
           >
             <Switch disabled={jobRO} />
           </Form.Item>
+          <Form.Item shouldUpdate>
+            {() => {
+              return (
+                <Form.Item
+                  label={t("jobs.fields.cieca_pfl.lbr_taxp")}
+                  name={["cieca_pfl", "LAR", "lbr_taxp"]}
+                  rules={[
+                    {
+                      required: form.getFieldValue(["cieca_pfl", "LAR", "lbr_tax_in"])
+                      //message: t("general.validation.required"),
+                    }
+                  ]}
+                >
+                  <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
+                </Form.Item>
+              );
+            }}
+          </Form.Item>
           <Form.Item
             label={t("jobs.fields.cieca_pfl.lbr_tx_in1")}
             name={["cieca_pfl", "LAR", "lbr_tx_in1"]}
@@ -325,6 +472,9 @@ export function JobsDetailRatesLabor({ jobRO, expanded, required = true, form })
           </Form.Item>
         </LayoutFormRow>
         <LayoutFormRow header={t("joblines.fields.lbr_types.LAS")}>
+          <Form.Item label={t("jobs.fields.cieca_pfl.lbr_adjp")} name={["cieca_pfl", "LAS", "lbr_adjp"]}>
+            <InputNumber min={-100} max={100} precision={4} disabled={jobRO} />
+          </Form.Item>
           <Form.Item
             label={t("jobs.fields.cieca_pfl.lbr_tax_in")}
             name={["cieca_pfl", "LAS", "lbr_tax_in"]}
@@ -332,6 +482,24 @@ export function JobsDetailRatesLabor({ jobRO, expanded, required = true, form })
           >
             <Switch disabled={jobRO} />
           </Form.Item>
+          <Form.Item shouldUpdate>
+            {() => {
+              return (
+                <Form.Item
+                  label={t("jobs.fields.cieca_pfl.lbr_taxp")}
+                  name={["cieca_pfl", "LAS", "lbr_taxp"]}
+                  rules={[
+                    {
+                      required: form.getFieldValue(["cieca_pfl", "LAS", "lbr_tax_in"])
+                      //message: t("general.validation.required"),
+                    }
+                  ]}
+                >
+                  <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
+                </Form.Item>
+              );
+            }}
+          </Form.Item>
           <Form.Item
             label={t("jobs.fields.cieca_pfl.lbr_tx_in1")}
             name={["cieca_pfl", "LAS", "lbr_tx_in1"]}
@@ -369,6 +537,9 @@ export function JobsDetailRatesLabor({ jobRO, expanded, required = true, form })
           </Form.Item>
         </LayoutFormRow>
         <LayoutFormRow header={t("joblines.fields.lbr_types.LAU")}>
+          <Form.Item label={t("jobs.fields.cieca_pfl.lbr_adjp")} name={["cieca_pfl", "LAU", "lbr_adjp"]}>
+            <InputNumber min={-100} max={100} precision={4} disabled={jobRO} />
+          </Form.Item>
           <Form.Item
             label={t("jobs.fields.cieca_pfl.lbr_tax_in")}
             name={["cieca_pfl", "LAU", "lbr_tax_in"]}
@@ -376,6 +547,24 @@ export function JobsDetailRatesLabor({ jobRO, expanded, required = true, form })
           >
             <Switch disabled={jobRO} />
           </Form.Item>
+          <Form.Item shouldUpdate>
+            {() => {
+              return (
+                <Form.Item
+                  label={t("jobs.fields.cieca_pfl.lbr_taxp")}
+                  name={["cieca_pfl", "LAU", "lbr_taxp"]}
+                  rules={[
+                    {
+                      required: form.getFieldValue(["cieca_pfl", "LAU", "lbr_tax_in"])
+                      //message: t("general.validation.required"),
+                    }
+                  ]}
+                >
+                  <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
+                </Form.Item>
+              );
+            }}
+          </Form.Item>
           <Form.Item
             label={t("jobs.fields.cieca_pfl.lbr_tx_in1")}
             name={["cieca_pfl", "LAU", "lbr_tx_in1"]}

client/src/components/jobs-detail-rates/jobs-detail-rates.materials.component.jsx

@@ -23,7 +23,9 @@ export function JobsDetailRatesMaterials({ jobRO, expanded, required = true, for
           <Form.Item label={t("jobs.fields.materials.cal_opcode")} name={["materials", "MAPA", "cal_opcode"]}>
             <Input disabled={jobRO} />
           </Form.Item>
-
+          <Form.Item label={t("jobs.fields.materials.mat_adjp")} name={["materials", "MAPA", "mat_adjp"]}>
+            <InputNumber min={-100} max={100} precision={4} disabled={jobRO} />
+          </Form.Item>
           <Form.Item
             label={t("jobs.fields.materials.tax_ind")}
             name={["materials", "MAPA", "tax_ind"]}
@@ -31,6 +33,24 @@ export function JobsDetailRatesMaterials({ jobRO, expanded, required = true, for
           >
             <Switch />
           </Form.Item>
+          <Form.Item shouldUpdate>
+            {() => {
+              return (
+                <Form.Item
+                  label={t("jobs.fields.materials.mat_taxp")}
+                  name={["materials", "MAPA", "mat_taxp"]}
+                  rules={[
+                    {
+                      required: form.getFieldValue(["materials", "MAPA", "tax_ind"])
+                      //message: t("general.validation.required"),
+                    }
+                  ]}
+                >
+                  <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
+                </Form.Item>
+              );
+            }}
+          </Form.Item>
           <Form.Item
             label={t("jobs.fields.materials.mat_tx_in1")}
             name={["materials", "MAPA", "mat_tx_in1"]}
@@ -74,7 +94,9 @@ export function JobsDetailRatesMaterials({ jobRO, expanded, required = true, for
           <Form.Item label={t("jobs.fields.materials.cal_opcode")} name={["materials", "MASH", "cal_opcode"]}>
             <Input disabled={jobRO} />
           </Form.Item>
-
+          <Form.Item label={t("jobs.fields.materials.mat_adjp")} name={["materials", "MAPA", "mat_adjp"]}>
+            <InputNumber min={-100} max={100} precision={4} disabled={jobRO} />
+          </Form.Item>
           <Form.Item
             label={t("jobs.fields.materials.tax_ind")}
             name={["materials", "MASH", "tax_ind"]}
@@ -82,6 +104,24 @@ export function JobsDetailRatesMaterials({ jobRO, expanded, required = true, for
           >
             <Switch />
           </Form.Item>
+          <Form.Item shouldUpdate>
+            {() => {
+              return (
+                <Form.Item
+                  label={t("jobs.fields.materials.mat_taxp")}
+                  name={["materials", "MASH", "mat_taxp"]}
+                  rules={[
+                    {
+                      required: form.getFieldValue(["materials", "MASH", "tax_ind"])
+                      //message: t("general.validation.required"),
+                    }
+                  ]}
+                >
+                  <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
+                </Form.Item>
+              );
+            }}
+          </Form.Item>
           <Form.Item
             label={t("jobs.fields.materials.mat_tx_in1")}
             name={["materials", "MASH", "mat_tx_in1"]}

client/src/components/jobs-detail-rates/jobs-detail-rates.parts.component.jsx

@@ -4,6 +4,7 @@ import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
+import InstanceRenderManager from "../../utils/instanceRenderMgr";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 
 const mapStateToProps = createStructuredSelector({
@@ -988,18 +989,24 @@ export function JobsDetailRatesParts({ jobRO, expanded, required = true, form })
           <Form.Item label={t("jobs.fields.tax_str_rt")} name="tax_str_rt">
             <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
-          <Form.Item label={t("jobs.fields.tax_paint_mat_rt")} name="tax_paint_mat_rt">
-            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
-          </Form.Item>
-          <Form.Item label={t("jobs.fields.tax_shop_mat_rt")} name="tax_shop_mat_rt">
-            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
-          </Form.Item>
+          {InstanceRenderManager({ imex: true, rome: false, promanager: "USE_ROME" }) ? (
+            <>
+              <Form.Item label={t("jobs.fields.tax_paint_mat_rt")} name="tax_paint_mat_rt">
+                <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
+              </Form.Item>
+              <Form.Item label={t("jobs.fields.tax_shop_mat_rt")} name="tax_shop_mat_rt">
+                <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
+              </Form.Item>{" "}
+            </>
+          ) : null}
           <Form.Item label={t("jobs.fields.tax_sub_rt")} name="tax_sub_rt">
             <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
-          <Form.Item label={t("jobs.fields.tax_lbr_rt")} name="tax_lbr_rt">
-            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
-          </Form.Item>
+          {InstanceRenderManager({ imex: true, rome: false, promanager: "USE_ROME" }) ? (
+            <Form.Item label={t("jobs.fields.tax_lbr_rt")} name="tax_lbr_rt">
+              <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
+            </Form.Item>
+          ) : null}
           <Form.Item label={t("jobs.fields.tax_levies_rt")} name="tax_levies_rt">
             <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>

client/src/components/production-list-columns/production-list-columns.date.component.jsx

@@ -1,11 +1,11 @@
 import { useMutation } from "@apollo/client";
-import { Button, Card, Dropdown, TimePicker } from "antd";
-import dayjs from "../../utils/day";
+import { Button, Card, Dropdown, Space, TimePicker } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import { UPDATE_JOB } from "../../graphql/jobs.queries";
 import { DateFormatter } from "../../utils/DateFormatter";
+import dayjs from "../../utils/day";
 import FormDatePicker from "../form-date-picker/form-date-picker.component";
 
 export default function ProductionListDate({ record, field, time, pastIndicator }) {
@@ -56,23 +56,25 @@ export default function ProductionListDate({ record, field, time, pastIndicator
         key: "overlayItem1",
         label: (
           <Card style={{ padding: "1rem" }} onClick={(e) => e.stopPropagation()}>
-            <FormDatePicker
-              onClick={(e) => e.stopPropagation()}
-              value={(record[field] && dayjs(record[field])) || null}
-              onChange={handleChange}
-              format="MM/DD/YYYY"
-              isDateOnly={!time}
-            />
-            {time && (
-              <TimePicker
+            <Space direction={"vertical"}>
+              <FormDatePicker
                 onClick={(e) => e.stopPropagation()}
                 value={(record[field] && dayjs(record[field])) || null}
                 onChange={handleChange}
-                minuteStep={15}
-                format="hh:mm a"
+                format="MM/DD/YYYY"
+                isDateOnly={!time}
               />
-            )}
-            <Button onClick={() => setOpen(false)}>{t("general.actions.close")}</Button>
+              {time && (
+                <TimePicker
+                  onClick={(e) => e.stopPropagation()}
+                  value={(record[field] && dayjs(record[field])) || null}
+                  onChange={handleChange}
+                  minuteStep={15}
+                  format="hh:mm a"
+                />
+              )}
+              <Button onClick={() => setOpen(false)}>{t("general.actions.close")}</Button>
+            </Space>
           </Card>
         )
       }

client/src/components/shop-info/shop-info.responsibilitycenters.taxes.component.jsx

@@ -4,6 +4,7 @@ import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import InstanceRenderManager from "../../utils/instanceRenderMgr";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 
 const mapStateToProps = createStructuredSelector({
@@ -51,6 +52,12 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
       <Collapse>
         <Collapse.Panel forceRender header={t("jobs.labels.cieca_pfl")} key="cieca_pfl">
           <LayoutFormRow header={t("joblines.fields.lbr_types.LAB")}>
+            <Form.Item
+              label={t("jobs.fields.cieca_pfl.lbr_adjp")}
+              name={["md_responsibility_centers", "cieca_pfl", "LAB", "lbr_adjp"]}
+            >
+              <InputNumber min={-100} max={100} precision={4} />
+            </Form.Item>
             <Form.Item
               label={t("jobs.fields.cieca_pfl.lbr_tax_in")}
               name={["md_responsibility_centers", "cieca_pfl", "LAB", "lbr_tax_in"]}
@@ -58,6 +65,24 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
             >
               <Switch />
             </Form.Item>
+            <Form.Item shouldUpdate>
+              {() => {
+                return (
+                  <Form.Item
+                    label={t("jobs.fields.cieca_pfl.lbr_taxp")}
+                    name={["md_responsibility_centers", "cieca_pfl", "LAB", "lbr_taxp"]}
+                    rules={[
+                      {
+                        required: form.getFieldValue(["md_responsibility_centers", "cieca_pfl", "LAB", "lbr_tax_in"])
+                        //message: t("general.validation.required"),
+                      }
+                    ]}
+                  >
+                    <InputNumber min={0} max={100} precision={4} />
+                  </Form.Item>
+                );
+              }}
+            </Form.Item>
             <Form.Item
               label={t("jobs.fields.cieca_pfl.lbr_tx_in1")}
               name={["md_responsibility_centers", "cieca_pfl", "LAB", "lbr_tx_in1"]}
@@ -95,6 +120,12 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
             </Form.Item>
           </LayoutFormRow>
           <LayoutFormRow header={t("joblines.fields.lbr_types.LAD")}>
+            <Form.Item
+              label={t("jobs.fields.cieca_pfl.lbr_adjp")}
+              name={["md_responsibility_centers", "cieca_pfl", "LAD", "lbr_adjp"]}
+            >
+              <InputNumber min={-100} max={100} precision={4} />
+            </Form.Item>
             <Form.Item
               label={t("jobs.fields.cieca_pfl.lbr_tax_in")}
               name={["md_responsibility_centers", "cieca_pfl", "LAD", "lbr_tax_in"]}
@@ -102,6 +133,24 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
             >
               <Switch />
             </Form.Item>
+            <Form.Item shouldUpdate>
+              {() => {
+                return (
+                  <Form.Item
+                    label={t("jobs.fields.cieca_pfl.lbr_taxp")}
+                    name={["md_responsibility_centers", "cieca_pfl", "LAD", "lbr_taxp"]}
+                    rules={[
+                      {
+                        required: form.getFieldValue(["md_responsibility_centers", "cieca_pfl", "LAD", "lbr_tax_in"])
+                        //message: t("general.validation.required"),
+                      }
+                    ]}
+                  >
+                    <InputNumber min={0} max={100} precision={4} />
+                  </Form.Item>
+                );
+              }}
+            </Form.Item>
             <Form.Item
               label={t("jobs.fields.cieca_pfl.lbr_tx_in1")}
               name={["md_responsibility_centers", "cieca_pfl", "LAD", "lbr_tx_in1"]}
@@ -139,6 +188,12 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
             </Form.Item>
           </LayoutFormRow>
           <LayoutFormRow header={t("joblines.fields.lbr_types.LAE")}>
+            <Form.Item
+              label={t("jobs.fields.cieca_pfl.lbr_adjp")}
+              name={["md_responsibility_centers", "cieca_pfl", "LAE", "lbr_adjp"]}
+            >
+              <InputNumber min={-100} max={100} precision={4} />
+            </Form.Item>
             <Form.Item
               label={t("jobs.fields.cieca_pfl.lbr_tax_in")}
               name={["md_responsibility_centers", "cieca_pfl", "LAE", "lbr_tax_in"]}
@@ -146,6 +201,24 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
             >
               <Switch />
             </Form.Item>
+            <Form.Item shouldUpdate>
+              {() => {
+                return (
+                  <Form.Item
+                    label={t("jobs.fields.cieca_pfl.lbr_taxp")}
+                    name={["md_responsibility_centers", "cieca_pfl", "LAE", "lbr_taxp"]}
+                    rules={[
+                      {
+                        required: form.getFieldValue(["md_responsibility_centers", "cieca_pfl", "LAE", "lbr_tax_in"])
+                        //message: t("general.validation.required"),
+                      }
+                    ]}
+                  >
+                    <InputNumber min={0} max={100} precision={4} />
+                  </Form.Item>
+                );
+              }}
+            </Form.Item>
             <Form.Item
               label={t("jobs.fields.cieca_pfl.lbr_tx_in1")}
               name={["md_responsibility_centers", "cieca_pfl", "LAE", "lbr_tx_in1"]}
@@ -183,6 +256,12 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
             </Form.Item>
           </LayoutFormRow>
           <LayoutFormRow header={t("joblines.fields.lbr_types.LAF")}>
+            <Form.Item
+              label={t("jobs.fields.cieca_pfl.lbr_adjp")}
+              name={["md_responsibility_centers", "cieca_pfl", "LAF", "lbr_adjp"]}
+            >
+              <InputNumber min={-100} max={100} precision={4} />
+            </Form.Item>
             <Form.Item
               label={t("jobs.fields.cieca_pfl.lbr_tax_in")}
               name={["md_responsibility_centers", "cieca_pfl", "LAF", "lbr_tax_in"]}
@@ -190,6 +269,24 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
             >
               <Switch />
             </Form.Item>
+            <Form.Item shouldUpdate>
+              {() => {
+                return (
+                  <Form.Item
+                    label={t("jobs.fields.cieca_pfl.lbr_taxp")}
+                    name={["md_responsibility_centers", "cieca_pfl", "LAF", "lbr_taxp"]}
+                    rules={[
+                      {
+                        required: form.getFieldValue(["md_responsibility_centers", "cieca_pfl", "LAF", "lbr_tax_in"])
+                        //message: t("general.validation.required"),
+                      }
+                    ]}
+                  >
+                    <InputNumber min={0} max={100} precision={4} />
+                  </Form.Item>
+                );
+              }}
+            </Form.Item>
             <Form.Item
               label={t("jobs.fields.cieca_pfl.lbr_tx_in1")}
               name={["md_responsibility_centers", "cieca_pfl", "LAF", "lbr_tx_in1"]}
@@ -227,6 +324,12 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
             </Form.Item>
           </LayoutFormRow>
           <LayoutFormRow header={t("joblines.fields.lbr_types.LAG")}>
+            <Form.Item
+              label={t("jobs.fields.cieca_pfl.lbr_adjp")}
+              name={["md_responsibility_centers", "cieca_pfl", "LAG", "lbr_adjp"]}
+            >
+              <InputNumber min={-100} max={100} precision={4} />
+            </Form.Item>
             <Form.Item
               label={t("jobs.fields.cieca_pfl.lbr_tax_in")}
               name={["md_responsibility_centers", "cieca_pfl", "LAG", "lbr_tax_in"]}
@@ -234,6 +337,24 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
             >
               <Switch />
             </Form.Item>
+            <Form.Item shouldUpdate>
+              {() => {
+                return (
+                  <Form.Item
+                    label={t("jobs.fields.cieca_pfl.lbr_taxp")}
+                    name={["md_responsibility_centers", "cieca_pfl", "LAG", "lbr_taxp"]}
+                    rules={[
+                      {
+                        required: form.getFieldValue(["md_responsibility_centers", "cieca_pfl", "LAG", "lbr_tax_in"])
+                        //message: t("general.validation.required"),
+                      }
+                    ]}
+                  >
+                    <InputNumber min={0} max={100} precision={4} />
+                  </Form.Item>
+                );
+              }}
+            </Form.Item>
             <Form.Item
               label={t("jobs.fields.cieca_pfl.lbr_tx_in1")}
               name={["md_responsibility_centers", "cieca_pfl", "LAG", "lbr_tx_in1"]}
@@ -271,6 +392,12 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
             </Form.Item>
           </LayoutFormRow>
           <LayoutFormRow header={t("joblines.fields.lbr_types.LAM")}>
+            <Form.Item
+              label={t("jobs.fields.cieca_pfl.lbr_adjp")}
+              name={["md_responsibility_centers", "cieca_pfl", "LAM", "lbr_adjp"]}
+            >
+              <InputNumber min={-100} max={100} precision={4} />
+            </Form.Item>
             <Form.Item
               label={t("jobs.fields.cieca_pfl.lbr_tax_in")}
               name={["md_responsibility_centers", "cieca_pfl", "LAM", "lbr_tax_in"]}
@@ -278,6 +405,24 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
             >
               <Switch />
             </Form.Item>
+            <Form.Item shouldUpdate>
+              {() => {
+                return (
+                  <Form.Item
+                    label={t("jobs.fields.cieca_pfl.lbr_taxp")}
+                    name={["md_responsibility_centers", "cieca_pfl", "LAM", "lbr_taxp"]}
+                    rules={[
+                      {
+                        required: form.getFieldValue(["md_responsibility_centers", "cieca_pfl", "LAM", "lbr_tax_in"])
+                        //message: t("general.validation.required"),
+                      }
+                    ]}
+                  >
+                    <InputNumber min={0} max={100} precision={4} />
+                  </Form.Item>
+                );
+              }}
+            </Form.Item>
             <Form.Item
               label={t("jobs.fields.cieca_pfl.lbr_tx_in1")}
               name={["md_responsibility_centers", "cieca_pfl", "LAM", "lbr_tx_in1"]}
@@ -315,6 +460,12 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
             </Form.Item>
           </LayoutFormRow>
           <LayoutFormRow header={t("joblines.fields.lbr_types.LAR")}>
+            <Form.Item
+              label={t("jobs.fields.cieca_pfl.lbr_adjp")}
+              name={["md_responsibility_centers", "cieca_pfl", "LAR", "lbr_adjp"]}
+            >
+              <InputNumber min={-100} max={100} precision={4} />
+            </Form.Item>
             <Form.Item
               label={t("jobs.fields.cieca_pfl.lbr_tax_in")}
               name={["md_responsibility_centers", "cieca_pfl", "LAR", "lbr_tax_in"]}
@@ -322,6 +473,24 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
             >
               <Switch />
             </Form.Item>
+            <Form.Item shouldUpdate>
+              {() => {
+                return (
+                  <Form.Item
+                    label={t("jobs.fields.cieca_pfl.lbr_taxp")}
+                    name={["md_responsibility_centers", "cieca_pfl", "LAR", "lbr_taxp"]}
+                    rules={[
+                      {
+                        required: form.getFieldValue(["md_responsibility_centers", "cieca_pfl", "LAR", "lbr_tax_in"])
+                        //message: t("general.validation.required"),
+                      }
+                    ]}
+                  >
+                    <InputNumber min={0} max={100} precision={4} />
+                  </Form.Item>
+                );
+              }}
+            </Form.Item>
             <Form.Item
               label={t("jobs.fields.cieca_pfl.lbr_tx_in1")}
               name={["md_responsibility_centers", "cieca_pfl", "LAR", "lbr_tx_in1"]}
@@ -359,6 +528,12 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
             </Form.Item>
           </LayoutFormRow>
           <LayoutFormRow header={t("joblines.fields.lbr_types.LAS")}>
+            <Form.Item
+              label={t("jobs.fields.cieca_pfl.lbr_adjp")}
+              name={["md_responsibility_centers", "cieca_pfl", "LAS", "lbr_adjp"]}
+            >
+              <InputNumber min={-100} max={100} precision={4} />
+            </Form.Item>
             <Form.Item
               label={t("jobs.fields.cieca_pfl.lbr_tax_in")}
               name={["md_responsibility_centers", "cieca_pfl", "LAS", "lbr_tax_in"]}
@@ -366,6 +541,24 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
             >
               <Switch />
             </Form.Item>
+            <Form.Item shouldUpdate>
+              {() => {
+                return (
+                  <Form.Item
+                    label={t("jobs.fields.cieca_pfl.lbr_taxp")}
+                    name={["md_responsibility_centers", "cieca_pfl", "LAS", "lbr_taxp"]}
+                    rules={[
+                      {
+                        required: form.getFieldValue(["md_responsibility_centers", "cieca_pfl", "LAS", "lbr_tax_in"])
+                        //message: t("general.validation.required"),
+                      }
+                    ]}
+                  >
+                    <InputNumber min={0} max={100} precision={4} />
+                  </Form.Item>
+                );
+              }}
+            </Form.Item>
             <Form.Item
               label={t("jobs.fields.cieca_pfl.lbr_tx_in1")}
               name={["md_responsibility_centers", "cieca_pfl", "LAS", "lbr_tx_in1"]}
@@ -403,6 +596,12 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
             </Form.Item>
           </LayoutFormRow>
           <LayoutFormRow header={t("joblines.fields.lbr_types.LAU")}>
+            <Form.Item
+              label={t("jobs.fields.cieca_pfl.lbr_adjp")}
+              name={["md_responsibility_centers", "cieca_pfl", "LAU", "lbr_adjp"]}
+            >
+              <InputNumber min={-100} max={100} precision={4} />
+            </Form.Item>
             <Form.Item
               label={t("jobs.fields.cieca_pfl.lbr_tax_in")}
               name={["md_responsibility_centers", "cieca_pfl", "LAU", "lbr_tax_in"]}
@@ -410,6 +609,24 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
             >
               <Switch />
             </Form.Item>
+            <Form.Item shouldUpdate>
+              {() => {
+                return (
+                  <Form.Item
+                    label={t("jobs.fields.cieca_pfl.lbr_taxp")}
+                    name={["md_responsibility_centers", "cieca_pfl", "LAU", "lbr_taxp"]}
+                    rules={[
+                      {
+                        required: form.getFieldValue(["md_responsibility_centers", "cieca_pfl", "LAU", "lbr_tax_in"])
+                        //message: t("general.validation.required"),
+                      }
+                    ]}
+                  >
+                    <InputNumber min={0} max={100} precision={2} />
+                  </Form.Item>
+                );
+              }}
+            </Form.Item>
             <Form.Item
               label={t("jobs.fields.cieca_pfl.lbr_tx_in1")}
               name={["md_responsibility_centers", "cieca_pfl", "LAU", "lbr_tx_in1"]}
@@ -462,7 +679,12 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
             >
               <Input />
             </Form.Item>
-
+            <Form.Item
+              label={t("jobs.fields.materials.mat_adjp")}
+              name={["md_responsibility_centers", "cieca_pfm", "MAPA", "mat_adjp"]}
+            >
+              <InputNumber min={-100} max={100} precision={4} />
+            </Form.Item>
             <Form.Item
               label={t("jobs.fields.materials.tax_ind")}
               name={["md_responsibility_centers", "cieca_pfm", "MAPA", "tax_ind"]}
@@ -470,6 +692,24 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
             >
               <Switch />
             </Form.Item>
+            <Form.Item shouldUpdate>
+              {() => {
+                return (
+                  <Form.Item
+                    label={t("jobs.fields.materials.mat_taxp")}
+                    name={["md_responsibility_centers", "cieca_pfm", "MAPA", "mat_taxp"]}
+                    rules={[
+                      {
+                        required: form.getFieldValue(["md_responsibility_centers", "cieca_pfm", "MAPA", "tax_ind"])
+                        //message: t("general.validation.required"),
+                      }
+                    ]}
+                  >
+                    <InputNumber min={0} max={100} precision={4} />
+                  </Form.Item>
+                );
+              }}
+            </Form.Item>
             <Form.Item
               label={t("jobs.fields.materials.mat_tx_in1")}
               name={["md_responsibility_centers", "cieca_pfm", "MAPA", "mat_tx_in1"]}
@@ -519,7 +759,12 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
             >
               <Input />
             </Form.Item>
-
+            <Form.Item
+              label={t("jobs.fields.materials.mat_adjp")}
+              name={["md_responsibility_centers", "cieca_pfm", "MASH", "mat_adjp"]}
+            >
+              <InputNumber min={-100} max={100} precision={4} />
+            </Form.Item>
             <Form.Item
               label={t("jobs.fields.materials.tax_ind")}
               name={["md_responsibility_centers", "cieca_pfm", "MASH", "tax_ind"]}
@@ -527,6 +772,24 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
             >
               <Switch />
             </Form.Item>
+            <Form.Item shouldUpdate>
+              {() => {
+                return (
+                  <Form.Item
+                    label={t("jobs.fields.materials.mat_taxp")}
+                    name={["md_responsibility_centers", "cieca_pfm", "MASH", "mat_taxp"]}
+                    rules={[
+                      {
+                        required: form.getFieldValue(["md_responsibility_centers", "cieca_pfm", "MASH", "tax_ind"])
+                        //message: t("general.validation.required"),
+                      }
+                    ]}
+                  >
+                    <InputNumber min={0} max={100} precision={4} />
+                  </Form.Item>
+                );
+              }}
+            </Form.Item>
             <Form.Item
               label={t("jobs.fields.materials.mat_tx_in1")}
               name={["md_responsibility_centers", "cieca_pfm", "MASH", "mat_tx_in1"]}
@@ -1765,25 +2028,37 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
             </Form.Item>
           </LayoutFormRow>
           <LayoutFormRow>
-            <Form.Item label={t("jobs.fields.tax_tow_rt")} name="tax_tow_rt">
+            <Form.Item label={t("jobs.fields.tax_tow_rt")} name={["md_responsibility_centers", "tax_tow_rt"]}>
               <InputNumber min={0} max={100} precision={4} />
             </Form.Item>
-            <Form.Item label={t("jobs.fields.tax_str_rt")} name="tax_str_rt">
+            <Form.Item label={t("jobs.fields.tax_str_rt")} name={["md_responsibility_centers", "tax_str_rt"]}>
               <InputNumber min={0} max={100} precision={4} />
             </Form.Item>
-            <Form.Item label={t("jobs.fields.tax_paint_mat_rt")} name="tax_paint_mat_rt">
+            {InstanceRenderManager({ imex: true, rome: false, promanager: "USE_ROME" }) ? (
+              <>
+                <Form.Item
+                  label={t("jobs.fields.tax_paint_mat_rt")}
+                  name={["md_responsibility_centers", "tax_paint_mat_rt"]}
+                >
+                  <InputNumber min={0} max={100} precision={4} />
+                </Form.Item>
+                <Form.Item
+                  label={t("jobs.fields.tax_shop_mat_rt")}
+                  name={["md_responsibility_centers", "tax_shop_mat_rt"]}
+                >
+                  <InputNumber min={0} max={100} precision={4} />
+                </Form.Item>
+              </>
+            ) : null}
+            <Form.Item label={t("jobs.fields.tax_sub_rt")} name={["md_responsibility_centers", "tax_sub_rt"]}>
               <InputNumber min={0} max={100} precision={4} />
             </Form.Item>
-            <Form.Item label={t("jobs.fields.tax_shop_mat_rt")} name="tax_shop_mat_rt">
-              <InputNumber min={0} max={100} precision={4} />
-            </Form.Item>
-            <Form.Item label={t("jobs.fields.tax_sub_rt")} name="tax_sub_rt">
-              <InputNumber min={0} max={100} precision={4} />
-            </Form.Item>
-            <Form.Item label={t("jobs.fields.tax_lbr_rt")} name="tax_lbr_rt">
-              <InputNumber min={0} max={100} precision={4} />
-            </Form.Item>
-            <Form.Item label={t("jobs.fields.tax_levies_rt")} name="tax_levies_rt">
+            {InstanceRenderManager({ imex: true, rome: false, promanager: "USE_ROME" }) ? (
+              <Form.Item label={t("jobs.fields.tax_lbr_rt")} name={["md_responsibility_centers", "tax_lbr_rt"]}>
+                <InputNumber min={0} max={100} precision={4} />
+              </Form.Item>
+            ) : null}
+            <Form.Item label={t("jobs.fields.tax_levies_rt")} name={["md_responsibility_centers", "tax_levies_rt"]}>
               <InputNumber min={0} max={100} precision={4} />
             </Form.Item>
           </LayoutFormRow>

client/src/graphql/jobs.queries.js

@@ -1149,6 +1149,7 @@ export const UPDATE_JOB = gql`
         suspended
         queued_for_parts
         scheduled_completion
+        scheduled_delivery
         actual_in
         date_repairstarted
         date_void

client/src/pages/jobs-create/jobs-create.container.jsx

@@ -10,9 +10,9 @@ import { INSERT_NEW_JOB } from "../../graphql/jobs.queries";
 import { QUERY_OWNER_FOR_JOB_CREATION } from "../../graphql/owners.queries";
 import { setBreadcrumbs, setSelectedHeader } from "../../redux/application/application.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import InstanceRenderManager from "../../utils/instanceRenderMgr";
 import JobsCreateComponent from "./jobs-create.component";
 import JobCreateContext from "./jobs-create.context";
-import InstanceRenderManager from "../../utils/instanceRenderMgr";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
@@ -159,13 +159,6 @@ function JobsCreateContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
           layout="vertical"
           autoComplete={"off"}
           initialValues={{
-            tax_tow_rt: bodyshop.bill_tax_rates.state_tax_rate / 100,
-            tax_str_rt: bodyshop.bill_tax_rates.state_tax_rate / 100,
-            tax_paint_mat_rt: bodyshop.bill_tax_rates.state_tax_rate / 100,
-            tax_shop_mat_rt: bodyshop.bill_tax_rates.state_tax_rate / 100,
-            tax_sub_rt: bodyshop.bill_tax_rates.state_tax_rate / 100,
-            tax_lbr_rt: bodyshop.bill_tax_rates.state_tax_rate / 100,
-            tax_levies_rt: bodyshop.bill_tax_rates.state_tax_rate / 100,
             federal_tax_rate: bodyshop.bill_tax_rates.federal_tax_rate / 100,
             state_tax_rate: bodyshop.bill_tax_rates.state_tax_rate / 100,
             local_tax_rate: bodyshop.bill_tax_rates.local_tax_rate / 100,
@@ -261,19 +254,34 @@ function JobsCreateContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
                     prt_tax_rt: bodyshop.bill_tax_rates.state_tax_rate / 100
                   }
                 },
-                rome: {
-                  cieca_pft: {
-                    ...bodyshop.md_responsibility_centers.taxes.tax_ty1,
-                    ...bodyshop.md_responsibility_centers.taxes.tax_ty2,
-                    ...bodyshop.md_responsibility_centers.taxes.tax_ty3,
-                    ...bodyshop.md_responsibility_centers.taxes.tax_ty4,
-                    ...bodyshop.md_responsibility_centers.taxes.tax_ty5
-                  },
-                  materials: bodyshop.md_responsibility_centers.cieca_pfm,
-                  cieca_pfl: bodyshop.md_responsibility_centers.cieca_pfl,
-                  parts_tax_rates: bodyshop.md_responsibility_centers.parts_tax_rates
-                }
-              }
+                tax_tow_rt: bodyshop.bill_tax_rates.state_tax_rate / 100,
+                tax_str_rt: bodyshop.bill_tax_rates.state_tax_rate / 100,
+                tax_paint_mat_rt: bodyshop.bill_tax_rates.state_tax_rate / 100,
+                tax_shop_mat_rt: bodyshop.bill_tax_rates.state_tax_rate / 100,
+                tax_sub_rt: bodyshop.bill_tax_rates.state_tax_rate / 100,
+                tax_lbr_rt: bodyshop.bill_tax_rates.state_tax_rate / 100,
+                tax_levies_rt: bodyshop.bill_tax_rates.state_tax_rate / 100
+              },
+              rome: {
+                cieca_pft: {
+                  ...bodyshop.md_responsibility_centers.taxes.tax_ty1,
+                  ...bodyshop.md_responsibility_centers.taxes.tax_ty2,
+                  ...bodyshop.md_responsibility_centers.taxes.tax_ty3,
+                  ...bodyshop.md_responsibility_centers.taxes.tax_ty4,
+                  ...bodyshop.md_responsibility_centers.taxes.tax_ty5
+                },
+                materials: bodyshop.md_responsibility_centers.cieca_pfm,
+                cieca_pfl: bodyshop.md_responsibility_centers.cieca_pfl,
+                parts_tax_rates: bodyshop.md_responsibility_centers.parts_tax_rates,
+                tax_tow_rt: bodyshop.md_responsibility_centers.tax_tow_rt,
+                tax_str_rt: bodyshop.md_responsibility_centers.tax_str_rt,
+                tax_paint_mat_rt: bodyshop.md_responsibility_centers.tax_paint_mat_rt,
+                tax_shop_mat_rt: bodyshop.md_responsibility_centers.tax_shop_mat_rt,
+                tax_sub_rt: bodyshop.md_responsibility_centers.tax_sub_rt,
+                tax_lbr_rt: bodyshop.md_responsibility_centers.tax_lbr_rt,
+                tax_levies_rt: bodyshop.md_responsibility_centers.tax_levies_rt
+              },
+              promanager: "USE_ROME"
             })
           }}
         >

server/accounting/qb-receivables-lines.js

@@ -664,7 +664,7 @@ exports.default = function ({ bodyshop, jobs_by_pk, qbo = false, items, taxCodes
       });
     }
   } else {
-    //Handle insurance profile adjustments
+    //Handle insurance profile adjustments for Parts
     Object.keys(job_totals.parts.adjustments).forEach((key) => {
       if (qbo) {
         //Going to always assume that we need to apply GST and PST for labor.
@@ -718,6 +718,67 @@ exports.default = function ({ bodyshop, jobs_by_pk, qbo = false, items, taxCodes
       }
     });
 
+    //Handle insurance profile adjustments for Labor and Materials
+    Object.keys(job_totals.rates).forEach((key) => {
+      if (
+        job_totals.rates[key] &&
+        job_totals.rates[key].adjustment &&
+        Dinero(job_totals.rates[key].adjustment).isZero() === false
+      ) {
+        if (qbo) {
+          //Going to always assume that we need to apply GST and PST for labor.
+          const taxAccountCode = findTaxCode(
+            {
+              local: false,
+              federal: process.env.COUNTRY === "USA" ? false : true,
+              state: jobs_by_pk.state_tax_rate === 0 ? false : true
+            },
+            bodyshop.md_responsibility_centers.sales_tax_codes
+          );
+          const account = responsibilityCenters.profits.find(
+            (c) => c.name === responsibilityCenters.defaults.profits[key.toUpperCase()]
+          );
+          const QboTaxId =
+            process.env.COUNTRY === "USA"
+              ? CheckQBOUSATaxID({
+                  //    jobline: jobline,
+                  job: jobs_by_pk,
+                  type: "storage"
+                })
+              : taxCodes[taxAccountCode];
+          InvoiceLineAdd.push({
+            DetailType: "SalesItemLineDetail",
+            Amount: Dinero(job_totals.rates[key].adjustment).toFormat(DineroQbFormat),
+            Description: `${account.accountdesc} - Adjustment`,
+            SalesItemLineDetail: {
+              ...(jobs_by_pk.class ? { ClassRef: { value: classes[jobs_by_pk.class] } } : {}),
+              ItemRef: {
+                value: items[account.accountitem]
+              },
+              TaxCodeRef: {
+                value: QboTaxId
+              },
+              Qty: 1
+            }
+          });
+        } else {
+          InvoiceLineAdd.push({
+            ItemRef: {
+              FullName: responsibilityCenters.profits.find(
+                (c) => c.name === responsibilityCenters.defaults.profits[key.toUpperCase()]
+              ).accountitem
+            },
+            Desc: "Storage",
+            Quantity: 1,
+            Amount: Dinero(job_totals.rates[key].adjustment).toFormat(DineroQbFormat),
+            SalesTaxCodeRef: {
+              FullName: bodyshop.md_responsibility_centers.taxes.itemexemptcode || "NON"
+            }
+          });
+        }
+      }
+    });
+
     const QboTaxId =
       process.env.COUNTRY === "USA"
         ? CheckQBOUSATaxID({

server/cdk/cdk-calculate-allocations.js

@@ -360,12 +360,10 @@ function calculateAllocations(connectionData, job) {
     }
   }
   if (InstanceManager({ rome: true })) {
-    //profile level adjustments
+    //profile level adjustments for parts
     Object.keys(job.job_totals.parts.adjustments).forEach((key) => {
       const accountName = selectedDmsAllocationConfig.profits[key];
-
       const otherAccount = bodyshop.md_responsibility_centers.profits.find((c) => c.name === accountName);
-
       if (otherAccount) {
         if (!profitCenterHash[accountName]) profitCenterHash[accountName] = Dinero();
 
@@ -380,6 +378,24 @@ function calculateAllocations(connectionData, job) {
         );
       }
     });
+    //profile level adjustments for labor and materials
+    Object.keys(job.job_totals.rates).forEach((key) => {
+      if (job.job_totals.rates[key] && job.job_totals.rates[key].adjustment && Dinero(job.job_totals.rates[key].adjustment).isZero() === false) {
+        const accountName = selectedDmsAllocationConfig.profits[key.toUpperCase()];
+        const otherAccount = bodyshop.md_responsibility_centers.profits.find((c) => c.name === accountName);
+        if (otherAccount) {
+          if (!profitCenterHash[accountName]) profitCenterHash[accountName] = Dinero();
+
+          profitCenterHash[accountName] = profitCenterHash[accountName].add(Dinero(job.job_totals.rates[key].adjustments));
+        } else {
+          CdkBase.createLogEvent(
+            connectionData,
+            "ERROR",
+            `Error encountered in CdkCalculateAllocations. Unable to find adjustment account. ${error}`
+          );
+        }
+      }
+    });
   }
 
   const jobAllocations = _.union(Object.keys(profitCenterHash), Object.keys(costCenterHash)).map((key) => {

server/graphql-client/queries.js

@@ -1527,6 +1527,8 @@ exports.QUERY_JOB_COSTING_DETAILS = ` query QUERY_JOB_COSTING_DETAILS($id: uuid!
       ca_bc_pvrt
       ca_customer_gst
       dms_allocation
+      cieca_pfl
+      materials
       joblines(where: { removed: { _eq: false } }) {
         id
         db_ref
@@ -1641,6 +1643,8 @@ exports.QUERY_JOB_COSTING_DETAILS_MULTI = ` query QUERY_JOB_COSTING_DETAILS_MULT
     ca_bc_pvrt
     ca_customer_gst
     dms_allocation
+    cieca_pfl
+    materials
     joblines(where: {removed: {_eq: false}}) {
       id
       db_ref
@@ -1866,6 +1870,8 @@ exports.GET_CDK_ALLOCATIONS = `query QUERY_JOB_CLOSE_DETAILS($id: uuid!) {
     scheduled_in
     actual_in
     ca_bc_pvrt
+    cieca_pfl
+    materials
     timetickets {
       id
       actualhrs

server/job/job-costing.js

@@ -286,9 +286,45 @@ function GenerateCostingData(job) {
 
           const rateName = `rate_${(val.mod_lbr_ty || "").toLowerCase()}`;
 
-          const laborAmount = Dinero({
+          let laborAmount = Dinero();
+          laborAmount = Dinero({
             amount: Math.round((job[rateName] || 0) * 100)
           }).multiply(val.mod_lb_hrs || 0);
+
+          if (
+            job.cieca_pfl &&
+            job.cieca_pfl[val.mod_lbr_ty.toUpperCase()] &&
+            job.cieca_pfl[val.mod_lbr_ty.toUpperCase()].lbr_adjp !== 0
+          ) {
+            let adjp = 0;
+            if (
+              val.mod_lbr_ty === "la1" ||
+              val.mod_lbr_ty === "la2" ||
+              val.mod_lbr_ty === "la3" ||
+              val.mod_lbr_ty === "la4"
+            ) {
+              adjp =
+                Math.abs(job.cieca_pfl["LAU"].lbr_adjp) > 1
+                  ? job.cieca_pfl["LAU"].lbr_adjp
+                  : job.cieca_pfl["LAU"].lbr_adjp * 100; //Adjust lbr_adjp to whole number
+            } else {
+              if (job.cieca_pfl[val.mod_lbr_ty.toUpperCase()]) {
+                adjp =
+                  Math.abs(job.cieca_pfl[val.mod_lbr_ty.toUpperCase()].lbr_adjp) > 1
+                    ? job.cieca_pfl[val.mod_lbr_ty.toUpperCase()].lbr_adjp
+                    : job.cieca_pfl[val.mod_lbr_ty.toUpperCase()].lbr_adjp * 100; //Adjust lbr_adjp to whole number
+              } else {
+                adjp =
+                  Math.abs(job.cieca_pfl["LAB"].lbr_adjp) > 1
+                    ? job.cieca_pfl["LAB"].lbr_adjp
+                    : job.cieca_pfl["LAB"].lbr_adjp * 100; //Adjust lbr_adjp to whole number
+              }
+            }
+            laborAmount = laborAmount.add(
+              laborAmount.percentage(adjp < 0 ? adjp * -1 : adjp).multiply(adjp < 0 ? -1 : 1)
+            );
+          }
+
           if (!acc.labor[laborProfitCenter]) acc.labor[laborProfitCenter] = Dinero();
           acc.labor[laborProfitCenter] = acc.labor[laborProfitCenter].add(laborAmount);
 
@@ -317,7 +353,7 @@ function GenerateCostingData(job) {
 
           if (!partsProfitCenter)
             console.log("Unknown cost/profit center mapping for parts.", val.line_desc, val.part_type);
-          const partsAmount = Dinero({
+          let partsAmount = Dinero({
             amount: val.act_price_before_ppc
               ? Math.round(val.act_price_before_ppc * 100)
               : Math.round(val.act_price * 100)
@@ -338,6 +374,33 @@ function GenerateCostingData(job) {
                       .multiply(val.prt_dsmk_p > 0 ? 1 : -1)
                 : Dinero()
             );
+
+          // Profile Discount for Parts
+          if (job.parts_tax_rates && job.parts_tax_rates[val.part_type.toUpperCase()]) {
+            if (
+              job.parts_tax_rates[val.part_type.toUpperCase()].prt_discp !== undefined &&
+              job.parts_tax_rates[val.part_type.toUpperCase()].prt_discp >= 0
+            ) {
+              const discountRate =
+                Math.abs(job.parts_tax_rates[val.part_type.toUpperCase()].prt_discp) > 1
+                  ? parts_tajob.parts_tax_rates_rates[val.part_type.toUpperCase()].prt_discp
+                  : job.parts_tax_rates[val.part_type.toUpperCase()].prt_discp * 100;
+              const disc = partsAmount.percentage(discountRate).multiply(-1);
+              partsAmount = partsAmount.add(disc);
+            }
+            if (
+              job.parts_tax_rates[val.part_type.toUpperCase()].prt_mkupp !== undefined &&
+              job.parts_tax_rates[val.part_type.toUpperCase()].prt_mkupp >= 0
+            ) {
+              const markupRate =
+                Math.abs(job.parts_tax_rates[val.part_type.toUpperCase()].prt_mkupp) > 1
+                  ? job.parts_tax_rates[val.part_type.toUpperCase()].prt_mkupp
+                  : job.parts_tax_rates[val.part_type.toUpperCase()].prt_mkupp * 100;
+              const markup = partsAmount.percentage(markupRate);
+              partsAmount = partsAmount.add(markup);
+            }
+          }
+
           if (!acc.parts[partsProfitCenter]) acc.parts[partsProfitCenter] = Dinero();
           acc.parts[partsProfitCenter] = acc.parts[partsProfitCenter].add(partsAmount);
         }
@@ -413,6 +476,7 @@ function GenerateCostingData(job) {
   if (!hasMapaLine) {
     if (!jobLineTotalsByProfitCenter.additional[defaultProfits["MAPA"]])
       jobLineTotalsByProfitCenter.additional[defaultProfits["MAPA"]] = Dinero();
+    
     jobLineTotalsByProfitCenter.additional[defaultProfits["MAPA"]] = jobLineTotalsByProfitCenter.additional[
       defaultProfits["MAPA"]
     ].add(
@@ -420,10 +484,26 @@ function GenerateCostingData(job) {
         amount: Math.round((job.rate_mapa || 0) * 100)
       }).multiply(materialsHours.mapaHrs || 0)
     );
+    let adjp = 0;
+    if (job.materials["MAPA"] && job.materials["MAPA"].mat_adjp) {
+      adjp =
+        Math.abs(job.materials["MAPA"].mat_adjp) > 1
+          ? job.materials["MAPA"].mat_adjp
+          : job.materials["MAPA"].mat_adjp * 100; //Adjust mat_adjp to whole number
+    }
+
+    jobLineTotalsByProfitCenter.additional[defaultProfits["MAPA"]] = jobLineTotalsByProfitCenter.additional[
+      defaultProfits["MAPA"]
+    ].add(
+      jobLineTotalsByProfitCenter.additional[defaultProfits["MAPA"]]
+        .percentage(adjp < 0 ? adjp * -1 : adjp)
+        .multiply(adjp < 0 ? -1 : 1)
+    );
   }
   if (!hasMashLine) {
     if (!jobLineTotalsByProfitCenter.additional[defaultProfits["MASH"]])
       jobLineTotalsByProfitCenter.additional[defaultProfits["MASH"]] = Dinero();
+
     jobLineTotalsByProfitCenter.additional[defaultProfits["MASH"]] = jobLineTotalsByProfitCenter.additional[
       defaultProfits["MASH"]
     ].add(
@@ -431,6 +511,21 @@ function GenerateCostingData(job) {
         amount: Math.round((job.rate_mash || 0) * 100)
       }).multiply(materialsHours.mashHrs || 0)
     );
+    let adjp = 0;
+    if (job.materials["MASH"] && job.materials["MASH"].mat_adjp) {
+      adjp =
+        Math.abs(job.materials["MASH"].mat_adjp) > 1
+          ? job.materials["MASH"].mat_adjp
+          : job.materials["MASH"].mat_adjp * 100; //Adjust mat_adjp to whole number
+    }
+
+    jobLineTotalsByProfitCenter.additional[defaultProfits["MASH"]] = jobLineTotalsByProfitCenter.additional[
+      defaultProfits["MASH"]
+    ].add(
+      jobLineTotalsByProfitCenter.additional[defaultProfits["MASH"]]
+        .percentage(adjp < 0 ? adjp * -1 : adjp)
+        .multiply(adjp < 0 ? -1 : 1)
+    );
   }
 
   //Is it a DMS Setup?

server/job/job-totals-USA.js

@@ -331,6 +331,8 @@ async function CalculateRatesTotals({ job, client }) {
     //Skip calculating mapa and mash if we got the amounts.
     if (!((property === "mapa" && hasMapaLine) || (property === "mash" && hasMashLine))) {
       if (!ret[property].total) {
+        ret[property].base = Dinero();
+        ret[property].adjustment = Dinero();
         ret[property].total = Dinero();
       }
       let threshold;
@@ -349,13 +351,50 @@ async function CalculateRatesTotals({ job, client }) {
         }
       }
 
-      const total = Dinero({
+      const base = Dinero({
         amount: Math.round((ret[property].rate || 0) * 100)
       }).multiply(ret[property].hours);
 
+      let adjp = 0;
+      if (property === "mapa" || property === "mash") {
+        if (job.materials[property.toUpperCase()] && job.materials[property.toUpperCase()].mat_adjp) {
+          adjp =
+            Math.abs(job.materials[property.toUpperCase()].mat_adjp) > 1
+              ? job.materials[property.toUpperCase()].mat_adjp
+              : job.materials[property.toUpperCase()].mat_adjp * 100; //Adjust mat_adjp to whole number
+        }
+      } else {
+        if (property === "la1" || property === "la2" || property === "la3" || property === "la4") {
+          if (job.cieca_pfl["LAU"] && job.cieca_pfl["LAU"].lbr_adjp) {
+            adjp =
+              Math.abs(job.cieca_pfl["LAU"].lbr_adjp) > 1
+                ? job.cieca_pfl["LAU"].lbr_adjp
+                : job.cieca_pfl["LAU"].lbr_adjp * 100; //Adjust lbr_adjp to whole number
+          }
+        } else {
+          if (job.cieca_pfl[property.toUpperCase()] && job.cieca_pfl[property.toUpperCase()].lbr_adjp) {
+            adjp =
+              Math.abs(job.cieca_pfl[property.toUpperCase()].lbr_adjp) > 1
+                ? job.cieca_pfl[property.toUpperCase()].lbr_adjp
+                : job.cieca_pfl[property.toUpperCase()].lbr_adjp * 100; //Adjust lbr_adjp to whole number
+          } else {
+            if (job.cieca_pfl["LAB"].lbr_adjp) {
+              adjp =
+                Math.abs(job.cieca_pfl["LAB"].lbr_adjp) > 1
+                  ? job.cieca_pfl["LAB"].lbr_adjp
+                  : job.cieca_pfl["LAB"].lbr_adjp * 100; //Adjust lbr_adjp to whole number
+            }
+          }
+        }
+      }
+      const adjustment = base.percentage(adjp < 0 ? adjp * -1 : adjp).multiply(adjp < 0 ? -1 : 1);
+      const total = base.add(adjustment);
+
       if (threshold && total.greaterThanOrEqual(threshold)) {
         ret[property].total = ret[property].total.add(threshold);
       } else {
+        ret[property].base = ret[property].base.add(base);
+        ret[property].adjustment = ret[property].adjustment.add(adjustment);
         ret[property].total = ret[property].total.add(total);
       }
     }
@@ -703,18 +742,19 @@ function CalculateTaxesTotals(job, otherTotals) {
   //Potential issue here with Sublet Calculation. Sublets are calculated under labor in Mitchell, but it's done in IO
   //Under the parts rates.
 
-  let statePartsTax = Dinero();
-  let additionalItemsTax = Dinero();
+  let stateTax = Dinero();
+  // let additionalItemsTax = Dinero(); //This is not used.
   let us_sales_tax_breakdown;
 
+  // This is not referenced in the code base.
   //Audatex sends additional glass part types. IO-774
-  const BackupGlassTax =
-    job.parts_tax_rates &&
-    (job.parts_tax_rates.PAGD ||
-      job.parts_tax_rates.PAGF ||
-      job.parts_tax_rates.PAGP ||
-      job.parts_tax_rates.PAGQ ||
-      job.parts_tax_rates.PAGR);
+  // const BackupGlassTax =
+  //   job.parts_tax_rates &&
+  //   (job.parts_tax_rates.PAGD ||
+  //     job.parts_tax_rates.PAGF ||
+  //     job.parts_tax_rates.PAGP ||
+  //     job.parts_tax_rates.PAGQ ||
+  //     job.parts_tax_rates.PAGR);
 
   const taxableAmounts = {
     PAA: Dinero(),
@@ -878,11 +918,27 @@ function CalculateTaxesTotals(job, otherTotals) {
       } else if (key.startsWith("LA")) {
         //Labor.
         for (let tyCounter = 1; tyCounter <= 5; tyCounter++) {
-          if (IsTrueOrYes(pfl[key][`lbr_tx_in${tyCounter}`])) {
-            //This amount is taxable for this type.
-            taxableAmountsByTier[`ty${tyCounter}Tax`] = taxableAmountsByTier[`ty${tyCounter}Tax`].add(
-              taxableAmounts[key]
-            );
+          if (key === "LA1" || key === "LA2" || key === "LA3" || key === "LA4") {
+            if (IsTrueOrYes(pfl["LAU"][`lbr_tx_in${tyCounter}`])) {
+              //This amount is taxable for this type.
+              taxableAmountsByTier[`ty${tyCounter}Tax`] = taxableAmountsByTier[`ty${tyCounter}Tax`].add(
+                taxableAmounts[key]
+              );
+            }
+          } else if (key === "LAA" && !pfl[key]) {
+            if (IsTrueOrYes(pfl["LAB"][`lbr_tx_in${tyCounter}`])) {
+              //This amount is taxable for this type.
+              taxableAmountsByTier[`ty${tyCounter}Tax`] = taxableAmountsByTier[`ty${tyCounter}Tax`].add(
+                taxableAmounts[key]
+              );
+            }
+          } else {
+            if (IsTrueOrYes(pfl[key][`lbr_tx_in${tyCounter}`])) {
+              //This amount is taxable for this type.
+              taxableAmountsByTier[`ty${tyCounter}Tax`] = taxableAmountsByTier[`ty${tyCounter}Tax`].add(
+                taxableAmounts[key]
+              );
+            }
           }
         }
       } else if (key === "TOW") {
@@ -919,7 +975,6 @@ function CalculateTaxesTotals(job, otherTotals) {
 
     Object.keys(taxableAmountsByTier).forEach((taxTierKey) => {
       taxable_adjustment = taxableAmountsByTier[taxTierKey].multiply(percent_of_adjustment);
-      console.log("🚀 ~ taxableAmountsByTier ~ taxable_adjustment:", taxable_adjustment);
       if (job.adjustment_bottom_line > 0) {
         taxableAmountsByTier[taxTierKey] = taxableAmountsByTier[taxTierKey].add(taxable_adjustment);
       } else {
@@ -937,8 +992,8 @@ function CalculateTaxesTotals(job, otherTotals) {
       let tyCounter = taxTierKey[2]; //Get the number from the key.
       //i represents the tax number. If we got here, this type of tax is applicable. Now we need to add based on the thresholds.
       for (let threshCounter = 1; threshCounter <= 5; threshCounter++) {
-        const thresholdAmount = parseFloat(job.cieca_pft[`ty${tyCounter}_thres${threshCounter}`]);
-        const thresholdTaxRate = parseFloat(job.cieca_pft[`ty${tyCounter}_rate${threshCounter}`]);
+        const thresholdAmount = parseFloat(job.cieca_pft[`ty${tyCounter}_thres${threshCounter}`]) || 0;
+        const thresholdTaxRate = parseFloat(job.cieca_pft[`ty${tyCounter}_rate${threshCounter}`]) || 0;
 
         let taxableAmountInThisThreshold;
         if (
@@ -946,7 +1001,7 @@ function CalculateTaxesTotals(job, otherTotals) {
           InstanceMgr({
             imex: false,
             rome: thresholdAmount === 0 && parseInt(tyCounter) === 1,
-            promanager: thresholdAmount === 0 && parseInt(tyCounter) === 1
+            promanager: "USE_ROME"
           })
         ) {
           //
@@ -980,10 +1035,10 @@ function CalculateTaxesTotals(job, otherTotals) {
     }
   });
 
-  // console.log("*** Total Tax by Tier Amounts***");
-  // console.table(JSON.parse(JSON.stringify(totalTaxByTier)));
+  console.log("*** Total Tax by Tier Amounts***");
+  console.table(JSON.parse(JSON.stringify(totalTaxByTier)));
 
-  statePartsTax = statePartsTax
+  stateTax = stateTax
     .add(totalTaxByTier.ty1Tax)
     .add(totalTaxByTier.ty2Tax)
     .add(totalTaxByTier.ty3Tax)
@@ -991,17 +1046,18 @@ function CalculateTaxesTotals(job, otherTotals) {
     .add(totalTaxByTier.ty5Tax)
     .add(totalTaxByTier.ty6Tax);
   us_sales_tax_breakdown = totalTaxByTier;
-  //console.log("Tiered Taxes Total for Parts/Labor", statePartsTax.toFormat());
+  //console.log("Tiered Taxes Total for Parts/Labor", stateTax.toFormat());
 
-  let laborTaxTotal = Dinero();
+  // This is not in use as such commented out.
+  // let laborTaxTotal = Dinero();
 
-  if (Object.keys(job.cieca_pfl).length > 0) {
-    //Ignore it now, we have calculated it above.
-    //This was previously used for JCS before parts were also calculated at a different rate.
-  } else {
-    //We don't have it, just add in how it was before.
-    laborTaxTotal = otherTotals.rates.subtotal.percentage((job.tax_lbr_rt || 0) * 100); // THis is currently using the lbr tax rate from PFH not PFL.
-  }
+  // if (Object.keys(job.cieca_pfl).length > 0) {
+  //   //Ignore it now, we have calculated it above.
+  //   //This was previously used for JCS before parts were also calculated at a different rate.
+  // } else {
+  //   //We don't have it, just add in how it was before.
+  //   laborTaxTotal = otherTotals.rates.subtotal.percentage((job.tax_lbr_rt || 0) * 100); // THis is currently using the lbr tax rate from PFH not PFL.
+  // }
 
   //console.log("Labor Tax Total", laborTaxTotal.toFormat());
 
@@ -1010,9 +1066,9 @@ function CalculateTaxesTotals(job, otherTotals) {
     federal_tax: subtotal
       .percentage((job.federal_tax_rate || 0) * 100)
       .add(otherTotals.additional.pvrt.percentage((job.federal_tax_rate || 0) * 100)),
-    statePartsTax,
+    stateTax,
     us_sales_tax_breakdown,
-    state_tax: statePartsTax,
+    state_tax: stateTax,
     local_tax: subtotal.percentage((job.local_tax_rate || 0) * 100)
   };
   ret.total_repairs = ret.subtotal