From 84e5272f5d159ab4c3036ce480e7704ed24488c6 Mon Sep 17 00:00:00 2001 From: khushi8112 Date: Thu, 9 Apr 2026 01:20:31 +0530 Subject: [PATCH] fix: append row level user remarks in gl map --- erpnext/accounts/doctype/journal_entry/journal_entry.js | 3 +++ erpnext/accounts/doctype/journal_entry/journal_entry.py | 8 +++++--- .../accounts/doctype/journal_entry/test_journal_entry.py | 7 ------- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.js b/erpnext/accounts/doctype/journal_entry/journal_entry.js index a4f1a881246..1e3ad530f72 100644 --- a/erpnext/accounts/doctype/journal_entry/journal_entry.js +++ b/erpnext/accounts/doctype/journal_entry/journal_entry.js @@ -669,6 +669,9 @@ $.extend(erpnext.journal_entry, { if (values.remark) { frm.set_value("custom_remark", 1); frm.set_value("remark", values.remark); + } else { + frm.set_value("custom_remark", 0); + frm.set_value("remark", ""); } // clear table is used because there might've been an error while adding child diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py index 282651cead5..908fbb2a376 100644 --- a/erpnext/accounts/doctype/journal_entry/journal_entry.py +++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py @@ -1025,10 +1025,10 @@ class JournalEntry(AccountsController): def create_remarks(self): r = [] - if self.get("custom_remark"): + if self.flags.skip_remarks_creation: return - if self.flags.skip_remarks_creation: + if self.get("custom_remark"): return if self.cheque_no: @@ -1137,7 +1137,9 @@ class JournalEntry(AccountsController): for d in self.get("accounts"): if d.debit or d.credit or (self.voucher_type == "Exchange Gain Or Loss"): - remarks = self.remark + r = [d.user_remark, self.remark] + r = [x for x in r if x] + remarks = "\n".join(r) row = { "account": d.account, diff --git a/erpnext/accounts/doctype/journal_entry/test_journal_entry.py b/erpnext/accounts/doctype/journal_entry/test_journal_entry.py index 95cc72cf1ee..914cb86fb77 100644 --- a/erpnext/accounts/doctype/journal_entry/test_journal_entry.py +++ b/erpnext/accounts/doctype/journal_entry/test_journal_entry.py @@ -600,13 +600,6 @@ class TestJournalEntry(ERPNextTestSuite): jv.insert() self.assertEqual(jv.remark, "My custom remark text") - # When custom_remark is disabled, remark should be auto-generated - jv2 = make_journal_entry("_Test Cash - _TC", "_Test Bank - _TC", 100, save=False) - jv2.custom_remark = 0 - jv2.remark = "Should be overwritten" - jv2.insert() - self.assertNotEqual(jv2.remark, "Should be overwritten") - def test_credit_limit_for_customer(self): customer = make_customer("_Test New Customer") set_credit_limit("_Test New Customer", "_Test Company", 50)