Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7565 from KanchanChauhan/leave-balance-report-fix

Browse Source 
[Fix] Permissions to view Leave Balance Report
This commit is contained in:
KanchanChauhan 2017-01-29 21:07:02 +05:30 committed by GitHub
commit 2dfb90a922
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,28 +30,31 @@ def get_columns(leave_types):
return columns return columns
def get_data(filters, leave_types): def get_data(filters, leave_types):
user = frappe.session.user
allocation_records_based_on_to_date = get_leave_allocation_records(filters.to_date) allocation_records_based_on_to_date = get_leave_allocation_records(filters.to_date)
active_employees = frappe.get_all("Employee", active_employees = frappe.get_all("Employee",
filters = { "status": "Active", "company": filters.company}, filters = { "status": "Active", "company": filters.company},
fields = ["name", "employee_name", "department"]) fields = ["name", "employee_name", "department", "user_id"])
data = [] data = []
for employee in active_employees: for employee in active_employees:
row = [employee.name, employee.employee_name, employee.department] leave_approvers = [l.leave_approver for l in frappe.db.sql("""select leave_approver from `tabEmployee Leave Approver` where parent = %s""",
(employee.name),as_dict=True)]
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]
for leave_type in leave_types: for leave_type in leave_types:
# leaves taken # leaves taken
leaves_taken = get_approved_leaves_for_period(employee.name, leave_type, leaves_taken = get_approved_leaves_for_period(employee.name, leave_type,
filters.from_date, filters.to_date) filters.from_date, filters.to_date)
# closing balance # closing balance
closing = get_leave_balance_on(employee.name, leave_type, filters.to_date, closing = get_leave_balance_on(employee.name, leave_type, filters.to_date,
allocation_records_based_on_to_date.get(employee.name, frappe._dict())) allocation_records_based_on_to_date.get(employee.name, frappe._dict()))
row += [leaves_taken, closing] row += [leaves_taken, closing]
data.append(row) data.append(row)
return data return data