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: Employee Grievance #25705

Merged
merged 29 commits into from
Jun 23, 2021

Conversation

Anurag810
Copy link
Contributor

@Anurag810 Anurag810 commented May 13, 2021

Documentation PR: frappe/erpnext_documentation#326

Employee Grievance

  • Development
  • Tests
  • Docs

Grievance Type:

Users can define Grievance Type like. Pay and Benefits and Interpersonal Grievance like "Employee Abuse". And same features. (Refer screen Shot)
image

Employee Grievance:

image

Validation:

Employee:

  1. You cannot change the status of an employee from suspended When an Employee is Suspended. (He will automatically Unsuspended after "suspended to" date. our you can unsuspend him manually)

Employee Grievance

  1. Only Employee Grievance with status Invalid and Resolved can be submitted.
  2. You need to Unsuspend Employee before cancellation.
  3. You need to set the Cause of Grievance before setting Status to Investigated.
  4. You need to fill Resolution Detail section before setting Employee Grievance Resolved.

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.

@ruchamahabal ruchamahabal changed the title Feat: Employee grievance feat: Employee grievance May 19, 2021
@ruchamahabal ruchamahabal changed the title feat: Employee grievance feat: Employee Grievance May 19, 2021
@ruchamahabal ruchamahabal self-assigned this May 19, 2021
@Anurag810 Anurag810 force-pushed the Employee-grievance branch 2 times, most recently from e52f036 to 5b1a0cc Compare May 24, 2021 08:45
@Anurag810
Copy link
Contributor Author

@ruchamahabal done 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 Anurag810 linked an issue Jun 21, 2021 that may be closed by this pull request
erpnext/hooks.py Outdated Show resolved Hide resolved
@Anurag810
Copy link
Contributor Author

Anurag810 commented Jun 23, 2021

Pay-cut and Employee suspension is a good feature to have, Will cover that part in different PR. with different workflow and design.

@Anurag810 Anurag810 removed the testing label Jun 23, 2021
@ruchamahabal
Copy link
Member

ruchamahabal commented Jun 23, 2021

@Anurag810 Please update the description and docs with revised screenshots

@ruchamahabal ruchamahabal merged commit fc98abe into frappe:version-13-hotfix Jun 23, 2021
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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Payroll Entry - ValueError - too many values to unpack (expected 2)
4 participants