From 352d95344e0e6be3e30d77a0d3591d9dc42d1095 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 8 Dec 2016 16:06:47 +0530 Subject: [PATCH] Set exchange rate on change of date for Journal/Payment Entry --- .../accounts/doctype/journal_entry/journal_entry.js | 10 +++++++++- .../accounts/doctype/payment_entry/payment_entry.js | 6 +++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.js b/erpnext/accounts/doctype/journal_entry/journal_entry.js index ba650cd462f..c98e77fdd24 100644 --- a/erpnext/accounts/doctype/journal_entry/journal_entry.js +++ b/erpnext/accounts/doctype/journal_entry/journal_entry.js @@ -35,6 +35,14 @@ frappe.ui.form.on("Journal Entry", { multi_currency: function(frm) { erpnext.journal_entry.toggle_fields_based_on_currency(frm); + }, + + posting_date: function(frm) { + if(!frm.doc.multi_currency) return; + + $.each(frm.doc.accounts || [], function(i, row) { + erpnext.journal_entry.set_exchange_rate(frm, row.doctype, row.name); + }) } }) @@ -345,7 +353,7 @@ frappe.ui.form.on("Journal Entry Account", { }); } }, - + debit_in_account_currency: function(frm, cdt, cdn) { erpnext.journal_entry.set_exchange_rate(frm, cdt, cdn); }, diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.js b/erpnext/accounts/doctype/payment_entry/payment_entry.js index f59d3e70fd0..d3dbd314cc7 100644 --- a/erpnext/accounts/doctype/payment_entry/payment_entry.js +++ b/erpnext/accounts/doctype/payment_entry/payment_entry.js @@ -327,7 +327,7 @@ frappe.ui.form.on('Payment Entry', { frappe.call({ method: "erpnext.setup.utils.get_exchange_rate", args: { - posting_date: frm.doc.posting_date, + transaction_date: frm.doc.posting_date, from_currency: from_currency, to_currency: to_currency }, @@ -336,6 +336,10 @@ frappe.ui.form.on('Payment Entry', { } }) }, + + posting_date: function(frm) { + frm.events.paid_from_account_currency(frm); + }, source_exchange_rate: function(frm) { if (frm.doc.paid_amount) {