commit 2153399c391b7289012a0bd560ebd00de15ca7ab
author Nabin Hait <nabinhait@gmail.com> Thu Jun 15 12:30:58 2017 +0530
committer GitHub <noreply@github.com> Thu Jun 15 12:30:58 2017 +0530
tree ede1f8df57e11634d2296a7894d00b9fb095abd1
parent 3514332cd8f52dca1e4db8cd2ecd22c18712cd4b

Create journal_entry.py

erpnext/accounts/doctype/journal_entry/journal_entry.py

diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py
index d5a1d62..a3de8da 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.py
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py
@@ -873,7 +873,7 @@
 
 		# The date used to retreive the exchange rate here is the date passed
 		# in as an argument to this function.
-		elif account_currency and posting_date:
+		elif (not exchange_rate or exchange_rate==1) and account_currency and posting_date:
 			exchange_rate = get_exchange_rate(account_currency, company_currency, posting_date)
 	else:
 		exchange_rate = 1