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

[Fix] - Leave Perid - Grant Allocations (#14668)

Browse Source 
* Leave Perid - Grant Allocations - Fix

* Codacy - string statement has no effect
This commit is contained in:
Jamsheer 2018-06-25 14:49:54 +05:30 committed by Nabin Hait
parent f845e749f2
commit 4f8deb92cc
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,9 +30,10 @@ class LeavePeriod(Document):
def grant_leave_allocation(self): def grant_leave_allocation(self):
if self.employee: if self.employee:
leave_allocation = self.grant_leave_alloc(self.employee) leave_allocation = []
leave_allocation = self.grant_leave_alloc(self.employee, leave_allocation)
if leave_allocation: if leave_allocation:
self.print_message([leave_allocation]) self.print_message(leave_allocation)
else: else:
self.grant_leave_alloc_for_employees() self.grant_leave_alloc_for_employees()
@ -41,25 +42,20 @@ class LeavePeriod(Document):
if employees: if employees:
leave_allocations = [] leave_allocations = []
for employee in employees: for employee in employees:
leave_allocation = self.grant_leave_alloc(cstr(employee[0])) leave_allocations = self.grant_leave_alloc(cstr(employee[0]), leave_allocations)
if leave_allocation:
leave_allocations.append(leave_allocation)
if leave_allocations: if leave_allocations:
self.print_message(leave_allocations) self.print_message(leave_allocations)
else: else:
frappe.msgprint(_("No employee found")) frappe.msgprint(_("No employee found"))
def grant_leave_alloc(self, employee): def grant_leave_alloc(self, employee, leave_allocations):
self.validate_allocation_exists(employee) self.validate_allocation_exists(employee)
leave_policy = get_employee_leave_policy(employee) leave_policy = get_employee_leave_policy(employee)
if leave_policy: if leave_policy:
for leave_policy_detail in leave_policy.leave_policy_details: for leave_policy_detail in leave_policy.leave_policy_details:
if not frappe.db.get_value("Leave Type", leave_policy_detail.leave_type, "is_lwp"): if not frappe.db.get_value("Leave Type", leave_policy_detail.leave_type, "is_lwp"):
return self.create_leave_allocation(employee, leave_policy_detail.leave_type, leave_policy_detail.annual_allocation) leave_allocations.append(self.create_leave_allocation(employee, leave_policy_detail.leave_type, leave_policy_detail.annual_allocation))
else: return leave_allocations
return None
else:
return None
def validate_allocation_exists(self, employee): def validate_allocation_exists(self, employee):
leave_alloc = frappe.db.exists({ leave_alloc = frappe.db.exists({
@ -82,8 +78,11 @@ class LeavePeriod(Document):
allocation.leave_type = leave_type allocation.leave_type = leave_type
allocation.from_date = self.from_date allocation.from_date = self.from_date
allocation.to_date = self.to_date allocation.to_date = self.to_date
'''Earned Leaves are allocated by scheduler, initially allocate 0''' # Earned Leaves and Compensatory Leaves are allocated by scheduler, initially allocate 0
allocation.new_leaves_allocated = new_leaves_allocated if not frappe.db.get_value("Leave Type", leave_type, "is_earned_leave") else 0 is_earned_leave, is_compensatory = frappe.db.get_value("Leave Type", leave_type, ["is_earned_leave", "is_compensatory"])
if is_earned_leave == 1 or is_compensatory == 1:
new_leaves_allocated = 0
allocation.new_leaves_allocated = new_leaves_allocated
allocation.leave_period = self.name allocation.leave_period = self.name
if self.carry_forward_leaves: if self.carry_forward_leaves:
if frappe.db.get_value("Leave Type", leave_type, "is_carry_forward"): if frappe.db.get_value("Leave Type", leave_type, "is_carry_forward"):