nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-28 14:18:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix conflicts

Browse Source
This commit is contained in:
Rucha Mahabal
2026-03-23 17:57:30 +05:30
committed by GitHub
parent 33d868f415
commit 03510d96be
2 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/setup/doctype/employee/test_employee.py
View File

@@ -64,8 +64,6 @@ class TestEmployee(ERPNextTestSuite):
self.assertEqual(qb_employee_list, employee_list)
frappe.set_user("Administrator")
<<<<<<< HEAD
=======
def test_create_user_automatically(self):
def get_new_employee(email: str, create_user_permission: int):
return frappe.get_doc(
@@ -118,13 +116,6 @@ 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):