From a65ad10c627ea84a657066d20c176a4fb903b0bf Mon Sep 17 00:00:00 2001 From: deepeshgarg007 Date: Sat, 27 Jul 2019 19:06:36 +0530 Subject: [PATCH] fix: GL entry validation fix --- .../doctype/accounting_dimension/accounting_dimension.py | 5 +++-- .../accounting_dimension/test_accounting_dimension.py | 1 - erpnext/accounts/doctype/gl_entry/gl_entry.py | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py b/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py index 61f699f6ab..1f418de47b 100644 --- a/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py +++ b/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py @@ -164,8 +164,9 @@ def get_accounting_dimensions(as_list=True): return accounting_dimensions def get_checks_for_pl_and_bs_accounts(): - dimensions = frappe.db.sql("""SELECT parent, company, mandatory_for_pl, mandatory_for_bs - FROM `tabAccounting Dimension Detail`""", as_dict=1) + dimensions = frappe.db.sql("""SELECT p.label, p.disabled, p.fieldname, c.company, c.mandatory_for_pl, c.mandatory_for_bs + FROM `tabAccounting Dimension`p ,`tabAccounting Dimension Detail` c + WHERE p.name = c.parent""", as_dict=1) return dimensions diff --git a/erpnext/accounts/doctype/accounting_dimension/test_accounting_dimension.py b/erpnext/accounts/doctype/accounting_dimension/test_accounting_dimension.py index c75ba825a4..104880f6f3 100644 --- a/erpnext/accounts/doctype/accounting_dimension/test_accounting_dimension.py +++ b/erpnext/accounts/doctype/accounting_dimension/test_accounting_dimension.py @@ -108,7 +108,6 @@ def disable_dimension(): dimension1.save() dimension2 = frappe.get_doc("Accounting Dimension", "Location") - dimension2.mandatory_for_pl = 0 dimension2.disabled = 1 dimension2.save() diff --git a/erpnext/accounts/doctype/gl_entry/gl_entry.py b/erpnext/accounts/doctype/gl_entry/gl_entry.py index 80e518644d..4944c8f76f 100644 --- a/erpnext/accounts/doctype/gl_entry/gl_entry.py +++ b/erpnext/accounts/doctype/gl_entry/gl_entry.py @@ -90,15 +90,15 @@ class GLEntry(Document): if account_type == "Profit and Loss" \ and self.company == dimension.company and dimension.mandatory_for_pl and not dimension.disabled: - if not self.get(frappe.scrub(dimension.parent)): + if not self.get(frappe.scrub(dimension.fieldname)): frappe.throw(_("Accounting Dimension {0} is required for 'Profit and Loss' account {1}.") - .format(dimension.parent, self.account)) + .format(dimension.label, self.account)) if account_type == "Balance Sheet" \ and self.company == dimension.company and dimension.mandatory_for_bs and not dimension.disabled: - if not self.get(frappe.scrub(dimension.parent)): + if not self.get(frappe.scrub(dimension.fieldname)): frappe.throw(_("Accounting Dimension {0} is required for 'Balance Sheet' account {1}.") - .format(dimension.parent, self.account)) + .format(dimension.label, self.account)) def check_pl_account(self):