-
Notifications
You must be signed in to change notification settings - Fork 688
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: option to enable/disable multiple Shift Assignments for same dates #1100
Merged
ruchamahabal
merged 11 commits into
frappe:develop
from
krantheman:feat-toggle-multiple-shift-assignments
Dec 7, 2023
Merged
feat: option to enable/disable multiple Shift Assignments for same dates #1100
ruchamahabal
merged 11 commits into
frappe:develop
from
krantheman:feat-toggle-multiple-shift-assignments
Dec 7, 2023
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
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## develop #1100 +/- ##
===========================================
+ Coverage 73.06% 73.08% +0.02%
===========================================
Files 199 199
Lines 10714 10722 +8
===========================================
+ Hits 7828 7836 +8
Misses 2886 2886
|
ruchamahabal
requested changes
Nov 24, 2023
Also add docs for this under HR settings + shift assignment |
Co-authored-by: Rucha Mahabal <[email protected]>
- also move shift settings below collapsible sections
ruchamahabal
approved these changes
Dec 7, 2023
ruchamahabal
added a commit
that referenced
this pull request
Dec 7, 2023
…1100 feat: option to enable/disable multiple Shift Assignments for same dates (backport #1100)
ruchamahabal
added a commit
that referenced
this pull request
Dec 7, 2023
…1100 feat: option to enable/disable multiple Shift Assignments for same dates (backport #1100)
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.
Currently, Shift Assignment allows for multiple Shifts to be assigned to an employee on the same date, provided that the timings don't clash.
This PR introduces an additional Allow Multiple Shift Assignments for Same Date field under HR Settings. As the name suggests, disabling this forbids the user from creating Shift Assignments for an employee with preexisting Assignments on any of the dates within the selected range, and vice versa.
See: #1086
Docs: https://frappehr.com/docs/v14/en/hr-settings#3-shift-settings