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

Merge pull request #21441 from ruchamahabal/fix-attendance-message

Browse Source 
fix: show date in the message for already marked attendance
This commit is contained in:
Deepesh Garg 2020-04-27 16:35:43 +05:30 committed by GitHub
commit cb8ea6643e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,13 +35,14 @@ class Attendance(Document):
and docstatus != 2 and docstatus != 2
""", (self.employee, getdate(self.attendance_date), self.name)) """, (self.employee, getdate(self.attendance_date), self.name))
if res: if res:
frappe.throw(_("Attendance for employee {0} is already marked").format(self.employee)) frappe.throw(_("Attendance for employee {0} is already marked for the date {1}").format(
frappe.bold(self.employee), frappe.bold(self.attendance_date)))
def check_leave_record(self): def check_leave_record(self):
leave_record = frappe.db.sql(""" leave_record = frappe.db.sql("""
select leave_type, half_day, half_day_date select leave_type, half_day, half_day_date
from `tabLeave Application` from `tabLeave Application`
where employee = %s where employee = %s
and %s between from_date and to_date and %s between from_date and to_date
and status = 'Approved' and status = 'Approved'
and docstatus = 1 and docstatus = 1