mirror of
https://github.com/frappe/erpnext.git
synced 2026-04-13 11:55:11 +00:00
fix: update user status depends on employee status
(cherry picked from commit 194d060f13)
# Conflicts:
# erpnext/setup/doctype/employee/employee.py
This commit is contained in:
committed by
Mergify
parent
2b25059315
commit
c5796fed4a
@@ -185,13 +185,17 @@ class Employee(NestedSet):
|
|||||||
throw(_("Please enter relieving date."))
|
throw(_("Please enter relieving date."))
|
||||||
|
|
||||||
def validate_for_enabled_user_id(self, enabled):
|
def validate_for_enabled_user_id(self, enabled):
|
||||||
|
<<<<<<< HEAD
|
||||||
if not self.status == "Active":
|
if not self.status == "Active":
|
||||||
return
|
return
|
||||||
|
|
||||||
|
=======
|
||||||
|
>>>>>>> 194d060f13 (fix: update user status depends on employee status)
|
||||||
if enabled is None:
|
if enabled is None:
|
||||||
frappe.throw(_("User {0} does not exist").format(self.user_id))
|
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):
|
def validate_duplicate_user_id(self):
|
||||||
Employee = frappe.qb.DocType("Employee")
|
Employee = frappe.qb.DocType("Employee")
|
||||||
|
|||||||
Reference in New Issue
Block a user