From 6ab831b3870e6a3808cbedacb0a038458b0fd123 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 18 Aug 2014 19:04:19 +0530 Subject: [PATCH] Allow Default Warehouse for Item, even if not a Stock Item --- erpnext/stock/doctype/item/item.json | 4 ++-- erpnext/stock/doctype/packed_item/packed_item.py | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json index 88109bbf9c..45b423271a 100644 --- a/erpnext/stock/doctype/item/item.json +++ b/erpnext/stock/doctype/item/item.json @@ -175,7 +175,7 @@ "reqd": 1 }, { - "depends_on": "eval:doc.is_stock_item==\"Yes\"", + "depends_on": "", "description": "Mandatory if Stock Item is \"Yes\". Also the default warehouse where reserved quantity is set from Sales Order.", "fieldname": "default_warehouse", "fieldtype": "Link", @@ -825,7 +825,7 @@ "icon": "icon-tag", "idx": 1, "max_attachments": 1, - "modified": "2014-07-03 10:45:19.574737", + "modified": "2014-08-18 09:32:57.268763", "modified_by": "Administrator", "module": "Stock", "name": "Item", diff --git a/erpnext/stock/doctype/packed_item/packed_item.py b/erpnext/stock/doctype/packed_item/packed_item.py index f04625b349..9263907da1 100644 --- a/erpnext/stock/doctype/packed_item/packed_item.py +++ b/erpnext/stock/doctype/packed_item/packed_item.py @@ -67,12 +67,10 @@ def make_packing_list(obj, item_table_fieldname): packing_list_idx = 0 parent_items = [] for d in obj.get(item_table_fieldname): - warehouse = (item_table_fieldname == "sales_order_details") \ - and d.warehouse or d.warehouse if frappe.db.get_value("Sales BOM", {"new_item_code": d.item_code}): for i in get_sales_bom_items(d.item_code): update_packing_list_item(obj, i['item_code'], flt(i['qty'])*flt(d.qty), - warehouse, d, packing_list_idx) + d.warehouse, d, packing_list_idx) if [d.item_code, d.name] not in parent_items: parent_items.append([d.item_code, d.name])