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

test: earned leave allocations based on DOJ

Browse Source 
(cherry picked from commit 9b0f9c3442)
This commit is contained in:
Rucha Mahabal
2022-02-11 20:08:01 +05:30
committed by mergify-bot
parent c0ea6d0721
commit c261621dca
3 changed files with 128 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/hr/utils.py
View File

@@ -421,13 +421,10 @@ def is_earned_leave_already_allocated(allocation, annual_allocation):
get_leave_type_details,
)
assignment = frappe.get_doc("Leave Policy Assignment", allocation.leave_policy_assignment)
if assignment.assignment_based_on == "Joining Date":
return False
leave_type_details = get_leave_type_details()
date_of_joining = frappe.db.get_value("Employee", allocation.employee, "date_of_joining")
assignment = frappe.get_doc("Leave Policy Assignment", allocation.leave_policy_assignment)
leaves_for_passed_months = assignment.get_leaves_for_passed_months(allocation.leave_type,
annual_allocation, leave_type_details, date_of_joining)