schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: earned leave allocation in policy assignment

Browse Source
This commit is contained in:
Rucha Mahabal
2023-12-19 13:03:36 +05:30
parent 48eaa51c4a
commit 14955c70d4
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/hr/doctype/leave_policy_assignment/leave_policy_assignment.py
View File

@@ -150,11 +150,14 @@ class LeavePolicyAssignment(Document):
) )
# Calculate leaves at pro-rata basis for employees joining after the beginning of the given leave period # Calculate leaves at pro-rata basis for employees joining after the beginning of the given leave period
elif getdate(date_of_joining) > getdate(self.effective_from): else:
if getdate(date_of_joining) > getdate(self.effective_from):
remaining_period = (date_diff(self.effective_to, date_of_joining) + 1) / ( remaining_period = (date_diff(self.effective_to, date_of_joining) + 1) / (
date_diff(self.effective_to, self.effective_from) + 1 date_diff(self.effective_to, self.effective_from) + 1
) )
new_leaves_allocated = ceil(new_leaves_allocated * remaining_period) new_leaves_allocated = ceil(annual_allocation * remaining_period)
else:
new_leaves_allocated = annual_allocation
# leave allocation should not exceed annual allocation as per policy assignment # leave allocation should not exceed annual allocation as per policy assignment
if new_leaves_allocated > annual_allocation: if new_leaves_allocated > annual_allocation: