Merge branch 'develop' into gratuity

2026-08-31 07:28:04 +00:00 · 2020-12-29 13:27:03 +05:30
parent 3278d02cd2 b75f198648
commit dfe8f7601b
62 changed files with 3352 additions and 333 deletions
--- a/erpnext/hr/doctype/employee/employee.py
+++ b/erpnext/hr/doctype/employee/employee.py
@@ -135,7 +135,7 @@ class Employee(NestedSet):
 				try:
 					frappe.get_doc({
 						"doctype": "File",
-						"file_name": self.image,
+						"file_url": self.image,
 						"attached_to_doctype": "User",
 						"attached_to_name": self.user_id
 					}).insert()