diff --git a/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py b/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py index 1f7ade23f4c..fccf722939e 100644 --- a/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +++ b/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py @@ -111,34 +111,30 @@ def get_data(filters: Filters) -> List: 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: - row = frappe._dict() - row.employee = employee.name - row.employee_name = employee.employee_name + if len(active_employees) > 1: + row = frappe._dict() - leaves_taken = ( - get_leaves_for_period(employee.name, leave_type, filters.from_date, filters.to_date) * -1 - ) + row.employee = employee.name + row.employee_name = employee.employee_name - new_allocation, expired_leaves, carry_forwarded_leaves = get_allocated_and_expired_leaves( - filters.from_date, filters.to_date, employee.name, leave_type - ) - opening = get_opening_balance(employee.name, leave_type, filters, carry_forwarded_leaves) + leaves_taken = ( + get_leaves_for_period(employee.name, leave_type, filters.from_date, filters.to_date) * -1 + ) - row.leaves_allocated = new_allocation - row.leaves_expired = expired_leaves - row.opening_balance = opening - row.leaves_taken = leaves_taken + new_allocation, expired_leaves, carry_forwarded_leaves = get_allocated_and_expired_leaves( + filters.from_date, filters.to_date, employee.name, leave_type + ) + opening = get_opening_balance(employee.name, leave_type, filters, carry_forwarded_leaves) - # not be shown on the basis of days left it create in user mind for carry_forward leave - row.closing_balance = new_allocation + opening - (row.leaves_expired + leaves_taken) - row.indent = 1 - data.append(row) + row.leaves_allocated = new_allocation + row.leaves_expired = expired_leaves + row.opening_balance = opening + row.leaves_taken = leaves_taken + + # not be shown on the basis of days left it create in user mind for carry_forward leave + row.closing_balance = new_allocation + opening - (row.leaves_expired + leaves_taken) + row.indent = 1 + data.append(row) return data diff --git a/erpnext/hr/report/employee_leave_balance_summary/employee_leave_balance_summary.py b/erpnext/hr/report/employee_leave_balance_summary/employee_leave_balance_summary.py index 35ba16c74a7..9750ad4e880 100644 --- a/erpnext/hr/report/employee_leave_balance_summary/employee_leave_balance_summary.py +++ b/erpnext/hr/report/employee_leave_balance_summary/employee_leave_balance_summary.py @@ -65,21 +65,16 @@ def get_data(filters, leave_types): if 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] - available_leave = get_leave_details(employee.name, filters.date) - for leave_type in leave_types: - remaining = 0 - if leave_type in available_leave["leave_allocation"]: - # opening balance - remaining = available_leave["leave_allocation"][leave_type]["remaining_leaves"] + row = [employee.name, employee.employee_name, employee.department] + available_leave = get_leave_details(employee.name, filters.date) + for leave_type in leave_types: + remaining = 0 + if leave_type in available_leave["leave_allocation"]: + # opening balance + remaining = available_leave["leave_allocation"][leave_type]["remaining_leaves"] - row += [remaining] + row += [remaining] - data.append(row) + data.append(row) return data