diff --git a/erpnext/stock/doctype/stock_settings/stock_settings.json b/erpnext/stock/doctype/stock_settings/stock_settings.json
index 58ea8083087..03303d247bf 100644
--- a/erpnext/stock/doctype/stock_settings/stock_settings.json
+++ b/erpnext/stock/doctype/stock_settings/stock_settings.json
@@ -131,7 +131,8 @@
    "description": "The percentage you are allowed to receive or deliver more against the quantity ordered. For example, if you have ordered 100 units, and your Allowance is 10%, then you are allowed to receive 110 units.",
    "fieldname": "over_delivery_receipt_allowance",
    "fieldtype": "Float",
-   "label": "Over Delivery/Receipt Allowance (%)"
+   "label": "Over Delivery/Receipt Allowance (%)",
+   "non_negative": 1
   },
   {
    "default": "Stop",
@@ -282,7 +283,12 @@
    "description": "The percentage you are allowed to transfer more against the quantity ordered. For example, if you have ordered 100 units, and your Allowance is 10%, then you are allowed transfer 110 units.",
    "fieldname": "mr_qty_allowance",
    "fieldtype": "Float",
+<<<<<<< HEAD
    "label": "Over Transfer Allowance"
+=======
+   "label": "Over Transfer Allowance (%)",
+   "non_negative": 1
+>>>>>>> 446ec6030a (fix(stock): validate over delivery/receipt allowance in stock settings)
   },
   {
    "default": "0",
@@ -446,7 +452,12 @@
    "description": "The percentage you are allowed to pick more items in the pick list than the ordered quantity.",
    "fieldname": "over_picking_allowance",
    "fieldtype": "Percent",
+<<<<<<< HEAD
    "label": "Over Picking Allowance"
+=======
+   "label": "Over Picking Allowance (%)",
+   "non_negative": 1
+>>>>>>> 446ec6030a (fix(stock): validate over delivery/receipt allowance in stock settings)
   },
   {
    "default": "1",
@@ -528,7 +539,11 @@
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
+<<<<<<< HEAD
  "modified": "2026-03-27 22:39:16.812184",
+=======
+ "modified": "2026-08-01 23:35:02.896836",
+>>>>>>> 446ec6030a (fix(stock): validate over delivery/receipt allowance in stock settings)
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Stock Settings",
diff --git a/erpnext/stock/doctype/stock_settings/stock_settings.py b/erpnext/stock/doctype/stock_settings/stock_settings.py
index f573c35925b..1c9611d733e 100644
--- a/erpnext/stock/doctype/stock_settings/stock_settings.py
+++ b/erpnext/stock/doctype/stock_settings/stock_settings.py
@@ -67,7 +67,7 @@ class StockSettings(Document):
 		use_naming_series: DF.Check
 		use_serial_batch_fields: DF.Check
 		validate_material_transfer_warehouses: DF.Check
-		valuation_method: DF.Literal["FIFO", "Moving Average", "LIFO"]
+		valuation_method: DF.Literal["FIFO", "Moving Average", "LIFO", "Standard Cost"]
 	# end: auto-generated types
 
 	def validate(self):
@@ -100,7 +100,12 @@ class StockSettings(Document):
 				validate_fields_for_doctype=False,
 			)
 
+<<<<<<< HEAD
 		self.validate_warehouses()
+=======
+		self.validate_over_delivery_receipt_allowance()
+		self.validate_serial_and_batch_no_settings()
+>>>>>>> 446ec6030a (fix(stock): validate over delivery/receipt allowance in stock settings)
 		self.cant_change_valuation_method()
 		self.validate_clean_description_html()
 		self.validate_pending_reposts()
@@ -110,6 +115,10 @@ class StockSettings(Document):
 		self.change_precision_for_purchase()
 		self.validate_do_not_use_batchwise_valuation()
 
+	def validate_over_delivery_receipt_allowance(self):
+		if not self.over_delivery_receipt_allowance:
+			self.role_allowed_to_over_deliver_receive = None
+
 	def validate_do_not_use_batchwise_valuation(self):
 		doc_before_save = self.get_doc_before_save()
 		if not doc_before_save: