nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-29 18:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(HR): Ignore invalid fields when updating employee details (#27456)

Browse Source 
(cherry picked from commit 95460d9818)

# Conflicts:
#	erpnext/hr/utils.py
This commit is contained in:
Chillar Anand
2021-09-14 12:00:34 +05:30
committed by Mergify
parent f5160dc83d
commit 48edcbfb69
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/hr/utils.py
View File

@@ -186,11 +186,21 @@ def update_employee_work_history(employee, details, date=None, cancel=False):
field = frappe.get_meta("Employee").get_field(item.fieldname) field = frappe.get_meta("Employee").get_field(item.fieldname)
if not field: if not field:
continue continue
<<<<<<< HEAD
new_value = item.new if not cancel else item.current new_value = item.new if not cancel else item.current
new_value = get_formatted_value(new_value, field.fieldtype) new_value = get_formatted_value(new_value, field.fieldtype)
setattr(employee, item.fieldname, new_value) setattr(employee, item.fieldname, new_value)
=======
fieldtype = field.fieldtype
new_data = item.new if not cancel else item.current
if fieldtype == "Date" and new_data:
new_data = getdate(new_data)
elif fieldtype =="Datetime" and new_data:
new_data = get_datetime(new_data)
setattr(employee, item.fieldname, new_data)
>>>>>>> 95460d9818 (fix(HR): Ignore invalid fields when updating employee details (#27456))
if item.fieldname in ["department", "designation", "branch"]: if item.fieldname in ["department", "designation", "branch"]:
internal_work_history[item.fieldname] = item.new internal_work_history[item.fieldname] = item.new