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

[fix] overlapping dates

Browse Source
This commit is contained in:
Saurabh 2018-05-12 17:45:22 +05:30
parent a35dad7610
commit c1acbdfb69
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
erpnext/hr/utils.py
View File

@ -50,8 +50,19 @@ def update_employee(employee, details, cancel=False):
setattr(employee, item.fieldname, new_data) setattr(employee, item.fieldname, new_data)
return employee return employee
def get_leave_period(from_date, to_date, company): def get_leave_period(from_date, to_date, company):
return frappe.db.sql("""select name from `tabLeave Period` leave_period = frappe.db.sql("""
where is_active=1 and company=%s select name, from_date, to_date
and to_date >= %s and from_date <= %s""", (company, to_date, from_date)) from `tabLeave Period`
where company=%(company)s and is_active=1
and (from_date between %(from_date)s and %(to_date)s
or to_date between %(from_date)s and %(to_date)s
or (from_date < %(from_date)s and to_date > %(to_date)s))
""", {
"from_date": from_date,
"to_date": to_date,
"company": company
}, as_dict=1)
if leave_period:
return leave_period