From 6db3d84cc0d1bd20f8e9754d80b979a9d65505cd Mon Sep 17 00:00:00 2001 From: Shreya Shah Date: Tue, 24 Apr 2018 12:07:40 +0530 Subject: [PATCH] remove unused code (#13765) --- erpnext/hr/doctype/employee/employee.js | 11 --------- erpnext/hr/doctype/employee/employee.py | 6 ----- .../test_leave_application.py | 24 ------------------- 3 files changed, 41 deletions(-) diff --git a/erpnext/hr/doctype/employee/employee.js b/erpnext/hr/doctype/employee/employee.js index 5e1013d6a2..240411dcfa 100755 --- a/erpnext/hr/doctype/employee/employee.js +++ b/erpnext/hr/doctype/employee/employee.js @@ -14,17 +14,6 @@ erpnext.hr.EmployeeController = frappe.ui.form.Controller.extend({ return { query: "erpnext.controllers.queries.employee_query"} } }, - onload: function() { - this.frm.set_query("leave_approver", "leave_approvers", function(doc) { - return { - query:"erpnext.hr.doctype.employee_leave_approver.employee_leave_approver.get_approvers", - filters:{ - user: doc.user_id - } - } - }); - }, - refresh: function() { var me = this; erpnext.toggle_naming_series(); diff --git a/erpnext/hr/doctype/employee/employee.py b/erpnext/hr/doctype/employee/employee.py index cd97e3f4fb..0f116399ae 100755 --- a/erpnext/hr/doctype/employee/employee.py +++ b/erpnext/hr/doctype/employee/employee.py @@ -40,7 +40,6 @@ class Employee(NestedSet): self.validate_date() self.validate_email() self.validate_status() - self.validate_employee_leave_approver() self.validate_reports_to() self.validate_preferred_email() @@ -150,11 +149,6 @@ class Employee(NestedSet): throw(_("User {0} is already assigned to Employee {1}").format( self.user_id, employee[0]), frappe.DuplicateEntryError) - def validate_employee_leave_approver(self): - for l in self.get("leave_approvers")[:]: - if "Leave Approver" not in frappe.get_roles(l.leave_approver): - frappe.get_doc("User", l.leave_approver).add_roles("Leave Approver") - def validate_reports_to(self): if self.reports_to == self.name: throw(_("Employee cannot report to himself.")) diff --git a/erpnext/hr/doctype/leave_application/test_leave_application.py b/erpnext/hr/doctype/leave_application/test_leave_application.py index 38b10f7df1..0f77fb93b9 100644 --- a/erpnext/hr/doctype/leave_application/test_leave_application.py +++ b/erpnext/hr/doctype/leave_application/test_leave_application.py @@ -59,29 +59,6 @@ class TestLeaveApplication(unittest.TestCase): def _clear_applications(self): frappe.db.sql("""delete from `tabLeave Application`""") - def _add_employee_leave_approver(self, employee, leave_approver): - temp_session_user = frappe.session.user - frappe.set_user("Administrator") - employee = frappe.get_doc("Employee", employee) - employee.append("leave_approvers", { - "doctype": "Employee Leave Approver", - "leave_approver": leave_approver - }) - employee.save() - frappe.set_user(temp_session_user) - - def _remove_employee_leave_approver(self, employee, leave_approver): - temp_session_user = frappe.session.user - frappe.set_user("Administrator") - employee = frappe.get_doc("Employee", employee) - d = employee.get("leave_approvers", { - "leave_approver": leave_approver - }) - if d: - employee.get("leave_approvers").remove(d[0]) - employee.save() - frappe.set_user(temp_session_user) - def get_application(self, doc): application = frappe.copy_doc(doc) application.from_date = "2013-01-01" @@ -230,7 +207,6 @@ class TestLeaveApplication(unittest.TestCase): from frappe.utils.user import add_role add_role("test1@example.com", "Employee") add_role("test@example.com", "Leave Approver") - self._add_employee_leave_approver("_T-Employee-00002", "test@example.com") make_allocation_record(employee="_T-Employee-00002")