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

feat: skip disabled accounts in COA (#38551)

Browse Source 
* feat: skip disabled accounts in coa

* fix: add parameter to other tree doctype utils
This commit is contained in:
Gursheen Kaur Anand 2023-12-29 12:55:37 +05:30 committed by GitHub
parent cd37fd790b
commit b7f283b2f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/accounts/utils.py
View File

@ -1116,12 +1116,16 @@ def get_companies():
@frappe.whitelist() @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 from erpnext.accounts.report.financial_statements import sort_accounts
parent_fieldname = "parent_" + doctype.lower().replace(" ", "_") parent_fieldname = "parent_" + doctype.lower().replace(" ", "_")
fields = ["name as value", "is_group as expandable"] fields = ["name as value", "is_group as expandable"]
filters = [["docstatus", "<", 2]] 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]) filters.append(['ifnull(`{0}`,"")'.format(parent_fieldname), "=", "" if is_root else parent])

7
erpnext/setup/doctype/department/department.py
View File

@ -69,7 +69,9 @@ def get_abbreviated_name(name, company):
@frappe.whitelist() @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"] fields = ["name as value", "is_group as expandable"]
filters = {} filters = {}
@ -81,6 +83,9 @@ def get_children(doctype, parent=None, company=None, is_root=False):
else: else:
filters["parent_department"] = parent 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") return frappe.get_all("Department", fields=fields, filters=filters, order_by="name")

7
erpnext/stock/doctype/warehouse/warehouse.py
View File

@ -183,15 +183,20 @@ class Warehouse(NestedSet):
@frappe.whitelist() @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: if is_root:
parent = "" parent = ""
if isinstance(include_disabled, str):
include_disabled = frappe.json.loads(include_disabled)
fields = ["name as value", "is_group as expandable"] fields = ["name as value", "is_group as expandable"]
filters = [ filters = [
["ifnull(`parent_warehouse`, '')", "=", parent], ["ifnull(`parent_warehouse`, '')", "=", parent],
["company", "in", (company, None, "")], ["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") return frappe.get_list(doctype, fields=fields, filters=filters, order_by="name")