fix: unable to remove image from employee

fix: employee image disappears when newly created user_id is linked to employee

(cherry picked from commit 0207d2d7b6)

# Conflicts:
#	erpnext/setup/doctype/employee/employee.json

erpnext/setup/doctype/employee/employee.json

@@ -182,8 +182,6 @@
    "read_only": 1
   },
   {
-   "fetch_from": "user_id.user_image",
-   "fetch_if_empty": 1,
    "fieldname": "image",
    "fieldtype": "Attach Image",
    "hidden": 1,
@@ -824,7 +822,11 @@
  "image_field": "image",
  "is_tree": 1,
  "links": [],
+<<<<<<< HEAD
  "modified": "2024-01-03 17:36:20.984421",
+=======
+ "modified": "2025-02-07 13:54:40.122345",
+>>>>>>> 0207d2d7b6 (fix: unable to remove image from employee)
  "modified_by": "Administrator",
  "module": "Setup",
  "name": "Employee",
@@ -873,4 +875,4 @@
  "states": [],
  "title_field": "employee_name",
  "track_changes": 1
-}
+}

erpnext/setup/doctype/employee/employee.py

@@ -65,14 +65,12 @@ class Employee(NestedSet):
 
 	def validate_user_details(self):
 		if self.user_id:
-			data = frappe.db.get_value("User", self.user_id, ["enabled", "user_image"], as_dict=1)
+			data = frappe.db.get_value("User", self.user_id, ["enabled"], as_dict=1)
 
 			if not data:
 				self.user_id = None
 				return
 
-			if data.get("user_image") and self.image == "":
-				self.image = data.get("user_image")
 			self.validate_for_enabled_user_id(data.get("enabled", 0))
 			self.validate_duplicate_user_id()