[Fix] Attendance tool
diff --git a/erpnext/hr/doctype/upload_attendance/upload_attendance.py b/erpnext/hr/doctype/upload_attendance/upload_attendance.py
index 78d5aee..c295d46 100644
--- a/erpnext/hr/doctype/upload_attendance/upload_attendance.py
+++ b/erpnext/hr/doctype/upload_attendance/upload_attendance.py
@@ -5,7 +5,7 @@
from __future__ import unicode_literals
import frappe
-from frappe.utils import cstr, add_days, date_diff
+from frappe.utils import cstr, add_days, date_diff, getdate
from frappe import _
from frappe.utils.csvutils import UnicodeWriter
from frappe.model.document import Document
@@ -48,8 +48,9 @@
for employee in employees:
existing_attendance = {}
if existing_attendance_records \
- and tuple([date, employee.name]) in existing_attendance_records:
- existing_attendance = existing_attendance_records[tuple([date, employee.name])]
+ and tuple([getdate(date), employee.name]) in existing_attendance_records:
+ existing_attendance = existing_attendance_records[tuple([getdate(date), employee.name])]
+
row = [
existing_attendance and existing_attendance.name or "",
employee.name, employee.employee_name, date,
@@ -114,6 +115,7 @@
if not row: continue
row_idx = i + 5
d = frappe._dict(zip(columns, row))
+
d["doctype"] = "Attendance"
if d.name:
d["docstatus"] = frappe.db.get_value("Attendance", d.name, "docstatus")
@@ -121,6 +123,8 @@
try:
check_record(d)
ret.append(import_doc(d, "Attendance", 1, row_idx, submit=True))
+ except AttributeError:
+ pass
except Exception as e:
error = True
ret.append('Error for row (#%d) %s : %s' % (row_idx,