fix: shift type filter in list view of shift assignment (backport #1625) #1628
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![mergify[bot]](https://avatars.githubusercontent.com/in/10562?s=60&v=4){kind=small}
Co-authored-by: Rucha Mahabal <[email protected]> (cherry picked from commit 438a449) # Conflicts: # hrms/hr/doctype/shift_assignment/shift_assignment.json
|
Cherry-pick of 438a449 has failed: 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
reviewed
Apr 5, 2024
|
Unrelated test failure. Merging |
frappe-pr-bot
pushed a commit
that referenced
this pull request
Apr 10, 2024
# [14.25.0](v14.24.2...v14.25.0) (2024-04-10) ### Bug Fixes * employee filter in list view of employee checkin (backport [#1612](#1612)) ([#1615](#1615)) ([b0ed010](b0ed010)) * employee filter in list view of shift assignment (backport [#1624](#1624)) ([#1626](#1626)) ([8ef26a6](8ef26a6)) * shift type filter in list view of shift assignment (backport [#1625](#1625)) ([#1628](#1628)) ([32abbc2](32abbc2)) * use reference name while updating exc rate (backport [#1623](#1623)) ([#1634](#1634)) ([e252e89](e252e89)) ### Features * show holidays and colour code in attendance calendar ([061840b](061840b))
|
🎉 This PR is included in version 14.25.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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
shift type filter in list view of shift assignment
This is an automatic backport of pull request #1625 done by [Mergify](https://mergify.com).