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:11:49 +05:30
committed by GitHub
parent 30cbe8feb6
commit 6aa6114757
2 changed files with 0 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/payroll/doctype/gratuity/gratuity.json
View File

@@ -195,11 +195,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2020-11-02 18:21:11.971488",
=======
"modified": "2022-05-27 13:56:14.349183", "modified": "2022-05-27 13:56:14.349183",
>>>>>>> 79b0aede00 (fix: add list view settings for Gratuity)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Payroll", "module": "Payroll",
"name": "Gratuity", "name": "Gratuity",

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

@@ -23,12 +23,6 @@ from erpnext.regional.united_arab_emirates.setup import create_gratuity_rule
test_dependencies = ["Salary Component", "Salary Slip", "Account"] test_dependencies = ["Salary Component", "Salary Slip", "Account"]
<<<<<<< HEAD
class TestGratuity(unittest.TestCase):
@classmethod
def setUpClass(cls):
make_earning_salary_component(setup=True, test_tax=True, company_list=["_Test Company"])
=======
class TestGratuity(FrappeTestCase): class TestGratuity(FrappeTestCase):
def setUp(self): def setUp(self):
frappe.db.delete("Gratuity") frappe.db.delete("Gratuity")
@@ -38,18 +32,10 @@ class TestGratuity(FrappeTestCase):
make_earning_salary_component( make_earning_salary_component(
setup=True, test_tax=True, company_list=["_Test Company"], include_flexi_benefits=True setup=True, test_tax=True, company_list=["_Test Company"], include_flexi_benefits=True
) )
>>>>>>> b81d7519c1 (test: Gratuity status for payment via salary slip)
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()
<<<<<<< HEAD
def setUp(self):
frappe.db.sql("DELETE FROM `tabGratuity`")
frappe.db.sql("DELETE FROM `tabAdditional Salary` WHERE ref_doctype = 'Gratuity'")
=======
@set_holiday_list("Salary Slip Test Holiday List", "_Test Company") @set_holiday_list("Salary Slip Test Holiday List", "_Test Company")
>>>>>>> 6c66bbbbfe (refactor: clean-up gratuity tests)
def test_get_last_salary_slip_should_return_none_for_new_employee(self): def test_get_last_salary_slip_should_return_none_for_new_employee(self):
new_employee = make_employee("new_employee@salary.com", company="_Test Company") new_employee = make_employee("new_employee@salary.com", company="_Test Company")
salary_slip = get_last_salary_slip(new_employee) salary_slip = get_last_salary_slip(new_employee)
@@ -167,13 +153,6 @@ class TestGratuity(FrappeTestCase):
self.assertEqual(gratuity.status, "Paid") self.assertEqual(gratuity.status, "Paid")
self.assertEqual(flt(gratuity.paid_amount, 2), flt(gratuity.amount, 2)) self.assertEqual(flt(gratuity.paid_amount, 2), flt(gratuity.amount, 2))
<<<<<<< HEAD
def tearDown(self):
frappe.db.sql("DELETE FROM `tabGratuity`")
frappe.db.sql("DELETE FROM `tabAdditional Salary` WHERE ref_doctype = 'Gratuity'")
=======
>>>>>>> 6c66bbbbfe (refactor: clean-up gratuity tests)
def get_gratuity_rule(name): def get_gratuity_rule(name):
rule = frappe.db.exists("Gratuity Rule", name) rule = frappe.db.exists("Gratuity Rule", name)