Merge branch 'develop' into drop-shipping
This commit is contained in:
commit
14c44e5e9e
@ -74,7 +74,7 @@ def setup_bom(**args):
|
|||||||
})
|
})
|
||||||
|
|
||||||
if not args.raw_materials:
|
if not args.raw_materials:
|
||||||
if not frappe.db.exists('Item', "Test Extra Item 1"):
|
if not frappe.db.exists('Item', "Test Extra Item N-1"):
|
||||||
make_item("Test Extra Item N-1", {
|
make_item("Test Extra Item N-1", {
|
||||||
'is_stock_item': 1,
|
'is_stock_item': 1,
|
||||||
})
|
})
|
||||||
|
@ -4,12 +4,14 @@ from __future__ import unicode_literals
|
|||||||
|
|
||||||
|
|
||||||
import frappe, unittest
|
import frappe, unittest
|
||||||
test_records = frappe.get_test_records('Project')
|
from frappe.utils import getdate, nowdate, add_days
|
||||||
test_ignore = ["Sales Order"]
|
|
||||||
|
|
||||||
from erpnext.projects.doctype.project_template.test_project_template import make_project_template
|
from erpnext.projects.doctype.project_template.test_project_template import make_project_template
|
||||||
from erpnext.projects.doctype.task.test_task import create_task
|
from erpnext.projects.doctype.task.test_task import create_task
|
||||||
from frappe.utils import getdate, nowdate, add_days
|
|
||||||
|
test_records = frappe.get_test_records('Project')
|
||||||
|
test_ignore = ["Sales Order"]
|
||||||
|
|
||||||
|
|
||||||
class TestProject(unittest.TestCase):
|
class TestProject(unittest.TestCase):
|
||||||
def test_project_with_template_having_no_parent_and_depend_tasks(self):
|
def test_project_with_template_having_no_parent_and_depend_tasks(self):
|
||||||
@ -112,7 +114,8 @@ def make_project(args):
|
|||||||
doctype = 'Project',
|
doctype = 'Project',
|
||||||
project_name = args.project_name,
|
project_name = args.project_name,
|
||||||
status = 'Open',
|
status = 'Open',
|
||||||
expected_start_date = args.start_date
|
expected_start_date = args.start_date,
|
||||||
|
company= args.company or '_Test Company'
|
||||||
))
|
))
|
||||||
|
|
||||||
if args.project_template_name:
|
if args.project_template_name:
|
||||||
|
Loading…
Reference in New Issue
Block a user