mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-18 12:39:18 +00:00
merge
This commit is contained in:
@@ -46,5 +46,8 @@ class DocType:
|
||||
|
||||
@webnotes.whitelist()
|
||||
def get_approver_list():
|
||||
return [r[0] for r in webnotes.conn.sql("""select distinct parent from `tabUserRole`
|
||||
roles = [r[0] for r in webnotes.conn.sql("""select distinct parent from `tabUserRole`
|
||||
where role='Expense Approver'""")]
|
||||
if not roles:
|
||||
webnotes.msgprint("No Expense Approvers. Please assign 'Expense Approver' Role to atleast one user.")
|
||||
return roles
|
||||
|
||||
@@ -119,5 +119,9 @@ def get_leave_balance(employee, leave_type, fiscal_year):
|
||||
|
||||
@webnotes.whitelist()
|
||||
def get_approver_list():
|
||||
return [r[0] for r in webnotes.conn.sql("""select distinct parent from `tabUserRole`
|
||||
roles = [r[0] for r in webnotes.conn.sql("""select distinct parent from `tabUserRole`
|
||||
where role='Leave Approver'""")]
|
||||
if not roles:
|
||||
webnotes.msgprint("No Leave Approvers. Please assign 'Leave Approver' Role to atleast one user.")
|
||||
|
||||
return roles
|
||||
|
||||
Reference in New Issue
Block a user