Skip to content

fix(attendance_request): enhance leave record checks for half-day attendance requests #4549

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deepeshgarg007 merged 1 commit into from
May 25, 2026
+130 −4
Merged

fix(attendance_request): enhance leave record checks for half-day attendance requests #4549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 36 additions & 1 deletion hrms/hr/doctype/attendance_request/attendance_request.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,25 @@ def create_or_update_attendance(self, date: str):
),
title=_("Attendance Updated"),
)
elif status == "Half Day" and doc.half_day_status == "Absent" and self.half_day:
old_half_day_status = doc.half_day_status
doc.db_set({"half_day_status": "Present", "attendance_request": self.name})
text = _(
"Changed the Status for Other Half from {0} to {1} via Attendance Request as the status is Half Day"
).format(frappe.bold(old_half_day_status), frappe.bold("Present"))
doc.add_comment(comment_type="Info", text=text)

frappe.msgprint(
_(
"Updated Status for Other Half from {0} to {1} for date {2} in the attendance record {3}"
).format(
frappe.bold(old_half_day_status),
frappe.bold("Present"),
frappe.bold(format_date(date)),
get_link_to_form("Attendance", doc.name),
),
title=_("Attendance Updated"),
)
else:
# submit a new attendance record
doc = frappe.new_doc("Attendance")
Expand Down Expand Up @@ -221,6 +240,19 @@ def should_mark_attendance(self, attendance_date: str) -> bool:
return True

def has_leave_record(self, attendance_date: str) -> str | None:
filters = {
"employee": self.employee,
"docstatus": 1,
"from_date": ("<=", attendance_date),
"to_date": (">=", attendance_date),
"status": "Approved",
}
if self.half_day_date == attendance_date:
filters["half_day"] = 0
Comment on lines +250 to +251
Copy link
Copy Markdown
Contributor

@coderabbitai coderabbitai Bot May 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor | ⚡ Quick win

Missing self.half_day check could incorrectly exclude half-day leave records.

If self.half_day is False but self.half_day_date retains a stale value (e.g., user unchecked the checkbox after setting a date), this condition may incorrectly exclude half-day leave records, allowing a conflicting attendance request to proceed.

🐛 Proposed fix 
-		if self.half_day_date == attendance_date:
+		if self.half_day and self.half_day_date == attendance_date:
 			filters["half_day"] = 0
