nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-15 18:01:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Patch fixed for v6 to v7 migration

Browse Source
This commit is contained in:
Nabin Hait
2016-08-16 18:31:09 +05:30
parent 0c1be8df35
commit 613ef344f3
5 changed files with 50 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/projects/doctype/timesheet/timesheet.py
View File

@@ -159,8 +159,8 @@ class Timesheet(Document):
existing = self.get_overlap_for(fieldname, args, value)
if existing:
frappe.throw(_("Row {0}: From Time and To Time overlap with existing from and to time").format(args.idx),
OverlapError)
frappe.throw(_("Row {0}: From Time and To Time of {1} is overlapping with {2}")
.format(args.idx, self.name, existing.name), OverlapError)
def get_overlap_for(self, fieldname, args, value):
cond = "ts.`{0}`".format(fieldname)