Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: validate leave allocation period to be within expiry limits

Browse Source
This commit is contained in:
Mangesh-Khairnar 2019-04-24 13:17:16 +05:30
parent 99c9cfaaed
commit 70cf4a6796
2 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
erpnext/hr/doctype/leave_allocation/leave_allocation.py
View File

@ -44,9 +44,17 @@ class LeaveAllocation(Document):
self.validate_against_leave_applications()
def validate_period(self):
if date_diff(self.to_date, self.from_date) <= 0:
allocation_period = date_diff(self.to_date, self.from_date)
if allocation_period <= 0:
frappe.throw(_("To date cannot be before from date"))
# check if the allocation period is more than the expiry allows for carry forwarded allocation
if self.carry_forward:
expiry_days = get_days_to_expiry_for_leave_type(self.leave_type)
if allocation_period > expiry_days:
frappe.throw(_("Leave allocation period cannot be more than the expiry days allocated"))
def validate_lwp(self):
if frappe.db.get_value("Leave Type", self.leave_type, "is_lwp"):
frappe.throw(_("Leave Type {0} cannot be allocated since it is leave without pay").format(self.leave_type))
@ -115,13 +123,10 @@ class LeaveAllocation(Document):
frappe.throw(_("Total allocated leaves {0} cannot be less than already approved leaves {1} for the period").format(self.total_leaves_allocated, leaves_taken), LessAllocationError)
def set_carry_forwarded_leaves(self):
# check number of days to expire, ignore expiry for default value 0
expiry_days = frappe.db.get_value("Leave Type",
filters={"leave_type": leave_type, "is_carry_forward": 1},
fieldname="carry_forward_leave_expiry")
self.carry_forwarded_leaves = get_carry_forwarded_leaves(self.employee, self.leave_type, self.from_date)
self.carry_forwarded_leaves = get_carry_forwarded_leaves(self.employee, self.leave_type, self.from_date, expiry_days)
max_leaves, leaves_allocated = self.get_max_leaves_with_leaves_allocated_for_leave_type(self.carry_forwarded_leaves)
if leaves_allocated > max_leaves:
self.carry_forwarded_leaves = max_leaves - (leaves_allocated - self.carry_forwarded_leaves)
@ -168,9 +173,10 @@ def get_leave_allocation_for_period(employee, leave_type, from_date, to_date):
return leave_allocated
@frappe.whitelist()
def get_carry_forwarded_leaves(employee, leave_type, date, expiry_days):
def get_carry_forwarded_leaves(employee, leave_type, date):
''' Calculates carry forwarded days based on previous unused leave allocations '''
carry_forwarded_leaves = 0
expiry_days = get_days_to_expiry_for_leave_type(leave_type)
validate_carry_forward(leave_type)
filters = {
"employee": employee,
@ -179,6 +185,8 @@ def get_carry_forwarded_leaves(employee, leave_type, date, expiry_days):
"to_date": ("<", date)
}
limit = 1
# check number of days to expire, ignore expiry for default value 0
if expiry_days:
filters.update(carry_forward=0)
limit = 2
@ -197,6 +205,14 @@ def get_carry_forwarded_leaves(employee, leave_type, date, expiry_days):
return carry_forwarded_leaves
def get_days_to_expiry_for_leave_type(leave_type):
''' returns days to expiry for a provided leave type '''
expiry_days = frappe.db.get_value("Leave Type",
filters={"leave_type": leave_type, "is_carry_forward": 1},
fieldname="carry_forward_leave_expiry")
def validate_carry_forward(leave_type):
if not frappe.db.get_value("Leave Type", leave_type, "is_carry_forward"):
frappe.throw(_("Leave Type {0} cannot be carry-forwarded").format(leave_type))

2
erpnext/hr/doctype/leave_period/leave_period.py
View File

@ -127,6 +127,6 @@ def create_carry_forward_leaves_allocation(employee, leave_type, leave_type_deta
allocation.to_date = add_days(leave_period.from_date, leave_type_details.carry_forward_leave_expiry) if not leave_type_details.carry_forward_leave_expiry else leave_period.to_date
allocation.leave_period = leave_period.name
allocation.carry_forward = carry_forward_leaves
allocation.carry_forwarded_leaves = get_carry_forwarded_leaves(employee, leave_type, leave_period.from_date, leave_type_details.carry_forward_leave_expiry)
allocation.carry_forwarded_leaves = get_carry_forwarded_leaves(employee, leave_type, leave_period.from_date)
allocation.save(ignore_permissions=True)
allocation.submit()