From 82c4320f0c9cba90ad0259760328210a3d130c48 Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Tue, 28 Jun 2022 16:04:34 -0700
Subject: [PATCH 1/7] Add paint mix data logging.

---
 server/mixdata/mixdata.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/server/mixdata/mixdata.js b/server/mixdata/mixdata.js
index dd538ddd9..68ae77119 100644
--- a/server/mixdata/mixdata.js
+++ b/server/mixdata/mixdata.js
@@ -32,6 +32,8 @@ exports.mixdataUpload = async (req, res) => {
         explicitArray: false,
       });
 
+      logger.log("job-mixdata-parse", "DEBUG", req.user.email, inboundRequest);
+
       const ScaleType = DetermineScaleType(inboundRequest);
       const RoNumbersFromInboundRequest = GetListOfRos(
         inboundRequest,

From f704fd5f56339a85636897d25b0d10ca2815c3df Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Tue, 28 Jun 2022 16:14:13 -0700
Subject: [PATCH 2/7] Added mix data logging.

---
 server/mixdata/mixdata.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/server/mixdata/mixdata.js b/server/mixdata/mixdata.js
index 68ae77119..5d52f4e5b 100644
--- a/server/mixdata/mixdata.js
+++ b/server/mixdata/mixdata.js
@@ -78,6 +78,7 @@ exports.mixdataUpload = async (req, res) => {
     res.status(500).JSON(error);
     logger.log("job-mixdata-upload-error", "ERROR", null, null, {
       error: error.message,
+      ...error,
     });
   }
 };

From 1d80153da1e81bcdef0f4fb578b52dbef85684f6 Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Tue, 28 Jun 2022 16:14:26 -0700
Subject: [PATCH 3/7] Added placeholder for paint codes on prod board.

---
 .../production-list-columns.data.js           | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/client/src/components/production-list-columns/production-list-columns.data.js b/client/src/components/production-list-columns/production-list-columns.data.js
index e09e98775..203dd9c46 100644
--- a/client/src/components/production-list-columns/production-list-columns.data.js
+++ b/client/src/components/production-list-columns/production-list-columns.data.js
@@ -1,5 +1,5 @@
 import { PauseCircleOutlined } from "@ant-design/icons";
-import { Space } from "antd";
+import { Space, Tag } from "antd";
 import i18n from "i18next";
 import moment from "moment";
 import React from "react";
@@ -530,6 +530,27 @@ const r = ({ technician, state, activeStatuses, bodyshop }) => {
         <JobPartsQueueCount parts={record.joblines_status} record={record} />
       ),
     },
+    //Added as a place holder for St Claude. Not implemented as it requires another join for a field used by only 1 client.
+    // {
+    //   title: i18n.t("vehicles.fields.v_paint_codes", { number: "" }),
+    //   dataIndex: "v_paint_codes",
+    //   key: "v_paint_codes",
+    //   render: (text, record) =>
+    //     record.vehicle?.v_paint_codes ? (
+    //       <span style={{ whiteSpace: "pre" }}>
+    //         {Object.keys(record.vehicle.v_paint_codes)
+    //           .filter(
+    //             (key) =>
+    //               record.vehicle.v_paint_codes[key] !== "" &&
+    //               record.vehicle.v_paint_codes[key] !== null &&
+    //               record.vehicle.v_paint_codes[key] !== undefined
+    //           )
+    //           .map((key, idx) => (
+    //             <Tag key={idx}>{record.vehicle.v_paint_codes[key]}</Tag>
+    //           ))}
+    //       </span>
+    //     ) : null,
+    // },
   ];
 };
 export default r;

From d45f84afbd6b2951ef5183df7d1057122acd7367 Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Tue, 28 Jun 2022 16:24:49 -0700
Subject: [PATCH 4/7] Change firebase handler rejection logging.

