admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in feature/IO-2458-RO-Closer (pull request #1406)

Browse Source 
Feature/IO-2458 RO Closer
This commit is contained in:
Patrick Fic
2024-04-11 20:25:25 +00:00
parent e991586254 08749b0c92
commit 73c38b3ae4
8 changed files with 107 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
bodyshop_translations.babel
View File

@@ -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 BabelEdit project file
@@ -1789,6 +1789,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>jobclosedwithbypass</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> <concept_node>
<name>jobconverted</name> <name>jobconverted</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -34608,27 +34629,6 @@
<folder_node> <folder_node>
<name>ro_guard</name> <name>ro_guard</name>
<children> <children>
<concept_node>
<name>eforce_profit</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> <concept_node>
<name>enforce_ar</name> <name>enforce_ar</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -34734,6 +34734,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>enforce_profit</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> <concept_node>
<name>enforce_sublet</name> <name>enforce_sublet</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>

102
client/src/components/job-bills-total/job-bills-total.component.jsx
View File

@@ -1,11 +1,11 @@
import { Alert, Card, Col, Row, Space, Statistic, Tooltip, Typography } from 'antd'; import { Alert, Card, Col, Row, Space, Statistic, Tooltip, Typography } from "antd";
import Dinero from 'dinero.js'; import Dinero from "dinero.js";
import React from 'react'; import React from "react";
import { useTranslation } from 'react-i18next'; import { useTranslation } from "react-i18next";
import InstanceRenderManager from '../../utils/instanceRenderMgr'; import InstanceRenderManager from "../../utils/instanceRenderMgr";
import AlertComponent from '../alert/alert.component'; import AlertComponent from "../alert/alert.component";
import LoadingSkeleton from '../loading-skeleton/loading-skeleton.component'; import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
import './job-bills-total.styles.scss'; import "./job-bills-total.styles.scss";
export default function JobBillsTotalComponent({ export default function JobBillsTotalComponent({
loading, loading,
@@ -13,16 +13,16 @@ export default function JobBillsTotalComponent({
partsOrders, partsOrders,
jobTotals, jobTotals,
showWarning, showWarning,
warningCallback, warningCallback
}) { }) {
const { t } = useTranslation(); const { t } = useTranslation();
if (loading) return <LoadingSkeleton />; if (loading) return <LoadingSkeleton />;
if (!!!jobTotals) { if (!!!jobTotals) {
if (showWarning && warningCallback && typeof warningCallback === 'function') { if (showWarning && warningCallback && typeof warningCallback === "function") {
warningCallback({ key: 'bills', warning: t('jobs.errors.nofinancial') }); warningCallback({ key: "bills", warning: t("jobs.errors.nofinancial") });
} }
return <AlertComponent type="error" message={t('jobs.errors.nofinancial')} />; return <AlertComponent type="error" message={t("jobs.errors.nofinancial")} />;
} }
const totals = jobTotals; const totals = jobTotals;
@@ -109,64 +109,60 @@ export default function JobBillsTotalComponent({
const discrepWithCms = discrepWithLbrAdj.add(totalReturns); const discrepWithCms = discrepWithLbrAdj.add(totalReturns);
const calculatedCreditsNotReceived = totalReturns.subtract(billCms); //billCms is tracked as a negative number. const calculatedCreditsNotReceived = totalReturns.subtract(billCms); //billCms is tracked as a negative number.
if (showWarning && warningCallback && typeof warningCallback === 'function') { if (showWarning && warningCallback && typeof warningCallback === "function") {
if ( if (discrepWithCms.getAmount() !== 0) {
discrepWithCms.getAmount() !== 0 ||
discrepWithLbrAdj.getAmount() !== 0 ||
discrepancy.getAmount() !== 0
) {
warningCallback({ warningCallback({
key: 'bills', key: "bills",
warning: t('jobs.labels.outstanding_reconciliation_discrep'), warning: t("jobs.labels.outstanding_reconciliation_discrep")
}); });
} }
if (calculatedCreditsNotReceived.getAmount() > 0) { if (calculatedCreditsNotReceived.getAmount() > 0) {
warningCallback({ key: 'cm', warning: t('jobs.labels.outstanding_credit_memos') }); warningCallback({ key: "cm", warning: t("jobs.labels.outstanding_credit_memos") });
} }
} }
return ( return (
<Row gutter={[16, 16]}> <Row gutter={[16, 16]}>
<Col md={24} lg={18}> <Col md={24} lg={18}>
<Card title={t('jobs.labels.jobtotals')} style={{ height: '100%' }}> <Card title={t("jobs.labels.jobtotals")} style={{ height: "100%" }}>
<Space wrap size="large"> <Space wrap size="large">
<Tooltip <Tooltip
title={ title={
<div <div
dangerouslySetInnerHTML={{ dangerouslySetInnerHTML={{
__html: t('jobs.labels.plitooltips.partstotal'), __html: t("jobs.labels.plitooltips.partstotal")
}} }}
/> />
} }
> >
<Statistic title={t('jobs.labels.rosaletotal')} value={totalPartsSublet.toFormat()} /> <Statistic title={t("jobs.labels.rosaletotal")} value={totalPartsSublet.toFormat()} />
</Tooltip> </Tooltip>
<Typography.Title>-</Typography.Title> <Typography.Title>-</Typography.Title>
<Tooltip <Tooltip
title={ title={
<div <div
dangerouslySetInnerHTML={{ dangerouslySetInnerHTML={{
__html: t('jobs.labels.plitooltips.billtotal'), __html: t("jobs.labels.plitooltips.billtotal")
}} }}
/> />
} }
> >
<Statistic title={t('bills.labels.retailtotal')} value={billTotals.toFormat()} /> <Statistic title={t("bills.labels.retailtotal")} value={billTotals.toFormat()} />
</Tooltip> </Tooltip>
<Typography.Title>=</Typography.Title> <Typography.Title>=</Typography.Title>
<Tooltip <Tooltip
title={ title={
<div <div
dangerouslySetInnerHTML={{ dangerouslySetInnerHTML={{
__html: t('jobs.labels.plitooltips.discrep1'), __html: t("jobs.labels.plitooltips.discrep1")
}} }}
/> />
} }
> >
<Statistic <Statistic
title={t('bills.labels.discrepancy')} title={t("bills.labels.discrepancy")}
valueStyle={{ valueStyle={{
color: discrepancy.getAmount() === 0 ? 'green' : 'red', color: discrepancy.getAmount() === 0 ? "green" : "red"
}} }}
value={discrepancy.toFormat()} value={discrepancy.toFormat()}
/> />
@@ -176,27 +172,27 @@ export default function JobBillsTotalComponent({
title={ title={
<div <div
dangerouslySetInnerHTML={{ dangerouslySetInnerHTML={{
__html: t('jobs.labels.plitooltips.laboradj'), __html: t("jobs.labels.plitooltips.laboradj")
}} }}
/> />
} }
> >
<Statistic title={t('bills.labels.dedfromlbr')} value={lbrAdjustments.toFormat()} /> <Statistic title={t("bills.labels.dedfromlbr")} value={lbrAdjustments.toFormat()} />
</Tooltip> </Tooltip>
<Typography.Title>=</Typography.Title> <Typography.Title>=</Typography.Title>
<Tooltip <Tooltip
title={ title={
<div <div
dangerouslySetInnerHTML={{ dangerouslySetInnerHTML={{
__html: t('jobs.labels.plitooltips.discrep2'), __html: t("jobs.labels.plitooltips.discrep2")
}} }}
/> />
} }
> >
<Statistic <Statistic
title={t('bills.labels.discrepancy')} title={t("bills.labels.discrepancy")}
valueStyle={{ valueStyle={{
color: discrepWithLbrAdj.getAmount() === 0 ? 'green' : 'red', color: discrepWithLbrAdj.getAmount() === 0 ? "green" : "red"
}} }}
value={discrepWithLbrAdj.toFormat()} value={discrepWithLbrAdj.toFormat()}
/> />
@@ -206,27 +202,27 @@ export default function JobBillsTotalComponent({
title={ title={
<div <div
dangerouslySetInnerHTML={{ dangerouslySetInnerHTML={{
__html: t('jobs.labels.plitooltips.creditmemos'), __html: t("jobs.labels.plitooltips.creditmemos")
}} }}
/> />
} }
> >
<Statistic title={t('bills.labels.totalreturns')} value={totalReturns.toFormat()} /> <Statistic title={t("bills.labels.totalreturns")} value={totalReturns.toFormat()} />
</Tooltip> </Tooltip>
<Typography.Title>=</Typography.Title> <Typography.Title>=</Typography.Title>
<Tooltip <Tooltip
title={ title={
<div <div
dangerouslySetInnerHTML={{ dangerouslySetInnerHTML={{
__html: t('jobs.labels.plitooltips.discrep3'), __html: t("jobs.labels.plitooltips.discrep3")
}} }}
/> />
} }
> >
<Statistic <Statistic
title={t('bills.labels.discrepancy')} title={t("bills.labels.discrepancy")}
valueStyle={{ valueStyle={{
color: discrepWithCms.getAmount() === 0 ? 'green' : 'red', color: discrepWithCms.getAmount() === 0 ? "green" : "red"
}} }}
value={discrepWithCms.toFormat()} value={discrepWithCms.toFormat()}
/> />
@@ -238,40 +234,40 @@ export default function JobBillsTotalComponent({
discrepWithLbrAdj.getAmount() !== 0 || discrepWithLbrAdj.getAmount() !== 0 ||
discrepancy.getAmount() !== 0) && ( discrepancy.getAmount() !== 0) && (
<Alert <Alert
style={{ margin: '8px 0px' }} style={{ margin: "8px 0px" }}
type="warning" type="warning"
message={t('jobs.labels.outstanding_reconciliation_discrep')} message={t("jobs.labels.outstanding_reconciliation_discrep")}
/> />
)} )}
</Card> </Card>
</Col> </Col>
<Col md={24} lg={6}> <Col md={24} lg={6}>
<Card title={t('jobs.labels.returntotals')} style={{ height: '100%' }}> <Card title={t("jobs.labels.returntotals")} style={{ height: "100%" }}>
<Space wrap> <Space wrap>
<Tooltip <Tooltip
title={ title={
<div <div
dangerouslySetInnerHTML={{ dangerouslySetInnerHTML={{
__html: t('jobs.labels.plitooltips.totalreturns'), __html: t("jobs.labels.plitooltips.totalreturns")
}} }}
/> />
} }
> >
<Statistic title={t('bills.labels.totalreturns')} value={totalReturns.toFormat()} /> <Statistic title={t("bills.labels.totalreturns")} value={totalReturns.toFormat()} />
</Tooltip> </Tooltip>
<Tooltip <Tooltip
title={ title={
<div <div
dangerouslySetInnerHTML={{ dangerouslySetInnerHTML={{
__html: t('jobs.labels.plitooltips.calculatedcreditsnotreceived'), __html: t("jobs.labels.plitooltips.calculatedcreditsnotreceived")
}} }}
/> />
} }
> >
<Statistic <Statistic
title={t('bills.labels.calculatedcreditsnotreceived')} title={t("bills.labels.calculatedcreditsnotreceived")}
valueStyle={{ valueStyle={{
color: calculatedCreditsNotReceived.getAmount() <= 0 ? 'green' : 'red', color: calculatedCreditsNotReceived.getAmount() <= 0 ? "green" : "red"
}} }}
value={ value={
calculatedCreditsNotReceived.getAmount() >= 0 calculatedCreditsNotReceived.getAmount() >= 0
@@ -284,15 +280,15 @@ export default function JobBillsTotalComponent({
title={ title={
<div <div
dangerouslySetInnerHTML={{ dangerouslySetInnerHTML={{
__html: t('jobs.labels.plitooltips.creditsnotreceived'), __html: t("jobs.labels.plitooltips.creditsnotreceived")
}} }}
/> />
} }
> >
<Statistic <Statistic
title={t('bills.labels.creditsnotreceived')} title={t("bills.labels.creditsnotreceived")}
valueStyle={{ valueStyle={{
color: totalReturnsMarkedNotReceived.getAmount() <= 0 ? 'green' : 'red', color: totalReturnsMarkedNotReceived.getAmount() <= 0 ? "green" : "red"
}} }}
value={ value={
totalReturnsMarkedNotReceived.getAmount() >= 0 totalReturnsMarkedNotReceived.getAmount() >= 0
@@ -303,11 +299,7 @@ export default function JobBillsTotalComponent({
</Tooltip> </Tooltip>
</Space> </Space>
{showWarning && calculatedCreditsNotReceived.getAmount() > 0 && ( {showWarning && calculatedCreditsNotReceived.getAmount() > 0 && (
<Alert <Alert style={{ margin: "8px 0px" }} type="warning" message={t("jobs.labels.outstanding_credit_memos")} />
style={{ margin: '8px 0px' }}
type="warning"
message={t('jobs.labels.outstanding_credit_memos')}
/>
)} )}
</Card> </Card>
</Col> </Col>

6
client/src/components/job-close-ro-guard/job-close-ro-guard.container.jsx
View File

@@ -84,12 +84,6 @@ export function JobCloseRoGuardContainer({ job, jobRO, bodyshop, form }) {
</Row> </Row>
</Col> </Col>
{InstanceRenderManager({ {InstanceRenderManager({
imex: (
<Col md={24} lg={8}>
{/* <JobCloseRoGuardSublet job={job} warningCallback={warningCallback} /> */}
<JobCloseRoGuardPpd job={job} warningCallback={warningCallback} />
</Col>
),
rome: ( rome: (
<Col md={24} lg={8}> <Col md={24} lg={8}>
{/* <JobCloseRoGuardSublet job={job} warningCallback={warningCallback} /> */} {/* <JobCloseRoGuardSublet job={job} warningCallback={warningCallback} /> */}

11
client/src/pages/jobs-close/jobs-close.component.jsx
View File

@@ -41,7 +41,7 @@ import { insertAuditTrail } from "../../redux/application/application.actions";
import { selectJobReadOnly } from "../../redux/application/application.selectors"; import { selectJobReadOnly } from "../../redux/application/application.selectors";
import { selectBodyshop } from "../../redux/user/user.selectors"; import { selectBodyshop } from "../../redux/user/user.selectors";
import AuditTrailMapping from "../../utils/AuditTrailMappings"; import AuditTrailMapping from "../../utils/AuditTrailMappings";
import JobCloseRoGuardContainer from '../../components/job-close-ro-guard/job-close-ro-guard.container'; import JobCloseRoGuardContainer from "../../components/job-close-ro-guard/job-close-ro-guard.container";
const mapStateToProps = createStructuredSelector({ const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop, bodyshop: selectBodyshop,
@@ -120,6 +120,13 @@ export function JobsCloseComponent({ job, bodyshop, jobRO, insertAuditTrail }) {
operation: AuditTrailMapping.jobinvoiced(), operation: AuditTrailMapping.jobinvoiced(),
type: "jobinvoiced" type: "jobinvoiced"
}); });
if (values.masterbypass) {
insertAuditTrail({
jobid: job.id,
operation: AuditTrailMapping.jobclosedwithbypass(),
type: "jobclosedwithbypass"
});
}
// history(`/manage/jobs/${job.id}`); // history(`/manage/jobs/${job.id}`);
} else { } else {
setLoading(false); setLoading(false);
@@ -184,7 +191,7 @@ export function JobsCloseComponent({ job, bodyshop, jobRO, insertAuditTrail }) {
</Space> </Space>
} }
/> />
<JobCloseRoGuardContainer form={form} job={job} /> <JobCloseRoGuardContainer form={form} job={job} />
<Space wrap direction="vertical" style={{ width: "100%" }}> <Space wrap direction="vertical" style={{ width: "100%" }}>
<FormsFieldChanged form={form} /> <FormsFieldChanged form={form} />
{!job.actual_in && job.scheduled_in && <Alert type="warning" message={t("jobs.labels.actual_in_inferred")} />} {!job.actual_in && job.scheduled_in && <Alert type="warning" message={t("jobs.labels.actual_in_inferred")} />}

5
client/src/translations/en_us/common.json
View File

@@ -116,6 +116,7 @@
"jobassignmentchange": "Employee {{name}} assigned to {{operation}}", "jobassignmentchange": "Employee {{name}} assigned to {{operation}}",
"jobassignmentremoved": "Employee assignment removed for {{operation}}", "jobassignmentremoved": "Employee assignment removed for {{operation}}",
"jobchecklist": "Checklist type \"{{type}}\" completed. In production set to {{inproduction}}. Status set to {{status}}.", "jobchecklist": "Checklist type \"{{type}}\" completed. In production set to {{inproduction}}. Status set to {{status}}.",
"jobclosedwithbypass": "Job was invoiced using the master bypass password. ",
"jobconverted": "Job converted and assigned number {{ro_number}}.", "jobconverted": "Job converted and assigned number {{ro_number}}.",
"jobdelivery": "Job intake completed. Status set to {{status}}. Actual completion is {{actual_completion}}.", "jobdelivery": "Job intake completed. Status set to {{status}}. Actual completion is {{actual_completion}}.",
"jobexported": "", "jobexported": "",
@@ -1975,7 +1976,7 @@
"outstanding_ar": "A balance is outstanding on this RO. Payments can still be entered when the job is closed. ", "outstanding_ar": "A balance is outstanding on this RO. Payments can still be entered when the job is closed. ",
"outstanding_credit_memos": "Outstanding credit memos have not been entered against this job. Credit Memos may still be posted once the job is closed.", "outstanding_credit_memos": "Outstanding credit memos have not been entered against this job. Credit Memos may still be posted once the job is closed.",
"outstanding_ppd": "There are outstanding PPDs that may not have been synced back to the estimate.", "outstanding_ppd": "There are outstanding PPDs that may not have been synced back to the estimate.",
"outstanding_reconciliation_discrep": "At least one discrepancy is not 0. This may indicate that this job is not properly reconciled and should not be closed.", "outstanding_reconciliation_discrep": "At least one discrepancy is not $0. This may indicate that this job is not properly reconciled and should not be closed.",
"outstanding_sublets": "There are sublet lines on the job which have not been marked as completed. ", "outstanding_sublets": "There are sublet lines on the job which have not been marked as completed. ",
"outstandinghours": "There are outstanding hours on the job that have not been paid or have been overpaid.", "outstandinghours": "There are outstanding hours on the job that have not been paid or have been overpaid.",
"override_header": "Override estimate header on import?", "override_header": "Override estimate header on import?",
@@ -2026,12 +2027,12 @@
"remove_from_ar": "Remove from AR", "remove_from_ar": "Remove from AR",
"returntotals": "Return Totals", "returntotals": "Return Totals",
"ro_guard": { "ro_guard": {
"eforce_profit": "Profit margins enforced.",
"enforce_ar": "AR collection enforced.", "enforce_ar": "AR collection enforced.",
"enforce_bills": "Bill discrepancy enforced.", "enforce_bills": "Bill discrepancy enforced.",
"enforce_cm": "Credit memo entry enforced.", "enforce_cm": "Credit memo entry enforced.",
"enforce_labor": "Labor allocations enforced.", "enforce_labor": "Labor allocations enforced.",
"enforce_ppd": "PPD sync enforced.", "enforce_ppd": "PPD sync enforced.",
"enforce_profit": "Profit margins enforced.",
"enforce_sublet": "Sublet completion enforced.", "enforce_sublet": "Sublet completion enforced.",
"enforce_validation": "Master Bypass Required: {{message}}", "enforce_validation": "Master Bypass Required: {{message}}",
"enforced": "This check has been enforced by your shop manager. Enter the master bypass password to close the Job." "enforced": "This check has been enforced by your shop manager. Enter the master bypass password to close the Job."

3
client/src/translations/es/common.json
View File

@@ -116,6 +116,7 @@
"jobassignmentchange": "", "jobassignmentchange": "",
"jobassignmentremoved": "", "jobassignmentremoved": "",
"jobchecklist": "", "jobchecklist": "",
"jobclosedwithbypass": "",
"jobconverted": "", "jobconverted": "",
"jobdelivery": "", "jobdelivery": "",
"jobexported": "", "jobexported": "",
@@ -2025,12 +2026,12 @@
"remove_from_ar": "", "remove_from_ar": "",
"returntotals": "", "returntotals": "",
"ro_guard": { "ro_guard": {
"eforce_profit": "",
"enforce_ar": "", "enforce_ar": "",
"enforce_bills": "", "enforce_bills": "",
"enforce_cm": "", "enforce_cm": "",
"enforce_labor": "", "enforce_labor": "",
"enforce_ppd": "", "enforce_ppd": "",
"enforce_profit": "",
"enforce_sublet": "", "enforce_sublet": "",
"enforce_validation": "", "enforce_validation": "",
"enforced": "" "enforced": ""

3
client/src/translations/fr/common.json
View File

@@ -116,6 +116,7 @@
"jobassignmentchange": "", "jobassignmentchange": "",
"jobassignmentremoved": "", "jobassignmentremoved": "",
"jobchecklist": "", "jobchecklist": "",
"jobclosedwithbypass": "",
"jobconverted": "", "jobconverted": "",
"jobdelivery": "", "jobdelivery": "",
"jobexported": "", "jobexported": "",
@@ -2025,12 +2026,12 @@
"remove_from_ar": "", "remove_from_ar": "",
"returntotals": "", "returntotals": "",
"ro_guard": { "ro_guard": {
"eforce_profit": "",
"enforce_ar": "", "enforce_ar": "",
"enforce_bills": "", "enforce_bills": "",
"enforce_cm": "", "enforce_cm": "",
"enforce_labor": "", "enforce_labor": "",
"enforce_ppd": "", "enforce_ppd": "",
"enforce_profit": "",
"enforce_sublet": "", "enforce_sublet": "",
"enforce_validation": "", "enforce_validation": "",
"enforced": "" "enforced": ""

1
client/src/utils/AuditTrailMappings.js
View File

@@ -24,6 +24,7 @@ const AuditTrailMapping = {
jobimported: () => i18n.t("audit_trail.messages.jobimported"), jobimported: () => i18n.t("audit_trail.messages.jobimported"),
jobinproductionchange: (inproduction) => i18n.t("audit_trail.messages.jobinproductionchange", { inproduction }), jobinproductionchange: (inproduction) => i18n.t("audit_trail.messages.jobinproductionchange", { inproduction }),
jobinvoiced: () => i18n.t("audit_trail.messages.jobinvoiced"), jobinvoiced: () => i18n.t("audit_trail.messages.jobinvoiced"),
jobclosedwithbypass: () => i18n.t("audit_trail.messages.jobclosedwithbypass"),
jobmodifylbradj: ({ mod_lbr_ty, hours }) => i18n.t("audit_trail.messages.jobmodifylbradj", { mod_lbr_ty, hours }), jobmodifylbradj: ({ mod_lbr_ty, hours }) => i18n.t("audit_trail.messages.jobmodifylbradj", { mod_lbr_ty, hours }),
jobnoteadded: () => i18n.t("audit_trail.messages.jobnoteadded"), jobnoteadded: () => i18n.t("audit_trail.messages.jobnoteadded"),
jobnoteupdated: () => i18n.t("audit_trail.messages.jobnoteupdated"), jobnoteupdated: () => i18n.t("audit_trail.messages.jobnoteupdated"),