diff --git a/erpnext/hr/doctype/employee_onboarding/employee_onboarding.js b/erpnext/hr/doctype/employee_onboarding/employee_onboarding.js index ffba940013a..08615888d3e 100644 --- a/erpnext/hr/doctype/employee_onboarding/employee_onboarding.js +++ b/erpnext/hr/doctype/employee_onboarding/employee_onboarding.js @@ -40,7 +40,7 @@ frappe.ui.form.on('Employee Onboarding', { }, callback: function(r) { if (r.message) { - frm.set_value('boarding_status', r.message) + frm.set_value('boarding_status', r.message); } refresh_field("boarding_status"); } diff --git a/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py b/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py index 29124fce24c..9262a06a3f0 100644 --- a/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py +++ b/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py @@ -5,7 +5,6 @@ from __future__ import unicode_literals import frappe from frappe import _ -from frappe.utils import flt from erpnext.hr.utils import EmployeeBoardingController from frappe.model.mapper import get_mapped_doc diff --git a/erpnext/hr/doctype/employee_onboarding/employee_onboarding_list.js b/erpnext/hr/doctype/employee_onboarding/employee_onboarding_list.js index c14d7a5a8e1..a33619bed4a 100644 --- a/erpnext/hr/doctype/employee_onboarding/employee_onboarding_list.js +++ b/erpnext/hr/doctype/employee_onboarding/employee_onboarding_list.js @@ -2,6 +2,6 @@ frappe.listview_settings['Employee Onboarding'] = { add_fields: ["boarding_status", "employee_name", "date_of_joining", "department"], filters:[["boarding_status","=", "Pending"]], get_indicator: function(doc) { - return [__(doc.boarding_status), frappe.utils.guess_colour(doc.boarding_status), "status,=," + doc.boarding_status]; - } - }; + return [__(doc.boarding_status), frappe.utils.guess_colour(doc.boarding_status), "status,=," + doc.boarding_status]; + } +}; diff --git a/erpnext/hr/doctype/employee_separation/employee_separation.js b/erpnext/hr/doctype/employee_separation/employee_separation.js index 6ef73eb5500..9a75c16317b 100644 --- a/erpnext/hr/doctype/employee_separation/employee_separation.js +++ b/erpnext/hr/doctype/employee_separation/employee_separation.js @@ -31,7 +31,7 @@ frappe.ui.form.on('Employee Separation', { }, callback: function(r) { if (r.message) { - frm.set_value('boarding_status', r.message) + frm.set_value('boarding_status', r.message); } refresh_field("boarding_status"); } diff --git a/erpnext/hr/doctype/employee_separation/employee_separation_list.js b/erpnext/hr/doctype/employee_separation/employee_separation_list.js index d23802c08cc..11487cc6f00 100644 --- a/erpnext/hr/doctype/employee_separation/employee_separation_list.js +++ b/erpnext/hr/doctype/employee_separation/employee_separation_list.js @@ -2,6 +2,6 @@ frappe.listview_settings['Employee Separation'] = { add_fields: ["boarding_status", "employee_name", "date_of_joining", "department"], filters:[["boarding_status","=", "Pending"]], get_indicator: function(doc) { - return [__(doc.boarding_status), frappe.utils.guess_colour(doc.boarding_status), "status,=," + doc.boarding_status]; - } - }; + return [__(doc.boarding_status), frappe.utils.guess_colour(doc.boarding_status), "status,=," + doc.boarding_status]; + } +};