---
 .../production-list-columns.data.js                       | 3 +--
 server/firebase/firebase-handler.js                       | 8 +++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/client/src/components/production-list-columns/production-list-columns.data.js b/client/src/components/production-list-columns/production-list-columns.data.js
index 203dd9c46..c3f8ecf88 100644
--- a/client/src/components/production-list-columns/production-list-columns.data.js
+++ b/client/src/components/production-list-columns/production-list-columns.data.js
@@ -1,8 +1,7 @@
 import { PauseCircleOutlined } from "@ant-design/icons";
-import { Space, Tag } from "antd";
+import { Space } from "antd";
 import i18n from "i18next";
 import moment from "moment";
-import React from "react";
 import { Link } from "react-router-dom";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { TimeFormatter } from "../../utils/DateFormatter";
diff --git a/server/firebase/firebase-handler.js b/server/firebase/firebase-handler.js
index 8fae9d96a..7221649ec 100644
--- a/server/firebase/firebase-handler.js
+++ b/server/firebase/firebase-handler.js
@@ -257,12 +257,14 @@ exports.validateFirebaseIdToken = async (req, res, next) => {
     return;
   } catch (error) {
     logger.log("api-unauthorized-call", "WARN", null, null, {
-      req,
+      path: req.path,
+      body: req.body,
+
       type: "unauthroized",
-      error,
+      ...error,
     });
 
-    res.status(403).send("Unauthorized");
+    res.status(401).send("Unauthorized");
     return;
   }
 };

From fb4b12233a497d41899acce468f8936385ecdb51 Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Wed, 29 Jun 2022 09:48:26 -0700
Subject: [PATCH 5/7] Update autohouse error logging.

---
 server/data/autohouse.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/data/autohouse.js b/server/data/autohouse.js
index 92851602c..08fcc9815 100644
--- a/server/data/autohouse.js
+++ b/server/data/autohouse.js
@@ -198,7 +198,7 @@ const CreateRepairOrderTag = (job, errorCallback) => {
 
   if (!job.job_totals) {
     errorCallback({
-      jobid: jobid,
+      jobid: job.id,
       ro_number: job.ro_number,
       error: { toString: () => "No job totals for RO." },
     });
@@ -674,7 +674,7 @@ const CreateRepairOrderTag = (job, errorCallback) => {
       error,
     });
 
-    errorCallback({ jobid: jobid, ro_number: job.ro_number, error });
+    errorCallback({ jobid: job.id, ro_number: job.ro_number, error });
   }
 };
 

From 037ff4c2a18b209d35ff9d7023d4a7573e17d7a5 Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Wed, 29 Jun 2022 10:54:19 -0700
Subject: [PATCH 6/7] Resolve email rendering issue with JSR Update.

---
 .../email-documents/email-documents.component.jsx        | 6 ------
 client/src/utils/RenderTemplate.js                       | 9 ++++-----
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/client/src/components/email-documents/email-documents.component.jsx b/client/src/components/email-documents/email-documents.component.jsx
index 7b3f393ae..7607e23e4 100644
--- a/client/src/components/email-documents/email-documents.component.jsx
+++ b/client/src/components/email-documents/email-documents.component.jsx
@@ -38,12 +38,6 @@ export function EmailDocumentsComponent({
     nextFetchPolicy: "network-only",
   });
 
-  console.log(
-    selectedMedia &&
-      selectedMedia
-        .filter((s) => s.isSelected)
-        .reduce((acc, val) => (acc = acc + val.size), 0)
-  );
   return (
     <div>
       {loading && <LoadingSpinner />}
diff --git a/client/src/utils/RenderTemplate.js b/client/src/utils/RenderTemplate.js
index c6d4a0ea9..acdfe1bf2 100644
--- a/client/src/utils/RenderTemplate.js
+++ b/client/src/utils/RenderTemplate.js
@@ -111,15 +111,16 @@ export default async function RenderTemplate(
         };
 
         const pdfRender = await jsreport.render(pdfRequest);
-        pdf = pdfRender.toDataURI();
+        pdf = await pdfRender.toDataURI();
       }
