-
Notifications
You must be signed in to change notification settings - Fork 7.1k
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: Employee Grievance #25705
Merged
ruchamahabal
merged 29 commits into
frappe:version-13-hotfix
from
Anurag810:Employee-grievance
Jun 23, 2021
Merged
feat: Employee Grievance #25705
ruchamahabal
merged 29 commits into
frappe:version-13-hotfix
from
Anurag810:Employee-grievance
Jun 23, 2021
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
ruchamahabal
requested changes
May 19, 2021
Anurag810
force-pushed
the
Employee-grievance
branch
2 times, most recently
from
May 24, 2021 08:45
e52f036
to
5b1a0cc
Compare
Anurag810
force-pushed
the
Employee-grievance
branch
from
May 24, 2021 10:03
5b1a0cc
to
7ba2a0d
Compare
@ruchamahabal done changes |
rmehta
requested changes
Jun 15, 2021
… employee responsible for all sorts of grievances - show pay cut and suspension buttons only if Employee Resposible is set - some label changes
- set title for documents - added list view settings - refactor suspend and unsuspend functions - add submit and cancel perms for system and hr managers - fix tests
Anurag810
force-pushed
the
Employee-grievance
branch
from
June 17, 2021 08:23
df5da8c
to
0bdca5e
Compare
ruchamahabal
requested changes
Jun 23, 2021
erpnext/payroll/doctype/salary_structure/test_salary_structure.py
Outdated
Show resolved
Hide resolved
Pay-cut and Employee suspension is a good feature to have, Will cover that part in different PR. with different workflow and design. |
ruchamahabal
approved these changes
Jun 23, 2021
@Anurag810 Please update the description and docs with revised screenshots |
Anurag810
added a commit
to Anurag810/erpnext
that referenced
this pull request
Jun 23, 2021
* feat: Employee Grievance * feat: link to desk and automatic unsuspend * test: Employee Grievance * fix: Sider and Translation * fix: sider * fix: formatting * feat: changes requested * feat: Employee Grievance * feat: link to desk and automatic unsuspend * test: Employee Grievance * fix: Sider and Translation * fix: sider * fix: formatting * feat: changes requested * fix: patch test and sider issue * fix: make Employee Responsible non-mandatory since there cannot be an employee responsible for all sorts of grievances - show pay cut and suspension buttons only if Employee Resposible is set - some label changes * feat: added subject field for more context - set title for documents - added list view settings - refactor suspend and unsuspend functions - add submit and cancel perms for system and hr managers - fix tests * fix: sider issues * fix: removed suspension and paycut * fix:sider * fix: test * fix: test * fix: resolved Conflicts * fix: sider * fix: remove debugging print statements * fix: validation message * fix: unnecessary comma Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
ruchamahabal
added a commit
that referenced
this pull request
Jun 23, 2021
* feat: Employee Grievance * feat: link to desk and automatic unsuspend * test: Employee Grievance * fix: Sider and Translation * fix: sider * fix: formatting * feat: changes requested * feat: Employee Grievance * feat: link to desk and automatic unsuspend * test: Employee Grievance * fix: Sider and Translation * fix: sider * fix: formatting * feat: changes requested * fix: patch test and sider issue * fix: make Employee Responsible non-mandatory since there cannot be an employee responsible for all sorts of grievances - show pay cut and suspension buttons only if Employee Resposible is set - some label changes * feat: added subject field for more context - set title for documents - added list view settings - refactor suspend and unsuspend functions - add submit and cancel perms for system and hr managers - fix tests * fix: sider issues * fix: removed suspension and paycut * fix:sider * fix: test * fix: test * fix: resolved Conflicts * fix: sider * fix: remove debugging print statements * fix: validation message * fix: unnecessary comma Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com> Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
asoral
pushed a commit
to asoral/erpnext
that referenced
this pull request
Nov 12, 2021
* feat: Employee Grievance * feat: link to desk and automatic unsuspend * test: Employee Grievance * fix: Sider and Translation * fix: sider * fix: formatting * feat: changes requested * feat: Employee Grievance * feat: link to desk and automatic unsuspend * test: Employee Grievance * fix: Sider and Translation * fix: sider * fix: formatting * feat: changes requested * fix: patch test and sider issue * fix: make Employee Responsible non-mandatory since there cannot be an employee responsible for all sorts of grievances - show pay cut and suspension buttons only if Employee Resposible is set - some label changes * feat: added subject field for more context - set title for documents - added list view settings - refactor suspend and unsuspend functions - add submit and cancel perms for system and hr managers - fix tests * fix: sider issues * fix: removed suspension and paycut * fix:sider * fix: test * fix: test * fix: resolved Conflicts * fix: sider * fix: remove debugging print statements * fix: validation message * fix: unnecessary comma Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com> Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
1 task
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#326
Employee Grievance
Grievance Type:
Users can define Grievance Type like. Pay and Benefits and Interpersonal Grievance like "Employee Abuse". And same features. (Refer screen Shot)
Employee Grievance:
Validation:
Employee:
Employee Grievance
Workflow Flow:
Step 1:The employee will Create an Employee Grievance against the Employee or Group of Employees.
For process may require Some document to be linked
Select Grievance type saves the document.
Step 2:
The HR manager will investigate and he will fill the cause of grievance, resolution detail
The employee responsible for Grievance will have a pay cut or suspension(he will be suspended for suspension days).
the status will change from Active to Suspended in employee master
Step3:
He can also unsuspend Employee.