From 9b18ed4ffe05e77f62f1fa8beb489868f4431f04 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Wed, 16 Nov 2016 11:27:05 +0530 Subject: [PATCH] [Fix] Payment entry, exchange rate is not set properly --- .../accounts/doctype/payment_entry/payment_entry.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.js b/erpnext/accounts/doctype/payment_entry/payment_entry.js index 6ecd8fa5ee..ce0cb50e20 100644 --- a/erpnext/accounts/doctype/payment_entry/payment_entry.js +++ b/erpnext/accounts/doctype/payment_entry/payment_entry.js @@ -406,7 +406,10 @@ frappe.ui.form.on('Payment Entry', { if(!frm.doc.paid_amount && frm.doc.paid_from_account_currency == frm.doc.paid_to_account_currency) { frm.set_value("paid_amount", frm.doc.received_amount); - frm.set_value("source_exchange_rate", frm.doc.target_exchange_rate); + + if(frm.doc.target_exchange_rate) { + frm.set_value("source_exchange_rate", frm.doc.target_exchange_rate); + } frm.set_value("base_paid_amount", frm.doc.base_received_amount); } @@ -426,7 +429,10 @@ frappe.ui.form.on('Payment Entry', { (frm.doc.paid_from_account_currency == frm.doc.paid_to_account_currency)) { frm.set_value("received_amount", frm.doc.paid_amount); - frm.set_value("target_exchange_rate", frm.doc.source_exchange_rate); + + if(frm.doc.source_exchange_rate) { + frm.set_value("target_exchange_rate", frm.doc.source_exchange_rate); + } frm.set_value("base_received_amount", frm.doc.base_paid_amount); }