🤖 Prompt for AI Agents 
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@hrms/hr/doctype/attendance_request/attendance_request.py` around lines 250 -
251, The condition that sets filters["half_day"] only checks self.half_day_date
and can misfire when the checkbox self.half_day is False but a stale date
remains; update the logic in attendance_request.py (where self.half_day and
self.half_day_date are used) to first verify self.half_day is truthy before
comparing dates (e.g., only set filters["half_day"] = 0 when both self.half_day
is True and self.half_day_date == attendance_date), and ensure you handle
None/empty values for self.half_day_date to avoid false matches.


return frappe.db.exists("Leave Application", filters)

def has_half_day_leave_record(self, attendance_date: str) -> str | None:
return frappe.db.exists(
"Leave Application",
{
Expand All @@ -229,6 +261,8 @@ def has_leave_record(self, attendance_date: str) -> str | None:
"from_date": ("<=", attendance_date),
"to_date": (">=", attendance_date),
"status": "Approved",
"half_day": 1,
"half_day_date": attendance_date,
},
)

Expand Down Expand Up @@ -256,6 +290,8 @@ def status_unchanged(self, attendance_date):
new_status = self.get_attendance_status(attendance_date)
attendance_doc = self.get_attendance_doc(attendance_date)
if attendance_doc and attendance_doc.status == new_status:
if new_status == "Half Day" and self.half_day and attendance_doc.half_day_status == "Absent":
return False
return True
return False

Expand All @@ -277,7 +313,6 @@ def get_attendance_warnings(self) -> list:

for day in range(request_days):
attendance_date = add_days(self.from_date, day)

if not self.include_holidays and is_holiday(self.employee, attendance_date):
attendance_warnings.append({"date": attendance_date, "reason": "Holiday", "action": "Skip"})
elif self.has_leave_record(attendance_date):
Expand Down
97 changes: 94 additions & 3 deletions hrms/hr/doctype/attendance_request/test_attendance_request.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,7 @@ def test_skip_attendance_on_leave(self):
self.to_date = get_year_ending(getdate())

frappe.delete_doc_if_exists("Leave Type", "Test Skip Attendance", force=1)
leave_type = frappe.get_doc(
dict(leave_type_name="Test Skip Attendance", doctype="Leave Type")
).insert()
leave_type = frappe.get_doc(leave_type_name="Test Skip Attendance", doctype="Leave Type").insert()

make_allocation_record(leave_type=leave_type.name, from_date=self.from_date, to_date=self.to_date)
today = getdate()
Expand Down Expand Up @@ -243,6 +241,99 @@ def test_half_day_status_change_when_existing_attendance_is_updated(self):
)
self.assertEqual(half_day_status, "Absent")

def test_half_day_absent_half_to_present(self):
"""Test attendance request updates half_day_status from Absent to Present when existing Half Day attendance has the other half marked absent"""
today = getdate()

mark_attendance(self.employee.name, today, "Half Day", half_day_status="Absent")

attendance_request = frappe.get_doc(
{
"doctype": "Attendance Request",
"employee": self.employee.name,
"from_date": today,
"to_date": today,
"reason": "On Duty",
"half_day": 1,
"half_day_date": today,
"company": "_Test Company",
}
).save()
attendance_request.submit()

updated = frappe.db.get_value(
"Attendance",
{"employee": self.employee.name, "attendance_date": today, "docstatus": 1},
["status", "half_day_status"],
as_dict=True,
)
self.assertEqual(updated.status, "Half Day")
self.assertEqual(updated.half_day_status, "Present")

def test_half_day_with_shift_auto_absent(self):
"""Test half-day attendance request when shift_type auto-flags the other half as absent due to missing checkins"""
from_date = get_year_start(add_months(getdate(), -1))
to_date = get_year_ending(getdate())
today = getdate()

frappe.delete_doc_if_exists("Leave Type", "Test Half Day Leave", force=1)
leave_type = frappe.get_doc(leave_type_name="Test Half Day Leave", doctype="Leave Type").insert()
make_allocation_record(leave_type=leave_type.name, from_date=from_date, to_date=to_date)
frappe.db.delete("Holiday", {"parent": self.holiday_list})

# 1) Submit half-day leave
leave_application = frappe.get_doc(
{
"doctype": "Leave Application",
"employee": self.employee.name,
"leave_type": leave_type.name,
"from_date": today,
"to_date": today,
"half_day": 1,
"half_day_date": today,
"status": "Approved",
}
).insert()
leave_application.submit()

# 2) Create shift type + assignment
shift_type = create_shift("Test Half Day Shift", "09:00:00", "17:00:00")
shift_type.process_attendance_after = add_days(today, -1)
shift_type.last_sync_of_checkin = add_days(today, 1)
shift_type.enable_auto_attendance = 1
shift_type.save()
create_shift_assignment(self.employee.name, shift_type.name, add_days(today, -1), add_days(today, 1))

# 3) Attendance request for the other half — creates half-day attendance
attendance_request = frappe.get_doc(
{
"doctype": "Attendance Request",
"employee": self.employee.name,
"from_date": today,
"to_date": today,
"reason": "On Duty",
"half_day": 1,
"half_day_date": today,
"company": "_Test Company",
}
).save()
attendance_request.submit()

# 4) Shift auto-attendance marks the other half absent when no checkins exist
frappe.get_doc("Shift Type", shift_type.name).mark_absent_for_half_day_dates(self.employee.name)

# Verify
attendance = frappe.db.get_value(
"Attendance",
{"attendance_request": attendance_request.name},
["name", "status", "half_day_status", "modify_half_day_status"],
as_dict=True,
)
self.assertTrue(attendance)
self.assertEqual(attendance.status, "Half Day")
self.assertEqual(attendance.half_day_status, "Absent")
self.assertEqual(attendance.modify_half_day_status, 0)

@HRMSTestSuite.change_settings("HR Settings", {"allow_multiple_shift_assignments": True})
def test_overlap_with_different_shifts(self):
shift_1 = create_shift("Morning Shift", "08:00:00", "12:00:00")
Expand Down
Loading