nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-01 19:29:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: handle multiple root / orphan nodes

Browse Source
This commit is contained in:
Rucha Mahabal
2021-07-07 12:05:50 +05:30
parent 97d2bab434
commit 31a0f36ed9
4 changed files with 49 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/hr/page/organizational_chart/organizational_chart.py
View File

@@ -17,7 +17,7 @@ def get_children(parent=None, company=None, exclude_node=None, is_root=False, is
if exclude_node:
filters.append(['name', '!=', exclude_node])
if parent and company and parent!=company:
if parent and company and parent != company:
filters.append(['reports_to', '=', parent])
else:
filters.append(['reports_to', '=', ''])
@@ -32,6 +32,7 @@ def get_children(parent=None, company=None, exclude_node=None, is_root=False, is
employee.connections = get_connections(employee.id)
employee.expandable = 1 if is_expandable else 0
employees.sort(key=lambda x: x['connections'], reverse=True)
return employees