From c784fa219b959329e23f043af6605cb5d7fb59de Mon Sep 17 00:00:00 2001
From: Neil Trini Lasrado <neil@frappe.io>
Date: Mon, 19 Jan 2015 17:04:47 +0530
Subject: [PATCH] commit

---
 erpnext/stock/doctype/item/item.json         | 6 +++---
 erpnext/stock/doctype/item/item.py           | 2 +-
 erpnext/stock/doctype/item/test_records.json | 6 ------
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json
index 550f5383363..ec444a9eaf6 100644
--- a/erpnext/stock/doctype/item/item.json
+++ b/erpnext/stock/doctype/item/item.json
@@ -687,7 +687,7 @@
    "read_only": 0
   }, 
   {
-   "depends_on": "eval:doc.is_manufactured_item==\"Yes\"", 
+   "depends_on": "", 
    "fieldname": "default_bom", 
    "fieldtype": "Link", 
    "ignore_user_permissions": 1, 
@@ -701,7 +701,7 @@
   }, 
   {
    "default": "No", 
-   "depends_on": "eval:doc.is_manufactured_item==\"Yes\"", 
+   "depends_on": "", 
    "description": "Selecting \"Yes\" will allow you to make a Production Order for this item.", 
    "fieldname": "is_pro_applicable", 
    "fieldtype": "Select", 
@@ -864,7 +864,7 @@
  "icon": "icon-tag", 
  "idx": 1, 
  "max_attachments": 1, 
- "modified": "2015-01-16 14:48:36.423571", 
+ "modified": "2015-01-19 16:17:59.756852", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Item", 
diff --git a/erpnext/stock/doctype/item/item.py b/erpnext/stock/doctype/item/item.py
index 8c74f0919aa..d77cd1d50b7 100644
--- a/erpnext/stock/doctype/item/item.py
+++ b/erpnext/stock/doctype/item/item.py
@@ -390,7 +390,7 @@ class Item(WebsiteGenerator):
 			if not frappe.db.exists("Item", newdn):
 				frappe.throw(_("Item {0} does not exist").format(newdn))
 
-			field_list = ["stock_uom", "is_stock_item", "has_serial_no", "has_batch_no", "is_manufactured_item"]
+			field_list = ["stock_uom", "is_stock_item", "has_serial_no", "has_batch_no"]
 			new_properties = [cstr(d) for d in frappe.db.get_value("Item", newdn, field_list)]
 			if new_properties != [cstr(self.get(fld)) for fld in field_list]:
 				frappe.throw(_("To merge, following properties must be same for both items")
diff --git a/erpnext/stock/doctype/item/test_records.json b/erpnext/stock/doctype/item/test_records.json
index 7d0f4b0e7e5..51dd9fb7bf2 100644
--- a/erpnext/stock/doctype/item/test_records.json
+++ b/erpnext/stock/doctype/item/test_records.json
@@ -64,7 +64,6 @@
   "income_account": "Sales - _TC",
   "inspection_required": "No",
   "is_asset_item": "No",
-  "is_manufactured_item": "No",
   "is_pro_applicable": "No",
   "is_purchase_item": "Yes",
   "is_sales_item": "Yes",
@@ -94,7 +93,6 @@
   "income_account": "Sales - _TC",
   "inspection_required": "No",
   "is_asset_item": "No",
-  "is_manufactured_item": "No",
   "is_pro_applicable": "No",
   "is_purchase_item": "Yes",
   "is_sales_item": "Yes",
@@ -214,9 +212,7 @@
   "income_account": "Sales - _TC",
   "inspection_required": "No",
   "is_asset_item": "No",
-  "is_manufactured_item": "Yes",
   "is_pro_applicable": "Yes",
-  "is_purchase_item": "Yes",
   "is_sales_item": "Yes",
   "is_service_item": "No",
   "is_stock_item": "Yes",
@@ -242,7 +238,6 @@
   "is_service_item": "No",
   "is_stock_item": "Yes",
   "is_sub_contracted_item": "Yes",
-  "is_manufactured_item": "Yes",
   "item_code": "_Test FG Item 2",
   "item_group": "_Test Item Group Desktops",
   "item_name": "_Test FG Item 2",
@@ -263,7 +258,6 @@
   "is_sales_item": "Yes",
   "is_service_item": "No",
   "is_stock_item": "Yes",
-  "is_manufactured_item": "Yes",
   "is_sub_contracted_item": "Yes",
   "item_code": "_Test Variant Item",
   "item_group": "_Test Item Group Desktops",