CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-12 06:48:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #45813 from frappe/mergify/bp/version-15-hotfix/pr-45793

Browse Source 
fix: unable to remove image from employee (backport #45793)
This commit is contained in:
ruthra kumar
2025-02-10 11:01:00 +05:30
committed by GitHub
parent 1f967f7e9d 1d6c50c9a1
commit 9a5aa8eeb9
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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,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",
@@ -873,4 +871,4 @@
"states": [],
"title_field": "employee_name",
"track_changes": 1
}
}

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

@@ -64,14 +64,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()