Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: added validation to if account is being added to child company

Browse Source
This commit is contained in:
Zlash65 2019-01-30 11:12:28 +05:30 committed by Rohit Waghchaure
parent 0407bf1e00
commit 88c990901d
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
erpnext/accounts/doctype/account/account.py
View File

@ -34,6 +34,7 @@ class Account(NestedSet):
return return
self.validate_parent() self.validate_parent()
self.validate_root_details() self.validate_root_details()
self.validate_root_company()
validate_field_number("Account", self.name, self.account_number, self.company, "account_number") validate_field_number("Account", self.name, self.account_number, self.company, "account_number")
self.validate_group_or_ledger() self.validate_group_or_ledger()
self.set_root_and_report_type() self.set_root_and_report_type()
@ -90,6 +91,13 @@ class Account(NestedSet):
if not self.parent_account and not self.is_group: if not self.parent_account and not self.is_group:
frappe.throw(_("Root Account must be a group")) frappe.throw(_("Root Account must be a group"))
def validate_root_company(self):
# fetch all ancestors in top-down hierarchy
if frappe.local.flags.ignore_root_company_validation: return
ancestors = get_root_company(self.company)
if ancestors:
frappe.throw(_("Please add the account to root level Company - %s" % ancestors[0]))
def validate_group_or_ledger(self): def validate_group_or_ledger(self):
if self.get("__islocal"): if self.get("__islocal"):
return return
@ -250,3 +258,9 @@ def merge_account(old, new, is_group, root_type, company):
frappe.rename_doc("Account", old, new, merge=1, ignore_permissions=1) frappe.rename_doc("Account", old, new, merge=1, ignore_permissions=1)
return new return new
@frappe.whitelist()
def get_root_company(company):
# return the topmost company in the hierarchy
ancestors = frappe.utils.nestedset.get_ancestors_of('Company', company, "lft asc")
return [ancestors[0]] if ancestors else []

1
erpnext/setup/doctype/company/company.py
View File

@ -141,6 +141,7 @@ class Company(NestedSet):
def create_default_accounts(self): def create_default_accounts(self):
from erpnext.accounts.doctype.account.chart_of_accounts.chart_of_accounts import create_charts from erpnext.accounts.doctype.account.chart_of_accounts.chart_of_accounts import create_charts
frappe.local.flags.ignore_root_company_validation = True
create_charts(self.name, self.chart_of_accounts, self.existing_company) create_charts(self.name, self.chart_of_accounts, self.existing_company)
frappe.db.set(self, "default_receivable_account", frappe.db.get_value("Account", frappe.db.set(self, "default_receivable_account", frappe.db.get_value("Account",