diff --git a/hrms/hr/doctype/leave_application/leave_application.py b/hrms/hr/doctype/leave_application/leave_application.py index f430c3e515..77f94da99a 100755 --- a/hrms/hr/doctype/leave_application/leave_application.py +++ b/hrms/hr/doctype/leave_application/leave_application.py @@ -480,7 +480,13 @@ def _get_first_from_date(reference_date): prev_date = add_days(reference_date, -1) application = frappe.db.get_value( "Leave Application", - {"employee": self.employee, "leave_type": self.leave_type, "to_date": prev_date}, + { + "employee": self.employee, + "leave_type": self.leave_type, + "to_date": prev_date, + "docstatus": ["!=", 2], + "status": ["in", ["Open", "Approved"]], + }, ["name", "from_date"], as_dict=True, ) @@ -494,7 +500,13 @@ def _get_last_to_date(reference_date): next_date = add_days(reference_date, 1) application = frappe.db.get_value( "Leave Application", - {"employee": self.employee, "leave_type": self.leave_type, "from_date": next_date}, + { + "employee": self.employee, + "leave_type": self.leave_type, + "from_date": next_date, + "docstatus": ["!=", 2], + "status": ["in", ["Open", "Approved"]], + }, ["name", "to_date"], as_dict=True, )