feat(HR): Some Enhancements and Onboarding #25741
Merged
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
Anurag810
changed the title
ruchamahabal
changed the title
|
This pull request has been automatically marked as stale because it has not had recent activity. It will be closed within a week if no further activity occurs, but it only takes a comment to keep a contribution alive :) Also, even if it is closed, you can always reopen the PR when you're ready. Thank you for contributing. |
|
This pull request has been automatically marked as stale because it has not had recent activity. It will be closed within a week if no further activity occurs, but it only takes a comment to keep a contribution alive :) Also, even if it is closed, you can always reopen the PR when you're ready. Thank you for contributing. |
|
@Anurag810 Please fix the conflicts |
|
This pull request has been automatically marked as stale because it has not had recent activity. It will be closed within a week if no further activity occurs, but it only takes a comment to keep a contribution alive :) Also, even if it is closed, you can always reopen the PR when you're ready. Thank you for contributing. |
|
|
ruchamahabal
approved these changes
Oct 2, 2021
|
@Mergifyio backport develop |
mergify bot
pushed a commit
that referenced
this pull request
Oct 2, 2021
* feat: Hr settings restructure * feat: remove validation and make As warning * feat: made leave policy Assignment feild read only * feat: send leave Notification via 'Notification' * patch: for field name change * feat: removed defaults value for removed field * feat: removed leave Notification fields * feat: better label and description * feat: Hr Module onboarding and Onboarding slides * fix: sider, test, translations * chore: remove unnecessary code formatting changes * refactor: HR Onboarding * refactor: HR Settings * revert: Notification changes * chore: remove unnecessary descriptions from leave type * fix: linter issues Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com> (cherry picked from commit 4837238)
mergify bot
pushed a commit
that referenced
this pull request
Oct 2, 2021
* feat: Hr settings restructure * feat: remove validation and make As warning * feat: made leave policy Assignment feild read only * feat: send leave Notification via 'Notification' * patch: for field name change * feat: removed defaults value for removed field * feat: removed leave Notification fields * feat: better label and description * feat: Hr Module onboarding and Onboarding slides * fix: sider, test, translations * chore: remove unnecessary code formatting changes * refactor: HR Onboarding * refactor: HR Settings * revert: Notification changes * chore: remove unnecessary descriptions from leave type * fix: linter issues Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com> (cherry picked from commit 4837238) # Conflicts: # erpnext/hr/doctype/employee/employee.js
|
Command
|
ruchamahabal
added a commit
that referenced
this pull request
Oct 2, 2021
* feat(HR): Some Enhancements and Onboarding (#25741) * feat: Hr settings restructure * feat: remove validation and make As warning * feat: made leave policy Assignment feild read only * feat: send leave Notification via 'Notification' * patch: for field name change * feat: removed defaults value for removed field * feat: removed leave Notification fields * feat: better label and description * feat: Hr Module onboarding and Onboarding slides * fix: sider, test, translations * chore: remove unnecessary code formatting changes * refactor: HR Onboarding * refactor: HR Settings * revert: Notification changes * chore: remove unnecessary descriptions from leave type * fix: linter issues Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com> (cherry picked from commit 4837238) # Conflicts: # erpnext/hr/doctype/employee/employee.js * fix: conflicts * fix: conflicts Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com> Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
asoral
pushed a commit
to asoral/erpnext
that referenced
this pull request
Nov 12, 2021
…rappe#27741) * feat(HR): Some Enhancements and Onboarding (frappe#25741) * feat: Hr settings restructure * feat: remove validation and make As warning * feat: made leave policy Assignment feild read only * feat: send leave Notification via 'Notification' * patch: for field name change * feat: removed defaults value for removed field * feat: removed leave Notification fields * feat: better label and description * feat: Hr Module onboarding and Onboarding slides * fix: sider, test, translations * chore: remove unnecessary code formatting changes * refactor: HR Onboarding * refactor: HR Settings * revert: Notification changes * chore: remove unnecessary descriptions from leave type * fix: linter issues Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com> (cherry picked from commit 51445a6) # Conflicts: # erpnext/hr/doctype/employee/employee.js * fix: conflicts * fix: conflicts Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com> Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
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.
Documentation PR: frappe/erpnext_documentation#328
TODO:
HR settings
Updated forms and section:
Leave Type
Updated Label and added description:
Onboarding Slides and Description
Form Tours and description
HR Settings:
Holiday List:
Employee:
Leave type:
Leave Allocation:
Leave application: