nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-31 18:59:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: showing Wrong balance on allocation boundary dates (#21904)

Browse Source
This commit is contained in:
Anurag Mishra
2020-05-26 18:00:37 +05:30
committed by GitHub
parent 7402451b96
commit 93e15c5f5c
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,13 +3,13 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe import frappe
from frappe.utils import flt from frappe.utils import flt, add_days
from frappe import _ from frappe import _
from erpnext.hr.doctype.leave_application.leave_application import get_leaves_for_period, get_leave_balance_on, get_leave_allocation_records from erpnext.hr.doctype.leave_application.leave_application import get_leaves_for_period, get_leave_balance_on
def execute(filters=None): def execute(filters=None):
if filters.to_date <= filters.from_date: if filters.to_date <= filters.from_date:
frappe.throw(_('From date can not be greater than than To date')) frappe.throw(_('"From date" can not be greater than or equal to "To date"'))
columns = get_columns() columns = get_columns()
data = get_data(filters) data = get_data(filters)
@@ -104,14 +104,17 @@ def get_data(filters):
new_allocation, expired_leaves = get_allocated_and_expired_leaves(filters.from_date, filters.to_date, employee.name, leave_type) new_allocation, expired_leaves = get_allocated_and_expired_leaves(filters.from_date, filters.to_date, employee.name, leave_type)
opening = get_leave_balance_on(employee.name, leave_type, filters.from_date) opening = get_leave_balance_on(employee.name, leave_type, add_days(filters.from_date, -1)) #allocation boundary condition
closing = get_leave_balance_on(employee.name, leave_type, filters.to_date)
row.leaves_allocated = new_allocation row.leaves_allocated = new_allocation
row.leaves_expired = expired_leaves - leaves_taken if expired_leaves - leaves_taken > 0 else 0 row.leaves_expired = expired_leaves - leaves_taken if expired_leaves - leaves_taken > 0 else 0
row.opening_balance = opening row.opening_balance = opening
row.leaves_taken = leaves_taken row.leaves_taken = leaves_taken
row.closing_balance = closing
# 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 row.indent = 1
data.append(row) data.append(row)
new_leaves_allocated = 0 new_leaves_allocated = 0
@@ -177,7 +180,7 @@ def get_allocated_and_expired_leaves(from_date, to_date, employee, leave_type):
}, as_dict=1) }, as_dict=1)
for record in records: for record in records:
if record.to_date <= getdate(to_date): if record.to_date < getdate(to_date):
expired_leaves += record.leaves expired_leaves += record.leaves
if record.from_date >= getdate(from_date): if record.from_date >= getdate(from_date):