Skip to content

Commit

Permalink
fix: unable to remove image from employee
Browse files Browse the repository at this point in the history
fix: employee image disappears when newly created user_id is linked to employee

(cherry picked from commit 0207d2d)

# Conflicts:
#	erpnext/setup/doctype/employee/employee.json
  • Loading branch information
asmitahase authored and mergify[bot] committed Feb 10, 2025
1 parent ceb5997 commit 91caca0
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 5 additions & 3 deletions erpnext/setup/doctype/employee/employee.json
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,6 @@
"read_only": 1
},
{
"fetch_from": "user_id.user_image",
"fetch_if_empty": 1,
"fieldname": "image",
"fieldtype": "Attach Image",
"hidden": 1,
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -873,4 +875,4 @@
"states": [],
"title_field": "employee_name",
"track_changes": 1
}
}
4 changes: 1 addition & 3 deletions erpnext/setup/doctype/employee/employee.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,12 @@ def set_employee_name(self):

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()

Expand Down

0 comments on commit 91caca0

Please sign in to comment.