From 2428ff850747dca2ea5b9571887ca0f10122f903 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CKhushi?= <“khushirawat.sophia@gamil.com”> Date: Wed, 27 Mar 2024 00:08:39 +0530 Subject: [PATCH 1/3] fix: default accounting dimension in journal entry child table --- erpnext/public/js/utils/dimension_tree_filter.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/erpnext/public/js/utils/dimension_tree_filter.js b/erpnext/public/js/utils/dimension_tree_filter.js index 578ff84670b..9346190bb6c 100644 --- a/erpnext/public/js/utils/dimension_tree_filter.js +++ b/erpnext/public/js/utils/dimension_tree_filter.js @@ -20,7 +20,8 @@ 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); - } + me.update_dimension(frm, doctype); + }, }); }, -- GitLab From 3b6c96dfa338bcc5cdf1890b5247b815827492fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CKhushi?= <“khushirawat.sophia@gamil.com”> Date: Tue, 9 Apr 2024 17:06:56 +0530 Subject: [PATCH 2/3] fix: indicate correct currency code for the payment --- erpnext/accounts/doctype/payment_entry/payment_entry.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.py b/erpnext/accounts/doctype/payment_entry/payment_entry.py index 6cd9a84a26b..8513e8f3eb0 100644 --- a/erpnext/accounts/doctype/payment_entry/payment_entry.py +++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py @@ -1082,9 +1082,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, ) ] -- GitLab From 045a44de89aaee241229177fa305f6652dde4ba6 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Wed, 10 Apr 2024 22:06:03 +0530 Subject: [PATCH 3/3] chore: remove unwanted changes --- erpnext/public/js/utils/dimension_tree_filter.js | 1 - 1 file changed, 1 deletion(-) diff --git a/erpnext/public/js/utils/dimension_tree_filter.js b/erpnext/public/js/utils/dimension_tree_filter.js index 9346190bb6c..ad842b60fd2 100644 --- a/erpnext/public/js/utils/dimension_tree_filter.js +++ b/erpnext/public/js/utils/dimension_tree_filter.js @@ -20,7 +20,6 @@ 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); - me.update_dimension(frm, doctype); }, }); }, -- GitLab