Merge branch 'develop' of https://github.com/frappe/erpnext into fix-asset-warehouse-validation
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
index 57bc0a7..84077f6 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
@@ -250,7 +250,7 @@
 	def validate_warehouse(self, for_validate=True):
 		if self.update_stock and for_validate:
 			for d in self.get("items"):
-				if not d.warehouse:
+				if not d.warehouse and not d.is_fixed_asset:
 					frappe.throw(
 						_(
 							"Row No {0}: Warehouse is required. Please set a Default Warehouse for Item {1} and Company {2}"