Skip to content

Commit

Permalink
Merge pull request #45813 from frappe/mergify/bp/version-15-hotfix/pr…
Browse files Browse the repository at this point in the history
…-45793

fix: unable to remove image from employee (backport #45793)
  • Loading branch information
ruthra-kumar authored Feb 10, 2025
2 parents 1f967f7 + 1d6c50c commit 9a5aa8e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
6 changes: 2 additions & 4 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,7 @@
"image_field": "image",
"is_tree": 1,
"links": [],
"modified": "2024-01-03 17:36:20.984421",
"modified": "2025-02-07 13:54:40.122345",
"modified_by": "Administrator",
"module": "Setup",
"name": "Employee",
Expand Down Expand Up @@ -873,4 +871,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 @@ -64,14 +64,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 9a5aa8e

Please sign in to comment.