Merge remote-tracking branch 'origin/master-AIO' into feature/IO-2433-esignature

2026-03-23 12:57:38 -07:00
parent 4abc1a7d0f 76b15f0521
commit e17b57c705
44 changed files with 1555 additions and 317 deletions
--- a/client/src/components/bill-ai-feedback/bill-ai-feedback.component.jsx
+++ b/client/src/components/bill-ai-feedback/bill-ai-feedback.component.jsx
@@ -0,0 +1,118 @@
+import { DislikeOutlined, LikeOutlined } from "@ant-design/icons";
+import { Button, Form, Input, Radio, Space } from "antd";
+import axios from "axios";
+import { useState } from "react";
+import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { selectBodyshop } from "../../redux/user/user.selectors.js";
+import { createStructuredSelector } from "reselect";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop
+});
+
+function BillAiFeedback({ billForm, rawAIData, bodyshop }) {
+  const { t } = useTranslation();
+  const [form] = Form.useForm();
+  const [submitting, setSubmitting] = useState(false);
+  const notification = useNotification();
+
+  //Need to sanitize becuase we pass as form data to include the attachment.
+  const sanitizeBillFormValues = (value) => {
+    const seen = new WeakSet();
+    return JSON.stringify(
+      value,
+      (key, v) => {
+        if (key === "originFileObj") return undefined;
+        if (key === "thumbUrl") return undefined;
+        if (key === "preview") return undefined;
+        if (typeof v === "function") return undefined;
+        if (v && typeof v === "object") {
+          if (seen.has(v)) return "[Circular]";
+          seen.add(v);
+        }
+        return v;
+      },
+      0
+    );
+  };
+
+  const getAttachmentFromBillFormUpload = () => {
+    const uploads = billForm?.getFieldValue?.("upload") || [];
+    const files = uploads.map((u) => u?.originFileObj).filter(Boolean);
+
+    return (
+      files.find((f) => f?.type === "application/pdf") ||
+      files.find((f) => isString(f?.name) && f.name.toLowerCase().endsWith(".pdf")) ||
+      files[0] ||
+      null
+    );
+  };
+
+  const submitFeedback = async ({ rating, comments }) => {
+    setSubmitting(true);
+    try {
+      const billFormValues = billForm.getFieldsValue(true);
+
+      const formData = new FormData();
+      formData.append("rating", rating);
+      formData.append("comments", comments || "");
+      formData.append("billFormValues", sanitizeBillFormValues(billFormValues));
+      formData.append("rawAIData", sanitizeBillFormValues(rawAIData));
+      formData.append("shopname", bodyshop?.shopname || "");
+
+      const attachmentFile = getAttachmentFromBillFormUpload();
+      if (attachmentFile) {
+        formData.append("billPdf", attachmentFile, attachmentFile.name || "bill.pdf");
+      }
+
+      await axios.post("/ai/bill-feedback", formData);
+
+      notification.success({
+        title: "Thanks — feedback submitted"
+      });
+      form.resetFields();
+    } catch (error) {
+      notification.error({
+        title: "Failed to submit feedback",
+        description: error?.response?.data?.message || error?.message
+      });
+    } finally {
+      setSubmitting(false);
+    }
+  };
+
+  const isString = (v) => typeof v === "string";
+
+  return (
+    <Form form={form} onFinish={submitFeedback} requiredMark={false}>
+      <Space wrap align="top" size="small">
+        <Form.Item name="rating" label={t("bills.labels.ai.feedback_prompt")} rules={[{ required: true }]}>
+          <Radio.Group optionType="button" buttonStyle="solid">
+            <Radio.Button value="up">
+              <LikeOutlined />
+            </Radio.Button>
+            <Radio.Button value="down">
+              <DislikeOutlined />
+            </Radio.Button>
+          </Radio.Group>
+        </Form.Item>
+
+        <Space wrap size="small" orientation="vertical">
+          <Form.Item name="comments">
+            <Input.TextArea
+              rows={3}
+              style={{ minWidth: "400px" }}
+              placeholder={t("bills.labels.ai.feedback_placeholder")}
+            />
+          </Form.Item>
+          <Button onClick={() => form.submit()} loading={submitting} disabled={submitting}>
+            {t("bills.labels.ai.submit_feedback")}
+          </Button>
+        </Space>
+      </Space>
+    </Form>
+  );
+}
+export default connect(mapStateToProps, null)(BillAiFeedback);
--- a/client/src/components/bill-enter-ai-scan/bill-enter-ai-scan.component.jsx
+++ b/client/src/components/bill-enter-ai-scan/bill-enter-ai-scan.component.jsx
@@ -23,7 +23,8 @@ function BillEnterAiScan({
  fileInputRef,
  scanLoading,
  setScanLoading,
-  setIsAiScan
+  setIsAiScan,
+  setRawAIData
 }) {
  const notification = useNotification();
  const { t } = useTranslation();
@@ -57,6 +58,7 @@ function BillEnterAiScan({
        }
        setScanLoading(false);

+        setRawAIData(data.data);
        // Update form with the extracted data
        if (data?.data?.billForm) {
          form.setFieldsValue(data.data.billForm);
@@ -147,6 +149,7 @@ function BillEnterAiScan({
                setScanLoading(false);

                form.setFieldsValue(data.data.billForm);
+                setRawAIData(data.data);
                await form.validateFields(["billlines"], { recursive: true });

                notification.success({
--- a/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx
+++ b/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx
@@ -1,6 +1,6 @@
 import { useApolloClient, useMutation } from "@apollo/client/react";
 import { useTreatmentsWithConfig } from "@splitsoftware/splitio-react";
-import { Button, Checkbox, Form, Modal, Space } from "antd";
+import { Button, Checkbox, Divider, Form, Modal, Space } from "antd";
 import _ from "lodash";
 import { useEffect, useMemo, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -28,6 +28,7 @@ import { CalculateBillTotal } from "../bill-form/bill-form.totals.utility";
 import { handleUpload as handleLocalUpload } from "../documents-local-upload/documents-local-upload.utility";
 import { handleUpload as handleUploadToImageProxy } from "../documents-upload-imgproxy/documents-upload-imgproxy.utility";
 import { handleUpload } from "../documents-upload/documents-upload.utility";
+import BillAiFeedback from "../bill-ai-feedback/bill-ai-feedback.component.jsx";

 const mapStateToProps = createStructuredSelector({
  billEnterModal: selectBillEnterModal,
@@ -53,6 +54,7 @@ function BillEnterModalContainer({ billEnterModal, toggleModalVisible, bodyshop,
  const [loading, setLoading] = useState(false);
  const [scanLoading, setScanLoading] = useState(false);
  const [isAiScan, setIsAiScan] = useState(false);
+  const [rawAIData, setRawAIData] = useState(null);
  const client = useApolloClient();
  const [generateLabel, setGenerateLabel] = useLocalStorage("enter_bill_generate_label", false);
  const notification = useNotification();
@@ -387,6 +389,7 @@ function BillEnterModalContainer({ billEnterModal, toggleModalVisible, bodyshop,
        billlines: []
      });
      setIsAiScan(false);
+      setRawAIData(null);
      // form.resetFields();
    } else {
      toggleModalVisible();
@@ -404,6 +407,7 @@ function BillEnterModalContainer({ billEnterModal, toggleModalVisible, bodyshop,
      }
      setScanLoading(false);
      setIsAiScan(false);
+      setRawAIData(null);
      toggleModalVisible();
    }
  };
@@ -429,6 +433,7 @@ function BillEnterModalContainer({ billEnterModal, toggleModalVisible, bodyshop,
      }
      setScanLoading(false);
      setIsAiScan(false);
+      setRawAIData(null);
    }
  }, [billEnterModal.open, form, formValues]);

@@ -456,6 +461,7 @@ function BillEnterModalContainer({ billEnterModal, toggleModalVisible, bodyshop,
              scanLoading={scanLoading}
              setScanLoading={setScanLoading}
              setIsAiScan={setIsAiScan}
+              setRawAIData={setRawAIData}
            />
          )}
        </Space>
@@ -471,26 +477,34 @@ function BillEnterModalContainer({ billEnterModal, toggleModalVisible, bodyshop,
        setLoading(false);
      }}
      footer={
-        <Space>
-          <Checkbox checked={generateLabel} onChange={(e) => setGenerateLabel(e.target.checked)}>
-            {t("bills.labels.generatepartslabel")}
-          </Checkbox>
-          <Button onClick={handleCancel}>{t("general.actions.cancel")}</Button>
-          <Button loading={loading} onClick={() => form.submit()} id="save-bill-enter-modal">
-            {t("general.actions.save")}
-          </Button>
-          {billEnterModal.context && billEnterModal.context.id ? null : (
-            <Button
-              type="primary"
-              loading={loading}
-              onClick={() => {
-                setEnterAgain(true);
-              }}
-              id="save-and-new-bill-enter-modal"
-            >
-              {t("general.actions.saveandnew")}
-            </Button>
+        <Space orientation="vertical">
+          {isAiScan && (
+            <>
+              <BillAiFeedback billForm={form} rawAIData={rawAIData} />
+              <Divider orientation="horizontal" />
+            </>
          )}
+          <Space wrap align="top">
+            <Checkbox checked={generateLabel} onChange={(e) => setGenerateLabel(e.target.checked)}>
+              {t("bills.labels.generatepartslabel")}
+            </Checkbox>
+            <Button onClick={handleCancel}>{t("general.actions.cancel")}</Button>
+            <Button loading={loading} onClick={() => form.submit()} id="save-bill-enter-modal">
+              {t("general.actions.save")}
+            </Button>
+            {billEnterModal.context && billEnterModal.context.id ? null : (
+              <Button
+                type="primary"
+                loading={loading}
+                onClick={() => {
+                  setEnterAgain(true);
+                }}
+                id="save-and-new-bill-enter-modal"
+              >
+                {t("general.actions.saveandnew")}
+              </Button>
+            )}
+          </Space>
        </Space>
      }
      destroyOnHidden
--- a/client/src/components/email-overlay/email-overlay.component.jsx
+++ b/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}`,
--- a/client/src/components/eula/eula.component.jsx
+++ b/client/src/components/eula/eula.component.jsx
@@ -25,6 +25,7 @@ const Eula = ({ currentEula, currentUser, acceptEula }) => {

  const handleScroll = useCallback(
    (e) => {
+      if (!e.target) return;
      const bottom = e.target.scrollHeight - 100 <= e.target.scrollTop + e.target.clientHeight;
      if (bottom && !hasEverScrolledToBottom) {
        setHasEverScrolledToBottom(true);
@@ -36,7 +37,9 @@ const Eula = ({ currentEula, currentUser, acceptEula }) => {
  );

  useEffect(() => {
-    handleScroll({ target: markdownCardRef.current });
+    if (markdownCardRef.current) {
+      handleScroll({ target: markdownCardRef.current });
+    }
  }, [handleScroll]);

  const handleChange = useCallback(() => {
--- a/client/src/components/job-detail-lines/job-lines.component.jsx
+++ b/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 && (
-                  <Button
-                    disabled={jobRO}
-                    onClick={() => {
-                      setJobLineEditContext({
-                        actions: { refetch: refetch, submit: form && form.submit },
-                        context: { ...record, jobid: job.id }
-                      });
-                    }}
-                    icon={<EditFilled />}
-                  />
-                )}
+                {(record.manual_line || jobIsPrivate) &&
+                  !technician &&
+                  HasRbacAccess({ bodyshop, authLevel, action: "jobs:manual-line" }) && (
+                    <Button
+                      disabled={jobRO}
+                      onClick={() => {
+                        setJobLineEditContext({
+                          actions: { refetch: refetch, submit: form && form.submit },
+                          context: { ...record, jobid: job.id }
+                        });
+                      }}
+                      icon={<EditFilled />}
+                    />
+                  )}
                <Button
                  title={t("tasks.buttons.create")}
                  onClick={() => {
@@ -410,29 +415,30 @@ export function JobLinesComponent({
                  }}
                  icon={<FaTasks />}
                />
-
-                {(record.manual_line || jobIsPrivate) && !technician && (
-                  <Button
-                    disabled={jobRO}
-                    onClick={async () => {
-                      await deleteJobLine({
-                        variables: { joblineId: record.id },
-                        update(cache) {
-                          cache.modify({
-                            fields: {
-                              joblines(existingJobLines, { readField }) {
-                                return existingJobLines.filter((jlRef) => record.id !== readField("id", jlRef));
+                {(record.manual_line || jobIsPrivate) &&
+                  !technician &&
+                  HasRbacAccess({ bodyshop, authLevel, action: "jobs:manual-line" }) && (
+                    <Button
+                      disabled={jobRO}
+                      onClick={async () => {
+                        await deleteJobLine({
+                          variables: { joblineId: record.id },
+                          update(cache) {
+                            cache.modify({
+                              fields: {
+                                joblines(existingJobLines, { readField }) {
+                                  return existingJobLines.filter((jlRef) => record.id !== readField("id", jlRef));
+                                }
                              }
-                            }
-                          });
-                        }
-                      });
-                      await axios.post("/job/totalsssu", { id: job.id });
-                      if (refetch) refetch();
-                    }}
-                    icon={<DeleteFilled />}
-                  />
-                )}
+                            });
+                          }
+                        });
+                        await axios.post("/job/totalsssu", { id: job.id });
+                        if (refetch) refetch();
+                      }}
+                      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={() => {
--- a/client/src/components/job-totals-table/job-totals.table.labor.component.jsx
+++ b/client/src/components/job-totals-table/job-totals.table.labor.component.jsx
@@ -144,18 +144,11 @@ export default function JobTotalsTableLabor({ job }) {
                {t("jobs.labels.mapa")}
                {InstanceRenderManager({
                  imex:
-                    job.materials?.mapa &&
-                    job.materials.mapa.cal_maxdlr &&
-                    job.materials.mapa.cal_maxdlr > 0 &&
-                    t("jobs.labels.threshhold", {
-                      amount: job.materials.mapa.cal_maxdlr
-                    }),
+                    (job.materials?.mapa ?? job.materials?.MAPA)?.cal_maxdlr > 0 &&
+                    t("jobs.labels.threshhold", { amount: (job.materials.mapa ?? job.materials.MAPA).cal_maxdlr }),
                  rome:
-                    job.materials?.MAPA &&
-                    job.materials.MAPA.cal_maxdlr !== undefined &&
-                    t("jobs.labels.threshhold", {
-                      amount: job.materials.MAPA.cal_maxdlr
-                    })
+                    job.materials?.MAPA?.cal_maxdlr !== undefined &&
+                    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.cal_maxdlr &&
-                    job.materials.mash.cal_maxdlr > 0 &&
-                    t("jobs.labels.threshhold", {
-                      amount: job.materials.mash.cal_maxdlr
-                    }),
+                    (job.materials?.mash ?? job.materials?.MASH)?.cal_maxdlr > 0 &&
+                    t("jobs.labels.threshhold", { amount: (job.materials.mash ?? job.materials.MASH).cal_maxdlr }),
                  rome:
-                    job.materials?.MASH &&
-                    job.materials.MASH.cal_maxdlr !== undefined &&
-                    t("jobs.labels.threshhold", {
-                      amount: job.materials.MASH.cal_maxdlr
-                    })
+                    job.materials?.MASH?.cal_maxdlr !== undefined &&
+                    t("jobs.labels.threshhold", { amount: job.materials.MASH.cal_maxdlr })
                })}
              </Space>
            </ResponsiveTable.Summary.Cell>
--- a/client/src/components/jobs-admin-class/jobs-admin-class.component.jsx
+++ b/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>
  );
--- a/client/src/components/jobs-admin-dates/jobs-admin-dates.component.jsx
+++ b/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>
--- a/client/src/components/jobs-admin-owner-reassociate/jobs-admin-owner-reassociate.component.jsx
+++ b/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>
--- a/client/src/components/jobs-admin-vehicle-reassociate/jobs-admin-vehicle-reassociate.component.jsx
+++ b/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>
--- a/client/src/components/jobs-close-lines/jobs-close-lines.component.jsx
+++ b/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) => ({
--- a/client/src/components/parts-order-list-table/parts-order-list-table.component.jsx
+++ b/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
-      : parts_orders.filter(
+      ? enrichedPartsOrders
+      : enrichedPartsOrders.filter(
          (b) =>
            (b.order_number || "").toString().toLowerCase().includes(searchText.toLowerCase()) ||
            (b.vendor.name || "").toLowerCase().includes(searchText.toLowerCase())
--- a/client/src/components/production-list-columns/production-list-columns.comment.component.jsx
+++ b/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 
-      style={{ width: "30em" }} 
-      onClick={(e) => e.stopPropagation()}
-      onPointerDown={(e) => e.stopPropagation()}
-    >
+    <div 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 
-      onOpenChange={handleOpenChange} 
-      open={open} 
-      content={content} 
-      trigger="click" 
+    <Popover
+      onOpenChange={handleOpenChange}
+      open={open}
+      content={content}
+      trigger="click"
      destroyOnHidden
-      styles={{ body: { padding: '12px' } }}
+      styles={{ body: { padding: "12px" } }}
      {...(usePortal ? { getPopupContainer: (trigger) => trigger.parentElement || document.body } : {})}
    >
      <div
--- a/client/src/components/production-list-columns/production-list-columns.productionnote.component.jsx
+++ b/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 
-      style={{ width: "30em" }} 
-      onClick={(e) => e.stopPropagation()}
-      onPointerDown={(e) => e.stopPropagation()}
-    >
+    <div 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 
-      onOpenChange={handleOpenChange} 
-      open={open} 
-      content={content} 
-      trigger="click" 
+    <Popover
+      onOpenChange={handleOpenChange}
+      open={open}
+      content={content}
+      trigger="click"
      destroyOnHidden
-      styles={{ body: { padding: '12px' } }}
+      styles={{ body: { padding: "12px" } }}
      {...(usePortal ? { getPopupContainer: (trigger) => trigger.parentElement || document.body } : {})}
    >
      <div
--- a/client/src/components/rbac-wrapper/rbac-defaults.js
+++ b/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,
--- a/client/src/components/shop-info/shop-info.rbac.component.jsx
+++ b/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")}
--- a/client/src/components/tech-job-clock-in-form/tech-job-clock-in-form.container.jsx
+++ b/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.tz(theTime, bodyshop.timezone).format("YYYY-MM-DD")
+                ? dayjs(theTime).tz(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,
--- a/client/src/components/tech-lookup-jobs-drawer/tech-lookup-jobs-drawer.component.jsx
+++ b/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 selectedBreakpoint = Object.entries(breakpoints)
-    .filter(([, isOn]) => !!isOn)
-    .slice(-1)[0];
+  const screens = Grid.useBreakpoint();

  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();
--- a/client/src/graphql/bills.queries.js
+++ b/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
--- a/client/src/graphql/jobs.queries.js
+++ b/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
--- a/client/src/pages/export-logs/export-logs.page.component.jsx
+++ b/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>;
        }
      }
    }
--- a/client/src/pages/jobs-create/jobs-create.component.jsx
+++ b/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));
-                  form.submit();
+                    .catch((error) => {
+                      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}
--- a/client/src/pages/jobs-create/jobs-create.container.jsx
+++ b/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>
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -231,13 +231,16 @@
            "overall": "Overall"
          },
          "disclaimer_title": "AI Scan Beta Disclaimer",
+          "feedback_placeholder": "Tell us what worked,  what didn't, and what could be better.",
+          "feedback_prompt": "Was this AI scan helpful?",
          "generic_failure": "Failed to process invoice.",
          "multipage": "The is a multi-page document.  Processing will take a few moments.",
          "processing": "Analyzing Bill",
          "scan": "AI Bill Scanner",
          "scancomplete": "AI Scan Complete",
          "scanfailed": "AI Scan Failed",
-          "scanstarted": "AI Scan Started"
+          "scanstarted": "AI Scan Started",
+          "submit_feedback": "Submit Feedback"
        },
        "bill_lines": "Bill Lines",
        "bill_total": "Bill Total Amount",
@@ -519,6 +522,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"
          },
@@ -1074,36 +1078,36 @@
        "earlyrorequired.message": "This job requires an early Repair Order to be created before posting to Reynolds. Please use the admin panel to create the early RO first."
      },
      "labels": {
-        "refreshallocations": "Refresh to see DMS Allocations.",
-        "provider_reynolds": "Reynolds",
-        "provider_fortellis": "Fortellis",
-        "provider_cdk": "CDK",
-        "provider_pbs": "PBS",
-        "provider_dms": "DMS",
-        "transport_wss": "(WSS)",
-        "transport_ws": "(WS)",
+        "banner_message": "Posting to {{provider}} | {{transport}} | {{status}}",
        "banner_status_connected": "Connected",
        "banner_status_disconnected": "Disconnected",
-        "banner_message": "Posting to {{provider}} | {{transport}} | {{status}}",
-        "reconnected_export_service": "Reconnected to {{provider}} Export Service",
-        "rr_validation_message": "Repair Order created in Reynolds. Complete validation in Reynolds, then click Finished/Close to finalize.",
-        "rr_validation_notice_title": "Reynolds RO created",
-        "rr_validation_notice_description": "Complete validation in Reynolds, then click Finished/Close to finalize and mark this export complete.",
-        "color_json": "Color JSON",
-        "plain_json": "Plain JSON",
-        "collapse_all": "Collapse All",
-        "expand_all": "Expand All",
-        "log_level": "Log Level",
        "clear_logs": "Clear Logs",
-        "reconnect": "Reconnect",
-        "details": "Details",
-        "hide_details": "Hide details",
-        "copy": "Copy",
+        "collapse_all": "Collapse All",
+        "color_json": "Color JSON",
        "copied": "Copied",
+        "copy": "Copy",
        "copy_request": "Copy Request",
        "copy_response": "Copy Response",
+        "details": "Details",
+        "expand_all": "Expand All",
+        "hide_details": "Hide details",
+        "log_level": "Log Level",
+        "plain_json": "Plain JSON",
+        "provider_cdk": "CDK",
+        "provider_dms": "DMS",
+        "provider_fortellis": "Fortellis",
+        "provider_pbs": "PBS",
+        "provider_reynolds": "Reynolds",
+        "reconnect": "Reconnect",
+        "reconnected_export_service": "Reconnected to {{provider}} Export Service",
+        "refreshallocations": "Refresh to see DMS Allocations.",
        "request_xml": "Request XML",
-        "response_xml": "Response XML"
+        "response_xml": "Response XML",
+        "rr_validation_message": "Repair Order created in Reynolds. Complete validation in Reynolds, then click Finished/Close to finalize.",
+        "rr_validation_notice_description": "Complete validation in Reynolds, then click Finished/Close to finalize and mark this export complete.",
+        "rr_validation_notice_title": "Reynolds RO created",
+        "transport_ws": "(WS)",
+        "transport_wss": "(WSS)"
      }
    },
    "documents": {
@@ -1295,6 +1299,7 @@
        "delete": "Delete",
        "deleteall": "Delete All",
        "deselectall": "Deselect All",
+        "done": "Done",
        "download": "Download",
        "edit": "Edit",
        "gotoadmin": "Go to Admin Panel",
@@ -3373,8 +3378,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_payables": "Work in Progress - Payables"
+        "work_in_progress_labour": "Work in Progress - Labor (Detail)",
+        "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": {
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -231,13 +231,16 @@
            "overall": ""
          },
          "disclaimer_title": "",
+          "feedback_placeholder": "",
+          "feedback_prompt": "",
          "generic_failure": "",
          "multipage": "",
          "processing": "",
          "scan": "",
          "scancomplete": "",
          "scanfailed": "",
-          "scanstarted": ""
+          "scanstarted": "",
+          "submit_feedback": ""
        },
        "bill_lines": "",
        "bill_total": "",
@@ -519,6 +522,7 @@
            "list-active": "",
            "list-all": "",
            "list-ready": "",
+            "manual-line": "",
            "partsqueue": "",
            "void": ""
          },
@@ -1074,36 +1078,36 @@
        "earlyrorequired.message": ""
      },
      "labels": {
-        "refreshallocations": "",
-        "provider_reynolds": "",
-        "provider_fortellis": "",
-        "provider_cdk": "",
-        "provider_pbs": "",
-        "provider_dms": "",
-        "transport_wss": "",
-        "transport_ws": "",
+        "banner_message": "",
        "banner_status_connected": "",
        "banner_status_disconnected": "",
-        "banner_message": "",
-        "reconnected_export_service": "",
-        "rr_validation_message": "",
-        "rr_validation_notice_title": "",
-        "rr_validation_notice_description": "",
-        "color_json": "",
-        "plain_json": "",
-        "collapse_all": "",
-        "expand_all": "",
-        "log_level": "",
        "clear_logs": "",
-        "reconnect": "",
-        "details": "",
-        "hide_details": "",
-        "copy": "",
+        "collapse_all": "",
+        "color_json": "",
        "copied": "",
+        "copy": "",
        "copy_request": "",
        "copy_response": "",
+        "details": "",
+        "expand_all": "",
+        "hide_details": "",
+        "log_level": "",
+        "plain_json": "",
+        "provider_cdk": "",
+        "provider_dms": "",
+        "provider_fortellis": "",
+        "provider_pbs": "",
+        "provider_reynolds": "",
+        "reconnect": "",
+        "reconnected_export_service": "",
+        "refreshallocations": "",
        "request_xml": "",
-        "response_xml": ""
+        "response_xml": "",
+        "rr_validation_message": "",
+        "rr_validation_notice_description": "",
+        "rr_validation_notice_title": "",
+        "transport_ws": "",
+        "transport_wss": ""
      }
    },
    "documents": {
@@ -1295,6 +1299,7 @@
        "delete": "Borrar",
        "deleteall": "",
        "deselectall": "",
+        "done": "",
        "download": "",
        "edit": "Editar",
        "gotoadmin": "",
@@ -3374,7 +3379,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": {
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -231,13 +231,16 @@
            "overall": ""
          },
          "disclaimer_title": "",
+          "feedback_placeholder": "",
+          "feedback_prompt": "",
          "generic_failure": "",
          "multipage": "",
          "processing": "",
          "scan": "",
          "scancomplete": "",
          "scanfailed": "",
-          "scanstarted": ""
+          "scanstarted": "",
+          "submit_feedback": ""
        },
        "bill_lines": "",
        "bill_total": "",
@@ -519,6 +522,7 @@
            "list-active": "",
            "list-all": "",
            "list-ready": "",
+            "manual-line": "",
            "partsqueue": "",
            "void": ""
          },
@@ -1074,36 +1078,36 @@
        "earlyrorequired.message": ""
      },
      "labels": {
-        "refreshallocations": "",
-        "provider_reynolds": "",
-        "provider_fortellis": "",
-        "provider_cdk": "",
-        "provider_pbs": "",
-        "provider_dms": "",
-        "transport_wss": "",
-        "transport_ws": "",
+        "banner_message": "",
        "banner_status_connected": "",
        "banner_status_disconnected": "",
-        "banner_message": "",
-        "reconnected_export_service": "",
-        "rr_validation_message": "",
-        "rr_validation_notice_title": "",
-        "rr_validation_notice_description": "",
-        "color_json": "",
-        "plain_json": "",
-        "collapse_all": "",
-        "expand_all": "",
-        "log_level": "",
        "clear_logs": "",
-        "reconnect": "",
-        "details": "",
-        "hide_details": "",
-        "copy": "",
+        "collapse_all": "",
+        "color_json": "",
        "copied": "",
+        "copy": "",
        "copy_request": "",
        "copy_response": "",
+        "details": "",
+        "expand_all": "",
+        "hide_details": "",
+        "log_level": "",
+        "plain_json": "",
+        "provider_cdk": "",
+        "provider_dms": "",
+        "provider_fortellis": "",
+        "provider_pbs": "",
+        "provider_reynolds": "",
+        "reconnect": "",
+        "reconnected_export_service": "",
+        "refreshallocations": "",
        "request_xml": "",
-        "response_xml": ""
+        "response_xml": "",
+        "rr_validation_message": "",
+        "rr_validation_notice_description": "",
+        "rr_validation_notice_title": "",
+        "transport_ws": "",
+        "transport_wss": ""
      }
    },
    "documents": {
@@ -1295,6 +1299,7 @@
        "delete": "Effacer",
        "deleteall": "",
        "deselectall": "",
+        "done": "",
        "download": "",
        "edit": "modifier",
        "gotoadmin": "",
@@ -3374,7 +3379,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": {
--- a/client/src/utils/TemplateConstants.js
+++ b/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: "",