commit df8efce36f751aa92e2c52563c30a7c53f821e5b
author Anand Doshi <anand@erpnext.com> Thu Sep 17 20:29:15 2015 +0530
committer Anand Doshi <anand@erpnext.com> Thu Sep 17 20:29:57 2015 +0530
tree 7c7e899612f50a1f5858c630a212ded352ee783d
parent ce6b61b41e7508a93461b62bcbe3f91ba4f031d5

[hotfix] set_balance_in_account_currency

erpnext/controllers/accounts_controller.py

diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py
index ceb9930..7a4a0df 100644
--- a/erpnext/controllers/accounts_controller.py
+++ b/erpnext/controllers/accounts_controller.py
@@ -236,8 +236,10 @@
 				.format(account, _(" or ").join(valid_currency)))
 
 	def set_balance_in_account_currency(self, gl_dict, account_currency=None):
-		if (not self.get("conversion_rate") and self.doctype!="Journal Entry"
-			and account_currency!=self.company_currency):
+		if self.doctype=="Journal Entry":
+			return
+
+		if (not self.get("conversion_rate") and account_currency!=self.company_currency):
 				frappe.throw(_("Account: {0} with currency: {1} can not be selected")
 					.format(gl_dict.account, account_currency))