Skip to content

fix(Employee): add/delete user permission (backport #47016) #50761

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.

Sign up for GitHub

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

Open
wants to merge 2 commits into
base: version-15-hotfix
Choose a base branch
from
+7 −4
Open

fix(Employee): add/delete user permission (backport #47016) #50761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
70acd71
fix(Employee): add/delete user permission
barredterra Apr 11, 2025
40c0458
fix: remove hook that does nothing
barredterra Apr 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions erpnext/hooks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,10 +340,7 @@
"User": {
"after_insert": "frappe.contacts.doctype.contact.contact.update_contact",
"validate": "erpnext.setup.doctype.employee.employee.validate_employee_role",
"on_update": [
"erpnext.setup.doctype.employee.employee.update_user_permissions",
"erpnext.portal.utils.set_default_role",
],
"on_update": "erpnext.portal.utils.set_default_role",
},
"Communication": {
"on_update": [
Expand Down
6 changes: 6 additions & 0 deletions erpnext/setup/doctype/employee/employee.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,12 @@ def on_update(self):

def update_user_permissions(self):
if not self.has_value_changed("user_id") and not self.has_value_changed("create_user_permission"):
<<<<<<< HEAD
return

if not has_permission("User Permission", ptype="write", raise_exception=False):
=======
>>>>>>> 046bcfa606 (fix(Employee): add/delete user permission)
return

employee_user_permission_exists = frappe.db.exists(
Expand Down Expand Up @@ -251,6 +254,7 @@ def validate_employee_role(doc, method=None, ignore_emp_check=False):
doc.get("roles").remove(doc.get("roles", {"role": "Employee Self Service"})[0])


<<<<<<< HEAD
def update_user_permissions(doc, method):
# called via User hook
if "Employee" in [d.role for d in doc.get("roles")]:
Expand All @@ -260,6 +264,8 @@ def update_user_permissions(doc, method):
employee.update_user_permissions()


=======
>>>>>>> 08f21c7905 (fix: remove hook that does nothing)
def get_employee_email(employee_doc):
return (
employee_doc.get("user_id") or employee_doc.get("personal_email") or employee_doc.get("company_email")
Expand Down
Loading