diff --git a/accounts/doctype/gl_entry/gl_entry.py b/accounts/doctype/gl_entry/gl_entry.py
index 2a84211..e97c4c3 100644
--- a/accounts/doctype/gl_entry/gl_entry.py
+++ b/accounts/doctype/gl_entry/gl_entry.py
@@ -152,7 +152,7 @@
 		
 	# Validation : Outstanding can not be negative
 	if bal < 0 and not on_cancel:
-		webnotes.throw(_("Outstanding for Voucher ") + gainst_voucher + _(" will become ") + 
+		webnotes.throw(_("Outstanding for Voucher ") + against_voucher + _(" will become ") + 
 			fmt_money(bal) + _(". Outstanding cannot be less than zero. \
 			 	Please match exact outstanding."))
 		
diff --git a/accounts/doctype/purchase_invoice/purchase_invoice.py b/accounts/doctype/purchase_invoice/purchase_invoice.py
index 2b84564..ca2c5b1 100644
--- a/accounts/doctype/purchase_invoice/purchase_invoice.py
+++ b/accounts/doctype/purchase_invoice/purchase_invoice.py
@@ -355,8 +355,10 @@
 		# item gl entries
 		stock_item_and_auto_accounting_for_stock = False
 		stock_items = self.get_stock_items()
+		warehouse_account = self.get_warehouse_account()
 		for item in self.doclist.get({"parentfield": "entries"}):
-			if auto_accounting_for_stock and item.item_code in stock_items:
+			if auto_accounting_for_stock and item.item_code in stock_items \
+					and warehouse_account.get(item.warehouse):
 				if flt(item.valuation_rate):
 					# if auto inventory accounting enabled and stock item, 
 					# then do stock related gl entries