diff --git a/erpnext/hr/doctype/exit_interview/test_exit_interview.py b/erpnext/hr/doctype/exit_interview/test_exit_interview.py index a0bf9b32ec..8e076edf0b 100644 --- a/erpnext/hr/doctype/exit_interview/test_exit_interview.py +++ b/erpnext/hr/doctype/exit_interview/test_exit_interview.py @@ -19,7 +19,7 @@ class TestExitInterview(unittest.TestCase): frappe.db.sql('delete from `tabExit Interview`') def test_duplicate_interview(self): - employee = make_employee('employeeexit1@example.com') + employee = make_employee('employeeexitint1@example.com') frappe.db.set_value('Employee', employee, 'relieving_date', getdate()) interview = create_exit_interview(employee) @@ -27,7 +27,7 @@ class TestExitInterview(unittest.TestCase): self.assertRaises(frappe.DuplicateEntryError, doc.save) def test_relieving_date_validation(self): - employee = make_employee('employeeexit2@example.com') + employee = make_employee('employeeexitint2@example.com') # unset relieving date frappe.db.set_value('Employee', employee, 'relieving_date', None) diff --git a/erpnext/hr/report/employee_exits/employee_exits.py b/erpnext/hr/report/employee_exits/employee_exits.py index 8e0b07d3e1..bde5a89926 100644 --- a/erpnext/hr/report/employee_exits/employee_exits.py +++ b/erpnext/hr/report/employee_exits/employee_exits.py @@ -108,12 +108,11 @@ def get_data(filters): interview.status.as_('interview_status'), interview.employee_status.as_('employee_status'), interview.reference_document_name.as_('questionnaire'), fnf.name.as_('full_and_final_statement')) .distinct() - .orderby(employee.relieving_date, order=Order.asc) .where( ((employee.relieving_date.isnotnull()) | (employee.relieving_date != '')) & ((interview.name.isnull()) | ((interview.name.isnotnull()) & (interview.docstatus != 2))) & ((fnf.name.isnull()) | ((fnf.name.isnotnull()) & (fnf.docstatus != 2))) - ) + ).orderby(employee.relieving_date, order=Order.asc) ) query = get_conditions(filters, query, employee, interview, fnf)