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

fix: Was showing opening on date not remaimning leave (#21899)

Browse Source
This commit is contained in:
Anurag Mishra 2020-05-26 18:01:03 +05:30 committed by GitHub
parent 93e15c5f5c
commit 752ca63fea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,7 @@ import frappe
from frappe import _ from frappe import _
from frappe.utils import flt from frappe.utils import flt
from erpnext.hr.doctype.leave_application.leave_application \ from erpnext.hr.doctype.leave_application.leave_application \
import get_leave_balance_on, get_leaves_for_period import get_leave_details
from erpnext.hr.report.employee_leave_balance.employee_leave_balance \ from erpnext.hr.report.employee_leave_balance.employee_leave_balance \
import get_department_leave_approver_map import get_department_leave_approver_map
@ -61,14 +61,14 @@ def get_data(filters, leave_types):
if (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(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)
for leave_type in leave_types: for leave_type in leave_types:
remaining = 0
if leave_type in available_leave["leave_allocation"]:
# opening balance # opening balance
opening = get_leave_balance_on(employee.name, leave_type, filters.date) remaining = available_leave["leave_allocation"][leave_type]['remaining_leaves']
row += [remaining]
row += [opening]
data.append(row) data.append(row)