fix: inventory dimensions should not be mandatory unnecesarily (backport #54064) (#54134)

* fix: inventory dimensions should not be mandatory unnecesarily (#54064)

(cherry picked from commit 6e44b89)

# Conflicts:
#	erpnext/patches.txt

* chore: resolve conflicts

---------

Co-authored-by: Mihir Kandoi <[email protected]>

Author: mergify[bot]

erpnext/patches.txt

@@ -473,3 +473,4 @@ erpnext.patches.v16_0.enable_serial_batch_setting
 erpnext.patches.v16_0.update_requested_qty_packed_item
 erpnext.patches.v16_0.remove_payables_receivables_workspace
 erpnext.patches.v16_0.co_by_product_patch
+erpnext.patches.v16_0.depends_on_inv_dimensions

erpnext/patches/v16_0/depends_on_inv_dimensions.py

@@ -0,0 +1,70 @@
+import frappe
+
+
+def get_inventory_dimensions():
+	return frappe.get_all(
+		"Inventory Dimension",
+		fields=[
+			"target_fieldname as fieldname",
+			"source_fieldname",
+			"reference_document as doctype",
+			"reqd",
+			"mandatory_depends_on",
+		],
+		order_by="creation",
+		distinct=True,
+	)
+
+
+def get_display_depends_on(doctype):
+	if doctype not in [
+		"Stock Entry Detail",
+		"Sales Invoice Item",
+		"Delivery Note Item",
+		"Purchase Invoice Item",
+		"Purchase Receipt Item",
+	]:
+		return
+
+	display_depends_on = ""
+
+	if doctype in ["Purchase Invoice Item", "Purchase Receipt Item"]:
+		display_depends_on = "eval:parent.is_internal_supplier == 1"
+	elif doctype != "Stock Entry Detail":
+		display_depends_on = "eval:parent.is_internal_customer == 1"
+	elif doctype == "Stock Entry Detail":
+		display_depends_on = "eval:doc.t_warehouse"
+
+	return display_depends_on
+
+
+def execute():
+	for dimension in get_inventory_dimensions():
+		frappe.set_value(
+			"Custom Field",
+			{"fieldname": dimension.source_fieldname, "dt": "Stock Entry Detail"},
+			"depends_on",
+			"eval:doc.s_warehouse",
+		)
+		frappe.set_value(
+			"Custom Field",
+			{"fieldname": dimension.source_fieldname, "dt": "Stock Entry Detail", "reqd": 1},
+			{"mandatory_depends_on": "eval:doc.s_warehouse", "reqd": 0},
+		)
+		frappe.set_value(
+			"Custom Field",
+			{
+				"fieldname": f"to_{dimension.fieldname}",
+				"dt": "Stock Entry Detail",
+				"depends_on": "eval:parent.purpose != 'Material Issue'",
+			},
+			"depends_on",
+			"eval:doc.t_warehouse",
+		)
+		if display_depends_on := get_display_depends_on(dimension.doctype):
+			frappe.set_value(
+				"Custom Field",
+				{"fieldname": dimension.fieldname, "dt": dimension.doctype},
+				"mandatory_depends_on",
+				display_depends_on if dimension.reqd else dimension.mandatory_depends_on,
+			)

erpnext/stock/doctype/inventory_dimension/inventory_dimension.json

@@ -8,9 +8,8 @@
  "field_order": [
   "dimension_details_tab",
   "dimension_name",
-  "reference_document",
   "column_break_4",
-  "disabled",
+  "reference_document",
   "field_mapping_section",
   "source_fieldname",
   "column_break_9",
@@ -93,12 +92,6 @@
    "fieldtype": "Check",
    "label": "Apply to All Inventory Documents"
   },
-  {
-   "default": "0",
-   "fieldname": "disabled",
-   "fieldtype": "Check",
-   "label": "Disabled"
-  },
   {
    "fieldname": "target_fieldname",
    "fieldtype": "Data",
@@ -159,6 +152,7 @@
    "label": "Conditional Rule Examples"
   },
   {
+   "depends_on": "eval:!doc.apply_to_all_doctypes",
    "description": "To apply condition on parent field use parent.field_name and to apply condition on child table use doc.field_name. Here field_name could be based on the actual column name of the respective field.",
    "fieldname": "mandatory_depends_on",
    "fieldtype": "Small Text",
@@ -188,7 +182,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2025-07-07 15:51:29.329064",
+ "modified": "2026-04-08 10:10:16.884388",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Inventory Dimension",

erpnext/stock/doctype/inventory_dimension/inventory_dimension.py

@@ -32,7 +32,6 @@ class InventoryDimension(Document):
 		apply_to_all_doctypes: DF.Check
 		condition: DF.Code | None
 		dimension_name: DF.Data
-		disabled: DF.Check
 		document_type: DF.Link | None
 		fetch_from_parent: DF.Literal[None]
 		istable: DF.Check
@@ -76,7 +75,6 @@ def do_not_update_document(self):
 
 		old_doc = self._doc_before_save
 		allow_to_edit_fields = [
-			"disabled",
 			"fetch_from_parent",
 			"type_of_transaction",
 			"condition",
@@ -120,6 +118,7 @@ def delete_custom_fields(self):
 	def reset_value(self):
 		if self.apply_to_all_doctypes:
 			self.type_of_transaction = ""
+			self.mandatory_depends_on = ""
 
 			self.istable = 0
 			for field in ["document_type", "condition"]:
@@ -184,8 +183,12 @@ def get_dimension_fields(self, doctype=None):
 				label=_(label),
 				depends_on="eval:doc.s_warehouse" if doctype == "Stock Entry Detail" else "",
 				search_index=1,
-				reqd=self.reqd,
-				mandatory_depends_on=self.mandatory_depends_on,
+				reqd=1
+				if self.reqd and not self.mandatory_depends_on and doctype != "Stock Entry Detail"
+				else 0,
+				mandatory_depends_on="eval:doc.s_warehouse"
+				if self.reqd and doctype == "Stock Entry Detail"
+				else self.mandatory_depends_on,
 			),
 		]
 
@@ -296,12 +299,13 @@ def add_transfer_field(self, doctype, dimension_fields):
 					options=self.reference_document,
 					label=label,
 					depends_on=display_depends_on,
+					mandatory_depends_on=display_depends_on if self.reqd else self.mandatory_depends_on,
 				),
 			]
 		)
 
 
