From eddc06fa64f9bd1facf968918d8039c3e1c675e8 Mon Sep 17 00:00:00 2001
From: Dany Robert <danyrt@wahni.com>
Date: Wed, 5 Jun 2024 13:21:40 +0000
Subject: [PATCH 1/2] fix: avoid rejected leave application on leave check
---
hrms/hr/doctype/attendance_request/attendance_request.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/hrms/hr/doctype/attendance_request/attendance_request.py b/hrms/hr/doctype/attendance_request/attendance_request.py
index 63bfefc230..298a614768 100644
--- a/hrms/hr/doctype/attendance_request/attendance_request.py
+++ b/hrms/hr/doctype/attendance_request/attendance_request.py
@@ -141,6 +141,7 @@ def has_leave_record(self, attendance_date: str) -> str | None:
"docstatus": 1,
"from_date": ("<=", attendance_date),
"to_date": (">=", attendance_date),
+ "status": "Approved"
},
)
From 9f406753c224c76bf7e39925e43071a8a1115095 Mon Sep 17 00:00:00 2001
From: Rucha Mahabal <ruchamahabal2@gmail.com>
Date: Thu, 6 Jun 2024 11:39:36 +0530
Subject: [PATCH 2/2] chore: fix linter
---
hrms/hr/doctype/attendance_request/attendance_request.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hrms/hr/doctype/attendance_request/attendance_request.py b/hrms/hr/doctype/attendance_request/attendance_request.py
index 298a614768..96f399b286 100644
--- a/hrms/hr/doctype/attendance_request/attendance_request.py
+++ b/hrms/hr/doctype/attendance_request/attendance_request.py
@@ -141,7 +141,7 @@ def has_leave_record(self, attendance_date: str) -> str | None:
"docstatus": 1,
"from_date": ("<=", attendance_date),
"to_date": (">=", attendance_date),
- "status": "Approved"
+ "status": "Approved",
},
)