feat: skip disabled accounts in COA (#38551)
* feat: skip disabled accounts in coa * fix: add parameter to other tree doctype utils
This commit is contained in:
parent
cd37fd790b
commit
b7f283b2f0
@ -1116,12 +1116,16 @@ def get_companies():
|
||||
|
||||
|
||||
@frappe.whitelist()
|
||||
def get_children(doctype, parent, company, is_root=False):
|
||||
def get_children(doctype, parent, company, is_root=False, include_disabled=False):
|
||||
if isinstance(include_disabled, str):
|
||||
include_disabled = frappe.json.loads(include_disabled)
|
||||
from erpnext.accounts.report.financial_statements import sort_accounts
|
||||
|
||||
parent_fieldname = "parent_" + doctype.lower().replace(" ", "_")
|
||||
fields = ["name as value", "is_group as expandable"]
|
||||
filters = [["docstatus", "<", 2]]
|
||||
if frappe.db.has_column(doctype, "disabled") and not include_disabled:
|
||||
filters.append(["disabled", "=", False])
|
||||
|
||||
filters.append(['ifnull(`{0}`,"")'.format(parent_fieldname), "=", "" if is_root else parent])
|
||||
|
||||
|
@ -69,7 +69,9 @@ def get_abbreviated_name(name, company):
|
||||
|
||||
|
||||
@frappe.whitelist()
|
||||
def get_children(doctype, parent=None, company=None, is_root=False):
|
||||
def get_children(doctype, parent=None, company=None, is_root=False, include_disabled=False):
|
||||
if isinstance(include_disabled, str):
|
||||
include_disabled = frappe.json.loads(include_disabled)
|
||||
fields = ["name as value", "is_group as expandable"]
|
||||
filters = {}
|
||||
|
||||
@ -81,6 +83,9 @@ def get_children(doctype, parent=None, company=None, is_root=False):
|
||||
else:
|
||||
filters["parent_department"] = parent
|
||||
|
||||
if frappe.db.has_column(doctype, "disabled") and not include_disabled:
|
||||
filters["disabled"] = False
|
||||
|
||||
return frappe.get_all("Department", fields=fields, filters=filters, order_by="name")
|
||||
|
||||
|
||||
|
@ -183,15 +183,20 @@ class Warehouse(NestedSet):
|
||||
|
||||
|
||||
@frappe.whitelist()
|
||||
def get_children(doctype, parent=None, company=None, is_root=False):
|
||||
def get_children(doctype, parent=None, company=None, is_root=False, include_disabled=False):
|
||||
if is_root:
|
||||
parent = ""
|
||||
|
||||
if isinstance(include_disabled, str):
|
||||
include_disabled = frappe.json.loads(include_disabled)
|
||||
|
||||
fields = ["name as value", "is_group as expandable"]
|
||||
filters = [
|
||||
["ifnull(`parent_warehouse`, '')", "=", parent],
|
||||
["company", "in", (company, None, "")],
|
||||
]
|
||||
if frappe.db.has_column(doctype, "disabled") and not include_disabled:
|
||||
filters.append(["disabled", "=", False])
|
||||
|
||||
return frappe.get_list(doctype, fields=fields, filters=filters, order_by="name")
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user