nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-23 06:59:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #55152 from frappe/mergify/bp/version-16-hotfix/pr-55146

Browse Source 
fix: correct remarks for foreign currency payment entries (backport #55146)
This commit is contained in:
Khushi Rawat
2026-05-21 20:33:30 +05:30
committed by GitHub
parent 0d816010dd f3f8f327df
commit bfb7a0e941
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/accounts/doctype/payment_entry/payment_entry.py
View File

@@ -1238,9 +1238,9 @@ class PaymentEntry(AccountsController):
else: else:
remarks = [ remarks = [
_("Amount {0} {1} {2} {3}").format( _("Amount {0} {1} {2} {3}").format(
_(self.paid_to_account_currency) _(self.paid_from_account_currency)
if self.payment_type == "Receive" if self.payment_type == "Receive"
else _(self.paid_from_account_currency), else _(self.paid_to_account_currency),
self.paid_amount if self.payment_type == "Receive" else self.received_amount, self.paid_amount if self.payment_type == "Receive" else self.received_amount,
_("received from") if self.payment_type == "Receive" else _("paid to"), _("received from") if self.payment_type == "Receive" else _("paid to"),
self.party, self.party,
@@ -1256,7 +1256,7 @@ class PaymentEntry(AccountsController):
for d in self.get("references"): for d in self.get("references"):
if d.allocated_amount: if d.allocated_amount:
remarks.append( remarks.append(
_("Amount {0} {1} against {2} {3}").format( _("Amount {0} {1} adjusted against {2} {3}").format(
_(self.party_account_currency), _(self.party_account_currency),
d.allocated_amount, d.allocated_amount,
d.reference_doctype, d.reference_doctype,
@@ -1267,7 +1267,7 @@ class PaymentEntry(AccountsController):
for d in self.get("deductions"): for d in self.get("deductions"):
if d.amount: if d.amount:
remarks.append( remarks.append(
_("Amount {0} {1} deducted against {2}").format( _("Amount {0} {1} as adjustment to {2}").format(
_(self.company_currency), d.amount, d.account _(self.company_currency), d.amount, d.account
) )
) )