From 2c9ee7ae148eedc5b00621ca965ee8bd9a4cb359 Mon Sep 17 00:00:00 2001 From: Ernesto Ruiz Date: Sat, 2 Aug 2025 13:43:18 -0600 Subject: [PATCH] chore: add translation function on remark in setup_journal_entry_metadata in depreciation.py (cherry picked from commit 803180d5de68bf53d717c2375e0edcd5b508c99b) # Conflicts: # erpnext/assets/doctype/asset/depreciation.py --- erpnext/assets/doctype/asset/depreciation.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/erpnext/assets/doctype/asset/depreciation.py b/erpnext/assets/doctype/asset/depreciation.py index d888e549cea..f4059828795 100644 --- a/erpnext/assets/doctype/asset/depreciation.py +++ b/erpnext/assets/doctype/asset/depreciation.py @@ -276,8 +276,15 @@ def _make_journal_entry_for_depreciation( je.naming_series = depreciation_series je.posting_date = depr_schedule.schedule_date je.company = asset.company +<<<<<<< HEAD je.finance_book = asset_depr_schedule_doc.finance_book je.remark = f"Depreciation Entry against {asset.name} worth {depr_schedule.depreciation_amount}" +======= + je.finance_book = depr_schedule_doc.finance_book + je.remark = _("Depreciation Entry against {0} worth {1}".format( + asset.name, depr_schedule.depreciation_amount + ) +>>>>>>> 803180d5de (chore: add translation function on remark in setup_journal_entry_metadata in depreciation.py) credit_entry = { "account": credit_account,