From c5796fed4a484cc05b9e2fcc83cdfaffbcc15111 Mon Sep 17 00:00:00 2001 From: Poovitha Palanivelu Date: Fri, 6 Mar 2026 12:27:24 +0530 Subject: [PATCH 1/2] fix: update user status depends on employee status (cherry picked from commit 194d060f1398481f4debdd5c849b3a5955389222) # Conflicts: # erpnext/setup/doctype/employee/employee.py --- erpnext/setup/doctype/employee/employee.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/erpnext/setup/doctype/employee/employee.py b/erpnext/setup/doctype/employee/employee.py index 14724ead051..f7da64e8e6f 100755 --- a/erpnext/setup/doctype/employee/employee.py +++ b/erpnext/setup/doctype/employee/employee.py @@ -185,13 +185,17 @@ class Employee(NestedSet): throw(_("Please enter relieving date.")) def validate_for_enabled_user_id(self, enabled): +<<<<<<< HEAD if not self.status == "Active": return +======= +>>>>>>> 194d060f13 (fix: update user status depends on employee status) if enabled is None: frappe.throw(_("User {0} does not exist").format(self.user_id)) - if enabled == 0: - frappe.throw(_("User {0} is disabled").format(self.user_id), EmployeeUserDisabledError) + + if self.status != "Active" and enabled or self.status == "Active" and enabled == 0: + frappe.set_value("User", self.user_id, "enabled", not enabled) def validate_duplicate_user_id(self): Employee = frappe.qb.DocType("Employee") From 55a0603356f308a67d3dec947ef79c6a9c808359 Mon Sep 17 00:00:00 2001 From: Navin-S-R Date: Tue, 10 Mar 2026 17:58:57 +0530 Subject: [PATCH 2/2] chore: resolve conflict --- erpnext/setup/doctype/employee/employee.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/erpnext/setup/doctype/employee/employee.py b/erpnext/setup/doctype/employee/employee.py index f7da64e8e6f..543a8a194b8 100755 --- a/erpnext/setup/doctype/employee/employee.py +++ b/erpnext/setup/doctype/employee/employee.py @@ -185,12 +185,6 @@ class Employee(NestedSet): throw(_("Please enter relieving date.")) def validate_for_enabled_user_id(self, enabled): -<<<<<<< HEAD - if not self.status == "Active": - return - -======= ->>>>>>> 194d060f13 (fix: update user status depends on employee status) if enabled is None: frappe.throw(_("User {0} does not exist").format(self.user_id))