From bb97309e2eac8f3589afa0a554d3e56a0bc337fb Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Sun, 12 Dec 2021 23:20:04 +0530 Subject: [PATCH] fix: tests - specify sorting order in employee exits query - rollback after work order tests --- erpnext/hr/report/employee_exits/employee_exits.py | 3 ++- erpnext/manufacturing/doctype/work_order/test_work_order.py | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/erpnext/hr/report/employee_exits/employee_exits.py b/erpnext/hr/report/employee_exits/employee_exits.py index d0e1ef9a327..8e0b07d3e10 100644 --- a/erpnext/hr/report/employee_exits/employee_exits.py +++ b/erpnext/hr/report/employee_exits/employee_exits.py @@ -3,6 +3,7 @@ import frappe from frappe import _ +from frappe.query_builder import Order from frappe.utils import getdate @@ -107,7 +108,7 @@ 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) + .orderby(employee.relieving_date, order=Order.asc) .where( ((employee.relieving_date.isnotnull()) | (employee.relieving_date != '')) & ((interview.name.isnull()) | ((interview.name.isnotnull()) & (interview.docstatus != 2))) diff --git a/erpnext/manufacturing/doctype/work_order/test_work_order.py b/erpnext/manufacturing/doctype/work_order/test_work_order.py index f590d680d35..1e74b6dda22 100644 --- a/erpnext/manufacturing/doctype/work_order/test_work_order.py +++ b/erpnext/manufacturing/doctype/work_order/test_work_order.py @@ -29,6 +29,9 @@ class TestWorkOrder(ERPNextTestCase): self.warehouse = '_Test Warehouse 2 - _TC' self.item = '_Test Item' + def tearDown(self): + frappe.db.rollback() + def check_planned_qty(self): planned0 = frappe.db.get_value("Bin", {"item_code": "_Test FG Item",