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

fix throw_overlap_error in Shift Assignment (#15103)

Browse Source 
fix throw_overlap_error in Shift Assignment
This commit is contained in:
ahmad zaqout
2018-08-08 08:06:40 +03:00
committed by Nabin Hait
parent 3be899caff
commit 63a741e5c8
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/hr/doctype/shift_assignment/shift_assignment.py
View File

@@ -38,7 +38,7 @@ class ShiftAssignment(Document):
def throw_overlap_error(self, d): def throw_overlap_error(self, d):
msg = _("Employee {0} has already applied for {1} on {2} : ").format(self.employee, msg = _("Employee {0} has already applied for {1} on {2} : ").format(self.employee,
d['shift_type'], formatdate(d['date'])) \ d['shift_type'], formatdate(d['date'])) \
+ """ <b><a href="#Form/Shift Request/{0}">{0}</a></b>""".format(d["name"]) + """ <b><a href="#Form/Shift Assignment/{0}">{0}</a></b>""".format(d["name"])
frappe.throw(msg, OverlapError) frappe.throw(msg, OverlapError)
@frappe.whitelist() @frappe.whitelist()
@@ -77,4 +77,4 @@ def add_assignments(events, start, end, conditions=None):
"docstatus": d.docstatus "docstatus": d.docstatus
} }
if e not in events: if e not in events:
events.append(e) events.append(e)