diff --git a/erpnext/selling/doctype/quotation/quotation.py b/erpnext/selling/doctype/quotation/quotation.py
index 37ac412ad09..3c8add44f79 100644
--- a/erpnext/selling/doctype/quotation/quotation.py
+++ b/erpnext/selling/doctype/quotation/quotation.py
@@ -106,8 +106,7 @@ def _make_sales_order(source_name, target_doc=None, ignore_permissions=False):
 			"Quotation Item": {
 				"doctype": "Sales Order Item",
 				"field_map": {
-					"parent": "prevdoc_docname",
-					"warehouse": "warehouse"
+					"parent": "prevdoc_docname"
 				}
 			},
 			"Sales Taxes and Charges": {
diff --git a/erpnext/selling/doctype/quotation_item/quotation_item.json b/erpnext/selling/doctype/quotation_item/quotation_item.json
index cf5f2dc2ac1..b1bb6f752ee 100644
--- a/erpnext/selling/doctype/quotation_item/quotation_item.json
+++ b/erpnext/selling/doctype/quotation_item/quotation_item.json
@@ -730,7 +730,7 @@
    "in_list_view": 0, 
    "label": "Warehouse", 
    "length": 0, 
-   "no_copy": 1, 
+   "no_copy": 0, 
    "options": "Warehouse", 
    "permlevel": 0, 
    "precision": "", 
@@ -1032,7 +1032,7 @@
  "istable": 1, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-02-17 14:48:49.320786", 
+ "modified": "2016-02-23 18:12:49.939175", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Quotation Item", 
diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py
index 8d7f23ea11d..686048612d8 100644
--- a/erpnext/stock/get_item_details.py
+++ b/erpnext/stock/get_item_details.py
@@ -164,8 +164,7 @@ def get_basic_details(args, item):
 		"net_amount": 0.0,
 		"discount_percentage": 0.0,
 		"supplier": item.default_supplier,
-		"delivered_by_supplier": item.delivered_by_supplier,
-		"actual_qty": get_available_qty(item.name, user_default_warehouse or args.warehouse or item.default_warehouse)
+		"delivered_by_supplier": item.delivered_by_supplier
 	})
 
 	# if default specified in item is for another company, fetch from company