fix: prioritise attendance record over holiday for calendar view by asmitahase [frappe] PR#3231

Bot Dokosrequested to merge
ft-pr-3231 into develop

From: https://github.com/frappe/hrms/pull/3231
Date: 2025-06-16 12:35:05+05:30

  • fix: prioritise attendance record over holiday for calendar view


Checkout instructions 
# Checkout locally
git fetch upstream
git switch ft-pr-3231

# Alternatively, re-take the changes
git switch develop
ft take ft-pr-3231

# Make changes then rebase
git rebase -i develop

# Fix or ignore conflicts
git checkout --theirs .
git rebase --continue

# Force-push changes
git push --force-with-lease

Merge request reports