+      const html = await render.toString();
       return new Promise((resolve, reject) => {
         resolve({
           pdf,
           filename:
             Templates[templateObject.name] &&
             Templates[templateObject.name].title,
-          html: render.toString(),
+          html,
         });
       });
     }
@@ -255,9 +256,7 @@ export async function RenderTemplates(
     if (!renderAsHtml) {
       render.download("Speed Print");
     } else {
-      return new Promise((resolve, reject) => {
-        resolve(render.toString());
-      });
+      return render.toString();
     }
   } catch (error) {
     notification["error"]({ message: JSON.stringify(error) });

From 39dbf40a49ca0a9c0d1c7cc446c8c31cb5c87ba8 Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Wed, 29 Jun 2022 15:05:03 -0700
Subject: [PATCH 7/7] IO-1967 Convert dollar amount to labor.

---
 bodyshop_translations.babel                   |  65 ++++-
 .../job-detail-lines/job-lines.component.jsx  |  10 +-
 .../job-line-convert-to-labor.component.jsx   | 244 ++++++++++++++++++
 .../jobs-close-lines.component.jsx            |  39 ++-
 client/src/graphql/jobs-lines.queries.js      |   1 +
 client/src/graphql/jobs.queries.js            |   2 +
 client/src/translations/en_us/common.json     |   3 +
 client/src/translations/es/common.json        |   3 +
 client/src/translations/fr/common.json        |   3 +
 hasura/metadata/tables.yaml                   |   3 +
 .../down.sql                                  |   4 +
 .../up.sql                                    |   2 +
 12 files changed, 365 insertions(+), 14 deletions(-)
 create mode 100644 client/src/components/job-line-convert-to-labor/job-line-convert-to-labor.component.jsx
 create mode 100644 hasura/migrations/1656527284493_alter_table_public_joblines_add_column_convertedtolbr/down.sql
 create mode 100644 hasura/migrations/1656527284493_alter_table_public_joblines_add_column_convertedtolbr/up.sql

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index 132e51f2b..0a0bddd67 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -1,4 +1,4 @@
-<babeledit_project be_version="2.7.1" version="1.2">
+<babeledit_project version="1.2" be_version="2.7.1">
     <!--
 
     BabelEdit project file
@@ -17826,6 +17826,27 @@
                             <folder_node>
                                 <name>actions</name>
                                 <children>
+                                    <concept_node>
+                                        <name>converttolabor</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>new</name>
                                         <definition_loaded>false</definition_loaded>
@@ -19006,6 +19027,27 @@
                             <folder_node>
                                 <name>labels</name>
                                 <children>
+                                    <concept_node>
+                                        <name>adjustmenttobeadded</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>billref</name>
                                         <definition_loaded>false</definition_loaded>
@@ -19027,6 +19069,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>convertedtolabor</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>edit</name>
                                         <definition_loaded>false</definition_loaded>
diff --git a/client/src/components/job-detail-lines/job-lines.component.jsx b/client/src/components/job-detail-lines/job-lines.component.jsx
index 401a5bba6..8d0c3488a 100644
--- a/client/src/components/job-detail-lines/job-lines.component.jsx
+++ b/client/src/components/job-detail-lines/job-lines.component.jsx
@@ -44,6 +44,7 @@ import JobCreateIOU from "../job-create-iou/job-create-iou.component";
 import JobLinesExpander from "./job-lines-expander.component";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import moment from "moment";
+import JobLineConvertToLabor from "../job-line-convert-to-labor/job-line-convert-to-labor.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -295,9 +296,9 @@ export function JobLinesComponent({
       dataIndex: "actions",
       key: "actions",
       render: (text, record) => (
-        <div>
+        <Space>
           {(record.manual_line || jobIsPrivate) && (
-            <Space>
+            <>
               <Button
                 disabled={jobRO}
                 onClick={() => {
@@ -334,9 +335,10 @@ export function JobLinesComponent({
               >
                 <DeleteFilled />
               </Button>
-            </Space>
+            </>
           )}
-        </div>
+          <JobLineConvertToLabor jobline={record} job={job} />
+        </Space>
       ),
     },
   ];
diff --git a/client/src/components/job-line-convert-to-labor/job-line-convert-to-labor.component.jsx b/client/src/components/job-line-convert-to-labor/job-line-convert-to-labor.component.jsx
new file mode 100644
index 000000000..a4650bdc9
--- /dev/null
+++ b/client/src/components/job-line-convert-to-labor/job-line-convert-to-labor.component.jsx
@@ -0,0 +1,244 @@
+import { ClockCircleOutlined } from "@ant-design/icons";
+import { useApolloClient, useMutation } from "@apollo/client";
+import {
+  Button,
+  Card,
+  Form,
+  InputNumber,
+  notification,
+  Popover,
+  Select,
+  Space,
+  Tooltip,
+} from "antd";
+import { useState } from "react";
+import { useTranslation } from "react-i18next";
+import { logImEXEvent } from "../../firebase/firebase.utils";
+import {
+  QUERY_JOB_LBR_ADJUSTMENTS,
+  UPDATE_JOB,
+} from "../../graphql/jobs.queries";
+import {
+  INSERT_SCOREBOARD_ENTRY,
+  UPDATE_SCOREBOARD_ENTRY,
+} from "../../graphql/scoreboard.queries";
+import FormDatePicker from "../form-date-picker/form-date-picker.component";
+import LaborTypeFormItemComponent from "../form-items-formatted/labor-type-form-item.component";
+
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { insertAuditTrail } from "../../redux/application/application.actions";
+import _ from "lodash";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
+import { UPDATE_JOB_LINE } from "../../graphql/jobs-lines.queries";
+const mapStateToProps = createStructuredSelector({
+  //currentUser: selectCurrentUser
+});
+const mapDispatchToProps = (dispatch) => ({
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
+});
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(JobLineConvertToLabor);
+
+export function JobLineConvertToLabor({ jobline, job, ...otherBtnProps }) {
+  const { t } = useTranslation();
+
+  const [loading, setLoading] = useState(false);
+  const [form] = Form.useForm();
+  const [visibility, setVisibility] = useState(false);
+  const client = useApolloClient();
+
+  const handleFinish = async (values) => {
+    const { mod_lbr_ty } = values;
+    logImEXEvent("job_convert_dollar_to_labor");
+
+    setLoading(true);
+
+    const existingAdjustments = await client.query({
+      query: QUERY_JOB_LBR_ADJUSTMENTS,
+      variables: {
+        id: job.id,
+      },
+    });
+
+    const newAdjustments = _.cloneDeep(
+      existingAdjustments.data.jobs_by_pk.lbr_adjustments
+    );
+
+    newAdjustments[mod_lbr_ty] =
+      (newAdjustments[mod_lbr_ty] || 0) +
+      calculateAdjustment({ mod_lbr_ty, job, jobline });
+
+    const jobUpdate = client.mutate({
+      mutation: UPDATE_JOB,
+      variables: {
+        jobId: job.id,
+        job: { lbr_adjustments: newAdjustments },
+      },
+    });
+
+    const lineUpdate = client.mutate({
+      mutation: UPDATE_JOB_LINE,
+      variables: {
+        lineId: jobline.id,
+        line: { convertedtolbr: true },
+      },
+    });
+
+    if (!!jobUpdate.errors) {
+      notification["error"]({
+        message: t("jobs.errors.saving", {
+          message: JSON.stringify(jobUpdate.errors),
+        }),
+      });
+      return;
+    }
+    if (!!lineUpdate.errors) {
+      notification["error"]({
+        message: t("joblines.errors.saving", {
+          message: JSON.stringify(lineUpdate.errors),
+        }),
+      });
+      return;
+    }
+    insertAuditTrail({
+      jobid: values.jobid,
+      operation: AuditTrailMapping.jobmodifylbradj(),
+    });
+    setLoading(false);
+    setVisibility(false);
+  };
+
+  const overlay = (
+    <Card>
+      <Form form={form} layout="vertical" onFinish={handleFinish}>
+        <Form.Item
+          label={t("joblines.fields.mod_lbr_ty")}
+          name="mod_lbr_ty"
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+        >
+          <Select allowClear optionFilterProp="children" showSearch>
+            <Select.Option value="LAA">
+              {t("joblines.fields.lbr_types.LAA")}
+            </Select.Option>
+            <Select.Option value="LAB">
+              {t("joblines.fields.lbr_types.LAB")}
+            </Select.Option>
+            <Select.Option value="LAD">
+              {t("joblines.fields.lbr_types.LAD")}
+            </Select.Option>
+            <Select.Option value="LAE">
+              {t("joblines.fields.lbr_types.LAE")}
+            </Select.Option>
+            <Select.Option value="LAF">
+              {t("joblines.fields.lbr_types.LAF")}
+            </Select.Option>
+            <Select.Option value="LAG">
+              {t("joblines.fields.lbr_types.LAG")}
+            </Select.Option>
+            <Select.Option value="LAM">
+              {t("joblines.fields.lbr_types.LAM")}
+            </Select.Option>
+            <Select.Option value="LAR">
+              {t("joblines.fields.lbr_types.LAR")}
+            </Select.Option>
+            <Select.Option value="LAS">
+              {t("joblines.fields.lbr_types.LAS")}
+            </Select.Option>
+            <Select.Option value="LAU">
+              {t("joblines.fields.lbr_types.LAU")}
+            </Select.Option>
+            <Select.Option value="LA1">
+              {t("joblines.fields.lbr_types.LA1")}
+            </Select.Option>
+            <Select.Option value="LA2">
+              {t("joblines.fields.lbr_types.LA2")}
+            </Select.Option>
+            <Select.Option value="LA3">
+              {t("joblines.fields.lbr_types.LA3")}
+            </Select.Option>
+            <Select.Option value="LA4">
+              {t("joblines.fields.lbr_types.LA4")}
+            </Select.Option>
+          </Select>
+        </Form.Item>
+
+        <Form.Item shouldUpdate>
+          {() => {
+            const { mod_lbr_ty } = form.getFieldsValue();
+            return t("joblines.labels.adjustmenttobeadded", {
+              adjustment: calculateAdjustment({
+                mod_lbr_ty,
+                job,
+                jobline,
+              }).toFixed(1),
+            });
+          }}
+        </Form.Item>
+
+        <Space wrap>
+          <Button
+            type="primary"
+            disabled={jobline.convertedtolbr}
+            htmlType="submit"
+          >
+            {t("general.actions.save")}
+          </Button>
+          <Button onClick={() => setVisibility(false)}>
+            {t("general.actions.cancel")}
+          </Button>
+        </Space>
+      </Form>
+    </Card>
+  );
+
+  const handleClick = (e) => {
+    setLoading(true);
+
+    form.setFieldsValue({
+      //   date: new moment(),
+      //   bodyhrs: Math.round(v.bodyhrs * 10) / 10,
+      //   painthrs: Math.round(v.painthrs * 10) / 10,
+    });
+    setVisibility(true);
+    setLoading(false);
+  };
+
+  return (
+    <Popover
+      disabled={jobline.convertedtolbr}
+      content={overlay}
+      visible={visibility}
+      placement="bottom"
+    >
+      <Tooltip title={t("joblines.actions.converttolabor")}>
+        <Button
+          disabled={jobline.convertedtolbr}
+          loading={loading}
+          onClick={handleClick}
+          {...otherBtnProps}
+        >
+          <ClockCircleOutlined />
+        </Button>
+      </Tooltip>
+    </Popover>
+  );
+}
+
+function calculateAdjustment({ mod_lbr_ty, job, jobline }) {
+  if (!mod_lbr_ty) return 0;
+  const rate = job[`rate_${mod_lbr_ty.toLowerCase()}`];
+
+  if (rate === 0 || rate === null || rate === undefined) return 0;
+  const adj = jobline.act_price / job[`rate_${mod_lbr_ty.toLowerCase()}`];
+
+  return adj;
+}
diff --git a/client/src/components/jobs-close-lines/jobs-close-lines.component.jsx b/client/src/components/jobs-close-lines/jobs-close-lines.component.jsx
index 73dd0675b..f662efe0f 100644
--- a/client/src/components/jobs-close-lines/jobs-close-lines.component.jsx
+++ b/client/src/components/jobs-close-lines/jobs-close-lines.component.jsx
@@ -1,4 +1,4 @@
-import { Form, Select } from "antd";
+import { Form, Select, Space, Tooltip } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -8,6 +8,7 @@ import { selectBodyshop } from "../../redux/user/user.selectors";
 import LaborTypeFormItem from "../form-items-formatted/labor-type-form-item.component";
 import PartTypeFormItem from "../form-items-formatted/part-type-form-item.component";
 import ReadOnlyFormItem from "../form-items-formatted/read-only-form-item.component";
+import { WarningOutlined } from "@ant-design/icons";
 import "./jobs-close-lines.styles.scss";
 
 const mapStateToProps = createStructuredSelector({
@@ -62,14 +63,23 @@ export function JobsCloseLines({ bodyshop, job, jobRO }) {
                       </Form.Item>
                     </td>
                     <td>
-                      <Form.Item
-                        span={2}
-                        //  label={t("joblines.fields.act_price")}
-                        key={`${index}act_price`}
-                        name={[field.name, "act_price"]}
-                      >
-                        <ReadOnlyFormItem type="currency" />
-                      </Form.Item>
+                      <Space>
+                        <Form.Item
+                          span={2}
+                          //  label={t("joblines.fields.act_price")}
+                          key={`${index}act_price`}
+                          name={[field.name, "act_price"]}
+                        >
+                          <ReadOnlyFormItem type="currency" />
+                        </Form.Item>
+                        <Form.Item
+                          noStyle
+                          key={`${index}convertedtolbr`}
+                          name={[field.name, "convertedtolbr"]}
+                        >
+                          <HasBeenConvertedTolabor />
+                        </Form.Item>
+                      </Space>
                     </td>
                     <td>
                       <Form.Item
@@ -192,3 +202,14 @@ export function JobsCloseLines({ bodyshop, job, jobRO }) {
   );
 }
 export default connect(mapStateToProps, mapDispatchToProps)(JobsCloseLines);
+
+const HasBeenConvertedTolabor = ({ value }) => {
+  const { t } = useTranslation();
+  console.log(value);
+  if (!value) return null;
+  return (
+    <Tooltip title={t("joblines.labels.convertedtolabor")}>
+      <WarningOutlined style={{ color: "tomato" }} />
+    </Tooltip>
+  );
+};
diff --git a/client/src/graphql/jobs-lines.queries.js b/client/src/graphql/jobs-lines.queries.js
index b2184f072..0c0b4228d 100644
--- a/client/src/graphql/jobs-lines.queries.js
+++ b/client/src/graphql/jobs-lines.queries.js
@@ -177,6 +177,7 @@ export const UPDATE_JOB_LINE = gql`
         location
         status
         removed
+        convertedtolbr
       }
     }
   }
diff --git a/client/src/graphql/jobs.queries.js b/client/src/graphql/jobs.queries.js
index d74f706d3..47e43bd4b 100644
--- a/client/src/graphql/jobs.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -702,6 +702,7 @@ export const GET_JOB_BY_PK = gql`
         prt_dsmk_p
         prt_dsmk_m
         ioucreated
+        convertedtolbr
         billlines(limit: 1, order_by: { bill: { date: desc } }) {
           id
           quantity
@@ -1905,6 +1906,7 @@ export const QUERY_JOB_CLOSE_DETAILS = gql`
         profitcenter_labor
         profitcenter_part
         prt_dsmk_p
+        convertedtolbr
       }
     }
   }
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index b8b7ba774..7562a7ddd 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -1114,6 +1114,7 @@
 		},
 		"joblines": {
 			"actions": {
+				"converttolabor": "Convert amount to Labor.",
 				"new": "New Line"
 			},
 			"errors": {
@@ -1179,7 +1180,9 @@
 				"unq_seq": "Seq #"
 			},
 			"labels": {
+				"adjustmenttobeadded": "Adjustment to be added: {{adjustment}}",
 				"billref": "Latest Bill",
+				"convertedtolabor": "This line has been converted to labor. Ensure you adjust the profit center for the amount accordingly.",
 				"edit": "Edit Line",
 				"ioucreated": "IOU",
 				"new": "New Line",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 07c7aa35e..ca23c77a3 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -1114,6 +1114,7 @@
 		},
 		"joblines": {
 			"actions": {
+				"converttolabor": "",
 				"new": ""
 			},
 			"errors": {
@@ -1179,7 +1180,9 @@
 				"unq_seq": "Seq #"
 			},
 			"labels": {
+				"adjustmenttobeadded": "",
 				"billref": "",
+				"convertedtolabor": "",
 				"edit": "Línea de edición",
 				"ioucreated": "",
 				"new": "Nueva línea",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index eeeeb35b9..7f5176898 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -1114,6 +1114,7 @@
 		},
 		"joblines": {
 			"actions": {
+				"converttolabor": "",
 				"new": ""
 			},
 			"errors": {
@@ -1179,7 +1180,9 @@
 				"unq_seq": "Seq #"
 			},
 			"labels": {
+				"adjustmenttobeadded": "",
 				"billref": "",
+				"convertedtolabor": "",
 				"edit": "Ligne d'édition",
 				"ioucreated": "",
 				"new": "Nouvelle ligne",
diff --git a/hasura/metadata/tables.yaml b/hasura/metadata/tables.yaml
index d41498645..978903388 100644
--- a/hasura/metadata/tables.yaml
+++ b/hasura/metadata/tables.yaml
@@ -2384,6 +2384,7 @@
           - bett_tax
           - bett_type
           - cert_part
+          - convertedtolbr
           - created_at
           - db_hrs
           - db_price
@@ -2447,6 +2448,7 @@
           - bett_tax
           - bett_type
           - cert_part
+          - convertedtolbr
           - created_at
           - db_hrs
           - db_price
@@ -2521,6 +2523,7 @@
           - bett_tax
           - bett_type
           - cert_part
+          - convertedtolbr
           - created_at
           - db_hrs
           - db_price
diff --git a/hasura/migrations/1656527284493_alter_table_public_joblines_add_column_convertedtolbr/down.sql b/hasura/migrations/1656527284493_alter_table_public_joblines_add_column_convertedtolbr/down.sql
new file mode 100644
index 000000000..7c4f71565
--- /dev/null
+++ b/hasura/migrations/1656527284493_alter_table_public_joblines_add_column_convertedtolbr/down.sql
@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."joblines" add column "convertedtolbr" boolean
+--  not null default 'false';
diff --git a/hasura/migrations/1656527284493_alter_table_public_joblines_add_column_convertedtolbr/up.sql b/hasura/migrations/1656527284493_alter_table_public_joblines_add_column_convertedtolbr/up.sql
new file mode 100644
index 000000000..e67709d19
--- /dev/null
+++ b/hasura/migrations/1656527284493_alter_table_public_joblines_add_column_convertedtolbr/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."joblines" add column "convertedtolbr" boolean
+ not null default 'false';