Skip to content
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.

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

feat: show holidays and colour code in attendance calendar (backport #1595) #1636

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 5, 2024

Description: Show holidays and colour code for each employee in attendance calendar

Before:
Screenshot 2024-03-28 at 12 39 03 PM

After:
Screenshot 2024-03-28 at 12 34 35 PM

Closes #1311 Closes #1173
no-docs (does not require docs as its just a visual enhancement)


This is an automatic backport of pull request #1595 done by [Mergify](https://mergify.com).

vinyselopal and others added 5 commits April 5, 2024 17:25
(cherry picked from commit b64d6b5)
(cherry picked from commit 592010e)
(cherry picked from commit c82d9a4)

# Conflicts:
#	hrms/hr/doctype/attendance/attendance.json
(cherry picked from commit a7aab2a)
@mergify mergify bot requested a review from ruchamahabal as a code owner April 5, 2024 17:25
@mergify mergify bot added the conflicts label Apr 5, 2024
Copy link
Contributor Author

mergify bot commented Apr 5, 2024

Cherry-pick of c82d9a4 has failed:

On branch mergify/bp/version-15-hotfix/pr-1595
Your branch is ahead of 'origin/version-15-hotfix' by 3 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit c82d9a40e.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   hrms/hr/doctype/attendance/attendance.json

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@ruchamahabal ruchamahabal merged commit dda4149 into version-15-hotfix Apr 5, 2024
6 of 7 checks passed
@mergify mergify bot deleted the mergify/bp/version-15-hotfix/pr-1595 branch April 5, 2024 18:00
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 15.17.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants