diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel index aeabb8f20..1a4659afe 100644 --- a/bodyshop_translations.babel +++ b/bodyshop_translations.babel @@ -6135,6 +6135,221 @@ + + md_ro_guard + + + enabled + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + + + enforce_ar + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + + + enforce_bills + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + + + enforce_cm + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + + + enforce_labor + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + + + enforce_ppd + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + + + enforce_profit + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + + + enforce_sublet + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + + + masterbypass + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + + + totalgppercent_minimum + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + + + md_tasks_presets @@ -10663,6 +10878,27 @@ + + md_ro_guard + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + md_tasks_presets false @@ -11067,6 +11303,32 @@ + + roguard + + + title + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + + + scheduling false @@ -21835,6 +22097,27 @@ + + act_price_before_ppc + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + ah_detail_line false @@ -30796,6 +31079,27 @@ labels + + accountsreceivable + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + act_price_ppc false @@ -33110,6 +33414,27 @@ + + masterbypass + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + materials @@ -33241,6 +33566,132 @@ + + outstanding_ar + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + + + outstanding_credit_memos + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + + + outstanding_ppd + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + + + outstanding_reconciliation_discrep + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + + + outstanding_sublets + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + + + outstandinghours + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + override_header false @@ -33430,6 +33881,27 @@ + + performance + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + pimraryamountpayable false @@ -33687,6 +34159,27 @@ + + ppdnotexported + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + profileadjustments false @@ -34070,6 +34563,95 @@ + + ro_guard + + + enforce_validation + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + + + enforced + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + + + + + roguard + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + + + roguardwarnings + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + rosaletotal false @@ -34280,6 +34862,27 @@ + + subletsnotcompleted + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + subletstotal false diff --git a/client/src/components/job-bills-total/job-bills-total.component.jsx b/client/src/components/job-bills-total/job-bills-total.component.jsx index 85f8ed893..f701cf262 100644 --- a/client/src/components/job-bills-total/job-bills-total.component.jsx +++ b/client/src/components/job-bills-total/job-bills-total.component.jsx @@ -1,17 +1,29 @@ -import { Card, Col, Row, Space, Statistic, Tooltip, Typography } from "antd"; -import Dinero from "dinero.js"; -import React from "react"; -import { useTranslation } from "react-i18next"; -import AlertComponent from "../alert/alert.component"; -import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component"; -import "./job-bills-total.styles.scss"; -import InstanceRenderManager from "../../utils/instanceRenderMgr"; +import { Alert, Card, Col, Row, Space, Statistic, Tooltip, Typography } from 'antd'; +import Dinero from 'dinero.js'; +import React from 'react'; +import { useTranslation } from 'react-i18next'; +import InstanceRenderManager from '../../utils/instanceRenderMgr'; +import AlertComponent from '../alert/alert.component'; +import LoadingSkeleton from '../loading-skeleton/loading-skeleton.component'; +import './job-bills-total.styles.scss'; -export default function JobBillsTotalComponent({ loading, bills, partsOrders, jobTotals }) { +export default function JobBillsTotalComponent({ + loading, + bills, + partsOrders, + jobTotals, + showWarning, + warningCallback, +}) { const { t } = useTranslation(); if (loading) return ; - if (!!!jobTotals) return ; + if (!!!jobTotals) { + if (showWarning && warningCallback && typeof warningCallback === 'function') { + warningCallback({ key: 'bills', warning: t('jobs.errors.nofinancial') }); + } + return ; + } const totals = jobTotals; @@ -97,48 +109,64 @@ export default function JobBillsTotalComponent({ loading, bills, partsOrders, jo const discrepWithCms = discrepWithLbrAdj.add(totalReturns); const calculatedCreditsNotReceived = totalReturns.subtract(billCms); //billCms is tracked as a negative number. + if (showWarning && warningCallback && typeof warningCallback === 'function') { + if ( + discrepWithCms.getAmount() !== 0 || + discrepWithLbrAdj.getAmount() !== 0 || + discrepancy.getAmount() !== 0 + ) { + warningCallback({ + key: 'bills', + warning: t('jobs.labels.outstanding_reconciliation_discrep'), + }); + } + if (calculatedCreditsNotReceived.getAmount() > 0) { + warningCallback({ key: 'cm', warning: t('jobs.labels.outstanding_credit_memos') }); + } + } + return ( - - - + + + } > - + - } > - + = } > @@ -148,27 +176,27 @@ export default function JobBillsTotalComponent({ loading, bills, partsOrders, jo title={
} > - + = } > @@ -178,61 +206,72 @@ export default function JobBillsTotalComponent({ loading, bills, partsOrders, jo title={
} > - + = } > + + {showWarning && + (discrepWithCms.getAmount() !== 0 || + discrepWithLbrAdj.getAmount() !== 0 || + discrepancy.getAmount() !== 0) && ( + + )} - - + + } > - + } > = 0 @@ -245,15 +284,15 @@ export default function JobBillsTotalComponent({ loading, bills, partsOrders, jo title={
} > = 0 @@ -263,6 +302,13 @@ export default function JobBillsTotalComponent({ loading, bills, partsOrders, jo /> + {showWarning && calculatedCreditsNotReceived.getAmount() > 0 && ( + + )} diff --git a/client/src/components/job-close-ro-guard/job-close-ro-gaurd.labor.jsx b/client/src/components/job-close-ro-guard/job-close-ro-gaurd.labor.jsx new file mode 100644 index 000000000..121521759 --- /dev/null +++ b/client/src/components/job-close-ro-guard/job-close-ro-gaurd.labor.jsx @@ -0,0 +1,61 @@ +import React from 'react'; + +import { useQuery } from '@apollo/client'; +import { useSplitTreatments } from '@splitsoftware/splitio-react'; +import { connect } from 'react-redux'; +import { createStructuredSelector } from 'reselect'; +import { GET_LINE_TICKET_BY_PK } from '../../graphql/jobs-lines.queries'; +import { selectJobReadOnly } from '../../redux/application/application.selectors'; +import { selectBodyshop } from '../../redux/user/user.selectors'; +import AlertComponent from '../alert/alert.component'; +import LaborAllocationsTableComponent from '../labor-allocations-table/labor-allocations-table.component'; +import PayrollLaborAllocationsTable from '../labor-allocations-table/labor-allocations-table.payroll.component'; +import LoadingSkeleton from '../loading-skeleton/loading-skeleton.component'; +const mapStateToProps = createStructuredSelector({ + //currentUser: selectCurrentUser + bodyshop: selectBodyshop, + jobRO: selectJobReadOnly, +}); +const mapDispatchToProps = (dispatch) => ({ + //setUserLanguage: language => dispatch(setUserLanguage(language)) +}); +export default connect(mapStateToProps, mapDispatchToProps)(JobCloseRoGuardLabor); + +export function JobCloseRoGuardLabor({ job, jobRO, bodyshop, form, warningCallback }) { + const { loading, error, data, refetch } = useQuery(GET_LINE_TICKET_BY_PK, { + variables: { id: job.id }, + fetchPolicy: 'network-only', + nextFetchPolicy: 'network-only', + }); + const { + treatments: { Enhanced_Payroll }, + } = useSplitTreatments({ + attributes: {}, + names: ['Enhanced_Payroll'], + splitKey: bodyshop.imexshopid, + }); + + if (loading) return ; + if (error) return ; + + return Enhanced_Payroll.treatment === 'on' ? ( + + ) : ( + + ); +} diff --git a/client/src/components/job-close-ro-guard/job-close-ro-guard.ar.jsx b/client/src/components/job-close-ro-guard/job-close-ro-guard.ar.jsx new file mode 100644 index 000000000..1bd4cd575 --- /dev/null +++ b/client/src/components/job-close-ro-guard/job-close-ro-guard.ar.jsx @@ -0,0 +1,66 @@ +import React, { useEffect } from 'react'; + +import { Alert, Card } from 'antd'; +import { useTranslation } from 'react-i18next'; +import { connect } from 'react-redux'; +import { createStructuredSelector } from 'reselect'; +import { selectJobReadOnly } from '../../redux/application/application.selectors'; +import { selectBodyshop } from '../../redux/user/user.selectors'; +import { useMemo } from 'react'; +import Dinero from 'dinero.js'; +import DataLabel from '../data-label/data-label.component'; + +const mapStateToProps = createStructuredSelector({ + //currentUser: selectCurrentUser + bodyshop: selectBodyshop, + jobRO: selectJobReadOnly, +}); +const mapDispatchToProps = (dispatch) => ({ + //setUserLanguage: language => dispatch(setUserLanguage(language)) +}); +export default connect(mapStateToProps, mapDispatchToProps)(JobCloseRoGuardProfit); + +export function JobCloseRoGuardProfit({ job, jobRO, bodyshop, form, warningCallback }) { + const { t } = useTranslation(); + + const total = useMemo(() => { + return ( + job.payments && + job.payments.reduce((acc, val) => { + acc = acc.add(Dinero({ amount: Math.round(val.amount * 100) })); + return acc; + }, Dinero()) + ); + }, [job.payments]); + + const balance = useMemo(() => { + if (job && job.job_totals && job.job_totals.totals.total_repairs) + return Dinero(job.job_totals.totals.total_repairs).subtract(total); + return Dinero({ amount: 0 }).subtract(total); + }, [job, total]); + + useEffect(() => { + if (balance.getAmount !== 0) { + warningCallback({ key: 'ar', warning: t('jobs.labels.outstanding_ar') }); + } + }, [balance, t, warningCallback]); + + return ( + + {total.toFormat()} + + {balance.toFormat()} + + {balance.getAmount !== 0 && ( + + )} + + ); +} diff --git a/client/src/components/job-close-ro-guard/job-close-ro-guard.bills.jsx b/client/src/components/job-close-ro-guard/job-close-ro-guard.bills.jsx new file mode 100644 index 000000000..23a0fe478 --- /dev/null +++ b/client/src/components/job-close-ro-guard/job-close-ro-guard.bills.jsx @@ -0,0 +1,40 @@ +import React from 'react'; + +import { useQuery } from '@apollo/client'; +import { connect } from 'react-redux'; +import { createStructuredSelector } from 'reselect'; +import { QUERY_BILLS_BY_JOBID } from '../../graphql/bills.queries'; +import { selectJobReadOnly } from '../../redux/application/application.selectors'; +import { selectBodyshop } from '../../redux/user/user.selectors'; +import AlertComponent from '../alert/alert.component'; +import JobBillsTotalComponent from '../job-bills-total/job-bills-total.component'; +const mapStateToProps = createStructuredSelector({ + //currentUser: selectCurrentUser + bodyshop: selectBodyshop, + jobRO: selectJobReadOnly, +}); +const mapDispatchToProps = (dispatch) => ({ + //setUserLanguage: language => dispatch(setUserLanguage(language)) +}); +export default connect(mapStateToProps, mapDispatchToProps)(JobCloseRoGuardBills); + +export function JobCloseRoGuardBills({ job, jobRO, bodyshop, form, warningCallback }) { + const { loading, error, data } = useQuery(QUERY_BILLS_BY_JOBID, { + variables: { jobid: job.id }, + fetchPolicy: 'network-only', + nextFetchPolicy: 'network-only', + }); + + if (error) return ; + + return ( + + ); +} diff --git a/client/src/components/job-close-ro-guard/job-close-ro-guard.container.jsx b/client/src/components/job-close-ro-guard/job-close-ro-guard.container.jsx new file mode 100644 index 000000000..0fe5f076f --- /dev/null +++ b/client/src/components/job-close-ro-guard/job-close-ro-guard.container.jsx @@ -0,0 +1,231 @@ +import React, { useCallback, useState } from 'react'; +import { LockOutlined } from '@ant-design/icons'; +import { Badge, Card, Col, Collapse, Form, Input, Row, Space, Tooltip } from 'antd'; +import { useTranslation } from 'react-i18next'; +import { connect } from 'react-redux'; +import { createStructuredSelector } from 'reselect'; +import { selectJobReadOnly } from '../../redux/application/application.selectors'; +import { selectBodyshop } from '../../redux/user/user.selectors'; +import JobCloseRoGuardLabor from './job-close-ro-gaurd.labor'; +import JobCloseRoGuardAr from './job-close-ro-guard.ar'; +import JobCloseRoGuardBills from './job-close-ro-guard.bills'; +import JobCloseRoGuardPpd from './job-close-ro-guard.ppd'; +import JobCloseRoGuardProfit from './job-close-ro-guard.profit'; +import './job-close-ro-guard.styles.scss'; +import JobCloseRoGuardSublet from './job-close-ro-guard.sublet'; +import JobCloseRoGuardTtLifecycle from './job-close-ro-guard.tt-lifecycle'; + +const mapStateToProps = createStructuredSelector({ + //currentUser: selectCurrentUser + bodyshop: selectBodyshop, + jobRO: selectJobReadOnly, +}); +const mapDispatchToProps = (dispatch) => ({ + //setUserLanguage: language => dispatch(setUserLanguage(language)) +}); +export default connect(mapStateToProps, mapDispatchToProps)(JobCloseRoGuardContainer); + +export function JobCloseRoGuardContainer({ job, jobRO, bodyshop, form }) { + const { t } = useTranslation(); + const [warnings, setWarnings] = useState([]); + + const warningCallback = useCallback( + ({ key, warning }) => + setWarnings((state) => { + if (state.find((s) => s.key === key)) return state; + return [...state, { key, warning }]; + }), + [] + ); + + if (!bodyshop?.md_ro_guard?.enabled) return null; + + return ( + <> + {warnings.length > 0 && ( + + + {t('jobs.labels.roguardwarnings')} + + } + > +
    + {warnings.map((w, index) => ( +
  • + {bodyshop.md_ro_guard[`enforce_${w.key}`] && ( + + + + )} + {w.warning} +
    • + ))} +
+ + )} + + + + + + + + + + + + + + + + + + + + + + + + ({ + validator(_, value) { + if ( + !PasswordCheck({ bodyshop, value }) && + bodyshop.md_ro_guard.enforce_bills && + warnings.find((w) => w.key === 'bills') + ) { + return Promise.reject(t('jobs.labels.ro_guard.enforce_bills')); + } + return Promise.resolve(); + }, + }), + ({ getFieldValue }) => ({ + validator(_, value) { + if ( + !PasswordCheck({ bodyshop, value }) && + bodyshop.md_ro_guard.enforce_cm && + warnings.find((w) => w.key === 'cm') + ) { + return Promise.reject( + t('translation.jobs.labels.ro_guard.enforce_validation', { + message: t('jobs.labels.ro_guard.enforce_cm'), + }) + ); + } + return Promise.resolve(); + }, + }), + ({ getFieldValue }) => ({ + validator(_, value) { + if ( + !PasswordCheck({ bodyshop, value }) && + bodyshop.md_ro_guard.enforce_profit && + warnings.find((w) => w.key === 'profit') + ) { + return Promise.reject( + t('translation.jobs.labels.ro_guard.enforce_validation', { + message: t('jobs.labels.ro_guard.enforce_profit'), + }) + ); + } + return Promise.resolve(); + }, + }), + ({ getFieldValue }) => ({ + validator(_, value) { + if ( + !PasswordCheck({ bodyshop, value }) && + bodyshop.md_ro_guard.enforce_ar && + warnings.find((w) => w.key === 'ar') + ) { + return Promise.reject( + t('translation.jobs.labels.ro_guard.enforce_validation', { + message: t('jobs.labels.ro_guard.enforce_ar'), + }) + ); + } + return Promise.resolve(); + }, + }), + ({ getFieldValue }) => ({ + validator(_, value) { + if ( + !PasswordCheck({ bodyshop, value }) && + bodyshop.md_ro_guard.enforce_sublet && + warnings.find((w) => w.key === 'sublet') + ) { + return Promise.reject( + t('translation.jobs.labels.ro_guard.enforce_validation', { + message: t('jobs.labels.ro_guard.enforce_sublet'), + }) + ); + } + return Promise.resolve(); + }, + }), + ({ getFieldValue }) => ({ + validator(_, value) { + if ( + !PasswordCheck({ bodyshop, value }) && + bodyshop.md_ro_guard.enforce_ppd && + warnings.find((w) => w.key === 'ppd') + ) { + return Promise.reject( + t('translation.jobs.labels.ro_guard.enforce_validation', { + message: t('jobs.labels.ro_guard.enforce_ppd'), + }) + ); + } + return Promise.resolve(); + }, + }), + ({ getFieldValue }) => ({ + validator(_, value) { + if ( + !PasswordCheck({ bodyshop, value }) && + bodyshop.md_ro_guard.enforce_labor && + warnings.find((w) => w.key === 'labor') + ) { + return Promise.reject( + t('translation.jobs.labels.ro_guard.enforce_validation', { + message: t('jobs.labels.ro_guard.enforce_labor'), + }) + ); + } + return Promise.resolve(); + }, + }), + ]} + > + } + type="password" + placeholder="Password" + disabled={jobRO} + /> + + + + + + + + + + + + + ); +} + +function PasswordCheck({ bodyshop, value }) { + return value === bodyshop?.md_ro_guard?.masterbypass; +} diff --git a/client/src/components/job-close-ro-guard/job-close-ro-guard.ppd.jsx b/client/src/components/job-close-ro-guard/job-close-ro-guard.ppd.jsx new file mode 100644 index 000000000..e445427ce --- /dev/null +++ b/client/src/components/job-close-ro-guard/job-close-ro-guard.ppd.jsx @@ -0,0 +1,98 @@ +import React, { useEffect } from 'react'; + +import { Alert, Card, Table } from 'antd'; +import { t } from 'i18next'; +import { connect } from 'react-redux'; +import { createStructuredSelector } from 'reselect'; +import { selectJobReadOnly } from '../../redux/application/application.selectors'; +import { selectBodyshop } from '../../redux/user/user.selectors'; +import CurrencyFormatter from '../../utils/CurrencyFormatter'; +import { alphaSort } from '../../utils/sorters'; +const mapStateToProps = createStructuredSelector({ + //currentUser: selectCurrentUser + bodyshop: selectBodyshop, + jobRO: selectJobReadOnly, +}); +const mapDispatchToProps = (dispatch) => ({ + //setUserLanguage: language => dispatch(setUserLanguage(language)) +}); +export default connect(mapStateToProps, mapDispatchToProps)(JobCloseRGuardPpd); + +export function JobCloseRGuardPpd({ job, jobRO, bodyshop, form, warningCallback }) { + const linesWithPPD = job?.joblines.filter( + (j) => j.act_price_before_ppc !== 0 && j.act_price_before_ppc !== null + ); + + useEffect(() => { + if (linesWithPPD.length > 0) { + warningCallback({ key: 'ppd', warning: t('jobs.labels.outstanding_sublets') }); + } + }, [linesWithPPD.length, warningCallback]); + + const columns = [ + { + title: t('joblines.fields.line_desc'), + dataIndex: 'line_desc', + fixed: 'left', + key: 'line_desc', + sorter: (a, b) => alphaSort(a.line_desc, b.line_desc), + onCell: (record) => ({ + className: record.manual_line && 'job-line-manual', + style: { + ...(record.critical ? { boxShadow: ' -.5em 0 0 #FFC107' } : {}), + }, + }), + ellipsis: true, + }, + { + title: t('joblines.fields.act_price'), + dataIndex: 'act_price', + key: 'act_price', + sorter: (a, b) => a.act_price - b.act_price, + + ellipsis: true, + render: (text, record) => {record.act_price}, + }, + { + title: t('joblines.fields.act_price_before_ppc'), + dataIndex: 'act_price_before_ppc', + key: 'act_price_before_ppc', + sorter: (a, b) => a.act_price_before_ppc - b.act_price_before_ppc, + + ellipsis: true, + render: (text, record) => ( + {record.act_price_before_ppc} + ), + }, + { + title: t('joblines.fields.part_qty'), + dataIndex: 'part_qty', + key: 'part_qty', + }, + { + title: t('joblines.fields.notes'), + dataIndex: 'notes', + key: 'notes', + }, + ]; + + return ( + + + {linesWithPPD.length > 0 && ( + + )} + + ); +} diff --git a/client/src/components/job-close-ro-guard/job-close-ro-guard.profit.jsx b/client/src/components/job-close-ro-guard/job-close-ro-guard.profit.jsx new file mode 100644 index 000000000..4cbbca357 --- /dev/null +++ b/client/src/components/job-close-ro-guard/job-close-ro-guard.profit.jsx @@ -0,0 +1,60 @@ +import React, { useEffect, useState } from 'react'; + +import { LockOutlined } from '@ant-design/icons'; +import { Card, Form, Input } from 'antd'; +import axios from 'axios'; +import { useTranslation } from 'react-i18next'; +import { connect } from 'react-redux'; +import { createStructuredSelector } from 'reselect'; +import { selectJobReadOnly } from '../../redux/application/application.selectors'; +import { selectBodyshop } from '../../redux/user/user.selectors'; +import JobCostingStatistics from '../job-costing-statistics/job-costing-statistics.component'; +import LoadingSkeleton from '../loading-skeleton/loading-skeleton.component'; + +const mapStateToProps = createStructuredSelector({ + //currentUser: selectCurrentUser + bodyshop: selectBodyshop, + jobRO: selectJobReadOnly, +}); +const mapDispatchToProps = (dispatch) => ({ + //setUserLanguage: language => dispatch(setUserLanguage(language)) +}); +export default connect(mapStateToProps, mapDispatchToProps)(JobCloseRoGuardProfit); + +export function JobCloseRoGuardProfit({ job, jobRO, bodyshop, form, warningCallback }) { + const [costingData, setCostingData] = useState(null); + const [loading, setLoading] = useState(false); + const { t } = useTranslation(); + + useEffect(() => { + async function getData() { + try { + if (job.id) { + setLoading(true); + const { data } = await axios.post('/job/costing', { jobid: job.id }); + setCostingData(data); + } + } catch (error) {} + setLoading(false); + } + + getData(); + }, [job.id]); + + const enforceProfitPassword = + parseFloat(costingData?.summaryData.gppercent) < bodyshop?.md_ro_guard?.totalgppercent_minimum; + + useEffect(() => { + if (enforceProfitPassword && typeof warningCallback === 'function') { + warningCallback({ key: 'profit', warning: t('jobs.labels.profitbypassrequired') }); + } + }, [enforceProfitPassword, t, warningCallback]); + + if (loading || !costingData) return ; + + return ( + + + + ); +} diff --git a/client/src/components/job-close-ro-guard/job-close-ro-guard.styles.scss b/client/src/components/job-close-ro-guard/job-close-ro-guard.styles.scss new file mode 100644 index 000000000..51f790b77 --- /dev/null +++ b/client/src/components/job-close-ro-guard/job-close-ro-guard.styles.scss @@ -0,0 +1,10 @@ +.ro-guard-col { + .ant-card { + height: 100%; + } +} +.ro-guard-col-50 { + .ant-card { + height: 50%; + } +} diff --git a/client/src/components/job-close-ro-guard/job-close-ro-guard.sublet.jsx b/client/src/components/job-close-ro-guard/job-close-ro-guard.sublet.jsx new file mode 100644 index 000000000..e44e58adf --- /dev/null +++ b/client/src/components/job-close-ro-guard/job-close-ro-guard.sublet.jsx @@ -0,0 +1,89 @@ +import React, { useEffect } from 'react'; + +import { Alert, Card, Table } from 'antd'; +import { t } from 'i18next'; +import { connect } from 'react-redux'; +import { createStructuredSelector } from 'reselect'; +import { selectJobReadOnly } from '../../redux/application/application.selectors'; +import { selectBodyshop } from '../../redux/user/user.selectors'; +import CurrencyFormatter from '../../utils/CurrencyFormatter'; +import { alphaSort } from '../../utils/sorters'; +const mapStateToProps = createStructuredSelector({ + //currentUser: selectCurrentUser + bodyshop: selectBodyshop, + jobRO: selectJobReadOnly, +}); +const mapDispatchToProps = (dispatch) => ({ + //setUserLanguage: language => dispatch(setUserLanguage(language)) +}); +export default connect(mapStateToProps, mapDispatchToProps)(JobCloseRGuardSublet); + +export function JobCloseRGuardSublet({ job, jobRO, bodyshop, form, warningCallback }) { + const subletsNotDone = job?.joblines.filter( + (j) => + (j.part_type === 'PAS' || j.part_type === 'PASL') && + (!j.sublet_completed || !j.sublet_ignored) + ); + + const columns = [ + { + title: t('joblines.fields.line_desc'), + dataIndex: 'line_desc', + fixed: 'left', + key: 'line_desc', + sorter: (a, b) => alphaSort(a.line_desc, b.line_desc), + onCell: (record) => ({ + className: record.manual_line && 'job-line-manual', + style: { + ...(record.critical ? { boxShadow: ' -.5em 0 0 #FFC107' } : {}), + }, + }), + ellipsis: true, + }, + { + title: t('joblines.fields.act_price'), + dataIndex: 'act_price', + key: 'act_price', + sorter: (a, b) => a.act_price - b.act_price, + + ellipsis: true, + render: (text, record) => {record.act_price}, + }, + { + title: t('joblines.fields.part_qty'), + dataIndex: 'part_qty', + key: 'part_qty', + }, + { + title: t('joblines.fields.notes'), + dataIndex: 'notes', + key: 'notes', + }, + ]; + + useEffect(() => { + if (subletsNotDone.length > 0) { + warningCallback({ key: 'sublet', warning: t('jobs.labels.outstanding_sublets') }); + } + }, [subletsNotDone.length, warningCallback]); + + return ( + +
+ {subletsNotDone.length > 0 && ( + + )} + + ); +} diff --git a/client/src/components/job-close-ro-guard/job-close-ro-guard.totals.jsx b/client/src/components/job-close-ro-guard/job-close-ro-guard.totals.jsx new file mode 100644 index 000000000..e765c941c --- /dev/null +++ b/client/src/components/job-close-ro-guard/job-close-ro-guard.totals.jsx @@ -0,0 +1,26 @@ +import React from 'react'; + +import { connect } from 'react-redux'; +import { createStructuredSelector } from 'reselect'; +import { selectJobReadOnly } from '../../redux/application/application.selectors'; +import { selectBodyshop } from '../../redux/user/user.selectors'; +import JobTotalsTableTotals from '../job-totals-table/job-totals.table.totals.component'; +import { Card } from 'antd'; +import { t } from 'i18next'; +const mapStateToProps = createStructuredSelector({ + //currentUser: selectCurrentUser + bodyshop: selectBodyshop, + jobRO: selectJobReadOnly, +}); +const mapDispatchToProps = (dispatch) => ({ + //setUserLanguage: language => dispatch(setUserLanguage(language)) +}); +export default connect(mapStateToProps, mapDispatchToProps)(JobCloseRGuardTotals); + +export function JobCloseRGuardTotals({ job, jobRO, bodyshop, form }) { + return ( + + + + ); +} diff --git a/client/src/components/job-close-ro-guard/job-close-ro-guard.tt-lifecycle.jsx b/client/src/components/job-close-ro-guard/job-close-ro-guard.tt-lifecycle.jsx new file mode 100644 index 000000000..1b0f60514 --- /dev/null +++ b/client/src/components/job-close-ro-guard/job-close-ro-guard.tt-lifecycle.jsx @@ -0,0 +1,24 @@ +import React from 'react'; + +import { connect } from 'react-redux'; +import { createStructuredSelector } from 'reselect'; +import { selectJobReadOnly } from '../../redux/application/application.selectors'; +import { selectBodyshop } from '../../redux/user/user.selectors'; +import JobLifecycleComponent from '../job-lifecycle/job-lifecycle.component'; +const mapStateToProps = createStructuredSelector({ + //currentUser: selectCurrentUser + bodyshop: selectBodyshop, + jobRO: selectJobReadOnly, +}); +const mapDispatchToProps = (dispatch) => ({ + //setUserLanguage: language => dispatch(setUserLanguage(language)) +}); +export default connect(mapStateToProps, mapDispatchToProps)(JobCloseRoGuardTTLifeCycle); + +export function JobCloseRoGuardTTLifeCycle({ job, jobRO, bodyshop, form }) { + return ( +
+ +
+ ); +} diff --git a/client/src/components/job-costing-statistics/job-costing-statistics.component.jsx b/client/src/components/job-costing-statistics/job-costing-statistics.component.jsx index 38a832d91..6d778bb7e 100644 --- a/client/src/components/job-costing-statistics/job-costing-statistics.component.jsx +++ b/client/src/components/job-costing-statistics/job-costing-statistics.component.jsx @@ -1,11 +1,35 @@ -import { Statistic } from "antd"; -import React from "react"; -import { useTranslation } from "react-i18next"; -import Dinero from "dinero.js"; +import { Space, Statistic } from 'antd'; +import React from 'react'; +import { useTranslation } from 'react-i18next'; +import Dinero from 'dinero.js'; -export default function JobCostingStatistics({ summaryData }) { +export default function JobCostingStatistics({ summaryData, onlyGP }) { const { t } = useTranslation(); + const gpTotals = ( + <> + + + + {' '} + + + + + + ); + + if (onlyGP) return gpTotals; + return (
diff --git a/client/src/components/job-payments/job-payments.component.jsx b/client/src/components/job-payments/job-payments.component.jsx index bfb74d8fc..979b23d44 100644 --- a/client/src/components/job-payments/job-payments.component.jsx +++ b/client/src/components/job-payments/job-payments.component.jsx @@ -133,6 +133,7 @@ export function JobPayments({ } ]; + //Same as in RO guard. If changed, update in both. const total = useMemo(() => { return ( job.payments && diff --git a/client/src/components/labor-allocations-table/labor-allocations-table.component.jsx b/client/src/components/labor-allocations-table/labor-allocations-table.component.jsx index 649f49584..aabe7b179 100644 --- a/client/src/components/labor-allocations-table/labor-allocations-table.component.jsx +++ b/client/src/components/labor-allocations-table/labor-allocations-table.component.jsx @@ -1,5 +1,5 @@ import { EditFilled } from "@ant-design/icons"; -import { Card, Col, Row, Space, Table, Typography } from "antd"; +import { Alert, Card, Col, Row, Space, Table, Typography } from "antd"; import _ from "lodash"; import React, { useEffect, useMemo, useState } from "react"; import { useTranslation } from "react-i18next"; @@ -18,7 +18,16 @@ const mapStateToProps = createStructuredSelector({ technician: selectTechnician }); -export function LaborAllocationsTable({ jobId, joblines, timetickets, bodyshop, adjustments, technician }) { +export function LaborAllocationsTable({ + jobId, + joblines, + timetickets, + bodyshop, + adjustments, + technician, + showWarning, + warningCallback +}) { const { t } = useTranslation(); const [totals, setTotals] = useState([]); const [state, setState] = useState({ @@ -176,6 +185,10 @@ export function LaborAllocationsTable({ jobId, joblines, timetickets, bodyshop, { hrs_total: 0, hrs_claimed: 0, adjustments: 0, difference: 0 } ); + if (summary.difference !== 0 && typeof warningCallback === "function") { + warningCallback({ key: "labor", warning: t("jobs.labels.outstandinghours") }); + } + return (
@@ -227,6 +240,9 @@ export function LaborAllocationsTable({ jobId, joblines, timetickets, bodyshop, )} + {showWarning && summary.difference !== 0 && ( + + )} ); } diff --git a/client/src/components/labor-allocations-table/labor-allocations-table.payroll.component.jsx b/client/src/components/labor-allocations-table/labor-allocations-table.payroll.component.jsx index 164c75fb2..3e8adc17b 100644 --- a/client/src/components/labor-allocations-table/labor-allocations-table.payroll.component.jsx +++ b/client/src/components/labor-allocations-table/labor-allocations-table.payroll.component.jsx @@ -1,4 +1,4 @@ -import { Button, Card, Col, notification, Row, Space, Table, Typography } from "antd"; +import { Alert, Button, Card, Col, notification, Row, Space, Table, Typography } from "antd"; import { SyncOutlined } from "@ant-design/icons"; import axios from "axios"; import _ from "lodash"; @@ -23,7 +23,9 @@ export function PayrollLaborAllocationsTable({ bodyshop, adjustments, technician, - refetch + refetch, + showWarning, + warningCallback }) { const { t } = useTranslation(); const [totals, setTotals] = useState([]); @@ -191,6 +193,10 @@ export function PayrollLaborAllocationsTable({ { hrs_total: 0, hrs_claimed: 0, adjustments: 0, difference: 0 } ); + if (summary.difference !== 0 && typeof warningCallback === "function") { + warningCallback({ key: "labor", warning: t("jobs.labels.outstandinghours") }); + } + return ( @@ -285,6 +291,9 @@ export function PayrollLaborAllocationsTable({ )} + {showWarning && summary.difference !== 0 && ( + + )} ); } diff --git a/client/src/components/shop-info/shop-info.component.jsx b/client/src/components/shop-info/shop-info.component.jsx index 90f4a5034..fd9ba96a8 100644 --- a/client/src/components/shop-info/shop-info.component.jsx +++ b/client/src/components/shop-info/shop-info.component.jsx @@ -1,24 +1,25 @@ -import { useSplitTreatments } from "@splitsoftware/splitio-react"; -import { Button, Card, Tabs } from "antd"; -import React from "react"; -import { useTranslation } from "react-i18next"; -import { connect } from "react-redux"; -import { createStructuredSelector } from "reselect"; -import { selectBodyshop } from "../../redux/user/user.selectors"; -import ShopInfoGeneral from "./shop-info.general.component"; -import ShopInfoIntakeChecklistComponent from "./shop-info.intake.component"; -import ShopInfoLaborRates from "./shop-info.laborrates.component"; -import ShopInfoOrderStatusComponent from "./shop-info.orderstatus.component"; -import ShopInfoPartsScan from "./shop-info.parts-scan"; -import ShopInfoRbacComponent from "./shop-info.rbac.component"; -import ShopInfoResponsibilityCenterComponent from "./shop-info.responsibilitycenters.component"; -import ShopInfoROStatusComponent from "./shop-info.rostatus.component"; -import ShopInfoSchedulingComponent from "./shop-info.scheduling.component"; -import ShopInfoSpeedPrint from "./shop-info.speedprint.component"; -import { useLocation, useNavigate } from "react-router-dom"; -import ShopInfoTaskPresets from "./shop-info.task-presets.component"; -import queryString from "query-string"; -import InstanceRenderManager from "../../utils/instanceRenderMgr"; +import { useSplitTreatments } from '@splitsoftware/splitio-react'; +import { Button, Card, Tabs } from 'antd'; +import React from 'react'; +import { useTranslation } from 'react-i18next'; +import { connect } from 'react-redux'; +import { createStructuredSelector } from 'reselect'; +import { selectBodyshop } from '../../redux/user/user.selectors'; +import ShopInfoGeneral from './shop-info.general.component'; +import ShopInfoIntakeChecklistComponent from './shop-info.intake.component'; +import ShopInfoLaborRates from './shop-info.laborrates.component'; +import ShopInfoOrderStatusComponent from './shop-info.orderstatus.component'; +import ShopInfoPartsScan from './shop-info.parts-scan'; +import ShopInfoRbacComponent from './shop-info.rbac.component'; +import ShopInfoResponsibilityCenterComponent from './shop-info.responsibilitycenters.component'; +import ShopInfoROStatusComponent from './shop-info.rostatus.component'; +import ShopInfoSchedulingComponent from './shop-info.scheduling.component'; +import ShopInfoSpeedPrint from './shop-info.speedprint.component'; +import { useLocation, useNavigate } from 'react-router-dom'; +import ShopInfoTaskPresets from './shop-info.task-presets.component'; +import queryString from 'query-string'; +import InstanceRenderManager from '../../utils/instanceRenderMgr'; +import ShopInfoRoGuard from './shop-info.roguard.component'; const mapStateToProps = createStructuredSelector({ bodyshop: selectBodyshop @@ -111,7 +112,18 @@ export function ShopInfoComponent({ bodyshop, form, saveLoading }) { children: } ] - : []) + : []), + ...InstanceRenderManager({ + imex: [ + { + key: 'roguard', + label: t('bodyshop.labels.roguard.title'), + children: , + }, + ], + rome: 'USE_IMEX', + promanager: [], + }), ]; return ( + + + + + + + {() => { + const disabled = !form.getFieldValue(['md_ro_guard', 'enabled']); + return ( + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ); + }} + + + ); +} diff --git a/client/src/graphql/bodyshop.queries.js b/client/src/graphql/bodyshop.queries.js index e1d5b93e1..6bbafe6e3 100644 --- a/client/src/graphql/bodyshop.queries.js +++ b/client/src/graphql/bodyshop.queries.js @@ -138,6 +138,7 @@ export const QUERY_BODYSHOP = gql` tt_enforce_hours_for_tech_console md_tasks_presets use_paint_scale_data + md_ro_guard employee_teams(order_by: { name: asc }, where: { active: { _eq: true } }) { id name @@ -265,6 +266,7 @@ export const UPDATE_SHOP = gql` enforce_conversion_category tt_enforce_hours_for_tech_console md_tasks_presets + md_ro_guard employee_teams(order_by: { name: asc }, where: { active: { _eq: true } }) { id name diff --git a/client/src/graphql/jobs.queries.js b/client/src/graphql/jobs.queries.js index 1dd4ea175..52a14bb61 100644 --- a/client/src/graphql/jobs.queries.js +++ b/client/src/graphql/jobs.queries.js @@ -1969,6 +1969,19 @@ export const QUERY_JOB_CLOSE_DETAILS = gql` kmout qb_multiple_payers lbr_adjustments + payments { + amount + created_at + date + exportedat + id + jobid + memo + payer + paymentnum + transactionid + type + } joblines(where: { removed: { _eq: false } }, order_by: { line_no: asc }) { id removed @@ -1981,6 +1994,7 @@ export const QUERY_JOB_CLOSE_DETAILS = gql` db_price act_price part_qty + notes mod_lbr_ty db_hrs mod_lb_hrs @@ -1992,6 +2006,9 @@ export const QUERY_JOB_CLOSE_DETAILS = gql` prt_dsmk_p convertedtolbr convertedtolbr_data + act_price_before_ppc + sublet_ignored + sublet_completed } } } diff --git a/client/src/pages/jobs-close/jobs-close.component.jsx b/client/src/pages/jobs-close/jobs-close.component.jsx index 0554f6a6e..102ba0611 100644 --- a/client/src/pages/jobs-close/jobs-close.component.jsx +++ b/client/src/pages/jobs-close/jobs-close.component.jsx @@ -41,6 +41,7 @@ import { insertAuditTrail } from "../../redux/application/application.actions"; import { selectJobReadOnly } from "../../redux/application/application.selectors"; import { selectBodyshop } from "../../redux/user/user.selectors"; import AuditTrailMapping from "../../utils/AuditTrailMappings"; +import JobCloseRoGuardContainer from '../../components/job-close-ro-guard/job-close-ro-guard.container'; const mapStateToProps = createStructuredSelector({ bodyshop: selectBodyshop, @@ -183,7 +184,7 @@ export function JobsCloseComponent({ job, bodyshop, jobRO, insertAuditTrail }) { } /> - + {!job.actual_in && job.scheduled_in && } diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json index 804a6fc90..a27230370 100644 --- a/client/src/translations/en_us/common.json +++ b/client/src/translations/en_us/common.json @@ -367,6 +367,18 @@ }, "md_payment_types": "Payment Types", "md_referral_sources": "Referral Sources", + "md_ro_guard": { + "enabled": "RO Guard Enabled?", + "enforce_ar": "Enforce AR Balance", + "enforce_bills": "Enforce Bill Discrepancy", + "enforce_cm": "Enforce Credit Memo Entry", + "enforce_labor": "Enforce Labor Allocation", + "enforce_ppd": "Enforce PPD Sync", + "enforce_profit": "Enforce Profit Requirement", + "enforce_sublet": "Enforce Sublet Completion", + "masterbypass": "Master Bypass Password (not encrypted)", + "totalgppercent_minimum": "Minimum Total Gross Profit %" + }, "md_tasks_presets": { "enable_tasks": "Enable Hour Flagging", "hourstype": "Hour Types", @@ -639,6 +651,7 @@ "laborrates": "Labor Rates", "licensing": "Licensing", "md_parts_scan": "Parts Scan Rules", + "md_ro_guard": "RO Guard", "md_tasks_presets": "Tasks Presets", "md_to_emails": "Preset To Emails", "md_to_emails_emails": "Emails", @@ -660,6 +673,9 @@ "tax_accounts": "Tax Accounts", "title": "Responsibility Centers" }, + "roguard": { + "title": "RO Guard" + }, "scheduling": "SMART Scheduling", "scoreboardsetup": "Scoreboard Setup", "shopinfo": "Shop Information", @@ -1356,6 +1372,7 @@ }, "fields": { "act_price": "Retail Price", + "act_price_before_ppc": "Original Part Price", "ah_detail_line": "Mark as Detail Labor Line (Autohouse Only)", "assigned_team": "Team", "assigned_team_name": "Team {{name}}", @@ -1825,6 +1842,7 @@ "scheddates": "Schedule Dates" }, "labels": { + "accountsreceivable": "Accounts Receivable", "act_price_ppc": "New Part Price", "actual_completion_inferred": "$t(jobs.fields.actual_completion) inferred using $t(jobs.fields.scheduled_completion).", "actual_delivery_inferred": "$t(jobs.fields.actual_delivery) inferred using $t(jobs.fields.scheduled_delivery).", @@ -1944,6 +1962,7 @@ "mapa": "Paint Materials", "markforreexport": "Mark for Re-export", "mash": "Shop Materials", + "masterbypass": "Master Bypass Password", "materials": { "mapa": "" }, @@ -1952,6 +1971,12 @@ "net_repairs": "Net Repairs", "notes": "Notes", "othertotal": "Other Totals", + "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_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_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.", "override_header": "Override estimate header on import?", "ownerassociation": "Owner Association", "parts": "Parts", @@ -1961,6 +1986,7 @@ "partsfilter": "Parts Only", "partssubletstotal": "Parts & Sublets Total", "partstotal": "Parts Total (ex. Taxes)", + "performance": "Performance", "pimraryamountpayable": "Total Primary Payable", "plitooltips": { "billtotal": "The total amount of all bill lines that have been posted against this RO (not including credits, taxes, or labor adjustments).", @@ -1975,6 +2001,7 @@ "totalreturns": "The total retail amount of returns created for this job." }, "ppc": "This line contains a part price change.", + "ppdnotexported": "PPDs not Exported", "profileadjustments": "Profile Disc./Mkup", "prt_dsmk_total": "Line Item Adjustment", "rates": "Rates", @@ -1995,6 +2022,12 @@ "relatedros": "Related ROs", "remove_from_ar": "Remove from AR", "returntotals": "Return Totals", + "ro_guard": { + "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." + }, + "roguard": "RO Guard", + "roguardwarnings": "RO Guard Warnings", "rosaletotal": "RO Parts Total", "sale_additional": "Sales - Additional", "sale_labor": "Sales - Labor", @@ -2005,6 +2038,7 @@ "scheduledinchange": "The scheduled in is based off the latest appointment. To change this date, please schedule or reschedule the Job. ", "specialcoveragepolicy": "Special Coverage Policy Applies", "state_tax_amt": "Provincial/State Taxes", + "subletsnotcompleted": "Outstanding Sublets", "subletstotal": "Sublets Total", "subtotal": "Subtotal", "supplementnote": "The Job had a supplement imported.", diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json index 06ed0e4b9..73c7e5b89 100644 --- a/client/src/translations/es/common.json +++ b/client/src/translations/es/common.json @@ -367,6 +367,18 @@ }, "md_payment_types": "", "md_referral_sources": "", + "md_ro_guard": { + "enabled": "", + "enforce_ar": "", + "enforce_bills": "", + "enforce_cm": "", + "enforce_labor": "", + "enforce_ppd": "", + "enforce_profit": "", + "enforce_sublet": "", + "masterbypass": "", + "totalgppercent_minimum": "" + }, "md_tasks_presets": { "enable_tasks": "", "hourstype": "", @@ -639,6 +651,7 @@ "laborrates": "", "licensing": "", "md_parts_scan": "", + "md_ro_guard": "", "md_tasks_presets": "", "md_to_emails": "", "md_to_emails_emails": "", @@ -660,6 +673,9 @@ "tax_accounts": "", "title": "" }, + "roguard": { + "title": "" + }, "scheduling": "", "scoreboardsetup": "", "shopinfo": "", @@ -1356,6 +1372,7 @@ }, "fields": { "act_price": "Precio actual", + "act_price_before_ppc": "", "ah_detail_line": "", "assigned_team": "", "assigned_team_name": "", @@ -1825,6 +1842,7 @@ "scheddates": "" }, "labels": { + "accountsreceivable": "", "act_price_ppc": "", "actual_completion_inferred": "", "actual_delivery_inferred": "", @@ -1944,6 +1962,7 @@ "mapa": "", "markforreexport": "", "mash": "", + "masterbypass": "", "materials": { "mapa": "" }, @@ -1952,6 +1971,12 @@ "net_repairs": "", "notes": "Notas", "othertotal": "", + "outstanding_ar": "", + "outstanding_credit_memos": "", + "outstanding_ppd": "", + "outstanding_reconciliation_discrep": "", + "outstanding_sublets": "", + "outstandinghours": "", "override_header": "¿Anular encabezado estimado al importar?", "ownerassociation": "", "parts": "Partes", @@ -1961,6 +1986,7 @@ "partsfilter": "", "partssubletstotal": "", "partstotal": "", + "performance": "", "pimraryamountpayable": "", "plitooltips": { "billtotal": "", @@ -1975,6 +2001,7 @@ "totalreturns": "" }, "ppc": "", + "ppdnotexported": "", "profileadjustments": "", "prt_dsmk_total": "", "rates": "Tarifas", @@ -1995,6 +2022,12 @@ "relatedros": "", "remove_from_ar": "", "returntotals": "", + "ro_guard": { + "enforce_validation": "", + "enforced": "" + }, + "roguard": "", + "roguardwarnings": "", "rosaletotal": "", "sale_additional": "", "sale_labor": "", @@ -2005,6 +2038,7 @@ "scheduledinchange": "", "specialcoveragepolicy": "", "state_tax_amt": "", + "subletsnotcompleted": "", "subletstotal": "", "subtotal": "", "supplementnote": "", diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json index 120a39d8d..12fe84189 100644 --- a/client/src/translations/fr/common.json +++ b/client/src/translations/fr/common.json @@ -367,6 +367,18 @@ }, "md_payment_types": "", "md_referral_sources": "", + "md_ro_guard": { + "enabled": "", + "enforce_ar": "", + "enforce_bills": "", + "enforce_cm": "", + "enforce_labor": "", + "enforce_ppd": "", + "enforce_profit": "", + "enforce_sublet": "", + "masterbypass": "", + "totalgppercent_minimum": "" + }, "md_tasks_presets": { "enable_tasks": "", "hourstype": "", @@ -639,6 +651,7 @@ "laborrates": "", "licensing": "", "md_parts_scan": "", + "md_ro_guard": "", "md_tasks_presets": "", "md_to_emails": "", "md_to_emails_emails": "", @@ -660,6 +673,9 @@ "tax_accounts": "", "title": "" }, + "roguard": { + "title": "" + }, "scheduling": "", "scoreboardsetup": "", "shopinfo": "", @@ -1356,6 +1372,7 @@ }, "fields": { "act_price": "Prix actuel", + "act_price_before_ppc": "", "ah_detail_line": "", "assigned_team": "", "assigned_team_name": "", @@ -1825,6 +1842,7 @@ "scheddates": "" }, "labels": { + "accountsreceivable": "", "act_price_ppc": "", "actual_completion_inferred": "", "actual_delivery_inferred": "", @@ -1944,6 +1962,7 @@ "mapa": "", "markforreexport": "", "mash": "", + "masterbypass": "", "materials": { "mapa": "" }, @@ -1952,6 +1971,12 @@ "net_repairs": "", "notes": "Remarques", "othertotal": "", + "outstanding_ar": "", + "outstanding_credit_memos": "", + "outstanding_ppd": "", + "outstanding_reconciliation_discrep": "", + "outstanding_sublets": "", + "outstandinghours": "", "override_header": "Remplacer l'en-tête d'estimation à l'importation?", "ownerassociation": "", "parts": "les pièces", @@ -1961,6 +1986,7 @@ "partsfilter": "", "partssubletstotal": "", "partstotal": "", + "performance": "", "pimraryamountpayable": "", "plitooltips": { "billtotal": "", @@ -1975,6 +2001,7 @@ "totalreturns": "" }, "ppc": "", + "ppdnotexported": "", "profileadjustments": "", "prt_dsmk_total": "", "rates": "Les taux", @@ -1995,6 +2022,12 @@ "relatedros": "", "remove_from_ar": "", "returntotals": "", + "ro_guard": { + "enforce_validation": "", + "enforced": "" + }, + "roguard": "", + "roguardwarnings": "", "rosaletotal": "", "sale_additional": "", "sale_labor": "", @@ -2005,6 +2038,7 @@ "scheduledinchange": "", "specialcoveragepolicy": "", "state_tax_amt": "", + "subletsnotcompleted": "", "subletstotal": "", "subtotal": "", "supplementnote": "",