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

[fix] Time log overlap validation

Browse Source
This commit is contained in:
Nabin Hait 2016-02-26 17:19:11 +05:30
parent bdf0f0a08d
commit 56f7fa66ad
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/projects/doctype/time_log/time_log.py
View File

@ -88,10 +88,9 @@ class TimeLog(Document):
existing = frappe.db.sql("""select name, from_time, to_time from `tabTime Log`
where `{0}`=%(val)s and
(
(from_time > %(from_time)s and from_time < %(to_time)s) or
(to_time > %(from_time)s and to_time < %(to_time)s) or
(%(from_time)s > from_time and %(from_time)s < to_time) or
(%(from_time)s = from_time and %(to_time)s = to_time))
(%(from_time)s between from_time and to_time) or
(%(to_time)s between from_time and to_time) or
(%(from_time)s <= from_time and %(to_time)s >= to_time))
and name!=%(name)s
and docstatus < 2""".format(fieldname),
{