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

fix: boundary determination for separate ledger entries

Browse Source 
(cherry picked from commit 70239158b9)
This commit is contained in:
Rucha Mahabal
2022-03-09 16:18:23 +05:30
committed by mergify-bot
parent b63cedc7d7
commit 75833243ae
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
erpnext/hr/doctype/leave_application/leave_application.py
View File

@@ -503,10 +503,18 @@ class LeaveApplication(Document):
get_link_to_form("Leave Allocation", alloc_on_from_date.name), get_link_to_form("Leave Allocation", alloc_on_to_date))) get_link_to_form("Leave Allocation", alloc_on_from_date.name), get_link_to_form("Leave Allocation", alloc_on_to_date)))
raise_exception = False if frappe.flags.in_patch else True raise_exception = False if frappe.flags.in_patch else True
if alloc_on_from_date:
first_alloc_end = alloc_on_from_date.to_date
second_alloc_start = add_days(alloc_on_from_date.to_date, 1)
else:
first_alloc_end = add_days(alloc_on_to_date.from_date, -1)
second_alloc_start = alloc_on_to_date.from_date
leaves_in_first_alloc = get_number_of_leave_days(self.employee, self.leave_type, leaves_in_first_alloc = get_number_of_leave_days(self.employee, self.leave_type,
self.from_date, alloc_on_from_date.to_date, self.half_day, self.half_day_date) self.from_date, first_alloc_end, self.half_day, self.half_day_date)
leaves_in_second_alloc = get_number_of_leave_days(self.employee, self.leave_type, leaves_in_second_alloc = get_number_of_leave_days(self.employee, self.leave_type,
add_days(alloc_on_from_date.to_date, 1), self.to_date, self.half_day, self.half_day_date) second_alloc_start, self.to_date, self.half_day, self.half_day_date)
args = dict( args = dict(
is_lwp=lwp, is_lwp=lwp,
@@ -516,14 +524,14 @@ class LeaveApplication(Document):
if leaves_in_first_alloc: if leaves_in_first_alloc:
args.update(dict( args.update(dict(
from_date=self.from_date, from_date=self.from_date,
to_date=alloc_on_from_date.to_date, to_date=first_alloc_end,
leaves=leaves_in_first_alloc * -1 leaves=leaves_in_first_alloc * -1
)) ))
create_leave_ledger_entry(self, args, submit) create_leave_ledger_entry(self, args, submit)
if leaves_in_second_alloc: if leaves_in_second_alloc:
args.update(dict( args.update(dict(
from_date=add_days(alloc_on_from_date.to_date, 1), from_date=second_alloc_start,
to_date=self.to_date, to_date=self.to_date,
leaves=leaves_in_second_alloc * -1 leaves=leaves_in_second_alloc * -1
)) ))