diff --git a/erpnext/controllers/stock_controller.py b/erpnext/controllers/stock_controller.py
index 346f7539918..05268e5e31c 100644
--- a/erpnext/controllers/stock_controller.py
+++ b/erpnext/controllers/stock_controller.py
@@ -103,8 +103,9 @@ class StockController(AccountsController):
 						}, warehouse_account[sle.warehouse]["account_currency"], item=item_row))
 
 						# expense account/ target_warehouse / source_warehouse
-						if item_row.target_warehouse:
-							expense_account = warehouse_account[item_row.target_warehouse]["account"]
+						if item_row.get('target_warehouse') or item_row.get('from_warehouse'):
+							warehouse = item_row.get('target_warehouse') or item_row.get('from_warehouse')
+							expense_account = warehouse_account[warehouse]["account"]
 						else:
 							expense_account = item_row.expense_account