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

minor fix

Browse Source
This commit is contained in:
Nabin Hait 2018-05-07 12:22:57 +05:30
parent 01f5df72cc
commit d5220c0ff4
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/hr/doctype/employee/employee_dashboard.py
View File

@ -25,6 +25,10 @@ def get_data():
{
'label': _('Evaluation'),
'items': ['Appraisal']
},
{
'label': _('Employee Lifecycle'),
'items': ['Employee Transfer', 'Employee Promotion']
}
]
}

4
erpnext/hr/doctype/employee_transfer/employee_transfer.py
View File

@ -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