commit 4c8ee279f3b7f27929631b1187d2441b5edc5074
author Nabin Hait <nabinhait@gmail.com> Thu Aug 13 14:15:45 2015 +0530
committer Nabin Hait <nabinhait@gmail.com> Thu Aug 13 14:15:45 2015 +0530
tree 1797e50fc979718218f3c55faef14bc804788df1
parent c0c4e866bed26cb8ac900fb488abdffc468e019d
parent 58aea1f819bd630235014862a37af785f19c979c

Merge branch 'bobzz-zone-patch-7' into develop

erpnext/stock/doctype/stock_entry/stock_entry.py

diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py
index 62f5b88..f263f34 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.py
@@ -98,7 +98,7 @@
 					if f in ["stock_uom", "conversion_factor"] or not item.get(f):
 						item.set(f, item_details.get(f))
 
-			if self.difference_account:
+			if self.difference_account and not item.expense_account:
 				item.expense_account = self.difference_account
 
 			if not item.transfer_qty: