diff --git a/client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.component.jsx b/client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.component.jsx
index 17f626c0d..c2ae3d1a7 100644
--- a/client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.component.jsx
+++ b/client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.component.jsx
@@ -67,22 +67,25 @@ export function JobLinesUpsertModalComponent({ bodyshop, open, jobLine, handleCa
         </LayoutFormRow>
         <LayoutFormRow grow>
           <Form.Item label={t("joblines.fields.mod_lbr_ty")} name="mod_lbr_ty">
-            <Select allowClear options={[
-              { value: "LAA", label: t("joblines.fields.lbr_types.LAA") },
-              { value: "LAB", label: t("joblines.fields.lbr_types.LAB") },
-              { value: "LAD", label: t("joblines.fields.lbr_types.LAD") },
-              { value: "LAE", label: t("joblines.fields.lbr_types.LAE") },
-              { value: "LAF", label: t("joblines.fields.lbr_types.LAF") },
-              { value: "LAG", label: t("joblines.fields.lbr_types.LAG") },
-              { value: "LAM", label: t("joblines.fields.lbr_types.LAM") },
-              { value: "LAR", label: t("joblines.fields.lbr_types.LAR") },
-              { value: "LAS", label: t("joblines.fields.lbr_types.LAS") },
-              { value: "LAU", label: t("joblines.fields.lbr_types.LAU") },
-              { value: "LA1", label: t("joblines.fields.lbr_types.LA1") },
-              { value: "LA2", label: t("joblines.fields.lbr_types.LA2") },
-              { value: "LA3", label: t("joblines.fields.lbr_types.LA3") },
-              { value: "LA4", label: t("joblines.fields.lbr_types.LA4") }
-            ]} />
+            <Select
+              allowClear
+              options={[
+                { value: "LAA", label: t("joblines.fields.lbr_types.LAA") },
+                { value: "LAB", label: t("joblines.fields.lbr_types.LAB") },
+                { value: "LAD", label: t("joblines.fields.lbr_types.LAD") },
+                { value: "LAE", label: t("joblines.fields.lbr_types.LAE") },
+                { value: "LAF", label: t("joblines.fields.lbr_types.LAF") },
+                { value: "LAG", label: t("joblines.fields.lbr_types.LAG") },
+                { value: "LAM", label: t("joblines.fields.lbr_types.LAM") },
+                { value: "LAR", label: t("joblines.fields.lbr_types.LAR") },
+                { value: "LAS", label: t("joblines.fields.lbr_types.LAS") },
+                { value: "LAU", label: t("joblines.fields.lbr_types.LAU") },
+                { value: "LA1", label: t("joblines.fields.lbr_types.LA1") },
+                { value: "LA2", label: t("joblines.fields.lbr_types.LA2") },
+                { value: "LA3", label: t("joblines.fields.lbr_types.LA3") },
+                { value: "LA4", label: t("joblines.fields.lbr_types.LA4") }
+              ]}
+            />
           </Form.Item>
           <Form.Item label={t("joblines.fields.op_code_desc")} name="op_code_desc">
             <Input />
@@ -128,21 +131,27 @@ export function JobLinesUpsertModalComponent({ bodyshop, open, jobLine, handleCa
         </LayoutFormRow>
         <LayoutFormRow>
           <Form.Item label={t("joblines.fields.part_type")} name="part_type">
-            <Select allowClear options={[
-              { value: "PAA", label: t("joblines.fields.part_types.PAA") },
-              { value: "PAC", label: t("joblines.fields.part_types.PAC") },
-              { value: "PAE", label: t("joblines.fields.part_types.PAE") },
-              { value: "PAL", label: t("joblines.fields.part_types.PAL") },
-              { value: "PAM", label: t("joblines.fields.part_types.PAM") },
-              { value: "PAN", label: t("joblines.fields.part_types.PAN") },
-              { value: "PAO", label: t("joblines.fields.part_types.PAO") },
-              { value: "PAR", label: t("joblines.fields.part_types.PAR") },
-              { value: "PAS", label: t("joblines.fields.part_types.PAS") }
-            ]} />
+            <Select
+              allowClear
+              options={[
+                { value: "PAA", label: t("joblines.fields.part_types.PAA") },
+                { value: "PAC", label: t("joblines.fields.part_types.PAC") },
+                { value: "PAE", label: t("joblines.fields.part_types.PAE") },
+                { value: "PAL", label: t("joblines.fields.part_types.PAL") },
+                { value: "PAM", label: t("joblines.fields.part_types.PAM") },
+                { value: "PAN", label: t("joblines.fields.part_types.PAN") },
+                { value: "PAO", label: t("joblines.fields.part_types.PAO") },
+                { value: "PAR", label: t("joblines.fields.part_types.PAR") },
+                { value: "PAS", label: t("joblines.fields.part_types.PAS") }
+              ]}
+            />
           </Form.Item>
           <Form.Item label={t("joblines.fields.oem_partno")} name="oem_partno">
             <Input />
           </Form.Item>
+          <Form.Item label={t("joblines.fields.alt_partno")} name="alt_partno">
+            <Input />
+          </Form.Item>
           <Form.Item
             label={t("joblines.fields.part_qty")}
             name="part_qty"
diff --git a/server/job/job-totals-USA.js b/server/job/job-totals-USA.js
index 4c280cdf2..ff24dd04f 100644
--- a/server/job/job-totals-USA.js
+++ b/server/job/job-totals-USA.js
@@ -501,7 +501,7 @@ async function CalculateRatesTotals({ job, client }) {
                 ? 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) {
+            if (job.cieca_pfl["LAB"] && job.cieca_pfl["LAB"].lbr_adjp) {
               adjp =
                 Math.abs(job.cieca_pfl["LAB"].lbr_adjp) > 1
                   ? job.cieca_pfl["LAB"].lbr_adjp