Merge pull request #21193 from nextchamp-saqib/pay-entry-ux-fix
chore: hide redundant base received amount
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.js b/erpnext/accounts/doctype/payment_entry/payment_entry.js
index d208087..b7c97a7 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.js
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.js
@@ -156,8 +156,11 @@
frm.toggle_display("base_paid_amount", frm.doc.paid_from_account_currency != company_currency);
- frm.toggle_display("base_received_amount", (frm.doc.paid_to_account_currency != company_currency &&
- frm.doc.paid_from_account_currency != frm.doc.paid_to_account_currency));
+ frm.toggle_display("base_received_amount", (
+ frm.doc.paid_to_account_currency != company_currency
+ && frm.doc.paid_from_account_currency != frm.doc.paid_to_account_currency
+ && frm.doc.base_paid_amount != frm.doc.base_received_amount
+ ));
frm.toggle_display("received_amount", (frm.doc.payment_type=="Internal Transfer" ||
frm.doc.paid_from_account_currency != frm.doc.paid_to_account_currency))
@@ -501,6 +504,7 @@
paid_amount: function(frm) {
frm.set_value("base_paid_amount", flt(frm.doc.paid_amount) * flt(frm.doc.source_exchange_rate));
frm.trigger("reset_received_amount");
+ frm.events.hide_unhide_fields(frm);
},
received_amount: function(frm) {
@@ -524,6 +528,7 @@
frm.events.set_unallocated_amount(frm);
frm.set_paid_amount_based_on_received_amount = false;
+ frm.events.hide_unhide_fields(frm);
},
reset_received_amount: function(frm) {