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

Merge branch 'master' of https://github.com/webnotes/erpnext

Browse Source
This commit is contained in:
Akhilesh Darjee 2013-03-25 12:52:54 +05:30
commit 498bed7b66
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
projects/doctype/time_log/time_log.py
View File

@ -3,6 +3,7 @@
from __future__ import unicode_literals
import webnotes
from webnotes import _
from webnotes.utils import cstr
from webnotes.widgets.reportview import build_match_conditions
@ -41,9 +42,11 @@ class DocType:
(to_time between %s and %s) or
(%s between from_time and to_time))
and name!=%s
and ifnull(task, "")=%s
and docstatus < 2""",
(self.doc.owner, self.doc.from_time, self.doc.to_time, self.doc.from_time,
self.doc.to_time, self.doc.from_time, self.doc.name or "No Name"))
self.doc.to_time, self.doc.from_time, self.doc.name or "No Name",
cstr(self.doc.task)))
if existing:
webnotes.msgprint(_("This Time Log conflicts with") + ":" + ', '.join(existing),