diff --git a/erpnext/selling/doctype/sales_order/test_sales_order.py b/erpnext/selling/doctype/sales_order/test_sales_order.py index ba5f025cfe..4fa88d42b0 100644 --- a/erpnext/selling/doctype/sales_order/test_sales_order.py +++ b/erpnext/selling/doctype/sales_order/test_sales_order.py @@ -240,9 +240,9 @@ class TestSalesOrder(unittest.TestCase): from erpnext.stock.doctype.item.test_item import make_item from erpnext.selling.doctype.product_bundle.test_product_bundle import make_product_bundle - make_item("_Test Service Product Bundle", {"is_stock_item": 0, "is_sales_item": 1}) - make_item("_Test Service Product Bundle Item 1", {"is_stock_item": 0, "is_sales_item": 1}) - make_item("_Test Service Product Bundle Item 2", {"is_stock_item": 0, "is_sales_item": 1}) + make_item("_Test Service Product Bundle", {"is_stock_item": 0, "is_pro_applicable": 0, "is_sales_item": 1}) + make_item("_Test Service Product Bundle Item 1", {"is_stock_item": 0, "is_pro_applicable": 0, "is_sales_item": 1}) + make_item("_Test Service Product Bundle Item 2", {"is_stock_item": 0, "is_pro_applicable": 0, "is_sales_item": 1}) make_product_bundle("_Test Service Product Bundle", ["_Test Service Product Bundle Item 1", "_Test Service Product Bundle Item 2"]) @@ -256,9 +256,9 @@ class TestSalesOrder(unittest.TestCase): from erpnext.stock.doctype.item.test_item import make_item from erpnext.selling.doctype.product_bundle.test_product_bundle import make_product_bundle - make_item("_Test Mix Product Bundle", {"is_stock_item": 0, "is_sales_item": 1}) + make_item("_Test Mix Product Bundle", {"is_stock_item": 0, "is_pro_applicable": 0, "is_sales_item": 1}) make_item("_Test Mix Product Bundle Item 1", {"is_stock_item": 1, "is_sales_item": 1}) - make_item("_Test Mix Product Bundle Item 2", {"is_stock_item": 0, "is_sales_item": 1}) + make_item("_Test Mix Product Bundle Item 2", {"is_stock_item": 0, "is_pro_applicable": 0, "is_sales_item": 1}) make_product_bundle("_Test Mix Product Bundle", ["_Test Mix Product Bundle Item 1", "_Test Mix Product Bundle Item 2"]) @@ -267,7 +267,7 @@ class TestSalesOrder(unittest.TestCase): def test_auto_insert_price(self): from erpnext.stock.doctype.item.test_item import make_item - make_item("_Test Item for Auto Price List", {"is_stock_item": 0, "is_sales_item": 1}) + make_item("_Test Item for Auto Price List", {"is_stock_item": 0, "is_pro_applicable": 0, "is_sales_item": 1}) frappe.db.set_value("Stock Settings", None, "auto_insert_price_list_rate_if_missing", 1) item_price = frappe.db.get_value("Item Price", {"price_list": "_Test Price List", diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json index e761653508..b36e34c022 100644 --- a/erpnext/stock/doctype/item/item.json +++ b/erpnext/stock/doctype/item/item.json @@ -1647,7 +1647,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, - "default": "", + "default": "1", "depends_on": "", "description": "", "fieldname": "is_pro_applicable", @@ -2113,7 +2113,7 @@ "issingle": 0, "istable": 0, "max_attachments": 1, - "modified": "2015-10-19 03:04:49.445770", + "modified": "2015-10-20 12:14:43.315827", "modified_by": "Administrator", "module": "Stock", "name": "Item",