From 0938b5dec618db231c5fed256d99807a17364634 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 2 Jan 2015 15:12:30 +0530 Subject: [PATCH] FG item and raw material can not be merged --- erpnext/stock/doctype/item/item.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/stock/doctype/item/item.py b/erpnext/stock/doctype/item/item.py index b8a31909ce..366e8282f1 100644 --- a/erpnext/stock/doctype/item/item.py +++ b/erpnext/stock/doctype/item/item.py @@ -229,7 +229,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"] + field_list = ["stock_uom", "is_stock_item", "has_serial_no", "has_batch_no", "is_manufactured_item"] 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")