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

Merge remote-tracking branch 'origin/release/2026-04-03' into feature/IO-3624-Shop-Config-UX-Refresh

Browse Source 
# Conflicts:
#	client/src/components/shop-employees/shop-employees-form.component.jsx
This commit is contained in:
Dave
2026-03-24 13:55:37 -04:00
parent dd306e1a7b 9b1488ac3b
commit 2690e09626
6 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
client/src/components/bill-form/bill-form.lines.component.jsx
View File

@@ -96,6 +96,7 @@ export function BillEnterModalLinesComponent({
// Only fill actual_cost when the user forward-tabs out of Retail (actual_price) // Only fill actual_cost when the user forward-tabs out of Retail (actual_price)
const autofillActualCost = (index) => { const autofillActualCost = (index) => {
if (bodyshop.accountingconfig?.disableBillCostCalculation) return;
Promise.resolve().then(() => { Promise.resolve().then(() => {
const retailRaw = form.getFieldValue(["billlines", index, "actual_price"]); const retailRaw = form.getFieldValue(["billlines", index, "actual_price"]);
const actualRaw = form.getFieldValue(["billlines", index, "actual_cost"]); const actualRaw = form.getFieldValue(["billlines", index, "actual_cost"]);

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

@@ -349,6 +349,14 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
valuePropName="checked" valuePropName="checked"
> >
<Switch /> <Switch />
</Form.Item>,
<Form.Item
key="disableBillCostCalculation"
name={["accountingconfig", "disableBillCostCalculation"]}
label={t("bodyshop.fields.disableBillCostCalculation")}
valuePropName="checked"
>
<Switch />
</Form.Item> </Form.Item>
] ]
: []), : []),

2
client/src/components/vendors-form/vendors-form.component.jsx
View File

@@ -152,7 +152,7 @@ export function VendorsFormComponent({ bodyshop, form, formLoading, handleDelete
{!isPartsEntry && ( {!isPartsEntry && (
<> <>
<Form.Item label={t("vendors.fields.discount")} name="discount"> <Form.Item label={t("vendors.fields.discount")} name="discount">
<InputNumber min={0} max={1} precision={2} step={0.01} /> <InputNumber min={0} max={1} precision={3} step={0.01} />
</Form.Item> </Form.Item>
<Form.Item label={t("vendors.fields.due_date")} name="due_date"> <Form.Item label={t("vendors.fields.due_date")} name="due_date">

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

@@ -339,6 +339,7 @@
"require_actual_delivery_date": "Require Actual Delivery", "require_actual_delivery_date": "Require Actual Delivery",
"templates": "Delivery Templates" "templates": "Delivery Templates"
}, },
"disableBillCostCalculation": "Disable Automatic Bill Cost Calculation",
"dms": { "dms": {
"apcontrol": "AP Control Number", "apcontrol": "AP Control Number",
"appostingaccount": "AP Posting Account", "appostingaccount": "AP Posting Account",

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

@@ -339,6 +339,7 @@
"require_actual_delivery_date": "", "require_actual_delivery_date": "",
"templates": "" "templates": ""
}, },
"disableBillCostCalculation": "",
"dms": { "dms": {
"apcontrol": "", "apcontrol": "",
"appostingaccount": "", "appostingaccount": "",

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

@@ -339,6 +339,7 @@
"require_actual_delivery_date": "", "require_actual_delivery_date": "",
"templates": "" "templates": ""
}, },
"disableBillCostCalculation": "",
"dms": { "dms": {
"apcontrol": "", "apcontrol": "",
"appostingaccount": "", "appostingaccount": "",