From c02a89db4d0f872db2c045ea087d2d0dcb8eda33 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Fri, 27 May 2022 15:30:29 +0530 Subject: [PATCH] fix: conflicts --- erpnext/payroll/doctype/gratuity/test_gratuity.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/erpnext/payroll/doctype/gratuity/test_gratuity.py b/erpnext/payroll/doctype/gratuity/test_gratuity.py index 67313feb5a2..158959eb1bd 100644 --- a/erpnext/payroll/doctype/gratuity/test_gratuity.py +++ b/erpnext/payroll/doctype/gratuity/test_gratuity.py @@ -29,9 +29,7 @@ class TestGratuity(FrappeTestCase): frappe.db.delete("Salary Slip") frappe.db.delete("Additional Salary", {"ref_doctype": "Gratuity"}) - make_earning_salary_component( - setup=True, test_tax=True, company_list=["_Test Company"], include_flexi_benefits=True - ) + make_earning_salary_component(setup=True, test_tax=True, company_list=["_Test Company"]) make_deduction_salary_component(setup=True, test_tax=True, company_list=["_Test Company"]) make_holiday_list()