Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Set exchange rate on change of date for Journal/Payment Entry

Browse Source
This commit is contained in:
Nabin Hait 2016-12-08 16:06:47 +05:30
parent aa0d174d3d
commit 352d95344e
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/accounts/doctype/journal_entry/journal_entry.js
View File

@ -35,6 +35,14 @@ frappe.ui.form.on("Journal Entry", {
multi_currency: function(frm) { multi_currency: function(frm) {
erpnext.journal_entry.toggle_fields_based_on_currency(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) { debit_in_account_currency: function(frm, cdt, cdn) {
erpnext.journal_entry.set_exchange_rate(frm, cdt, cdn); erpnext.journal_entry.set_exchange_rate(frm, cdt, cdn);
}, },

6
erpnext/accounts/doctype/payment_entry/payment_entry.js
View File

@ -327,7 +327,7 @@ frappe.ui.form.on('Payment Entry', {
frappe.call({ frappe.call({
method: "erpnext.setup.utils.get_exchange_rate", method: "erpnext.setup.utils.get_exchange_rate",
args: { args: {
posting_date: frm.doc.posting_date, transaction_date: frm.doc.posting_date,
from_currency: from_currency, from_currency: from_currency,
to_currency: to_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) { source_exchange_rate: function(frm) {
if (frm.doc.paid_amount) { if (frm.doc.paid_amount) {