diff --git a/erpnext/domains/services.py b/erpnext/domains/services.py index 3a0568c499..1fb0e19edd 100644 --- a/erpnext/domains/services.py +++ b/erpnext/domains/services.py @@ -12,9 +12,6 @@ data = { 'HR', 'ToDo' ], - 'properties': [ - {'doctype': 'Item', 'fieldname': 'is_stock_item', 'property': 'default', 'value': 0}, - ], 'set_value': [ ['Stock Settings', None, 'show_barcode_field', 0] ], diff --git a/erpnext/restaurant/doctype/restaurant/test_restaurant.py b/erpnext/restaurant/doctype/restaurant/test_restaurant.py index 7b9885c4e9..3ba7f5785e 100644 --- a/erpnext/restaurant/doctype/restaurant/test_restaurant.py +++ b/erpnext/restaurant/doctype/restaurant/test_restaurant.py @@ -8,9 +8,9 @@ import unittest test_records = [ dict(doctype='Restaurant', name='Test Restaurant 1', company='_Test Company 1', - invoice_series_prefix='Test-Rest-1-Inv-', defaut_customer='_Test Customer 1'), + invoice_series_prefix='Test-Rest-1-Inv-', default_customer='_Test Customer 1'), dict(doctype='Restaurant', name='Test Restaurant 2', company='_Test Company 1', - invoice_series_prefix='Test-Rest-2-Inv-', defaut_customer='_Test Customer 1'), + invoice_series_prefix='Test-Rest-2-Inv-', default_customer='_Test Customer 1'), ] class TestRestaurant(unittest.TestCase): diff --git a/erpnext/stock/doctype/material_request/test_material_request.py b/erpnext/stock/doctype/material_request/test_material_request.py index 709b8c720c..a24957e2b0 100644 --- a/erpnext/stock/doctype/material_request/test_material_request.py +++ b/erpnext/stock/doctype/material_request/test_material_request.py @@ -558,5 +558,5 @@ class TestMaterialRequest(unittest.TestCase): item_code= %s and warehouse= %s """, (mr.items[0].item_code, mr.items[0].warehouse))[0][0] self.assertEquals(requested_qty, new_requested_qty) -test_dependencies = ["Currency Exchange"] +test_dependencies = ["Currency Exchange", "BOM"] test_records = frappe.get_test_records('Material Request') diff --git a/erpnext/stock/reorder_item.py b/erpnext/stock/reorder_item.py index 8da9f110f0..01a6a6d547 100644 --- a/erpnext/stock/reorder_item.py +++ b/erpnext/stock/reorder_item.py @@ -121,8 +121,7 @@ def create_material_request(material_requests): mr.update({ "company": company, "transaction_date": nowdate(), - "material_request_type": "Material Transfer" if request_type=="Transfer" else request_type, - "schedule_date": add_days(nowdate(), cint(items[0].lead_time_days)) + "material_request_type": "Material Transfer" if request_type=="Transfer" else request_type }) for d in items: