From 2ed6c211f95ca29222cd10c79e7275b47d4d2eff Mon Sep 17 00:00:00 2001 From: JK1117 <41583468+JK-1117@users.noreply.github.com> Date: Thu, 27 Feb 2025 15:17:10 +0800 Subject: [PATCH 1/2] feat: fetch source_fieldname for inventory dimension (cherry picked from commit 4e63ee1a70da5e3c7ac8f8405a79a45c79f16a72) --- erpnext/stock/doctype/inventory_dimension/inventory_dimension.py | 1 + 1 file changed, 1 insertion(+) diff --git a/erpnext/stock/doctype/inventory_dimension/inventory_dimension.py b/erpnext/stock/doctype/inventory_dimension/inventory_dimension.py index 75366d823a3..b08a602fdf2 100644 --- a/erpnext/stock/doctype/inventory_dimension/inventory_dimension.py +++ b/erpnext/stock/doctype/inventory_dimension/inventory_dimension.py @@ -398,6 +398,7 @@ def get_inventory_dimensions(): "Inventory Dimension", fields=[ "distinct target_fieldname as fieldname", + "source_fieldname", "reference_document as doctype", "validate_negative_stock", ], From 250b67076d19579164783badb95d140254f89afa Mon Sep 17 00:00:00 2001 From: JK1117 <41583468+JK-1117@users.noreply.github.com> Date: Thu, 27 Feb 2025 15:17:39 +0800 Subject: [PATCH 2/2] fix: use source_fieldname to validate inventory dimension (cherry picked from commit daa5bebdd014ea81de9856a3609b931100ac1d91) --- .../stock/doctype/stock_reconciliation/stock_reconciliation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py index 46f9f9dcf1b..d91a22631d8 100644 --- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py @@ -92,7 +92,7 @@ class StockReconciliation(StockController): dimensions = get_inventory_dimensions() for dimension in dimensions: for row in self.items: - if not row.batch_no and row.current_qty and row.get(dimension.get("fieldname")): + if not row.batch_no and row.current_qty and row.get(dimension.get("source_fieldname")): frappe.throw( _( "Row #{0}: You cannot use the inventory dimension '{1}' in Stock Reconciliation to modify the quantity or valuation rate. Stock reconciliation with inventory dimensions is intended solely for performing opening entries."