Remove GST related sections.

This commit is contained in:
Patrick Fic
2023-09-29 11:08:29 -07:00
parent 53526d9c80
commit 4bd139f93b
13 changed files with 484 additions and 470 deletions

View File

@@ -29597,6 +29597,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>cieca_pfo</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>closeconfirm</name> <name>closeconfirm</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>

View File

@@ -364,13 +364,15 @@ export function BillFormComponent({
)} )}
</LayoutFormRow> </LayoutFormRow>
<LayoutFormRow> <LayoutFormRow>
<Form.Item {
span={3} // <Form.Item
label={t("bills.fields.federal_tax_rate")} // span={3}
name="federal_tax_rate" // label={t("bills.fields.federal_tax_rate")}
> // name="federal_tax_rate"
<CurrencyInput min={0} disabled={disabled} /> // >
</Form.Item> // <CurrencyInput min={0} disabled={disabled} />
// </Form.Item>
}
<Form.Item <Form.Item
span={3} span={3}
label={t("bills.fields.state_tax_rate")} label={t("bills.fields.state_tax_rate")}
@@ -378,13 +380,15 @@ export function BillFormComponent({
> >
<CurrencyInput min={0} disabled={disabled} /> <CurrencyInput min={0} disabled={disabled} />
</Form.Item> </Form.Item>
<Form.Item {
span={3} // <Form.Item
label={t("bills.fields.local_tax_rate")} // span={3}
name="local_tax_rate" // label={t("bills.fields.local_tax_rate")}
> // name="local_tax_rate"
<CurrencyInput min={0} /> // >
</Form.Item> // <CurrencyInput min={0} />
// </Form.Item>
}
<Form.Item shouldUpdate span={15}> <Form.Item shouldUpdate span={15}>
{() => { {() => {
const values = form.getFieldsValue([ const values = form.getFieldsValue([
@@ -410,21 +414,25 @@ export function BillFormComponent({
value={totals.subtotal.toFormat()} value={totals.subtotal.toFormat()}
precision={2} precision={2}
/> />
<Statistic {
title={t("bills.labels.federal_tax")} // <Statistic
value={totals.federalTax.toFormat()} // title={t("bills.labels.federal_tax")}
precision={2} // value={totals.federalTax.toFormat()}
/> // precision={2}
// />
}
<Statistic <Statistic
title={t("bills.labels.state_tax")} title={t("bills.labels.state_tax")}
value={totals.stateTax.toFormat()} value={totals.stateTax.toFormat()}
precision={2} precision={2}
/> />
<Statistic {
title={t("bills.labels.local_tax")} // <Statistic
value={totals.localTax.toFormat()} // title={t("bills.labels.local_tax")}
precision={2} // value={totals.localTax.toFormat()}
/> // precision={2}
// />
}
<Statistic <Statistic
title={t("bills.labels.entered_total")} title={t("bills.labels.entered_total")}
value={totals.enteredTotal.toFormat()} value={totals.enteredTotal.toFormat()}

View File

@@ -458,21 +458,21 @@ export function BillEnterModalLinesComponent({
</Form.Item> </Form.Item>
), ),
}, },
{ // {
title: t("billlines.fields.federal_tax_applicable"), // title: t("billlines.fields.federal_tax_applicable"),
dataIndex: "applicable_taxes.federal", // dataIndex: "applicable_taxes.federal",
editable: true, // editable: true,
formItemProps: (field) => { // formItemProps: (field) => {
return { // return {
key: `${field.index}fedtax`, // key: `${field.index}fedtax`,
valuePropName: "checked", // valuePropName: "checked",
// initialValue: true, // // initialValue: true,
name: [field.name, "applicable_taxes", "federal"], // name: [field.name, "applicable_taxes", "federal"],
}; // };
}, // },
formInput: (record, index) => <Switch disabled={disabled} />, // formInput: (record, index) => <Switch disabled={disabled} />,
}, // },
{ {
title: t("billlines.fields.state_tax_applicable"), title: t("billlines.fields.state_tax_applicable"),
dataIndex: "applicable_taxes.state", dataIndex: "applicable_taxes.state",
@@ -487,20 +487,20 @@ export function BillEnterModalLinesComponent({
}, },
formInput: (record, index) => <Switch disabled={disabled} />, formInput: (record, index) => <Switch disabled={disabled} />,
}, },
{ // {
title: t("billlines.fields.local_tax_applicable"), // title: t("billlines.fields.local_tax_applicable"),
dataIndex: "applicable_taxes.local", // dataIndex: "applicable_taxes.local",
editable: true, // editable: true,
formItemProps: (field) => { // formItemProps: (field) => {
return { // return {
key: `${field.index}localtax`, // key: `${field.index}localtax`,
valuePropName: "checked", // valuePropName: "checked",
name: [field.name, "applicable_taxes", "local"], // name: [field.name, "applicable_taxes", "local"],
}; // };
}, // },
formInput: (record, index) => <Switch disabled={disabled} />, // formInput: (record, index) => <Switch disabled={disabled} />,
}, // },
{ {
title: t("general.labels.actions"), title: t("general.labels.actions"),

View File

@@ -32,23 +32,33 @@ export function JobTotalsTableTotals({ bodyshop, job }) {
...(job.job_totals.totals.us_sales_tax_breakdown ...(job.job_totals.totals.us_sales_tax_breakdown
? [ ? [
{ {
key: bodyshop.md_responsibility_centers.taxes.tax_ty1.tax_type1, key:
bodyshop.md_responsibility_centers.taxes.tax_ty1?.tax_type1 ||
"T1",
total: job.job_totals.totals.us_sales_tax_breakdown.ty1Tax, total: job.job_totals.totals.us_sales_tax_breakdown.ty1Tax,
}, },
{ {
key: bodyshop.md_responsibility_centers.taxes.tax_ty2.tax_type2, key:
bodyshop.md_responsibility_centers.taxes.tax_ty2?.tax_type2 ||
"T2",
total: job.job_totals.totals.us_sales_tax_breakdown.ty2Tax, total: job.job_totals.totals.us_sales_tax_breakdown.ty2Tax,
}, },
{ {
key: bodyshop.md_responsibility_centers.taxes.tax_ty3.tax_type3, key:
bodyshop.md_responsibility_centers.taxes.tax_ty3?.tax_type3 ||
"T3",
total: job.job_totals.totals.us_sales_tax_breakdown.ty3Tax, total: job.job_totals.totals.us_sales_tax_breakdown.ty3Tax,
}, },
{ {
key: bodyshop.md_responsibility_centers.taxes.tax_ty4.tax_type4, key:
bodyshop.md_responsibility_centers.taxes.tax_ty4?.tax_type4 ||
"T4",
total: job.job_totals.totals.us_sales_tax_breakdown.ty4Tax, total: job.job_totals.totals.us_sales_tax_breakdown.ty4Tax,
}, },
{ {
key: bodyshop.md_responsibility_centers.taxes.tax_ty5.tax_type5, key:
bodyshop.md_responsibility_centers.taxes.tax_ty5?.tax_type5 ||
"T5",
total: job.job_totals.totals.us_sales_tax_breakdown.ty5Tax, total: job.job_totals.totals.us_sales_tax_breakdown.ty5Tax,
}, },
] ]
@@ -67,10 +77,10 @@ export function JobTotalsTableTotals({ bodyshop, job }) {
key: t("jobs.fields.ded_amt"), key: t("jobs.fields.ded_amt"),
total: job.job_totals.totals.custPayable.deductible, total: job.job_totals.totals.custPayable.deductible,
}, },
{ // {
key: t("jobs.fields.federal_tax_payable"), // key: t("jobs.fields.federal_tax_payable"),
total: job.job_totals.totals.custPayable.federal_tax, // total: job.job_totals.totals.custPayable.federal_tax,
}, // },
{ {
key: t("jobs.fields.other_amount_payable"), key: t("jobs.fields.other_amount_payable"),
total: job.job_totals.totals.custPayable.other_customer_amount, total: job.job_totals.totals.custPayable.other_customer_amount,

View File

@@ -1,4 +1,4 @@
import { Collapse, Form, Input, InputNumber, Select, Switch } from "antd"; import { Collapse, Form, Input, Select, Switch } from "antd";
import React from "react"; import React from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { connect } from "react-redux"; import { connect } from "react-redux";
@@ -258,26 +258,28 @@ export function JobsCreateJobsInfo({ bodyshop, form, selected }) {
<CurrencyInput /> <CurrencyInput />
</Form.Item> </Form.Item>
</LayoutFormRow> </LayoutFormRow>
<LayoutFormRow> {
<Form.Item // <LayoutFormRow>
label={t("jobs.fields.federal_tax_rate")} // <Form.Item
name="federal_tax_rate" // label={t("jobs.fields.federal_tax_rate")}
> // name="federal_tax_rate"
<InputNumber min={0} max={1} precision={2} /> // >
</Form.Item> // <InputNumber min={0} max={1} precision={2} />
<Form.Item // </Form.Item>
label={t("jobs.fields.state_tax_rate")} // <Form.Item
name="state_tax_rate" // label={t("jobs.fields.state_tax_rate")}
> // name="state_tax_rate"
<InputNumber min={0} max={1} precision={2} /> // >
</Form.Item> // <InputNumber min={0} max={1} precision={2} />
<Form.Item // </Form.Item>
label={t("jobs.fields.local_tax_rate")} // <Form.Item
name="local_tax_rate" // label={t("jobs.fields.local_tax_rate")}
> // name="local_tax_rate"
<InputNumber min={0} max={1} precision={2} /> // >
</Form.Item> // <InputNumber min={0} max={1} precision={2} />
</LayoutFormRow> // </Form.Item>
// </LayoutFormRow>
}
<LayoutFormRow> <LayoutFormRow>
<Form.Item label={t("jobs.fields.rate_lab")} name="rate_lab"> <Form.Item label={t("jobs.fields.rate_lab")} name="rate_lab">
<CurrencyInput /> <CurrencyInput />

View File

@@ -1,28 +1,19 @@
import { import { Divider, Form, Input, Select, Space, Switch, Tooltip } from "antd";
Divider,
Form,
Input,
InputNumber,
Select,
Space,
Switch,
Tooltip,
} from "antd";
import React from "react"; import React from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { connect } from "react-redux"; import { connect } from "react-redux";
import { createStructuredSelector } from "reselect"; import { createStructuredSelector } from "reselect";
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 CABCpvrtCalculator from "../ca-bc-pvrt-calculator/ca-bc-pvrt-calculator.component";
import CurrencyInput from "../form-items-formatted/currency-form-item.component"; import CurrencyInput from "../form-items-formatted/currency-form-item.component";
import JobsDetailRatesChangeButton from "../jobs-detail-rates-change-button/jobs-detail-rates-change-button.component"; import JobsDetailRatesChangeButton from "../jobs-detail-rates-change-button/jobs-detail-rates-change-button.component";
import JobsMarkPstExempt from "../jobs-mark-pst-exempt/jobs-mark-pst-exempt.component"; import JobsMarkPstExempt from "../jobs-mark-pst-exempt/jobs-mark-pst-exempt.component";
import FormRow from "../layout-form-row/layout-form-row.component"; import FormRow from "../layout-form-row/layout-form-row.component";
import JobsDetailRatesParts from "./jobs-detail-rates.parts.component";
import JobsDetailRatesLabor from "./jobs-detail-rates.labor.component"; import JobsDetailRatesLabor from "./jobs-detail-rates.labor.component";
import JobsDetailRatesMaterials from "./jobs-detail-rates.materials.component"; import JobsDetailRatesMaterials from "./jobs-detail-rates.materials.component";
import JobsDetailRatesOther from "./jobs-detail-rates.other.component"; import JobsDetailRatesOther from "./jobs-detail-rates.other.component";
import JobsDetailRatesParts from "./jobs-detail-rates.parts.component";
const mapStateToProps = createStructuredSelector({ const mapStateToProps = createStructuredSelector({
jobRO: selectJobReadOnly, jobRO: selectJobReadOnly,
@@ -87,14 +78,7 @@ export function JobsDetailRates({ jobRO, form, job, bodyshop }) {
> >
<CurrencyInput disabled={jobRO || bodyshop.cdk_dealerid} /> <CurrencyInput disabled={jobRO || bodyshop.cdk_dealerid} />
</Form.Item> </Form.Item>
{bodyshop.region_config === "CA_BC" && (
<Space align="center">
<Form.Item label={t("jobs.fields.ca_bc_pvrt")} name="ca_bc_pvrt">
<CurrencyInput disabled={jobRO} min={0} />
</Form.Item>
<CABCpvrtCalculator form={form} disabled={jobRO} />
</Space>
)}
<Form.Item <Form.Item
label={t("jobs.fields.auto_add_ats")} label={t("jobs.fields.auto_add_ats")}
name="auto_add_ats" name="auto_add_ats"
@@ -123,41 +107,7 @@ export function JobsDetailRates({ jobRO, form, job, bodyshop }) {
}} }}
</Form.Item> </Form.Item>
</FormRow> </FormRow>
<FormRow>
<Form.Item
label={t("jobs.fields.federal_tax_rate")}
name="federal_tax_rate"
>
<InputNumber min={0} max={1} precision={2} disabled={jobRO} />
</Form.Item>
<Form.Item
label={t("jobs.fields.state_tax_rate")}
name="state_tax_rate"
>
<InputNumber
min={0}
max={1}
precision={2}
disabled={jobRO}
autoComplete="new-password"
/>
</Form.Item>
<Form.Item
label={t("jobs.fields.local_tax_rate")}
name="local_tax_rate"
>
<InputNumber min={0} max={1} precision={2} disabled={jobRO} />
</Form.Item>
{bodyshop.region_config.toLowerCase().startsWith("ca") && (
<Form.Item
label={t("jobs.fields.ca_gst_registrant")}
name="ca_gst_registrant"
valuePropName="checked"
>
<Switch disabled={jobRO} />
</Form.Item>
)}
</FormRow>
<Divider <Divider
orientation="left" orientation="left"
type="horizontal" type="horizontal"

View File

@@ -21,10 +21,10 @@ export function JobsDetailRatesMaterials({
<Collapse defaultActiveKey={expanded && "rates"}> <Collapse defaultActiveKey={expanded && "rates"}>
<Collapse.Panel <Collapse.Panel
forceRender forceRender
header={t("jobs.labels.materials.materials")} header={t("jobs.fields.materials.materials")}
key="materials" key="materials"
> >
<LayoutFormRow header={t("job.fields.materials.MAPA")}> <LayoutFormRow header={t("jobs.fields.materials.MAPA")}>
<Form.Item <Form.Item
label={t("jobs.fields.materials.cal_maxdlr")} label={t("jobs.fields.materials.cal_maxdlr")}
name={["materials", "MAPA", "cal_maxdlr"]} name={["materials", "MAPA", "cal_maxdlr"]}
@@ -81,7 +81,7 @@ export function JobsDetailRatesMaterials({
<Switch /> <Switch />
</Form.Item> </Form.Item>
</LayoutFormRow> </LayoutFormRow>
<LayoutFormRow header={t("job.fields.materials.MASH")}> <LayoutFormRow header={t("jobs.fields.materials.MASH")}>
<Form.Item <Form.Item
label={t("jobs.fields.materials.cal_maxdlr")} label={t("jobs.fields.materials.cal_maxdlr")}
name={["materials", "MASH", "cal_maxdlr"]} name={["materials", "MASH", "cal_maxdlr"]}

View File

@@ -24,7 +24,7 @@ export function JobsDetailRatesOther({
header={t("jobs.labels.cieca_pfo")} header={t("jobs.labels.cieca_pfo")}
key="cieca_pfo" key="cieca_pfo"
> >
<LayoutFormRow header={t("jobs.fields.cieca_pfo")}> <LayoutFormRow noDivider>
<Form.Item <Form.Item
label={t("jobs.fields.cieca_pfo.tow_t_in1")} label={t("jobs.fields.cieca_pfo.tow_t_in1")}
name={["cieca_pfo", "tow_t_in1"]} name={["cieca_pfo", "tow_t_in1"]}

View File

@@ -290,30 +290,34 @@ export function ShopInfoGeneral({ form, bodyshop }) {
> >
<InputNumber min={0} precision={2} /> <InputNumber min={0} precision={2} />
</Form.Item> </Form.Item>
<Form.Item {
label={t("bodyshop.fields.federal_tax_id")} // <Form.Item
name="federal_tax_id" // label={t("bodyshop.fields.federal_tax_id")}
> // name="federal_tax_id"
<Input /> // >
</Form.Item> // <Input />
// </Form.Item>
}
<Form.Item <Form.Item
label={t("bodyshop.fields.state_tax_id")} label={t("bodyshop.fields.state_tax_id")}
name="state_tax_id" name="state_tax_id"
> >
<Input /> <Input />
</Form.Item> </Form.Item>
<Form.Item {
label={t("bodyshop.fields.invoice_federal_tax_rate")} // <Form.Item
name={["bill_tax_rates", "federal_tax_rate"]} // label={t("bodyshop.fields.invoice_federal_tax_rate")}
rules={[ // name={["bill_tax_rates", "federal_tax_rate"]}
{ // rules={[
required: true, // {
//message: t("general.validation.required"), // required: true,
}, // //message: t("general.validation.required"),
]} // },
> // ]}
<InputNumber /> // >
</Form.Item> // <InputNumber />
// </Form.Item>
}
<Form.Item <Form.Item
label={t("bodyshop.fields.invoice_state_tax_rate")} label={t("bodyshop.fields.invoice_state_tax_rate")}
name={["bill_tax_rates", "state_tax_rate"]} name={["bill_tax_rates", "state_tax_rate"]}

View File

@@ -4117,122 +4117,124 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
</LayoutFormRow> </LayoutFormRow>
</SelectorDiv> </SelectorDiv>
<LayoutFormRow {
header={t("bodyshop.labels.responsibilitycenters.tax_accounts")} // <LayoutFormRow
id="tax_accounts" // header={t("bodyshop.labels.responsibilitycenters.tax_accounts")}
> // id="tax_accounts"
<Form.Item // >
label={t("bodyshop.fields.responsibilitycenters.federal_tax")} // <Form.Item
rules={[ // label={t("bodyshop.fields.responsibilitycenters.federal_tax")}
{ // rules={[
required: true, // {
//message: t("general.validation.required"), // required: true,
}, // //message: t("general.validation.required"),
]} // },
name={["md_responsibility_centers", "taxes", "federal", "name"]} // ]}
> // name={["md_responsibility_centers", "taxes", "federal", "name"]}
<Input /> // >
</Form.Item> // <Input />
{/* <Form.Item // </Form.Item>
label={t("bodyshop.fields.responsibilitycenter_accountnumber")} // {/* <Form.Item
rules={[ // label={t("bodyshop.fields.responsibilitycenter_accountnumber")}
{ // rules={[
required: true, // {
//message: t("general.validation.required"), // required: true,
}, // //message: t("general.validation.required"),
]} // },
name={[ // ]}
"md_responsibility_centers", // name={[
"taxes", // "md_responsibility_centers",
"federal", // "taxes",
"accountnumber", // "federal",
]} // "accountnumber",
> // ]}
<Input /> // >
</Form.Item> */} // <Input />
{/* <Form.Item // </Form.Item> */}
label={t("bodyshop.fields.responsibilitycenter_accountname")} // {/* <Form.Item
rules={[ // label={t("bodyshop.fields.responsibilitycenter_accountname")}
{ // rules={[
required: true, // {
//message: t("general.validation.required"), // required: true,
}, // //message: t("general.validation.required"),
]} // },
name={[ // ]}
"md_responsibility_centers", // name={[
"taxes", // "md_responsibility_centers",
"federal", // "taxes",
"accountname", // "federal",
]} // "accountname",
> // ]}
<Input /> // >
</Form.Item> */} // <Input />
<Form.Item // </Form.Item> */}
label={t("bodyshop.fields.responsibilitycenter_accountdesc")} // <Form.Item
rules={[ // label={t("bodyshop.fields.responsibilitycenter_accountdesc")}
{ // rules={[
required: true, // {
//message: t("general.validation.required"), // required: true,
}, // //message: t("general.validation.required"),
]} // },
name={[ // ]}
"md_responsibility_centers", // name={[
"taxes", // "md_responsibility_centers",
"federal", // "taxes",
"accountdesc", // "federal",
]} // "accountdesc",
> // ]}
<Input /> // >
</Form.Item> // <Input />
<Form.Item // </Form.Item>
label={t("bodyshop.fields.responsibilitycenter_accountitem")} // <Form.Item
rules={[ // label={t("bodyshop.fields.responsibilitycenter_accountitem")}
{ // rules={[
required: true, // {
//message: t("general.validation.required"), // required: true,
}, // //message: t("general.validation.required"),
]} // },
name={[ // ]}
"md_responsibility_centers", // name={[
"taxes", // "md_responsibility_centers",
"federal", // "taxes",
"accountitem", // "federal",
]} // "accountitem",
> // ]}
<Input /> // >
</Form.Item> // <Input />
{(bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber) && ( // </Form.Item>
<Form.Item // {(bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber) && (
label={t("bodyshop.fields.dms.dms_acctnumber")} // <Form.Item
rules={[ // label={t("bodyshop.fields.dms.dms_acctnumber")}
{ // rules={[
required: true, // {
//message: t("general.validation.required"), // required: true,
}, // //message: t("general.validation.required"),
]} // },
name={[ // ]}
"md_responsibility_centers", // name={[
"taxes", // "md_responsibility_centers",
"federal", // "taxes",
"dms_acctnumber", // "federal",
]} // "dms_acctnumber",
> // ]}
<Input /> // >
</Form.Item> // <Input />
)} // </Form.Item>
<Form.Item // )}
label={t("bodyshop.fields.responsibilitycenter_rate")} // <Form.Item
rules={[ // label={t("bodyshop.fields.responsibilitycenter_rate")}
{ // rules={[
required: true, // {
//message: t("general.validation.required"), // required: true,
}, // //message: t("general.validation.required"),
]} // },
name={["md_responsibility_centers", "taxes", "federal", "rate"]} // ]}
> // name={["md_responsibility_centers", "taxes", "federal", "rate"]}
<InputNumber precision={2} /> // >
</Form.Item> // <InputNumber precision={2} />
</LayoutFormRow> // </Form.Item>
// </LayoutFormRow>
}
{DmsAp.treatment === "on" && ( {DmsAp.treatment === "on" && (
<LayoutFormRow id="federal_tax_itc"> <LayoutFormRow id="federal_tax_itc">
<Form.Item <Form.Item
@@ -4348,104 +4350,106 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
</Form.Item> </Form.Item>
</LayoutFormRow> </LayoutFormRow>
)} )}
<LayoutFormRow id="state_tax"> {
<Form.Item // <LayoutFormRow id="state_tax">
label={t("bodyshop.fields.responsibilitycenters.state_tax")} // <Form.Item
rules={[ // label={t("bodyshop.fields.responsibilitycenters.state_tax")}
{ // rules={[
required: true, // {
//message: t("general.validation.required"), // required: true,
}, // //message: t("general.validation.required"),
]} // },
name={["md_responsibility_centers", "taxes", "state", "name"]} // ]}
> // name={["md_responsibility_centers", "taxes", "state", "name"]}
<Input /> // >
</Form.Item> // <Input />
{/* <Form.Item // </Form.Item>
label={t("bodyshop.fields.responsibilitycenter_accountnumber")} // {/* <Form.Item
rules={[ // label={t("bodyshop.fields.responsibilitycenter_accountnumber")}
{ // rules={[
required: true, // {
//message: t("general.validation.required"), // required: true,
}, // //message: t("general.validation.required"),
]} // },
name={[ // ]}
"md_responsibility_centers", // name={[
"taxes", // "md_responsibility_centers",
"state", // "taxes",
"accountnumber", // "state",
]} // "accountnumber",
> // ]}
<Input /> // >
</Form.Item> // <Input />
<Form.Item // </Form.Item>
label={t("bodyshop.fields.responsibilitycenter_accountname")} // <Form.Item
rules={[ // label={t("bodyshop.fields.responsibilitycenter_accountname")}
{ // rules={[
required: true, // {
//message: t("general.validation.required"), // required: true,
}, // //message: t("general.validation.required"),
]} // },
name={["md_responsibility_centers", "taxes", "state", "accountname"]} // ]}
> // name={["md_responsibility_centers", "taxes", "state", "accountname"]}
<Input /> // >
</Form.Item> */} // <Input />
<Form.Item // </Form.Item> */}
label={t("bodyshop.fields.responsibilitycenter_accountdesc")} // <Form.Item
rules={[ // label={t("bodyshop.fields.responsibilitycenter_accountdesc")}
{ // rules={[
required: true, // {
//message: t("general.validation.required"), // required: true,
}, // //message: t("general.validation.required"),
]} // },
name={["md_responsibility_centers", "taxes", "state", "accountdesc"]} // ]}
> // name={["md_responsibility_centers", "taxes", "state", "accountdesc"]}
<Input /> // >
</Form.Item> // <Input />
<Form.Item // </Form.Item>
label={t("bodyshop.fields.responsibilitycenter_accountitem")} // <Form.Item
rules={[ // label={t("bodyshop.fields.responsibilitycenter_accountitem")}
{ // rules={[
required: true, // {
//message: t("general.validation.required"), // required: true,
}, // //message: t("general.validation.required"),
]} // },
name={["md_responsibility_centers", "taxes", "state", "accountitem"]} // ]}
> // name={["md_responsibility_centers", "taxes", "state", "accountitem"]}
<Input /> // >
</Form.Item> // <Input />
{(bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber) && ( // </Form.Item>
<Form.Item // {(bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber) && (
label={t("bodyshop.fields.dms.dms_acctnumber")} // <Form.Item
rules={[ // label={t("bodyshop.fields.dms.dms_acctnumber")}
{ // rules={[
required: true, // {
//message: t("general.validation.required"), // required: true,
}, // //message: t("general.validation.required"),
]} // },
name={[ // ]}
"md_responsibility_centers", // name={[
"taxes", // "md_responsibility_centers",
"state", // "taxes",
"dms_acctnumber", // "state",
]} // "dms_acctnumber",
> // ]}
<Input /> // >
</Form.Item> // <Input />
)} // </Form.Item>
<Form.Item // )}
label={t("bodyshop.fields.responsibilitycenter_rate")} // <Form.Item
rules={[ // label={t("bodyshop.fields.responsibilitycenter_rate")}
{ // rules={[
required: true, // {
//message: t("general.validation.required"), // required: true,
}, // //message: t("general.validation.required"),
]} // },
name={["md_responsibility_centers", "taxes", "state", "rate"]} // ]}
> // name={["md_responsibility_centers", "taxes", "state", "rate"]}
<InputNumber precision={2} /> // >
</Form.Item> // <InputNumber precision={2} />
</LayoutFormRow> // </Form.Item>
// </LayoutFormRow>
}
<ShopInfoResponsibilitycentersTaxesComponent /> <ShopInfoResponsibilitycentersTaxesComponent />
<Form.Item <Form.Item
label={t("bodyshop.fields.responsibilitycenters.itemexemptcode")} label={t("bodyshop.fields.responsibilitycenters.itemexemptcode")}
@@ -4472,104 +4476,116 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
<Input /> <Input />
</Form.Item> </Form.Item>
<LayoutFormRow id="local_tax"> {
<Form.Item // <LayoutFormRow id="local_tax">
label={t("bodyshop.fields.responsibilitycenters.local_tax")} // <Form.Item
rules={[ // label={t("bodyshop.fields.responsibilitycenters.local_tax")}
{ // rules={[
required: true, // {
//message: t("general.validation.required"), // required: true,
}, // //message: t("general.validation.required"),
]} // },
name={["md_responsibility_centers", "taxes", "local", "name"]} // ]}
> // name={["md_responsibility_centers", "taxes", "local", "name"]}
<Input /> // >
</Form.Item> // <Input />
{/* <Form.Item // </Form.Item>
label={t("bodyshop.fields.responsibilitycenter_accountnumber")} // {/* <Form.Item
rules={[ // label={t("bodyshop.fields.responsibilitycenter_accountnumber")}
{ // rules={[
required: true, // {
//message: t("general.validation.required"), // required: true,
}, // //message: t("general.validation.required"),
]} // },
name={[ // ]}
"md_responsibility_centers", // name={[
"taxes", // "md_responsibility_centers",
"local", // "taxes",
"accountnumber", // "local",
]} // "accountnumber",
> // ]}
<Input /> // >
</Form.Item> // <Input />
<Form.Item // </Form.Item>
label={t("bodyshop.fields.responsibilitycenter_accountname")} // <Form.Item
rules={[ // label={t("bodyshop.fields.responsibilitycenter_accountname")}
{ // rules={[
required: true, // {
//message: t("general.validation.required"), // required: true,
}, // //message: t("general.validation.required"),
]} // },
name={["md_responsibility_centers", "taxes", "local", "accountname"]} // ]}
> // name={["md_responsibility_centers", "taxes", "local", "accountname"]}
<Input /> // >
</Form.Item> */} // <Input />
<Form.Item // </Form.Item> */}
label={t("bodyshop.fields.responsibilitycenter_accountdesc")} // <Form.Item
rules={[ // label={t("bodyshop.fields.responsibilitycenter_accountdesc")}
{ // rules={[
required: true, // {
//message: t("general.validation.required"), // required: true,
}, // //message: t("general.validation.required"),
]} // },
name={["md_responsibility_centers", "taxes", "local", "accountdesc"]} // ]}
> // name={[
<Input /> // "md_responsibility_centers",
</Form.Item> // "taxes",
<Form.Item // "local",
label={t("bodyshop.fields.responsibilitycenter_accountitem")} // "accountdesc",
rules={[ // ]}
{ // >
required: true, // <Input />
//message: t("general.validation.required"), // </Form.Item>
}, // <Form.Item
]} // label={t("bodyshop.fields.responsibilitycenter_accountitem")}
name={["md_responsibility_centers", "taxes", "local", "accountitem"]} // rules={[
> // {
<Input /> // required: true,
</Form.Item> // //message: t("general.validation.required"),
{(bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber) && ( // },
<Form.Item // ]}
label={t("bodyshop.fields.dms.dms_acctnumber")} // name={[
rules={[ // "md_responsibility_centers",
{ // "taxes",
required: true, // "local",
//message: t("general.validation.required"), // "accountitem",
}, // ]}
]} // >
name={[ // <Input />
"md_responsibility_centers", // </Form.Item>
"taxes", // {(bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber) && (
"local", // <Form.Item
"dms_acctnumber", // label={t("bodyshop.fields.dms.dms_acctnumber")}
]} // rules={[
> // {
<Input /> // required: true,
</Form.Item> // //message: t("general.validation.required"),
)} // },
<Form.Item // ]}
label={t("bodyshop.fields.responsibilitycenter_rate")} // name={[
rules={[ // "md_responsibility_centers",
{ // "taxes",
required: true, // "local",
//message: t("general.validation.required"), // "dms_acctnumber",
}, // ]}
]} // >
name={["md_responsibility_centers", "taxes", "local", "rate"]} // <Input />
> // </Form.Item>
<InputNumber precision={2} /> // )}
</Form.Item> // <Form.Item
</LayoutFormRow> // label={t("bodyshop.fields.responsibilitycenter_rate")}
// rules={[
// {
// required: true,
// //message: t("general.validation.required"),
// },
// ]}
// name={["md_responsibility_centers", "taxes", "local", "rate"]}
// >
// <InputNumber precision={2} />
// </Form.Item>
// </LayoutFormRow>
}
<LayoutFormRow header={<div>AR</div>} id="AR"> <LayoutFormRow header={<div>AR</div>} id="AR">
{/* <Form.Item {/* <Form.Item
label={t("bodyshop.fields.responsibilitycenters.ar")} label={t("bodyshop.fields.responsibilitycenters.ar")}

View File

@@ -1745,6 +1745,7 @@
"checklistdocuments": "Checklist Documents", "checklistdocuments": "Checklist Documents",
"checklists": "Checklists", "checklists": "Checklists",
"cieca_pfl": "Profile - Labor", "cieca_pfl": "Profile - Labor",
"cieca_pfo": "Profile - Other",
"closeconfirm": "Are you sure you want to close this job? This cannot be easily undone.", "closeconfirm": "Are you sure you want to close this job? This cannot be easily undone.",
"closejob": "Close Job {{ro_number}}", "closejob": "Close Job {{ro_number}}",
"closingperiod": "This Invoice Date is outside of the Closing Period.", "closingperiod": "This Invoice Date is outside of the Closing Period.",

View File

@@ -1745,6 +1745,7 @@
"checklistdocuments": "", "checklistdocuments": "",
"checklists": "", "checklists": "",
"cieca_pfl": "", "cieca_pfl": "",
"cieca_pfo": "",
"closeconfirm": "", "closeconfirm": "",
"closejob": "", "closejob": "",
"closingperiod": "", "closingperiod": "",

View File

@@ -1745,6 +1745,7 @@
"checklistdocuments": "", "checklistdocuments": "",
"checklists": "", "checklists": "",
"cieca_pfl": "", "cieca_pfl": "",
"cieca_pfo": "",
"closeconfirm": "", "closeconfirm": "",
"closejob": "", "closejob": "",
"closingperiod": "", "closingperiod": "",