feat: toggle self leave approval for employees from HR settings #2486
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
… based on the leave approval HR setting
asmitahase
force-pushed
the
self-leave-approval
branch
from
978dafd to
c831870
Compare
| "default": "1", | ||
| "fieldname": "allow_self_leave_approval", | ||
| "fieldtype": "Check", | ||
| "label": "Enable Self-Approval For Leaves" |
There was a problem hiding this comment.
Suggested change
| "label": "Enable Self-Approval For Leaves" | |
| "label": "Allow self approval for Leave Application" |
Fieldname says allow so keep it consistent?
There was a problem hiding this comment.
Based on this setting, Approval field should also become read-only - client-side change
Comment on lines
+799
to
+805
|
|
||
| if (not self_leave_approval_allowed) and ( | ||
| self.employee == get_current_employee_info().get("name") | ||
| if get_current_employee_info() | ||
| else None and not get_workflow_name("Leave Application") | ||
| ): | ||
| frappe.throw(_("Self-approval for leaves is not allowed"), frappe.ValidationError) |
There was a problem hiding this comment.
Suggested change
| if (not self_leave_approval_allowed) and ( | |
| self.employee == get_current_employee_info().get("name") | |
| if get_current_employee_info() | |
| else None and not get_workflow_name("Leave Application") | |
| ): | |
| frappe.throw(_("Self-approval for leaves is not allowed"), frappe.ValidationError) | |
| employee_user = frappe.db.get_value("Employee", self.employee, "user_id") | |
| if ( | |
| employee_user == frappe.session.user | |
| and not self_leave_approval_allowed | |
| and not get_workflow_name("Leave Application") | |
| ): | |
| frappe.throw(_("Self approval for leaves is not allowed")) |
- Simplify checks
get_current_employee_infofetches additional columns that aren't required here. We only need to compare the session user.- Drop frappe.ValidationError, that's the default exception
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.
Issue
Immediately after employees create and save leave application they see the document with "submit" as primary action that can lead to confusion as to clicking submit is part of the leave application process. So the employees ended up submitting their own leaves even if a different leave approver was already set in the application.
Role permission do not help in case one employee is leave approver for another employee.
Before
self_leave_approval_before.mov
After
self_leave_approval_pwa_after.mov
Screen.Recording.2024-12-06.at.12.48.36.PM.mov
Fix
Added a new setting in HR Settings called Enable Self-Approval for Leaves which is enabled by default.
The submit action is removed on leave application if self approval is not enabled. Self approval setting is ignored if the leave application doctype has a workflow.
Added tests for when self approval is enabled/disabled
I'll update the documentation once this is merged, no-docs for now