commit dacf127f1b63856663b8b315c08a92d12b847706
author Rushabh Mehta <rmehta@gmail.com> Tue Jul 14 11:06:28 2015 +0530
committer Rushabh Mehta <rmehta@gmail.com> Tue Jul 14 11:06:28 2015 +0530
tree 15efffd09e6978217a079c44f3f60bbae8e6985c
parent 533434e878004862d14ec4289dcfbbba0272ffe5

[fix] time log overlap condition, #SavedByATestCase

erpnext/projects/doctype/time_log/time_log.py

diff --git a/erpnext/projects/doctype/time_log/time_log.py b/erpnext/projects/doctype/time_log/time_log.py
index ce87bd6..136362b 100644
--- a/erpnext/projects/doctype/time_log/time_log.py
+++ b/erpnext/projects/doctype/time_log/time_log.py
@@ -85,7 +85,8 @@
 			(
 				(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))
+				(%(from_time)s > from_time and %(from_time)s < to_time) or
+				(%(from_time)s = from_time and %(to_time)s = to_time))
 			and name!=%(name)s
 			and ifnull(task, "")=%(task)s
 			and docstatus < 2""".format(fieldname),