mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-24 23:49:19 +00:00
test(fix): set company in employee
(cherry picked from commit a14f834589)
# Conflicts:
# erpnext/setup/doctype/employee/test_employee.py
This commit is contained in:
@@ -72,7 +72,7 @@ class TestEmployee(ERPNextTestSuite):
|
|||||||
{
|
{
|
||||||
"doctype": "Employee",
|
"doctype": "Employee",
|
||||||
"first_name": "Test Auto User 1",
|
"first_name": "Test Auto User 1",
|
||||||
"company": erpnext.get_default_company(),
|
"company": "_Test Company",
|
||||||
"date_of_birth": "2000-05-08",
|
"date_of_birth": "2000-05-08",
|
||||||
"date_of_joining": "2013-01-01",
|
"date_of_joining": "2013-01-01",
|
||||||
"gender": "Female",
|
"gender": "Female",
|
||||||
@@ -118,10 +118,13 @@ class TestEmployee(ERPNextTestSuite):
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
def tearDown(self):
|
def tearDown(self):
|
||||||
frappe.db.rollback()
|
frappe.db.rollback()
|
||||||
|
|
||||||
>>>>>>> d4ecede3c3 (test: Create User Automatically)
|
>>>>>>> d4ecede3c3 (test: Create User Automatically)
|
||||||
|
=======
|
||||||
|
>>>>>>> a14f834589 (test(fix): set company in employee)
|
||||||
|
|
||||||
def make_employee(user, company=None, **kwargs):
|
def make_employee(user, company=None, **kwargs):
|
||||||
if not frappe.db.get_value("User", user):
|
if not frappe.db.get_value("User", user):
|
||||||
|
|||||||
Reference in New Issue
Block a user