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

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

Browse Source
This commit is contained in:
Anurag Mishra
2020-05-26 18:00:27 +05:30
committed by GitHub
parent 7177514b0d
commit a3ec869c58
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,7 +4,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe import frappe
from frappe import _ from frappe import _
from frappe.utils import flt from frappe.utils import flt, add_days
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_balance_on, get_leaves_for_period
@@ -26,8 +26,8 @@ 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) + " " + _("Opening") + ":Float:160")
columns.append(_(leave_type) + " " + _("Allocated") + ":Float:160") columns.append(_(leave_type) + " " + _("Allocated") + ":Float:160")
columns.append(_(leave_type) + " " + _("Expired") + ":Float:160")
columns.append(_(leave_type) + " " + _("Taken") + ":Float:160") columns.append(_(leave_type) + " " + _("Taken") + ":Float:160")
columns.append(_(leave_type) + " " + _("Expired") + ":Float:160")
columns.append(_(leave_type) + " " + _("Balance") + ":Float:160") columns.append(_(leave_type) + " " + _("Balance") + ":Float:160")
return columns return columns
@@ -84,7 +84,7 @@ def calculate_leaves_details(filters, leave_type, employee):
# removing expired leaves # removing expired leaves
leaves_taken = leaves_deducted - remove_expired_leave(ledger_entries) leaves_taken = leaves_deducted - remove_expired_leave(ledger_entries)
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))
new_allocation , expired_allocation = get_allocated_and_expired_leaves(ledger_entries, filters.from_date, filters.to_date) new_allocation , expired_allocation = get_allocated_and_expired_leaves(ledger_entries, filters.from_date, filters.to_date)
@@ -94,7 +94,7 @@ def calculate_leaves_details(filters, leave_type, employee):
#Formula for calculating closing balance #Formula for calculating closing balance
closing = max(opening + new_allocation - (leaves_taken + expired_leaves), 0) closing = max(opening + new_allocation - (leaves_taken + expired_leaves), 0)
return [opening, new_allocation, expired_leaves, leaves_taken, closing] return [opening, new_allocation, leaves_taken, expired_leaves, closing]
def remove_expired_leave(records): def remove_expired_leave(records):
@@ -113,7 +113,7 @@ def get_allocated_and_expired_leaves(records, from_date, to_date):
expired_leaves = 0 expired_leaves = 0
for record in records: for record in records:
if record.to_date <= getdate(to_date) and record.leaves>0: if record.to_date < getdate(to_date) and record.leaves>0:
expired_leaves += record.leaves expired_leaves += record.leaves
if record.from_date >= getdate(from_date) and record.leaves>0: if record.from_date >= getdate(from_date) and record.leaves>0:

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

@@ -45,16 +45,16 @@ def get_columns():
'fieldtype': 'Float', 'fieldtype': 'Float',
'fieldname': 'new_allocation', 'fieldname': 'new_allocation',
'width': 120, 'width': 120,
}, {
'label': _('Expired Leaves'),
'fieldtype': 'Float',
'fieldname': 'expired_leaves',
'width': 120,
}, { }, {
'label': _('Leaves Taken'), 'label': _('Leaves Taken'),
'fieldtype': 'float', 'fieldtype': 'float',
'fieldname': 'leaves_taken', 'fieldname': 'leaves_taken',
'width': 120, 'width': 120,
}, {
'label': _('Expired Leaves'),
'fieldtype': 'Float',
'fieldname': 'expired_leaves',
'width': 120,
}, { }, {
'label': _('Closing Balance'), 'label': _('Closing Balance'),
'fieldtype': 'float', 'fieldtype': 'float',
@@ -96,8 +96,8 @@ def get_data(filters):
leave_details = calculate_leaves_details(filters, leave_type, employee) leave_details = calculate_leaves_details(filters, leave_type, employee)
row.opening_balance = flt(leave_details[0]) row.opening_balance = flt(leave_details[0])
row.new_allocation = flt(leave_details[1]) row.new_allocation = flt(leave_details[1])
row.expired_leaves = flt(leave_details[2]) row.leaves_taken = flt(leave_details[2])
row.leaves_taken = flt(leave_details[3]) row.expired_leaves = flt(leave_details[3])
row.closing_balance = flt(leave_details[4]) row.closing_balance = flt(leave_details[4])
data.append(row) data.append(row)