From 4a5e0b181fee4aea5feb1224184ed6b042d145e8 Mon Sep 17 00:00:00 2001 From: Ernesto Ruiz Date: Sat, 2 Aug 2025 13:29:33 -0600 Subject: [PATCH 1/4] chore: add translation function on remarks in make_journal_entry in asset.py (cherry picked from commit 119904e44f00faa3559ea03ecad601cf99ba8643) --- erpnext/assets/doctype/asset/asset.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/assets/doctype/asset/asset.py b/erpnext/assets/doctype/asset/asset.py index 14d0d53ac69..79e266d14c2 100644 --- a/erpnext/assets/doctype/asset/asset.py +++ b/erpnext/assets/doctype/asset/asset.py @@ -1097,7 +1097,7 @@ def make_journal_entry(asset_name): je.voucher_type = "Depreciation Entry" je.naming_series = depreciation_series je.company = asset.company - je.remark = f"Depreciation Entry against asset {asset_name}" + je.remark = _("Depreciation Entry against asset {0}").format(asset_name) je.append( "accounts", From 2c9ee7ae148eedc5b00621ca965ee8bd9a4cb359 Mon Sep 17 00:00:00 2001 From: Ernesto Ruiz Date: Sat, 2 Aug 2025 13:43:18 -0600 Subject: [PATCH 2/4] 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, From 78857cd798d06db95972e7ce8578354532c37945 Mon Sep 17 00:00:00 2001 From: Khushi Rawat <142375893+khushi8112@users.noreply.github.com> Date: Tue, 5 Aug 2025 12:50:33 +0530 Subject: [PATCH 3/4] fix: add missing parentheses (cherry picked from commit a60db40fd2d97863168fc8df815a60a36299f8cd) --- erpnext/assets/doctype/asset/depreciation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/assets/doctype/asset/depreciation.py b/erpnext/assets/doctype/asset/depreciation.py index f4059828795..8f26188e01a 100644 --- a/erpnext/assets/doctype/asset/depreciation.py +++ b/erpnext/assets/doctype/asset/depreciation.py @@ -281,7 +281,7 @@ def _make_journal_entry_for_depreciation( 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( + 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) From 4a8465df9078b29bdbc72144e612e1e2edfb06fd Mon Sep 17 00:00:00 2001 From: Khushi Rawat <142375893+khushi8112@users.noreply.github.com> Date: Tue, 5 Aug 2025 16:05:54 +0530 Subject: [PATCH 4/4] chore: resolved conflicts --- erpnext/assets/doctype/asset/depreciation.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/erpnext/assets/doctype/asset/depreciation.py b/erpnext/assets/doctype/asset/depreciation.py index 8f26188e01a..a0681cc2c56 100644 --- a/erpnext/assets/doctype/asset/depreciation.py +++ b/erpnext/assets/doctype/asset/depreciation.py @@ -276,15 +276,10 @@ 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,