|
|
@ -20,7 +20,7 @@ def get_approvers(doctype, txt, searchfield, start, page_len, filters): |
|
|
|
approvers = [] |
|
|
|
department_details = {} |
|
|
|
department_list = [] |
|
|
|
employee = frappe.get_value("Employee", filters.get("employee"), ["department", "leave_approver", "expense_approver", "shift_request_approver"], as_dict=True) |
|
|
|
employee = frappe.get_value("Employee", filters.get("employee"), ["employee_name","department", "leave_approver", "expense_approver", "shift_request_approver"], as_dict=True) |
|
|
|
|
|
|
|
employee_department = filters.get("department") or employee.department |
|
|
|
if employee_department: |
|
|
@ -59,11 +59,9 @@ def get_approvers(doctype, txt, searchfield, start, page_len, filters): |
|
|
|
and approver.approver=user.name""",(d, "%" + txt + "%", parentfield), as_list=True) |
|
|
|
|
|
|
|
if len(approvers) == 0: |
|
|
|
frappe.throw(_("Please set {0} for the Employee or for Department: {1}"). |
|
|
|
format( |
|
|
|
field_name, frappe.bold(employee_department), |
|
|
|
frappe.bold(employee.name) |
|
|
|
), |
|
|
|
title=_(field_name + " Missing")) |
|
|
|
error_msg = _("Please set {0} for the Employee: {1}").format(field_name, frappe.bold(employee.employee_name)) |
|
|
|
if department_list: |
|
|
|
error_msg += _(" or for Department: {0}").format(frappe.bold(employee_department)) |
|
|
|
frappe.throw(error_msg, title=_(field_name + " Missing")) |
|
|
|
|
|
|
|
return set(tuple(approver) for approver in approvers) |
|
|
|