From a8fa10d2a98780bb33c36fa678e5e192c909e598 Mon Sep 17 00:00:00 2001 From: mbauskar Date: Wed, 22 Feb 2017 14:50:48 +0530 Subject: [PATCH] [minor] minor fixes for journal entry get_exchange_rate trigger --- erpnext/accounts/doctype/journal_entry/journal_entry.js | 2 +- erpnext/accounts/doctype/journal_entry/journal_entry.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.js b/erpnext/accounts/doctype/journal_entry/journal_entry.js index c98e77fdd24f..add3e54d79d7 100644 --- a/erpnext/accounts/doctype/journal_entry/journal_entry.js +++ b/erpnext/accounts/doctype/journal_entry/journal_entry.js @@ -38,7 +38,7 @@ frappe.ui.form.on("Journal Entry", { }, posting_date: function(frm) { - if(!frm.doc.multi_currency) return; + if(!frm.doc.multi_currency || !frm.doc.posting_date) return; $.each(frm.doc.accounts || [], function(i, row) { erpnext.journal_entry.set_exchange_rate(frm, row.doctype, row.name); diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py index 5cf2d9277cb1..0f9b5d34bbca 100644 --- a/erpnext/accounts/doctype/journal_entry/journal_entry.py +++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py @@ -832,7 +832,7 @@ def get_account_balance_and_party_type(account, date, company, debit=None, credi # Added posting_date as one of the parameters of get_exchange_rate @frappe.whitelist() -def get_exchange_rate(posting_date, account, account_currency=None, company=None, +def get_exchange_rate(posting_date, account=None, 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,