Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Enhance] Add user image in the employee from the user (#15680)

Browse Source
This commit is contained in:
rohitwaghchaure 2018-10-15 14:57:46 +05:30 committed by Nabin Hait
parent 3362d6b948
commit 94fcb0e9f9
3 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
erpnext/hr/doctype/employee/employee.py
View File

@ -45,14 +45,21 @@ class Employee(NestedSet):
self.validate_prefered_email() self.validate_prefered_email()
if self.user_id: if self.user_id:
self.validate_for_enabled_user_id() self.validate_user_details()
self.validate_duplicate_user_id()
else: else:
existing_user_id = frappe.db.get_value("Employee", self.name, "user_id") existing_user_id = frappe.db.get_value("Employee", self.name, "user_id")
if existing_user_id: if existing_user_id:
frappe.permissions.remove_user_permission( frappe.permissions.remove_user_permission(
"Employee", self.name, existing_user_id) "Employee", self.name, existing_user_id)
def validate_user_details(self):
data = frappe.db.get_value('User',
self.user_id, ['enabled', 'user_image'], as_dict=1)
self.image = data.get("user_image")
self.validate_for_enabled_user_id(data.get("enabled", 0))
self.validate_duplicate_user_id()
def update_nsm_model(self): def update_nsm_model(self):
frappe.utils.nestedset.update_nsm(self) frappe.utils.nestedset.update_nsm(self)
@ -133,10 +140,10 @@ class Employee(NestedSet):
if self.status == 'Left' and not self.relieving_date: if self.status == 'Left' and not self.relieving_date:
throw(_("Please enter relieving date.")) throw(_("Please enter relieving date."))
def validate_for_enabled_user_id(self): def validate_for_enabled_user_id(self, enabled):
if not self.status == 'Active': if not self.status == 'Active':
return return
enabled = frappe.db.get_value("User", self.user_id, "enabled")
if enabled is None: if enabled is None:
frappe.throw(_("User {0} does not exist").format(self.user_id)) frappe.throw(_("User {0} does not exist").format(self.user_id))
if enabled == 0: if enabled == 0:

3
erpnext/patches.txt
View File

@ -505,4 +505,5 @@ erpnext.patches.v10_0.update_status_in_purchase_receipt
erpnext.patches.v10_0.update_address_template_for_india erpnext.patches.v10_0.update_address_template_for_india
erpnext.patches.v10_0.set_discount_amount erpnext.patches.v10_0.set_discount_amount
erpnext.patches.v10_0.recalculate_gross_margin_for_project erpnext.patches.v10_0.recalculate_gross_margin_for_project
erpnext.patches.v10_0.delete_hub_documents erpnext.patches.v10_0.delete_hub_documents
erpnext.patches.v10_0.update_user_image_in_employee

19
erpnext/patches/v10_0/update_user_image_in_employee.py Normal file
View File

@ -0,0 +1,19 @@
# Copyright (c) 2017, Frappe and Contributors
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
import frappe
def execute():
frappe.reload_doc('hr', 'doctype', 'employee')
frappe.db.sql("""
UPDATE
`tabEmployee`, `tabUser`
SET
`tabEmployee`.image = `tabUser`.user_image
WHERE
`tabEmployee`.user_id = `tabUser`.name and
`tabEmployee`.user_id is not null and
`tabEmployee`.user_id != '' and `tabEmployee`.image is null
""")