schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: remove hard-coded roles for populating leave balance reports (#249) (#33557)

Browse Source
This commit is contained in:
Rucha Mahabal
2023-01-06 14:28:15 +05:30
committed by GitHub
parent 7d0a118eab
commit c20d469f31
2 changed files with 29 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/hr/report/employee_leave_balance/employee_leave_balance.py
View File

@@ -111,13 +111,9 @@ def get_data(filters: Filters) -> List:
employee.leave_approver employee.leave_approver
) )
if (
(leave_approvers and len(leave_approvers) and user in leave_approvers)
or (user in ["Administrator", employee.user_id])
or ("HR Manager" in frappe.get_roles(user))
):
if len(active_employees) > 1: if len(active_employees) > 1:
row = frappe._dict() row = frappe._dict()
row.employee = employee.name row.employee = employee.name
row.employee_name = employee.employee_name row.employee_name = employee.employee_name

5
erpnext/hr/report/employee_leave_balance_summary/employee_leave_balance_summary.py
View File

@@ -65,11 +65,6 @@ def get_data(filters, leave_types):
if employee.leave_approver: if employee.leave_approver:
leave_approvers.append(employee.leave_approver) leave_approvers.append(employee.leave_approver)
if (
(len(leave_approvers) and user in leave_approvers)
or (user in ["Administrator", employee.user_id])
or ("HR Manager" in frappe.get_roles(user))
):
row = [employee.name, employee.employee_name, employee.department] row = [employee.name, employee.employee_name, employee.department]
available_leave = get_leave_details(employee.name, filters.date) available_leave = get_leave_details(employee.name, filters.date)
for leave_type in leave_types: for leave_type in leave_types: