From 3eb5cb14d127909d68e8511b504f6e65d24e5df7 Mon Sep 17 00:00:00 2001 From: tunde Date: Thu, 8 Jun 2017 14:23:49 +0100 Subject: [PATCH] calls erpnext.setup.utils.get_exchange_rate instead of get_average_exchange_rate --- erpnext/accounts/doctype/payment_entry/payment_entry.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.js b/erpnext/accounts/doctype/payment_entry/payment_entry.js index 2eef79cd76..345210de52 100644 --- a/erpnext/accounts/doctype/payment_entry/payment_entry.js +++ b/erpnext/accounts/doctype/payment_entry/payment_entry.js @@ -317,10 +317,12 @@ frappe.ui.form.on('Payment Entry', { frm.set_value("source_exchange_rate", 1); } else if (frm.doc.paid_from){ if (in_list(["Internal Transfer", "Pay"], frm.doc.payment_type)) { + var company_currency = frappe.get_doc(":Company", frm.doc.company).default_currency; frappe.call({ - method: "erpnext.accounts.doctype.journal_entry.journal_entry.get_average_exchange_rate", + method: "erpnext.setup.utils.get_exchange_rate", args: { - account: frm.doc.paid_from + from_currency: frm.doc.paid_from_account_currency, + to_currency: company_currency }, callback: function(r, rt) { frm.set_value("source_exchange_rate", r.message);