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

Merged in release/2021-09-10 (pull request #206)

Browse Source 
IO-1350 Audatex import issues.
This commit is contained in:
Patrick Fic
2021-09-09 20:10:20 +00:00
parent 03f25c8c0e e46307e715
commit 78c883743f
6 changed files with 113 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
bodyshop_translations.babel
View File

@@ -6344,6 +6344,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>pasl</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>refund</name> <name>refund</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>

78
client/src/components/shop-info/shop-info.responsibilitycenters.component.jsx
View File

@@ -871,6 +871,27 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
))} ))}
</Select> </Select>
</Form.Item> </Form.Item>
<Form.Item
label={t(
"bodyshop.fields.responsibilitycenters.pasl"
)}
rules={[
{
required: true,
//message: t("general.validation.required"),
},
]}
key={`${index}costs-PASL`}
name={[field.name, "costs", "PASL"]}
>
<Select>
{costOptions.map((item, idx) => (
<Select.Option key={idx} value={item}>
{item}
</Select.Option>
))}
</Select>
</Form.Item>
<Form.Item <Form.Item
label={t( label={t(
"bodyshop.fields.responsibilitycenters.tow" "bodyshop.fields.responsibilitycenters.tow"
@@ -1337,6 +1358,27 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
))} ))}
</Select> </Select>
</Form.Item> </Form.Item>
<Form.Item
label={t(
"bodyshop.fields.responsibilitycenters.pasl"
)}
rules={[
{
required: true,
//message: t("general.validation.required"),
},
]}
key={`${index}profits-PASL`}
name={[field.name, "profits", "PASL"]}
>
<Select>
{profitOptions.map((item, idx) => (
<Select.Option key={idx} value={item}>
{item}
</Select.Option>
))}
</Select>
</Form.Item>
<Form.Item <Form.Item
label={t( label={t(
"bodyshop.fields.responsibilitycenters.tow" "bodyshop.fields.responsibilitycenters.tow"
@@ -1771,6 +1813,24 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
))} ))}
</Select> </Select>
</Form.Item> </Form.Item>
<Form.Item
label={t("bodyshop.fields.responsibilitycenters.pasl")}
rules={[
{
required: true,
//message: t("general.validation.required"),
},
]}
name={["md_responsibility_centers", "defaults", "costs", "PASL"]}
>
<Select>
{costOptions.map((item, idx) => (
<Select.Option key={idx} value={item}>
{item}
</Select.Option>
))}
</Select>
</Form.Item>
<Form.Item <Form.Item
label={t("bodyshop.fields.responsibilitycenters.tow")} label={t("bodyshop.fields.responsibilitycenters.tow")}
rules={[ rules={[
@@ -2169,6 +2229,24 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
))} ))}
</Select> </Select>
</Form.Item> </Form.Item>
<Form.Item
label={t("bodyshop.fields.responsibilitycenters.pasl")}
rules={[
{
required: true,
//message: t("general.validation.required"),
},
]}
name={["md_responsibility_centers", "defaults", "profits", "PASL"]}
>
<Select>
{profitOptions.map((item, idx) => (
<Select.Option key={idx} value={item}>
{item}
</Select.Option>
))}
</Select>
</Form.Item>
<Form.Item <Form.Item
label={t("bodyshop.fields.responsibilitycenters.tow")} label={t("bodyshop.fields.responsibilitycenters.tow")}
rules={[ rules={[

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

@@ -406,6 +406,7 @@
"pap": "OEM Partial", "pap": "OEM Partial",
"par": "Recored", "par": "Recored",
"pas": "Sublet", "pas": "Sublet",
"pasl": "Sublet (L)",
"refund": "Refund", "refund": "Refund",
"sales_tax_codes": { "sales_tax_codes": {
"code": "Code", "code": "Code",

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

@@ -406,6 +406,7 @@
"pap": "", "pap": "",
"par": "", "par": "",
"pas": "", "pas": "",
"pasl": "",
"refund": "", "refund": "",
"sales_tax_codes": { "sales_tax_codes": {
"code": "", "code": "",

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

@@ -406,6 +406,7 @@
"pap": "", "pap": "",
"par": "", "par": "",
"pas": "", "pas": "",
"pasl": "",
"refund": "", "refund": "",
"sales_tax_codes": { "sales_tax_codes": {
"code": "", "code": "",

12
server/job/job-totals.js
View File

@@ -242,7 +242,16 @@ function CalculatePartsTotals(jobLines) {
subtotal: acc.sublets.subtotal.add( subtotal: acc.sublets.subtotal.add(
Dinero({ Dinero({
amount: Math.round(value.act_price * 100), amount: Math.round(value.act_price * 100),
}).multiply(value.part_qty || 0) })
.multiply(value.part_qty || 0)
.add(
Dinero({
amount: Math.round(value.act_price * 100),
})
.multiply(value.part_qty || 0)
.percentage(Math.abs(value.prt_dsmk_p || 0))
.multiply(value.prt_dsmk_p > 0 ? 1 : -1)
)
), ),
}, },
}; };
@@ -306,6 +315,7 @@ function CalculatePartsTotals(jobLines) {
}, },
sublets: { sublets: {
subtotal: Dinero({ amount: 0 }), subtotal: Dinero({ amount: 0 }),
total: Dinero({ amount: 0 }), total: Dinero({ amount: 0 }),
}, },
} }