schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: conflicts

Browse Source
This commit is contained in:
Rucha Mahabal
2022-05-27 15:30:29 +05:30
committed by GitHub
parent 6aa6114757
commit c02a89db4d
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/payroll/doctype/gratuity/test_gratuity.py
View File

@@ -29,9 +29,7 @@ class TestGratuity(FrappeTestCase):
frappe.db.delete("Salary Slip") frappe.db.delete("Salary Slip")
frappe.db.delete("Additional Salary", {"ref_doctype": "Gratuity"}) frappe.db.delete("Additional Salary", {"ref_doctype": "Gratuity"})
make_earning_salary_component( make_earning_salary_component(setup=True, test_tax=True, company_list=["_Test Company"])
setup=True, test_tax=True, company_list=["_Test Company"], include_flexi_benefits=True
)
make_deduction_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() make_holiday_list()