diff --git a/client/src/components/bill-form/bill-form.lines.component.jsx b/client/src/components/bill-form/bill-form.lines.component.jsx
index b9c41074c..541608ec4 100644
--- a/client/src/components/bill-form/bill-form.lines.component.jsx
+++ b/client/src/components/bill-form/bill-form.lines.component.jsx
@@ -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"]);
diff --git a/client/src/components/shop-info/shop-info.responsibilitycenters.component.jsx b/client/src/components/shop-info/shop-info.responsibilitycenters.component.jsx
index 69e958fe3..f88b3f059 100644
--- a/client/src/components/shop-info/shop-info.responsibilitycenters.component.jsx
+++ b/client/src/components/shop-info/shop-info.responsibilitycenters.component.jsx
@@ -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>
                 ]
               : []),
diff --git a/client/src/components/vendors-form/vendors-form.component.jsx b/client/src/components/vendors-form/vendors-form.component.jsx
index 547ff9a2a..ddd9b93d8 100644
--- a/client/src/components/vendors-form/vendors-form.component.jsx
+++ b/client/src/components/vendors-form/vendors-form.component.jsx
@@ -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">
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index cc63bdfea..c70a7e3bf 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -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",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 8b2443628..403d9a907 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -339,6 +339,7 @@
           "require_actual_delivery_date": "",
           "templates": ""
         },
+        "disableBillCostCalculation": "",
         "dms": {
           "apcontrol": "",
           "appostingaccount": "",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 3244c162e..edc02d5c8 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -339,6 +339,7 @@
           "require_actual_delivery_date": "",
           "templates": ""
         },
+        "disableBillCostCalculation": "",
         "dms": {
           "apcontrol": "",
           "appostingaccount": "",