nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-27 02:28:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: append row level user remarks in gl map

Browse Source 
(cherry picked from commit 84e5272f5d)
This commit is contained in:
khushi8112
2026-04-09 01:20:31 +05:30
committed by Mergify
parent 27c5dab7e4
commit aa359aded4
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/accounts/doctype/journal_entry/journal_entry.js
View File

@@ -669,6 +669,9 @@ $.extend(erpnext.journal_entry, {
if (values.remark) { if (values.remark) {
frm.set_value("custom_remark", 1); frm.set_value("custom_remark", 1);
frm.set_value("remark", values.remark); 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 // clear table is used because there might've been an error while adding child

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

@@ -1024,10 +1024,10 @@ class JournalEntry(AccountsController):
def create_remarks(self): def create_remarks(self):
r = [] r = []
if self.get("custom_remark"): if self.flags.skip_remarks_creation:
return return
if self.flags.skip_remarks_creation: if self.get("custom_remark"):
return return
if self.cheque_no: if self.cheque_no:
@@ -1136,7 +1136,9 @@ class JournalEntry(AccountsController):
for d in self.get("accounts"): for d in self.get("accounts"):
if d.debit or d.credit or (self.voucher_type == "Exchange Gain Or Loss"): 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 = { row = {
"account": d.account, "account": d.account,

7
erpnext/accounts/doctype/journal_entry/test_journal_entry.py
View File

@@ -600,13 +600,6 @@ class TestJournalEntry(ERPNextTestSuite):
jv.insert() jv.insert()
self.assertEqual(jv.remark, "My custom remark text") 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): def test_credit_limit_for_customer(self):
customer = make_customer("_Test New Customer") customer = make_customer("_Test New Customer")
set_credit_limit("_Test New Customer", "_Test Company", 50) set_credit_limit("_Test New Customer", "_Test Company", 50)