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

fix(test): Employee Exit Summary (#28888)

Browse Source
This commit is contained in:
Rucha Mahabal 2021-12-14 22:03:44 +05:30 committed by GitHub
parent 7c33df5d54
commit a481a7c90e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/hr/doctype/exit_interview/test_exit_interview.py
View File

@ -19,7 +19,7 @@ class TestExitInterview(unittest.TestCase):
frappe.db.sql('delete from `tabExit Interview`') frappe.db.sql('delete from `tabExit Interview`')
def test_duplicate_interview(self): 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()) frappe.db.set_value('Employee', employee, 'relieving_date', getdate())
interview = create_exit_interview(employee) interview = create_exit_interview(employee)
@ -27,7 +27,7 @@ class TestExitInterview(unittest.TestCase):
self.assertRaises(frappe.DuplicateEntryError, doc.save) self.assertRaises(frappe.DuplicateEntryError, doc.save)
def test_relieving_date_validation(self): def test_relieving_date_validation(self):
employee = make_employee('employeeexit2@example.com') employee = make_employee('employeeexitint2@example.com')
# unset relieving date # unset relieving date
frappe.db.set_value('Employee', employee, 'relieving_date', None) frappe.db.set_value('Employee', employee, 'relieving_date', None)

3
erpnext/hr/report/employee_exits/employee_exits.py
View File

@ -108,12 +108,11 @@ def get_data(filters):
interview.status.as_('interview_status'), interview.employee_status.as_('employee_status'), interview.status.as_('interview_status'), interview.employee_status.as_('employee_status'),
interview.reference_document_name.as_('questionnaire'), fnf.name.as_('full_and_final_statement')) interview.reference_document_name.as_('questionnaire'), fnf.name.as_('full_and_final_statement'))
.distinct() .distinct()
.orderby(employee.relieving_date, order=Order.asc)
.where( .where(
((employee.relieving_date.isnotnull()) | (employee.relieving_date != '')) ((employee.relieving_date.isnotnull()) | (employee.relieving_date != ''))
& ((interview.name.isnull()) | ((interview.name.isnotnull()) & (interview.docstatus != 2))) & ((interview.name.isnull()) | ((interview.name.isnotnull()) & (interview.docstatus != 2)))
& ((fnf.name.isnull()) | ((fnf.name.isnotnull()) & (fnf.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) query = get_conditions(filters, query, employee, interview, fnf)