mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-20 13:39:18 +00:00
Merge pull request #49093 from ljain112/fix-account-coa
fix: allow creation of root accounts in account tree view
This commit is contained in:
@@ -167,7 +167,7 @@ class Account(NestedSet):
|
|||||||
if par.root_type:
|
if par.root_type:
|
||||||
self.root_type = par.root_type
|
self.root_type = par.root_type
|
||||||
|
|
||||||
if self.is_group:
|
if cint(self.is_group):
|
||||||
db_value = self.get_doc_before_save()
|
db_value = self.get_doc_before_save()
|
||||||
if db_value:
|
if db_value:
|
||||||
if self.report_type != db_value.report_type:
|
if self.report_type != db_value.report_type:
|
||||||
@@ -210,7 +210,7 @@ class Account(NestedSet):
|
|||||||
if doc_before_save and not doc_before_save.parent_account:
|
if doc_before_save and not doc_before_save.parent_account:
|
||||||
throw(_("Root cannot be edited."), RootNotEditable)
|
throw(_("Root cannot be edited."), RootNotEditable)
|
||||||
|
|
||||||
if not self.parent_account and not self.is_group:
|
if not self.parent_account and not cint(self.is_group):
|
||||||
throw(_("The root account {0} must be a group").format(frappe.bold(self.name)))
|
throw(_("The root account {0} must be a group").format(frappe.bold(self.name)))
|
||||||
|
|
||||||
def validate_root_company_and_sync_account_to_children(self):
|
def validate_root_company_and_sync_account_to_children(self):
|
||||||
@@ -259,7 +259,7 @@ class Account(NestedSet):
|
|||||||
|
|
||||||
if self.check_gle_exists():
|
if self.check_gle_exists():
|
||||||
throw(_("Account with existing transaction cannot be converted to ledger"))
|
throw(_("Account with existing transaction cannot be converted to ledger"))
|
||||||
elif self.is_group:
|
elif cint(self.is_group):
|
||||||
if self.account_type and not self.flags.exclude_account_type_check:
|
if self.account_type and not self.flags.exclude_account_type_check:
|
||||||
throw(_("Cannot covert to Group because Account Type is selected."))
|
throw(_("Cannot covert to Group because Account Type is selected."))
|
||||||
elif self.check_if_child_exists():
|
elif self.check_if_child_exists():
|
||||||
|
|||||||
@@ -236,10 +236,6 @@ frappe.treeview_settings["Account"] = {
|
|||||||
root_company,
|
root_company,
|
||||||
]);
|
]);
|
||||||
} else {
|
} else {
|
||||||
const node = treeview.tree.get_selected_node();
|
|
||||||
if (node.is_root) {
|
|
||||||
frappe.throw(__("Cannot create root account."));
|
|
||||||
}
|
|
||||||
treeview.new_node();
|
treeview.new_node();
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -258,8 +254,7 @@ frappe.treeview_settings["Account"] = {
|
|||||||
].treeview.page.fields_dict.root_company.get_value() ||
|
].treeview.page.fields_dict.root_company.get_value() ||
|
||||||
frappe.flags.ignore_root_company_validation) &&
|
frappe.flags.ignore_root_company_validation) &&
|
||||||
node.expandable &&
|
node.expandable &&
|
||||||
!node.hide_add &&
|
!node.hide_add
|
||||||
!node.is_root
|
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
click: function () {
|
click: function () {
|
||||||
|
|||||||
Reference in New Issue
Block a user