From 33d868f41536ded4c7bfb179888f3059d4e437e5 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Mon, 23 Mar 2026 16:52:11 +0530 Subject: [PATCH] test(fix): set company in employee (cherry picked from commit a14f834589b5edb952a52c3b2f8a73642ff6b022) # Conflicts: # erpnext/setup/doctype/employee/test_employee.py --- erpnext/setup/doctype/employee/test_employee.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/erpnext/setup/doctype/employee/test_employee.py b/erpnext/setup/doctype/employee/test_employee.py index 6560c2f883b..c1361829cea 100644 --- a/erpnext/setup/doctype/employee/test_employee.py +++ b/erpnext/setup/doctype/employee/test_employee.py @@ -72,7 +72,7 @@ class TestEmployee(ERPNextTestSuite): { "doctype": "Employee", "first_name": "Test Auto User 1", - "company": erpnext.get_default_company(), + "company": "_Test Company", "date_of_birth": "2000-05-08", "date_of_joining": "2013-01-01", "gender": "Female", @@ -118,10 +118,13 @@ class TestEmployee(ERPNextTestSuite): ) ) +<<<<<<< HEAD def tearDown(self): frappe.db.rollback() >>>>>>> d4ecede3c3 (test: Create User Automatically) +======= +>>>>>>> a14f834589 (test(fix): set company in employee) def make_employee(user, company=None, **kwargs): if not frappe.db.get_value("User", user):