nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-28 17:34:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflict

Browse Source
This commit is contained in:
Navin-S-R
2026-03-10 17:58:57 +05:30
parent c5796fed4a
commit 55a0603356
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/setup/doctype/employee/employee.py
View File

@@ -185,12 +185,6 @@ 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":
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))