diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.py b/erpnext/accounts/doctype/payment_entry/payment_entry.py index be910cafcda004806ae9aae1fd4c3ec238cb6c2f..54218f80f10aa7bf88ed165fbe9c759abb49f221 100644 --- a/erpnext/accounts/doctype/payment_entry/payment_entry.py +++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py @@ -1086,9 +1086,11 @@ class PaymentEntry(AccountsController): remarks = [ _("Amount {0} {1} {2} {3}").format( - _(self.party_account_currency), + _(self.paid_to_account_currency) + if self.payment_type == "Receive" + else _(self.paid_from_account_currency), self.paid_amount if self.payment_type == "Receive" else self.received_amount, - _("received from") if self.payment_type == "Receive" else _("to"), + _("received from") if self.payment_type == "Receive" else _("paid to"), self.party, ) ] diff --git a/erpnext/public/js/utils/dimension_tree_filter.js b/erpnext/public/js/utils/dimension_tree_filter.js index 135d93efd64044453950b396459917e205e95d0c..bde5d2fd9f7bb7564296cf1f48a601163dc0ef9d 100644 --- a/erpnext/public/js/utils/dimension_tree_filter.js +++ b/erpnext/public/js/utils/dimension_tree_filter.js @@ -20,7 +20,7 @@ erpnext.accounts.dimensions = { me.accounting_dimensions = me.accounting_dimensions.filter(x=>{return x.document_type != "Project"}); me.default_dimensions = r.message[1]; me.setup_filters(frm, doctype); - } + }, }); },