Merged in release/2026-03-13 (pull request #3131)

Release/2026-03-13 into master-AIO - IO-3571, IO-3582, IO-3584, IO-3590, IO-3592, IO-3596, IO-3600, IO-3601, IO-3603, IO-3604, IO-3605, IO-3606, IO-3607, IO-3610

client/src/components/email-overlay/email-overlay.component.jsx

@@ -41,7 +41,7 @@ export function EmailOverlayComponent({ emailConfig, form, selectedMediaState, b
   const emailsToMenu = {
     items: [
       ...bodyshop.employees
-        .filter((e) => e.user_email)
+        .filter((e) => e.user_email && e.active === true)
         .map((e, idx) => ({
           key: idx,
           label: `${e.first_name} ${e.last_name}`,
@@ -59,7 +59,7 @@ export function EmailOverlayComponent({ emailConfig, form, selectedMediaState, b
   const menuCC = {
     items: [
       ...bodyshop.employees
-        .filter((e) => e.user_email)
+        .filter((e) => e.user_email && e.active === true)
         .map((e, idx) => ({
           key: idx,
           label: `${e.first_name} ${e.last_name}`,

client/src/components/job-detail-lines/job-lines.component.jsx

@@ -33,7 +33,7 @@ import JobLinesBillRefernece from "../job-lines-bill-reference/job-lines-bill-re
 import { useTreatmentsWithConfig } from "@splitsoftware/splitio-react";
 import _ from "lodash";
 import { FaTasks } from "react-icons/fa";
-import { selectBodyshop } from "../../redux/user/user.selectors";
+import { selectAuthLevel, selectBodyshop } from "../../redux/user/user.selectors";
 import dayjs from "../../utils/day";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
 import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
@@ -49,6 +49,7 @@ import JobLinesPartPriceChange from "./job-lines-part-price-change.component";
 import JobLinesExpanderSimple from "./jobs-lines-expander-simple.component";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+import { HasRbacAccess } from "../rbac-wrapper/rbac-wrapper.component.jsx";
 
 const UPDATE_JOB_LINES_LOCATION_BULK = gql`
   mutation UPDATE_JOB_LINES_LOCATION_BULK($ids: [uuid!]!, $location: String!) {
@@ -66,7 +67,8 @@ const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   jobRO: selectJobReadOnly,
   technician: selectTechnician,
-  isPartsEntry: selectIsPartsEntry
+  isPartsEntry: selectIsPartsEntry,
+  authLevel: selectAuthLevel
 });
 
 const mapDispatchToProps = (dispatch) => ({
@@ -94,7 +96,8 @@ export function JobLinesComponent({
   setTaskUpsertContext,
   billsQuery,
   handlePartsOrderOnRowClick,
-  isPartsEntry
+  isPartsEntry,
+  authLevel
 }) {
   const [deleteJobLine] = useMutation(DELETE_JOB_LINE_BY_PK);
   const [bulkUpdateLocations] = useMutation(UPDATE_JOB_LINES_LOCATION_BULK);
@@ -386,18 +389,20 @@ export function JobLinesComponent({
             key: "actions",
             render: (text, record) => (
               <Space>
-                {(record.manual_line || jobIsPrivate) && !technician && (
+                {(record.manual_line || jobIsPrivate) &&
-                  <Button
+                  !technician &&
-                    disabled={jobRO}
+                  HasRbacAccess({ bodyshop, authLevel, action: "jobs:manual-line" }) && (
-                    onClick={() => {
+                    <Button
-                      setJobLineEditContext({
+                      disabled={jobRO}
-                        actions: { refetch: refetch, submit: form && form.submit },
+                      onClick={() => {
-                        context: { ...record, jobid: job.id }
+                        setJobLineEditContext({
-                      });
+                          actions: { refetch: refetch, submit: form && form.submit },
-                    }}
+                          context: { ...record, jobid: job.id }
-                    icon={<EditFilled />}
+                        });
-                  />
+                      }}
-                )}
+                      icon={<EditFilled />}
+                    />
+                  )}
                 <Button
                   title={t("tasks.buttons.create")}
                   onClick={() => {
@@ -410,29 +415,30 @@ export function JobLinesComponent({
                   }}
                   icon={<FaTasks />}
                 />
-
+                {(record.manual_line || jobIsPrivate) &&
-                {(record.manual_line || jobIsPrivate) && !technician && (
+                  !technician &&
-                  <Button
+                  HasRbacAccess({ bodyshop, authLevel, action: "jobs:manual-line" }) && (
-                    disabled={jobRO}
+                    <Button
-                    onClick={async () => {
+                      disabled={jobRO}
-                      await deleteJobLine({
+                      onClick={async () => {
-                        variables: { joblineId: record.id },
+                        await deleteJobLine({
-                        update(cache) {
+                          variables: { joblineId: record.id },
-                          cache.modify({
+                          update(cache) {
-                            fields: {
+                            cache.modify({
-                              joblines(existingJobLines, { readField }) {
+                              fields: {
-                                return existingJobLines.filter((jlRef) => record.id !== readField("id", jlRef));
+                                joblines(existingJobLines, { readField }) {
+                                  return existingJobLines.filter((jlRef) => record.id !== readField("id", jlRef));
+                                }
                               }
-                            }
+                            });
-                          });
+                          }
-                        }
+                        });
-                      });
+                        await axios.post("/job/totalsssu", { id: job.id });
-                      await axios.post("/job/totalsssu", { id: job.id });
+                        if (refetch) refetch();
-                      if (refetch) refetch();
+                      }}
-                    }}
+                      icon={<DeleteFilled />}
-                    icon={<DeleteFilled />}
+                    />
-                  />
+                  )}
-                )}
               </Space>
             )
           }
@@ -657,7 +663,7 @@ export function JobLinesComponent({
               <Button id="repair-data-mark-button">{t("jobs.actions.mark")}</Button>
             </Dropdown>
 
-            {!isPartsEntry && (
+            {!isPartsEntry && HasRbacAccess({ bodyshop, authLevel, action: "jobs:manual-line" }) && (
               <Button
                 disabled={jobRO || technician}
                 onClick={() => {

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

@@ -144,18 +144,11 @@ export default function JobTotalsTableLabor({ job }) {
                 {t("jobs.labels.mapa")}
                 {InstanceRenderManager({
                   imex:
-                    job.materials?.mapa &&
+                    (job.materials?.mapa ?? job.materials?.MAPA)?.cal_maxdlr > 0 &&
-                    job.materials.mapa.cal_maxdlr &&
+                    t("jobs.labels.threshhold", { amount: (job.materials.mapa ?? job.materials.MAPA).cal_maxdlr }),
-                    job.materials.mapa.cal_maxdlr > 0 &&
-                    t("jobs.labels.threshhold", {
-                      amount: job.materials.mapa.cal_maxdlr
-                    }),
                   rome:
-                    job.materials?.MAPA &&
+                    job.materials?.MAPA?.cal_maxdlr !== undefined &&
-                    job.materials.MAPA.cal_maxdlr !== undefined &&
+                    t("jobs.labels.threshhold", { amount: job.materials.MAPA.cal_maxdlr })
-                    t("jobs.labels.threshhold", {
-                      amount: job.materials.MAPA.cal_maxdlr
-                    })
                 })}
               </Space>
             </ResponsiveTable.Summary.Cell>
@@ -190,18 +183,11 @@ export default function JobTotalsTableLabor({ job }) {
                 {t("jobs.labels.mash")}
                 {InstanceRenderManager({
                   imex:
-                    job.materials?.mash &&
+                    (job.materials?.mash ?? job.materials?.MASH)?.cal_maxdlr > 0 &&
-                    job.materials.mash.cal_maxdlr &&
+                    t("jobs.labels.threshhold", { amount: (job.materials.mash ?? job.materials.MASH).cal_maxdlr }),
-                    job.materials.mash.cal_maxdlr > 0 &&
-                    t("jobs.labels.threshhold", {
-                      amount: job.materials.mash.cal_maxdlr
-                    }),
                   rome:
-                    job.materials?.MASH &&
+                    job.materials?.MASH?.cal_maxdlr !== undefined &&
-                    job.materials.MASH.cal_maxdlr !== undefined &&
+                    t("jobs.labels.threshhold", { amount: job.materials.MASH.cal_maxdlr })
-                    t("jobs.labels.threshhold", {
-                      amount: job.materials.MASH.cal_maxdlr
-                    })
                 })}
               </Space>
             </ResponsiveTable.Summary.Cell>

client/src/components/jobs-admin-class/jobs-admin-class.component.jsx

@@ -69,7 +69,9 @@ export function JobsAdminClass({ bodyshop, job }) {
       </Form>
 
       <Popconfirm title={t("jobs.labels.changeclass")} onConfirm={() => form.submit()}>
-        <Button loading={loading}>{t("general.actions.save")}</Button>
+        <Button loading={loading} type="primary">
+          {t("general.actions.save")}
+        </Button>
       </Popconfirm>
     </div>
   );

client/src/components/jobs-admin-dates/jobs-admin-dates.component.jsx

@@ -157,7 +157,7 @@ export function JobsAdminDatesChange({ insertAuditTrail, job }) {
         </LayoutFormRow>
       </Form>
 
-      <Button loading={loading} onClick={() => form.submit()}>
+      <Button loading={loading} type="primary" onClick={() => form.submit()}>
         {t("general.actions.save")}
       </Button>
     </div>

client/src/components/jobs-admin-owner-reassociate/jobs-admin-owner-reassociate.component.jsx

@@ -54,7 +54,7 @@ export default function JobAdminOwnerReassociate({ job }) {
         </Form.Item>
       </Form>
       <div>{t("jobs.labels.associationwarning")}</div>
-      <Button loading={loading} onClick={() => form.submit()}>
+      <Button loading={loading} type="primary" onClick={() => form.submit()}>
         {t("general.actions.save")}
       </Button>
     </div>

client/src/components/jobs-admin-vehicle-reassociate/jobs-admin-vehicle-reassociate.component.jsx

@@ -54,7 +54,7 @@ export default function JobAdminOwnerReassociate({ job }) {
         </Form.Item>
       </Form>
       <div>{t("jobs.labels.associationwarning")}</div>
-      <Button loading={loading} onClick={() => form.submit()}>
+      <Button loading={loading} type="primary" onClick={() => form.submit()}>
         {t("general.actions.save")}
       </Button>
     </div>

client/src/components/jobs-close-lines/jobs-close-lines.component.jsx

@@ -138,7 +138,7 @@ export function JobsCloseLines({ bodyshop, job, jobRO }) {
                           showSearch={{
                             optionFilterProp: "children",
                             filterOption: (input, option) =>
-                              option.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+                              option?.value?.toLowerCase().indexOf(input?.toLowerCase()) >= 0
                           }}
                           disabled={jobRO}
                           options={bodyshop.md_responsibility_centers.profits.map((p) => ({
@@ -166,7 +166,7 @@ export function JobsCloseLines({ bodyshop, job, jobRO }) {
                           showSearch={{
                             optionFilterProp: "children",
                             filterOption: (input, option) =>
-                              option.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+                              option?.value?.toLowerCase().indexOf(input?.toLowerCase()) >= 0
                           }}
                           disabled={jobRO}
                           options={bodyshop.md_responsibility_centers.profits.map((p) => ({

client/src/components/parts-order-list-table/parts-order-list-table.component.jsx

@@ -70,6 +70,12 @@ export function PartsOrderListTableComponent({
   const [deletePartsOrder] = useMutation(DELETE_PARTS_ORDER);
 
   const parts_orders = billsQuery.data ? billsQuery.data.parts_orders : [];
+
+  const enrichedPartsOrders = parts_orders.map((order) => ({
+    ...order,
+    invoice_number: order.bill?.invoice_number
+  }));
+
   const { refetch } = billsQuery;
 
   const recordActions = (record, showView = false) => (
@@ -222,7 +228,12 @@ export function PartsOrderListTableComponent({
       dataIndex: "order_number",
       key: "order_number",
       sorter: (a, b) => alphaSort(a.invoice_number, b.invoice_number),
-      sortOrder: state.sortedInfo.columnKey === "invoice_number" && state.sortedInfo.order
+      sortOrder: state.sortedInfo.columnKey === "invoice_number" && state.sortedInfo.order,
+      render: (text, record) => (
+        <span>
+          {record.order_number} {record.invoice_number && `(${record.invoice_number})`}
+        </span>
+      )
     },
     {
       title: t("parts_orders.fields.order_date"),
@@ -272,10 +283,10 @@ export function PartsOrderListTableComponent({
     setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
   };
 
-  const filteredPartsOrders = parts_orders
+  const filteredPartsOrders = enrichedPartsOrders
     ? searchText === ""
-      ? parts_orders
+      ? enrichedPartsOrders
-      : parts_orders.filter(
+      : enrichedPartsOrders.filter(
           (b) =>
             (b.order_number || "").toString().toLowerCase().includes(searchText.toLowerCase()) ||
             (b.vendor.name || "").toLowerCase().includes(searchText.toLowerCase())

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

@@ -1,7 +1,7 @@
 import Icon from "@ant-design/icons";
 import { useMutation } from "@apollo/client/react";
 import { Button, Input, Popover, Tooltip } from "antd";
-import { useState } from "react";
+import { useState, useRef } from "react";
 import { useTranslation } from "react-i18next";
 import { FaRegStickyNote } from "react-icons/fa";
 import { UPDATE_JOB } from "../../graphql/jobs.queries";
@@ -9,10 +9,10 @@ import { logImEXEvent } from "../../firebase/firebase.utils";
 
 export default function ProductionListColumnComment({ record, usePortal = false }) {
   const { t } = useTranslation();
-
   const [note, setNote] = useState(record.comment || "");
-
   const [open, setOpen] = useState(false);
+  const textAreaRef = useRef(null);
+  const rafIdRef = useRef(null);
 
   const [updateAlert] = useMutation(UPDATE_JOB);
 
@@ -38,23 +38,35 @@ export default function ProductionListColumnComment({ record, usePortal = false
   };
 
   const handleOpenChange = (flag) => {
+    if (rafIdRef.current) {
+      cancelAnimationFrame(rafIdRef.current);
+      rafIdRef.current = null;
+    }
     setOpen(flag);
-    if (flag) setNote(record.comment || "");
+    if (flag) {
+      setNote(record.comment || "");
+      rafIdRef.current = requestAnimationFrame(() => {
+        rafIdRef.current = null;
+        if (textAreaRef.current?.focus) {
+          try {
+            textAreaRef.current.focus({ preventScroll: true });
+          } catch {
+            textAreaRef.current.focus();
+          }
+        }
+      });
+    }
   };
 
   const content = (
-    <div 
+    <div style={{ width: "30em" }} onClick={(e) => e.stopPropagation()} onPointerDown={(e) => e.stopPropagation()}>
-      style={{ width: "30em" }} 
-      onClick={(e) => e.stopPropagation()}
-      onPointerDown={(e) => e.stopPropagation()}
-    >
       <Input.TextArea
         id={`job-comment-${record.id}`}
         name="comment"
         rows={5}
         value={note}
         onChange={handleChange}
-        autoFocus
+        ref={textAreaRef}
         allowClear
         style={{ marginBottom: "1em" }}
       />
@@ -67,13 +79,13 @@ export default function ProductionListColumnComment({ record, usePortal = false
   );
 
   return (
-    <Popover 
+    <Popover
-      onOpenChange={handleOpenChange} 
+      onOpenChange={handleOpenChange}
-      open={open} 
+      open={open}
-      content={content} 
+      content={content}
-      trigger="click" 
+      trigger="click"
       destroyOnHidden
-      styles={{ body: { padding: '12px' } }}
+      styles={{ body: { padding: "12px" } }}
       {...(usePortal ? { getPopupContainer: (trigger) => trigger.parentElement || document.body } : {})}
     >
       <div

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

@@ -1,7 +1,7 @@
 import Icon from "@ant-design/icons";
 import { useMutation } from "@apollo/client/react";
 import { Button, Input, Popover, Space } from "antd";
-import { useCallback, useState } from "react";
+import { useCallback, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { FaRegStickyNote } from "react-icons/fa";
 import { logImEXEvent } from "../../firebase/firebase.utils";
@@ -20,6 +20,8 @@ function ProductionListColumnProductionNote({ record, setNoteUpsertContext, useP
   const { t } = useTranslation();
   const [note, setNote] = useState(record.production_vars?.note || "");
   const [open, setOpen] = useState(false);
+  const textAreaRef = useRef(null);
+  const rafIdRef = useRef(null);
 
   const [updateAlert] = useMutation(UPDATE_JOB);
 
@@ -52,25 +54,37 @@ function ProductionListColumnProductionNote({ record, setNoteUpsertContext, useP
 
   const handleOpenChange = useCallback(
     (flag) => {
+      if (rafIdRef.current) {
+        cancelAnimationFrame(rafIdRef.current);
+        rafIdRef.current = null;
+      }
       setOpen(flag);
-      if (flag) setNote(record.production_vars?.note || "");
+      if (flag) {
+        setNote(record.production_vars?.note || "");
+        rafIdRef.current = requestAnimationFrame(() => {
+          rafIdRef.current = null;
+          if (textAreaRef.current?.focus) {
+            try {
+              textAreaRef.current.focus({ preventScroll: true });
+            } catch {
+              textAreaRef.current.focus();
+            }
+          }
+        });
+      }
     },
     [record]
   );
 
   const content = (
-    <div 
+    <div style={{ width: "30em" }} onClick={(e) => e.stopPropagation()} onPointerDown={(e) => e.stopPropagation()}>
-      style={{ width: "30em" }} 
-      onClick={(e) => e.stopPropagation()}
-      onPointerDown={(e) => e.stopPropagation()}
-    >
       <Input.TextArea
         id={`job-production-note-${record.id}`}
         name="production_note"
         rows={5}
         value={note}
         onChange={handleChange}
-        autoFocus
+        ref={textAreaRef}
         allowClear
         style={{ marginBottom: "1em" }}
       />
@@ -96,13 +110,13 @@ function ProductionListColumnProductionNote({ record, setNoteUpsertContext, useP
   );
 
   return (
-    <Popover 
+    <Popover
-      onOpenChange={handleOpenChange} 
+      onOpenChange={handleOpenChange}
-      open={open} 
+      open={open}
-      content={content} 
+      content={content}
-      trigger="click" 
+      trigger="click"
       destroyOnHidden
-      styles={{ body: { padding: '12px' } }}
+      styles={{ body: { padding: "12px" } }}
       {...(usePortal ? { getPopupContainer: (trigger) => trigger.parentElement || document.body } : {})}
     >
       <div

client/src/components/rbac-wrapper/rbac-defaults.js

@@ -26,6 +26,7 @@ const ret = {
   "jobs:partsqueue": 4,
   "jobs:checklist-view": 2,
   "jobs:list-ready": 1,
+  "jobs:manual-line": 1,
   "jobs:void": 5,
 
   "bills:enter": 2,

client/src/components/shop-info/shop-info.rbac.component.jsx

@@ -435,6 +435,19 @@ export function ShopInfoRbacComponent({ bodyshop }) {
           >
             <InputNumber />
           </Form.Item>,
+          <Form.Item
+            key="jobs:manual-line"
+            label={t("bodyshop.fields.rbac.jobs.manual-line")}
+            rules={[
+              {
+                required: true
+                //message: t("general.validation.required"),
+              }
+            ]}
+            name={["md_rbac", "jobs:manual-line"]}
+          >
+            <InputNumber />
+          </Form.Item>,
           <Form.Item
             key="jobs:partsqueue"
             label={t("bodyshop.fields.rbac.jobs.partsqueue")}

client/src/components/tech-job-clock-in-form/tech-job-clock-in-form.container.jsx

@@ -66,10 +66,9 @@ export function TechClockInContainer({ setTimeTicketContext, technician, bodysho
             employeeid: technician.id,
             date:
               typeof bodyshop.timezone === "string"
-                ? // TODO: Client Update - This may be broken
+                ? dayjs(theTime).tz(bodyshop.timezone).format("YYYY-MM-DD")
-                  dayjs.tz(theTime, bodyshop.timezone).format("YYYY-MM-DD")
                 : typeof bodyshop.timezone === "number"
-                  ? dayjs(theTime).format("YYYY-MM-DD").utcOffset(bodyshop.timezone)
+                  ? dayjs(theTime).utcOffset(bodyshop.timezone).format("YYYY-MM-DD")
                   : dayjs(theTime).format("YYYY-MM-DD"),
             clockon: dayjs(theTime),
             jobid: values.jobid,

client/src/components/tech-lookup-jobs-drawer/tech-lookup-jobs-drawer.component.jsx

@@ -25,10 +25,7 @@ const mapDispatchToProps = (dispatch) => ({
 });
 
 export function TechLookupJobsDrawer({ bodyshop, setPrintCenterContext }) {
-  const breakpoints = Grid.useBreakpoint();
+  const screens = Grid.useBreakpoint();
-  const selectedBreakpoint = Object.entries(breakpoints)
-    .filter(([, isOn]) => !!isOn)
-    .slice(-1)[0];
 
   const bpoints = {
     xs: "100%",
@@ -36,10 +33,16 @@ export function TechLookupJobsDrawer({ bodyshop, setPrintCenterContext }) {
     md: "100%",
     lg: "100%",
     xl: "90%",
-    xxl: "85%"
+    xxl: "90%"
   };
 
-  const drawerPercentage = selectedBreakpoint ? bpoints[selectedBreakpoint[0]] : "100%";
+  let drawerPercentage = "100%";
+  if (screens.xxl) drawerPercentage = bpoints.xxl;
+  else if (screens.xl) drawerPercentage = bpoints.xl;
+  else if (screens.lg) drawerPercentage = bpoints.lg;
+  else if (screens.md) drawerPercentage = bpoints.md;
+  else if (screens.sm) drawerPercentage = bpoints.sm;
+  else if (screens.xs) drawerPercentage = bpoints.xs;
 
   const location = useLocation();
   const history = useNavigate();

client/src/graphql/bills.queries.js

@@ -91,6 +91,10 @@ export const QUERY_PARTS_BILLS_BY_JOBID = gql`
       order_number
       comments
       user_email
+      bill {
+        id
+        invoice_number
+      }
     }
     parts_dispatch(where: { jobid: { _eq: $jobid } }) {
       id

client/src/graphql/jobs.queries.js

@@ -1375,6 +1375,9 @@ export const QUERY_JOB_FOR_DUPE = gql`
       agt_ph2x
       area_of_damage
       cat_no
+      cieca_pfl
+      cieca_pfo
+      cieca_pft
       cieca_stl
       cieca_ttl
       clm_addr1
@@ -1452,6 +1455,7 @@ export const QUERY_JOB_FOR_DUPE = gql`
       labor_rate_desc
       labor_rate_id
       local_tax_rate
+      materials
       other_amount_payable
       owner_owing
       ownerid

client/src/pages/export-logs/export-logs.page.component.jsx

@@ -142,13 +142,13 @@ export function ExportLogsPageComponent() {
             <div>
               <ul>
                 {message.map((m, idx) => (
-                  <li key={idx}>{m}</li>
+                  <li key={idx}>{typeof m === "object" ? JSON.stringify(m) : m}</li>
                 ))}
               </ul>
             </div>
           );
         } else {
-          return <div>{record.message}</div>;
+          return <div>{typeof message === "object" ? JSON.stringify(message) : message}</div>;
         }
       }
     }

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

@@ -10,14 +10,12 @@ import JobsCreateOwnerInfoContainer from "../../components/jobs-create-owner-inf
 import JobsCreateVehicleInfoContainer from "../../components/jobs-create-vehicle-info/jobs-create-vehicle-info.container";
 import JobCreateContext from "../../pages/jobs-create/jobs-create.context";
 
-export default function JobsCreateComponent({ form }) {
+export default function JobsCreateComponent({ form, isSubmitting }) {
   const [pageIndex, setPageIndex] = useState(0);
-
   const [errorMessage, setErrorMessage] = useState(null);
-
   const [state] = useContext(JobCreateContext);
-
   const { t } = useTranslation();
+
   const steps = [
     {
       title: t("jobs.labels.create.vehicleinfo"),
@@ -42,11 +40,9 @@ export default function JobsCreateComponent({ form }) {
 
   const next = () => {
     setPageIndex(pageIndex + 1);
-    console.log("Next");
   };
   const prev = () => {
     setPageIndex(pageIndex - 1);
-    console.log("Previous");
   };
 
   const ProgressButtons = ({ top }) => {
@@ -79,17 +75,19 @@ export default function JobsCreateComponent({ form }) {
             {pageIndex === steps.length - 1 && (
               <Button
                 type="primary"
+                loading={isSubmitting}
                 onClick={() => {
                   form
                     .validateFields()
                     .then(() => {
-                      // NO OP
+                      form.submit();
                     })
-                    .catch((error) => console.log("error", error));
+                    .catch((error) => {
-                  form.submit();
+                      console.log("error", error);
+                    });
                 }}
               >
-                Done
+                {t("general.actions.done")}
               </Button>
             )}
           </Space>
@@ -146,13 +144,11 @@ export default function JobsCreateComponent({ form }) {
       ) : (
         <div>
           <ProgressButtons top />
-
           {errorMessage ? (
             <div>
               <AlertComponent title={errorMessage} type="error" />
             </div>
           ) : null}
-
           {steps.map((item, idx) => (
             <div
               key={idx}

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

@@ -46,6 +46,7 @@ function JobsCreateContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, curr
   });
   const [form] = Form.useForm();
   const [state, setState] = contextState;
+  const [isSubmitting, setIsSubmitting] = useState(false);
   const [insertJob] = useMutation(INSERT_NEW_JOB);
   const [loadOwner, remoteOwnerData] = useLazyQuery(QUERY_OWNER_FOR_JOB_CREATION);
 
@@ -83,16 +84,19 @@ function JobsCreateContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, curr
           newJobId: resp.data.insert_jobs.returning[0].id
         });
         logImEXEvent("manual_job_create_completed", {});
+        setIsSubmitting(false);
       })
       .catch((error) => {
         notification.error({
           title: t("jobs.errors.creating", { error: error })
         });
         setState({ ...state, error: error });
+        setIsSubmitting(false);
       });
   };
 
   const handleFinish = (values) => {
+    setIsSubmitting(true);
     let job = Object.assign(
       {},
       values,
@@ -297,7 +301,7 @@ function JobsCreateContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, curr
             })
           }}
         >
-          <JobsCreateComponent form={form} />
+          <JobsCreateComponent form={form} isSubmitting={isSubmitting} />
         </Form>
       </RbacWrapper>
     </JobCreateContext.Provider>

client/src/translations/en_us/common.json

@@ -519,6 +519,7 @@
             "list-active": "Jobs -> List Active",
             "list-all": "Jobs -> List All",
             "list-ready": "Jobs -> List Ready",
+            "manual-line": "Jobs -> Manual Line",
             "partsqueue": "Jobs -> Parts Queue",
             "void": "Jobs -> Void"
           },
@@ -1295,6 +1296,7 @@
         "delete": "Delete",
         "deleteall": "Delete All",
         "deselectall": "Deselect All",
+        "done": "Done",
         "download": "Download",
         "edit": "Edit",
         "gotoadmin": "Go to Admin Panel",
@@ -3372,8 +3374,10 @@
         "void_ros": "Void ROs",
         "work_in_progress_committed_labour": "Work in Progress - Committed Labor",
         "work_in_progress_jobs": "Work in Progress - Jobs",
-        "work_in_progress_labour": "Work in Progress - Labor",
+        "work_in_progress_labour": "Work in Progress - Labor (Detail)",
-        "work_in_progress_payables": "Work in Progress - Payables"
+        "work_in_progress_labour_summary": "Work in Progress - Labor (Summary)",
+        "work_in_progress_payables": "Work in Progress - Payables (Detail)",
+        "work_in_progress_payables_summary": "Work in Progress - Payables (Summary)"
       }
     },
     "schedule": {

client/src/translations/es/common.json

@@ -519,6 +519,7 @@
             "list-active": "",
             "list-all": "",
             "list-ready": "",
+            "manual-line": "",
             "partsqueue": "",
             "void": ""
           },
@@ -1295,6 +1296,7 @@
         "delete": "Borrar",
         "deleteall": "",
         "deselectall": "",
+        "done": "",
         "download": "",
         "edit": "Editar",
         "gotoadmin": "",
@@ -3373,7 +3375,9 @@
         "work_in_progress_committed_labour": "",
         "work_in_progress_jobs": "",
         "work_in_progress_labour": "",
-        "work_in_progress_payables": ""
+        "work_in_progress_labour_summary": "",
+        "work_in_progress_payables": "",
+        "work_in_progress_payables_summary": ""
       }
     },
     "schedule": {

client/src/translations/fr/common.json

@@ -519,6 +519,7 @@
             "list-active": "",
             "list-all": "",
             "list-ready": "",
+            "manual-line": "",
             "partsqueue": "",
             "void": ""
           },
@@ -1295,6 +1296,7 @@
         "delete": "Effacer",
         "deleteall": "",
         "deselectall": "",
+        "done": "",
         "download": "",
         "edit": "modifier",
         "gotoadmin": "",
@@ -3373,7 +3375,9 @@
         "work_in_progress_committed_labour": "",
         "work_in_progress_jobs": "",
         "work_in_progress_labour": "",
-        "work_in_progress_payables": ""
+        "work_in_progress_labour_summary": "",
+        "work_in_progress_payables": "",
+        "work_in_progress_payables_summary": ""
       }
     },
     "schedule": {

client/src/utils/TemplateConstants.js

@@ -1717,6 +1717,20 @@ export const TemplateList = (type, context) => {
             group: "jobs",
             featureNameRestricted: "timetickets"
           },
+          work_in_progress_labour_summary: {
+            title: i18n.t("reportcenter.templates.work_in_progress_labour_summary"),
+            description: "",
+            subject: i18n.t("reportcenter.templates.work_in_progress_labour_summary"),
+            key: "work_in_progress_labour_summary",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_open")
+            },
+            group: "jobs",
+            featureNameRestricted: "timetickets"
+          },
           work_in_progress_committed_labour: {
             title: i18n.t("reportcenter.templates.work_in_progress_committed_labour"),
             description: "",
@@ -1746,6 +1760,20 @@ export const TemplateList = (type, context) => {
             group: "jobs",
             featureNameRestricted: "bills"
           },
+          work_in_progress_payables_summary: {
+            title: i18n.t("reportcenter.templates.work_in_progress_payables_summary"),
+            description: "",
+            subject: i18n.t("reportcenter.templates.work_in_progress_payables_summary"),
+            key: "work_in_progress_payables_summary",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_open")
+            },
+            group: "jobs",
+            featureNameRestricted: "bills"
+          },
           lag_time: {
             title: i18n.t("reportcenter.templates.lag_time"),
             description: "",

server/accounting/qbo/qbo-payables.js

@@ -130,12 +130,13 @@ exports.default = async (req, res) => {
 
 async function QueryVendorRecord(oauthClient, qbo_realmId, req, bill) {
   try {
+    const url = urlBuilder(
+      qbo_realmId,
+      "query",
+      `select * From vendor where DisplayName = '${StandardizeName(bill.vendor.name)}'`
+    );
     const result = await oauthClient.makeApiCall({
-      url: urlBuilder(
+      url: url,
-        qbo_realmId,
-        "query",
-        `select * From vendor where DisplayName = '${StandardizeName(bill.vendor.name)}'`
-      ),
       method: "POST",
       headers: {
         "Content-Type": "application/json"
@@ -150,6 +151,11 @@ async function QueryVendorRecord(oauthClient, qbo_realmId, req, bill) {
       bodyshopid: bill.job.shopid,
       email: req.user.email
     });
+    logger.log("qbo-payables-query", "DEBUG", req.user.email, null, {
+      method: "QueryVendorRecord",
+      call: url,
+      result: result.json
+    });
 
     return result.json?.QueryResponse?.Vendor?.[0];
   } catch (error) {
@@ -167,8 +173,9 @@ async function InsertVendorRecord(oauthClient, qbo_realmId, req, bill) {
     DisplayName: StandardizeName(bill.vendor.name)
   };
   try {
+    const url = urlBuilder(qbo_realmId, "vendor");
     const result = await oauthClient.makeApiCall({
-      url: urlBuilder(qbo_realmId, "vendor"),
+      url: url,
       method: "POST",
       headers: {
         "Content-Type": "application/json"
@@ -184,6 +191,12 @@ async function InsertVendorRecord(oauthClient, qbo_realmId, req, bill) {
       bodyshopid: bill.job.shopid,
       email: req.user.email
     });
+    logger.log("qbo-payments-insert", "DEBUG", req.user.email, null, {
+      method: "InsertVendorRecord",
+      call: url,
+      Vendor: Vendor,
+      result: result.json
+    });
 
     if (result.status >= 400) {
       throw new Error(JSON.stringify(result.json.Fault));
@@ -274,11 +287,12 @@ async function InsertBill(oauthClient, qbo_realmId, req, bill, vendor, bodyshop)
     VendorRef: {
       value: vendor.Id
     },
-    ...(vendor.TermRef && !bill.is_credit_memo && {
+    ...(vendor.TermRef &&
-      SalesTermRef: {
+      !bill.is_credit_memo && {
-        value: vendor.TermRef.value
+        SalesTermRef: {
-      }
+          value: vendor.TermRef.value
-    }),
+        }
+      }),
     TxnDate: moment(bill.date)
       //.tz(bill.job.bodyshop.timezone)
       .format("YYYY-MM-DD"),
@@ -318,8 +332,9 @@ async function InsertBill(oauthClient, qbo_realmId, req, bill, vendor, bodyshop)
     [logKey]: logValue
   });
   try {
+    const url = urlBuilder(qbo_realmId, bill.is_credit_memo ? "vendorcredit" : "bill");
     const result = await oauthClient.makeApiCall({
-      url: urlBuilder(qbo_realmId, bill.is_credit_memo ? "vendorcredit" : "bill"),
+      url: url,
       method: "POST",
       headers: {
         "Content-Type": "application/json"
@@ -335,6 +350,12 @@ async function InsertBill(oauthClient, qbo_realmId, req, bill, vendor, bodyshop)
       bodyshopid: bill.job.shopid,
       email: req.user.email
     });
+    logger.log("qbo-payables-insert", "DEBUG", req.user.email, null, {
+      method: "InsertBill",
+      call: url,
+      postingObj: bill.is_credit_memo ? VendorCredit : billQbo,
+      result: result.json
+    });
 
     if (result.status >= 400) {
       throw new Error(JSON.stringify(result.json.Fault));

server/accounting/qbo/qbo-payments.js

@@ -82,14 +82,7 @@ exports.default = async (req, res) => {
 
         if (isThreeTier || (!isThreeTier && twoTierPref === "name")) {
           //Insert the name/owner and account for whether the source should be the ins co in 3 tier..
-          ownerCustomerTier = await QueryOwner(
+          ownerCustomerTier = await QueryOwner(oauthClient, qbo_realmId, req, payment.job, insCoCustomerTier);
-            oauthClient,
-            qbo_realmId,
-            req,
-            payment.job,
-            isThreeTier,
-            insCoCustomerTier
-          );
           //Query for the owner itself.
           if (!ownerCustomerTier) {
             ownerCustomerTier = await InsertOwner(
@@ -229,8 +222,9 @@ async function InsertPayment(oauthClient, qbo_realmId, req, payment, parentRef)
     paymentQbo
   });
   try {
+    const url = urlBuilder(qbo_realmId, "payment");
     const result = await oauthClient.makeApiCall({
-      url: urlBuilder(qbo_realmId, "payment"),
+      url: url,
       method: "POST",
       headers: {
         "Content-Type": "application/json"
@@ -246,6 +240,12 @@ async function InsertPayment(oauthClient, qbo_realmId, req, payment, parentRef)
       bodyshopid: payment.job.shopid,
       email: req.user.email
     });
+    logger.log("qbo-payments-insert", "DEBUG", req.user.email, null, {
+      method: "InsertPayment",
+      call: url,
+      paymentQbo: paymentQbo,
+      result: result.json
+    });
 
     if (result.status >= 400) {
       throw new Error(JSON.stringify(result.json.Fault));
@@ -428,8 +428,9 @@ async function InsertCreditMemo(oauthClient, qbo_realmId, req, payment, parentRe
     paymentQbo
   });
   try {
+    const url = urlBuilder(qbo_realmId, "creditmemo");
     const result = await oauthClient.makeApiCall({
-      url: urlBuilder(qbo_realmId, "creditmemo"),
+      url: url,
       method: "POST",
       headers: {
         "Content-Type": "application/json"
@@ -445,6 +446,12 @@ async function InsertCreditMemo(oauthClient, qbo_realmId, req, payment, parentRe
       bodyshopid: req.user.bodyshopid,
       email: req.user.email
     });
+    logger.log("qbo-metadata-query", "DEBUG", req.user.email, null, {
+      method: "InsertCreditMemo",
+      call: url,
+      paymentQbo: paymentQbo,
+      result: result.json
+    });
 
     if (result.status >= 400) {
       throw new Error(JSON.stringify(result.json.Fault));

server/accounting/qbo/qbo-receivables.js

@@ -213,12 +213,13 @@ exports.default = async (req, res) => {
 
 async function QueryInsuranceCo(oauthClient, qbo_realmId, req, job) {
   try {
+    const url = urlBuilder(
+      qbo_realmId,
+      "query",
+      `select * From Customer where DisplayName = '${StandardizeName(job.ins_co_nm.trim())}' and Active = true`
+    );
     const result = await oauthClient.makeApiCall({
-      url: urlBuilder(
+      url: url,
-        qbo_realmId,
-        "query",
-        `select * From Customer where DisplayName = '${StandardizeName(job.ins_co_nm.trim())}' and Active = true`
-      ),
       method: "POST",
       headers: {
         "Content-Type": "application/json"
@@ -233,6 +234,11 @@ async function QueryInsuranceCo(oauthClient, qbo_realmId, req, job) {
       jobid: job.id,
       email: req.user.email
     });
+    logger.log("qbo-receivables-query", "DEBUG", req.user.email, job.id, {
+      method: "QueryInsuranceCo",
+      call: url,
+      result: result.json
+    });
 
     return result.json?.QueryResponse?.Customer?.[0];
   } catch (error) {
@@ -266,8 +272,9 @@ async function InsertInsuranceCo(oauthClient, qbo_realmId, req, job, bodyshop) {
     }
   };
   try {
+    const url = urlBuilder(qbo_realmId, "customer");
     const result = await oauthClient.makeApiCall({
-      url: urlBuilder(qbo_realmId, "customer"),
+      url: url,
       method: "POST",
       headers: {
         "Content-Type": "application/json"
@@ -283,6 +290,12 @@ async function InsertInsuranceCo(oauthClient, qbo_realmId, req, job, bodyshop) {
       jobid: job.id,
       email: req.user.email
     });
+    logger.log("qbo-receivables-insert", "DEBUG", req.user.email, job.id, {
+      method: "InsertInsuranceCo",
+      call: url,
+      customerObj: Customer,
+      result: result.json
+    });
 
     return result.json?.Customer;
   } catch (error) {
@@ -298,12 +311,13 @@ exports.InsertInsuranceCo = InsertInsuranceCo;
 
 async function QueryOwner(oauthClient, qbo_realmId, req, job, parentTierRef) {
   const ownerName = generateOwnerTier(job, true, null);
+  const url = urlBuilder(
+    qbo_realmId,
+    "query",
+    `select * From Customer where DisplayName = '${StandardizeName(ownerName)}' and Active = true`
+  );
   const result = await oauthClient.makeApiCall({
-    url: urlBuilder(
+    url: url,
-      qbo_realmId,
-      "query",
-      `select * From Customer where DisplayName = '${StandardizeName(ownerName)}' and Active = true`
-    ),
     method: "POST",
     headers: {
       "Content-Type": "application/json"
@@ -318,6 +332,11 @@ async function QueryOwner(oauthClient, qbo_realmId, req, job, parentTierRef) {
     jobid: job.id,
     email: req.user.email
   });
+  logger.log("qbo-receivables-query", "DEBUG", req.user.email, job.id, {
+    method: "QueryOwner",
+    call: url,
+    result: result.json
+  });
 
   return result.json?.QueryResponse?.Customer?.find((x) => x.ParentRef?.value === parentTierRef?.Id);
 }
@@ -347,8 +366,9 @@ async function InsertOwner(oauthClient, qbo_realmId, req, job, isThreeTier, pare
       : {})
   };
   try {
+    const url = urlBuilder(qbo_realmId, "customer");
     const result = await oauthClient.makeApiCall({
-      url: urlBuilder(qbo_realmId, "customer"),
+      url: url,
       method: "POST",
       headers: {
         "Content-Type": "application/json"
@@ -364,6 +384,12 @@ async function InsertOwner(oauthClient, qbo_realmId, req, job, isThreeTier, pare
       jobid: job.id,
       email: req.user.email
     });
+    logger.log("qbo-receivables-insert", "DEBUG", req.user.email, job.id, {
+      method: "InsertOwner",
+      call: url,
+      customerObj: Customer,
+      result: result.json
+    });
 
     return result.json?.Customer;
   } catch (error) {
@@ -378,12 +404,13 @@ async function InsertOwner(oauthClient, qbo_realmId, req, job, isThreeTier, pare
 exports.InsertOwner = InsertOwner;
 
 async function QueryJob(oauthClient, qbo_realmId, req, job, parentTierRef) {
+  const url = urlBuilder(
+    qbo_realmId,
+    "query",
+    `select * From Customer where DisplayName = '${job.ro_number}' and Active = true`
+  );
   const result = await oauthClient.makeApiCall({
-    url: urlBuilder(
+    url: url,
-      qbo_realmId,
-      "query",
-      `select * From Customer where DisplayName = '${job.ro_number}' and Active = true`
-    ),
     method: "POST",
     headers: {
       "Content-Type": "application/json"
@@ -398,6 +425,11 @@ async function QueryJob(oauthClient, qbo_realmId, req, job, parentTierRef) {
     jobid: job.id,
     email: req.user.email
   });
+  logger.log("qbo-receivables-query", "DEBUG", req.user.email, job.id, {
+    method: "QueryJob",
+    call: url,
+    result: result.json
+  });
 
   const customers = result.json?.QueryResponse?.Customer;
   return customers && (parentTierRef ? customers.find((x) => x.ParentRef.value === parentTierRef.Id) : customers[0]);
@@ -423,8 +455,9 @@ async function InsertJob(oauthClient, qbo_realmId, req, job, parentTierRef) {
     }
   };
   try {
+    const url = urlBuilder(qbo_realmId, "customer");
     const result = await oauthClient.makeApiCall({
-      url: urlBuilder(qbo_realmId, "customer"),
+      url: url,
       method: "POST",
       headers: {
         "Content-Type": "application/json"
@@ -440,6 +473,12 @@ async function InsertJob(oauthClient, qbo_realmId, req, job, parentTierRef) {
       jobid: job.id,
       email: req.user.email
     });
+    logger.log("qbo-receivables-insert", "DEBUG", req.user.email, job.id, {
+      method: "InsertJob",
+      call: url,
+      customerObj: Customer,
+      result: result.json
+    });
 
     if (result.status >= 400) {
       throw new Error(JSON.stringify(result.json.Fault));

server/job/job-totals.js

@@ -315,7 +315,12 @@ function CalculateRatesTotals(ratesList) {
     if (item.mod_lbr_ty) {
       //Check to see if it has 0 hours and a price instead.
       //Extend for when there are hours and a price.
-      if (item.lbr_op === "OP14" && item.act_price > 0 && (!item.part_type || item.mod_lb_hrs === 0) && !IsAdditionalCost(item)) {
+      if (
+        item.lbr_op === "OP14" &&
+        item.act_price > 0 &&
+        (!item.part_type || item.mod_lb_hrs === 0) &&
+        !IsAdditionalCost(item)
+      ) {
         //Scenario where SGI may pay out hours using a part price.
         if (!ret[item.mod_lbr_ty.toLowerCase()].total) {
           ret[item.mod_lbr_ty.toLowerCase()].total = Dinero();
@@ -339,38 +344,30 @@ function CalculateRatesTotals(ratesList) {
   let subtotal = Dinero({ amount: 0 });
   let rates_subtotal = Dinero({ amount: 0 });
 
-  for (const property in ret) {
+  for (const [property, values] of Object.entries(ret)) {
     //Skip calculating mapa and mash if we got the amounts.
-    if (!((property === "mapa" && hasMapaLine) || (property === "mash" && hasMashLine))) {
+    const shouldSkipCalculation = (property === "mapa" && hasMapaLine) || (property === "mash" && hasMashLine);
-      if (!ret[property].total) {
+
-        ret[property].total = Dinero();
+    if (!shouldSkipCalculation) {
-      }
+      values.total ??= Dinero();
-      let threshold;
+
-      //Check if there is a max for this type.
+      //Check if there is a max for this type and apply it.
-      if (ratesList.materials && ratesList.materials[property]) {
+      const maxDollar =
-        //
+        ratesList.materials?.[property]?.cal_maxdlr || ratesList.materials?.[property.toUpperCase()]?.cal_maxdlr;
-        if (ratesList.materials[property].cal_maxdlr && ratesList.materials[property].cal_maxdlr > 0) {
+      const threshold = maxDollar > 0 ? Dinero({ amount: Math.round(maxDollar * 100) }) : null;
-          //It has an upper threshhold.
-          threshold = Dinero({
-            amount: Math.round(ratesList.materials[property].cal_maxdlr * 100)
-          });
-        }
-      }
 
       const total = Dinero({
-        amount: Math.round((ret[property].rate || 0) * 100)
+        amount: Math.round((values.rate || 0) * 100)
-      }).multiply(ret[property].hours);
+      }).multiply(values.hours);
 
-      if (threshold && total.greaterThanOrEqual(threshold)) {
+      values.total = values.total.add(threshold && total.greaterThanOrEqual(threshold) ? threshold : total);
-        ret[property].total = ret[property].total.add(threshold);
-      } else {
-        ret[property].total = ret[property].total.add(total);
-      }
     }
 
-    subtotal = subtotal.add(ret[property].total);
+    subtotal = subtotal.add(values.total);
 
-    if (property !== "mapa" && property !== "mash") rates_subtotal = rates_subtotal.add(ret[property].total);
+    if (property !== "mapa" && property !== "mash") {
+      rates_subtotal = rates_subtotal.add(values.total);
+    }
   }
 
   ret.subtotal = subtotal;