From d5220c0ff47759a344a81e67f0dc8da399046bda Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 7 May 2018 12:22:57 +0530 Subject: [PATCH] minor fix --- erpnext/hr/doctype/employee/employee_dashboard.py | 4 ++++ erpnext/hr/doctype/employee_transfer/employee_transfer.py | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/erpnext/hr/doctype/employee/employee_dashboard.py b/erpnext/hr/doctype/employee/employee_dashboard.py index 0f95020306..e1e1fcedcd 100644 --- a/erpnext/hr/doctype/employee/employee_dashboard.py +++ b/erpnext/hr/doctype/employee/employee_dashboard.py @@ -25,6 +25,10 @@ def get_data(): { 'label': _('Evaluation'), 'items': ['Appraisal'] + }, + { + 'label': _('Employee Lifecycle'), + 'items': ['Employee Transfer', 'Employee Promotion'] } ] } \ No newline at end of file diff --git a/erpnext/hr/doctype/employee_transfer/employee_transfer.py b/erpnext/hr/doctype/employee_transfer/employee_transfer.py index d80e293bbb..b58d334d29 100644 --- a/erpnext/hr/doctype/employee_transfer/employee_transfer.py +++ b/erpnext/hr/doctype/employee_transfer/employee_transfer.py @@ -13,6 +13,8 @@ class EmployeeTransfer(Document): def validate(self): if frappe.get_value("Employee", self.employee, "status") == "Left": frappe.throw(_("Cannot transfer Employee with status Left")) + if self.new_company and self.company == self.new_company: + frappe.throw_("New Company must be different from current company") def before_submit(self): if getdate(self.transfer_date) > getdate(): @@ -23,6 +25,8 @@ class EmployeeTransfer(Document): employee = frappe.get_doc("Employee", self.employee) if self.create_new_employee_id: new_employee = frappe.copy_doc(employee) + new_employee.name = None + new_employee.employee_number = None new_employee = update_employee(new_employee, self.transfer_details) if self.new_company: new_employee.company = self.new_company