From aeaf416d6dc27d0b07ce913a4cb0de3d30f92167 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Wed, 18 Sep 2019 13:11:30 +0530 Subject: [PATCH] fix: upload attendance template not marking attendance --- erpnext/hr/doctype/upload_attendance/upload_attendance.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/hr/doctype/upload_attendance/upload_attendance.py b/erpnext/hr/doctype/upload_attendance/upload_attendance.py index f452155681..1707e3578b 100644 --- a/erpnext/hr/doctype/upload_attendance/upload_attendance.py +++ b/erpnext/hr/doctype/upload_attendance/upload_attendance.py @@ -60,8 +60,8 @@ def get_data(args): existing_attendance = {} if existing_attendance_records \ and tuple([getdate(date), employee.name]) in existing_attendance_records \ - and getdate(employee.date_of_joining) >= getdate(date) \ - and getdate(employee.relieving_date) <= getdate(date): + and getdate(employee.date_of_joining) <= getdate(date) \ + and getdate(employee.relieving_date) >= getdate(date): existing_attendance = existing_attendance_records[tuple([getdate(date), employee.name])] row = [ existing_attendance and existing_attendance.name or "",