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

No Leave allocation for Leave Type for which Leave Without Pay is checked (#6626)

Browse Source
This commit is contained in:
KanchanChauhan
2016-10-17 17:01:29 +05:30
committed by Nabin Hait
parent 5ea16640fe
commit 81581c669f
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/hr/doctype/leave_allocation/leave_allocation.js
View File

@@ -11,6 +11,13 @@ frappe.ui.form.on("Leave Allocation", {
return { return {
query: "erpnext.controllers.queries.employee_query" query: "erpnext.controllers.queries.employee_query"
} }
});
frm.set_query("leave_type", function() {
return {
filters: {
is_lwp: 0
}
}
}) })
}, },

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

@@ -23,6 +23,7 @@ class LeaveAllocation(Document):
self.validate_back_dated_allocation() self.validate_back_dated_allocation()
self.set_total_leaves_allocated() self.set_total_leaves_allocated()
self.validate_total_leaves_allocated() self.validate_total_leaves_allocated()
self.validate_lwp()
set_employee_name(self) set_employee_name(self)
def on_update_after_submit(self): def on_update_after_submit(self):
@@ -37,6 +38,10 @@ class LeaveAllocation(Document):
def validate_period(self): def validate_period(self):
if date_diff(self.to_date, self.from_date) <= 0: if date_diff(self.to_date, self.from_date) <= 0:
frappe.throw(_("To date cannot be before from date")) frappe.throw(_("To date cannot be before from date"))
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))
def validate_new_leaves_allocated_value(self): def validate_new_leaves_allocated_value(self):
"""validate that leave allocation is in multiples of 0.5""" """validate that leave allocation is in multiples of 0.5"""