From 6485d4a7495fd2e72bb07019efaa167661261286 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 26 Oct 2015 14:31:10 +0530 Subject: [PATCH] [fix] account currency is not mandatory in get exchange rate --- .../accounts/doctype/journal_entry/journal_entry.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py index 9eaf1ddfc4f..082652143ab 100644 --- a/erpnext/accounts/doctype/journal_entry/journal_entry.py +++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py @@ -817,11 +817,19 @@ def get_account_balance_and_party_type(account, date, company, debit=None, credi return grid_values @frappe.whitelist() -def get_exchange_rate(account, account_currency, company, +def get_exchange_rate(account, account_currency=None, company=None, reference_type=None, reference_name=None, debit=None, credit=None, exchange_rate=None): from erpnext.setup.utils import get_exchange_rate + account_details = frappe.db.get_value("Account", account, + ["account_type", "root_type", "account_currency", "company"], as_dict=1) + + if not company: + company = account_details.company + + if not account_currency: + account_currency = account_details.account_currency + company_currency = get_company_currency(company) - account_details = frappe.db.get_value("Account", account, ["account_type", "root_type"], as_dict=1) if account_currency != company_currency: if reference_type in ("Sales Invoice", "Purchase Invoice") and reference_name: