nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-29 09:54:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Show opening balance of leaves (#14925)

Browse Source 
* Show opening balance of leaves

* Update employee_leave_balance.py
This commit is contained in:
Shreya Shah
2018-07-17 11:59:51 +05:30
committed by Nabin Hait
parent a3e070bc6b
commit fbeab5bf73
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,6 +24,7 @@ def get_columns(leave_types):
] ]
for leave_type in leave_types: for leave_type in leave_types:
columns.append(_(leave_type) + " " + _("Opening") + ":Float:160")
columns.append(_(leave_type) + " " + _("Taken") + ":Float:160") columns.append(_(leave_type) + " " + _("Taken") + ":Float:160")
columns.append(_(leave_type) + " " + _("Balance") + ":Float:160") columns.append(_(leave_type) + " " + _("Balance") + ":Float:160")
@@ -32,6 +33,7 @@ def get_columns(leave_types):
def get_data(filters, leave_types): def get_data(filters, leave_types):
user = frappe.session.user 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)
allocation_records_based_on_from_date = get_leave_allocation_records(filters.from_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},
@@ -48,13 +50,17 @@ def get_data(filters, 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)
# opening balance
opening = get_leave_balance_on(employee.name, leave_type, filters.from_date,
allocation_records_based_on_from_date.get(employee.name, frappe._dict()))
# 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 += [opening, leaves_taken, closing]
data.append(row) data.append(row)
return data return data