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

Attendance - Unique check based on Employee and Date excluding cancelled docs (#15556)

Browse Source
This commit is contained in:
Sharath C 2018-10-03 10:40:22 +05:30 committed by Rushabh Mehta
parent e0a148474d
commit c0b684dc30
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,7 +13,7 @@ from frappe.utils import cstr
class Attendance(Document):
def validate_duplicate_record(self):
res = frappe.db.sql("""select name from `tabAttendance` where employee = %s and attendance_date = %s
and name != %s and docstatus = 1""",
and name != %s and docstatus != 2""",
(self.employee, self.attendance_date, self.name))
if res:
frappe.throw(_("Attendance for employee {0} is already marked").format(self.employee))
@ -89,4 +89,4 @@ def add_attendance(events, start, end, conditions=None):
"docstatus": d.docstatus
}
if e not in events:
events.append(e)
events.append(e)