-def field_exists(doctype, fieldname) -> str or None:
+def field_exists(doctype, fieldname) -> str | None:
 	return frappe.db.get_value("DocField", {"parent": doctype, "fieldname": fieldname}, "name")
 
 
@@ -372,7 +376,6 @@ def get_document_wise_inventory_dimensions(doctype) -> dict:
 			"type_of_transaction",
 			"fetch_from_parent",
 		],
-		filters={"disabled": 0},
 		or_filters={"document_type": doctype, "apply_to_all_doctypes": 1},
 	)
 
@@ -389,7 +392,6 @@ def get_inventory_dimensions():
 			"validate_negative_stock",
 			"name as dimension_name",
 		],
-		filters={"disabled": 0},
 		order_by="creation",
 		distinct=True,
 	)

erpnext/stock/doctype/inventory_dimension/test_inventory_dimension.py

@@ -211,17 +211,17 @@ def test_check_mandatory_dimensions(self):
 		doc = create_inventory_dimension(
 			reference_document="Pallet",
 			type_of_transaction="Outward",
-			dimension_name="Pallet",
+			dimension_name="Pallet 75",
 			apply_to_all_doctypes=0,
-			document_type="Stock Entry Detail",
+			document_type="Delivery Note Item",
 		)
 
 		doc.reqd = 1
 		doc.save()
 
 		self.assertTrue(
 			frappe.db.get_value(
-				"Custom Field", {"fieldname": "pallet", "dt": "Stock Entry Detail", "reqd": 1}, "name"
+				"Custom Field", {"fieldname": "pallet_75", "dt": "Delivery Note Item", "reqd": 1}, "name"
 			)
 		)