diff --git a/erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.py b/erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.py index fd832d98ba4..6eff320e3a3 100644 --- a/erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.py +++ b/erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.py @@ -38,7 +38,8 @@ class AccountingDimensionFilter(Document): def validate(self): self.fieldname = frappe.db.get_value( "Accounting Dimension", {"document_type": self.accounting_dimension}, "fieldname" - ) + ) or frappe.scrub(self.accounting_dimension) # scrub to handle default accounting dimension + self.validate_applicable_accounts() def validate_applicable_accounts(self): diff --git a/erpnext/patches/v15_0/update_fieldname_in_accounting_dimension_filter.py b/erpnext/patches/v15_0/update_fieldname_in_accounting_dimension_filter.py index 50d3fbe6f9c..11d2cc91446 100644 --- a/erpnext/patches/v15_0/update_fieldname_in_accounting_dimension_filter.py +++ b/erpnext/patches/v15_0/update_fieldname_in_accounting_dimension_filter.py @@ -3,6 +3,7 @@ from frappe.query_builder import DocType def execute(): + default_accounting_dimension() ADF = DocType("Accounting Dimension Filter") AD = DocType("Accounting Dimension") @@ -21,3 +22,14 @@ def execute(): doc.fieldname, update_modified=False, ) + + +def default_accounting_dimension(): + for accounting_dimension in ["Cost Center", "Project"]: + frappe.db.set_value( + "Accounting Dimension Filter", + {"accounting_dimension": accounting_dimension}, + "fieldname", + frappe.scrub(accounting_dimension), + update_modified=False, + )