nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-05 22:48:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: Added all companies option in employee tree to view employee accress all companies

Browse Source
This commit is contained in:
Deepesh Garg
2020-07-03 18:39:51 +05:30
parent 73edba0e10
commit d7adacd3e2
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/hr/doctype/employee/employee.py
View File

@@ -413,7 +413,11 @@ def get_employee_emails(employee_list):
@frappe.whitelist() @frappe.whitelist()
def get_children(doctype, parent=None, company=None, is_root=False, is_tree=False): def get_children(doctype, parent=None, company=None, is_root=False, is_tree=False):
filters = [['company', '=', company]]
filters = []
if company and company != 'All Companies':
filters = [['company', '=', company]]
fields = ['name as value', 'employee_name as title'] fields = ['name as value', 'employee_name as title']
if is_root: if is_root:

2
erpnext/hr/doctype/employee/employee_tree.js
View File

@@ -4,7 +4,7 @@ frappe.treeview_settings['Employee'] = {
{ {
fieldname: "company", fieldname: "company",
fieldtype:"Select", fieldtype:"Select",
options: erpnext.utils.get_tree_options("company"), options: ['All Companies'].concat(erpnext.utils.get_tree_options("company")),
label: __("Company"), label: __("Company"),
default: erpnext.utils.get_tree_default("company") default: erpnext.utils.get_tree_default("company")
} }