Merge remote-tracking branch 'origin/release/2026-04-03' into feature/IO-3624-Shop-Config-UX-Refresh
# Conflicts: # client/src/components/shop-employees/shop-employees-form.component.jsx
This commit is contained in:
@@ -96,6 +96,7 @@ export function BillEnterModalLinesComponent({
|
||||
|
||||
// Only fill actual_cost when the user forward-tabs out of Retail (actual_price)
|
||||
const autofillActualCost = (index) => {
|
||||
if (bodyshop.accountingconfig?.disableBillCostCalculation) return;
|
||||
Promise.resolve().then(() => {
|
||||
const retailRaw = form.getFieldValue(["billlines", index, "actual_price"]);
|
||||
const actualRaw = form.getFieldValue(["billlines", index, "actual_cost"]);
|
||||
|
||||
@@ -349,6 +349,14 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
|
||||
valuePropName="checked"
|
||||
>
|
||||
<Switch />
|
||||
</Form.Item>,
|
||||
<Form.Item
|
||||
key="disableBillCostCalculation"
|
||||
name={["accountingconfig", "disableBillCostCalculation"]}
|
||||
label={t("bodyshop.fields.disableBillCostCalculation")}
|
||||
valuePropName="checked"
|
||||
>
|
||||
<Switch />
|
||||
</Form.Item>
|
||||
]
|
||||
: []),
|
||||
|
||||
@@ -152,7 +152,7 @@ export function VendorsFormComponent({ bodyshop, form, formLoading, handleDelete
|
||||
{!isPartsEntry && (
|
||||
<>
|
||||
<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 label={t("vendors.fields.due_date")} name="due_date">
|
||||
|
||||
@@ -339,6 +339,7 @@
|
||||
"require_actual_delivery_date": "Require Actual Delivery",
|
||||
"templates": "Delivery Templates"
|
||||
},
|
||||
"disableBillCostCalculation": "Disable Automatic Bill Cost Calculation",
|
||||
"dms": {
|
||||
"apcontrol": "AP Control Number",
|
||||
"appostingaccount": "AP Posting Account",
|
||||
|
||||
@@ -339,6 +339,7 @@
|
||||
"require_actual_delivery_date": "",
|
||||
"templates": ""
|
||||
},
|
||||
"disableBillCostCalculation": "",
|
||||
"dms": {
|
||||
"apcontrol": "",
|
||||
"appostingaccount": "",
|
||||
|
||||
@@ -339,6 +339,7 @@
|
||||
"require_actual_delivery_date": "",
|
||||
"templates": ""
|
||||
},
|
||||
"disableBillCostCalculation": "",
|
||||
"dms": {
|
||||
"apcontrol": "",
|
||||
"appostingaccount": "",
|
||||
|
||||
Reference in New Issue
Block a user