Merge pull request #22573 from deepeshgarg007/employee_tree
feat: Added all companies option in employee tree to view employee ac…
This commit is contained in:
commit
b78dc75456
@ -413,7 +413,11 @@ def get_employee_emails(employee_list):
|
||||
|
||||
@frappe.whitelist()
|
||||
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']
|
||||
|
||||
if is_root:
|
||||
|
@ -4,7 +4,7 @@ frappe.treeview_settings['Employee'] = {
|
||||
{
|
||||
fieldname: "company",
|
||||
fieldtype:"Select",
|
||||
options: erpnext.utils.get_tree_options("company"),
|
||||
options: ['All Companies'].concat(erpnext.utils.get_tree_options("company")),
|
||||
label: __("Company"),
|
||||
default: erpnext.utils.get_tree_default("company")
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user