From a71814a483d1056fb50c4be7412210d2cada7374 Mon Sep 17 00:00:00 2001 From: khushi8112 Date: Thu, 9 Apr 2026 01:54:35 +0530 Subject: [PATCH 1/2] fix: Set remarks blank instead of No remarks in Sales/Purchase Invoices (cherry picked from commit 2515bf3aff9ae14b4ad34586e3788d7e60c7be62) --- erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py | 3 --- erpnext/accounts/doctype/sales_invoice/sales_invoice.py | 3 --- 2 files changed, 6 deletions(-) diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py index 8b561730de0..c790f86633a 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py @@ -332,9 +332,6 @@ class PurchaseInvoice(BuyingController): if self.bill_date: self.remarks += " " + _("dated {0}").format(formatdate(self.bill_date)) - else: - self.remarks = _("No Remarks") - def set_missing_values(self, for_validate=False): if not self.credit_to: self.credit_to = get_party_account("Supplier", self.supplier, self.company) diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py index ba5aa9dfd93..0477c172587 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py @@ -1101,9 +1101,6 @@ class SalesInvoice(SellingController): if self.po_date: self.remarks += " " + _("dated {0}").format(formatdate(self.po_date)) - else: - self.remarks = _("No Remarks") - def validate_auto_set_posting_time(self): # Don't auto set the posting date and time if invoice is amended if self.is_new() and self.amended_from: From 699325506f76d74d60a0ea9d63ed10015666c3aa Mon Sep 17 00:00:00 2001 From: khushi8112 Date: Thu, 9 Apr 2026 11:14:35 +0530 Subject: [PATCH 2/2] fix(test): Remove usage of No remark as remark in tests (cherry picked from commit 56416d18d3cc155d87f0f4a4fc1781408ac972d1) --- .../test_accounts_receivable.py | 35 +++++++++++-------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/erpnext/accounts/report/accounts_receivable/test_accounts_receivable.py b/erpnext/accounts/report/accounts_receivable/test_accounts_receivable.py index a739502074e..4b852e0583d 100644 --- a/erpnext/accounts/report/accounts_receivable/test_accounts_receivable.py +++ b/erpnext/accounts/report/accounts_receivable/test_accounts_receivable.py @@ -120,12 +120,12 @@ class TestAccountsReceivable(ERPNextTestSuite, AccountsTestMixin): report = execute(filters) - expected_data = [[100, 30, "No Remarks"], [100, 50, "No Remarks"], [100, 20, "No Remarks"]] + expected_data = [[100, 30], [100, 50], [100, 20]] for i in range(3): row = report[1][i - 1] - self.assertEqual(expected_data[i - 1], [row.invoice_grand_total, row.invoiced, row.remarks]) - + self.assertEqual(expected_data[i - 1], [row.invoice_grand_total, row.invoiced]) + self.assertFalse(row.get("remarks")) # check invoice grand total, invoiced, paid and outstanding column's value after payment self.create_payment_entry(si.name) report = execute(filters) @@ -178,11 +178,11 @@ class TestAccountsReceivable(ERPNextTestSuite, AccountsTestMixin): report = execute(filters) - expected_data = [[100, 30, "No Remarks"], [100, 50, "No Remarks"], [100, 20, "No Remarks"]] + expected_data = [[100, 30], [100, 50], [100, 20]] for i in range(3): row = report[1][i - 1] - self.assertEqual(expected_data[i - 1], [row.invoice_grand_total, row.invoiced, row.remarks]) + self.assertEqual(expected_data[i - 1], [row.invoice_grand_total, row.invoiced]) # check invoice grand total, invoiced, paid and outstanding column's value after credit note cr_note = self.create_credit_note(si.name, do_not_submit=True) @@ -225,9 +225,10 @@ class TestAccountsReceivable(ERPNextTestSuite, AccountsTestMixin): report = execute(filters) row = report[1][0] - expected_data = [8000, 8000, "No Remarks"] # Data in company currency + expected_data = [8000, 8000] # Data in company currency - self.assertEqual(expected_data, [row.invoice_grand_total, row.invoiced, row.remarks]) + self.assertEqual(expected_data, [row.invoice_grand_total, row.invoiced]) + self.assertFalse(row.get("remarks")) # CASE 2: Transaction currency and party account currency are the same self.create_customer( @@ -258,18 +259,20 @@ class TestAccountsReceivable(ERPNextTestSuite, AccountsTestMixin): report = execute(filters) row = report[1][0] - expected_data = [100, 100, "No Remarks"] # Data in Part Account Currency + expected_data = [100, 100] # Data in Part Account Currency - self.assertEqual(expected_data, [row.invoice_grand_total, row.invoiced, row.remarks]) + self.assertEqual(expected_data, [row.invoice_grand_total, row.invoiced]) + self.assertFalse(row.get("remarks")) # View in Company currency filters.pop("in_party_currency") report = execute(filters) row = report[1][0] - expected_data = [8000, 8000, "No Remarks"] # Data in Company Currency + expected_data = [8000, 8000] # Data in Company Currency - self.assertEqual(expected_data, [row.invoice_grand_total, row.invoiced, row.remarks]) + self.assertEqual(expected_data, [row.invoice_grand_total, row.invoiced]) + self.assertFalse(row.get("remarks")) def test_accounts_receivable_with_partial_payment(self): filters = { @@ -285,11 +288,12 @@ class TestAccountsReceivable(ERPNextTestSuite, AccountsTestMixin): report = execute(filters) - expected_data = [[200, 60, "No Remarks"], [200, 100, "No Remarks"], [200, 40, "No Remarks"]] + expected_data = [[200, 60], [200, 100], [200, 40]] for i in range(3): row = report[1][i - 1] - self.assertEqual(expected_data[i - 1], [row.invoice_grand_total, row.invoiced, row.remarks]) + self.assertEqual(expected_data[i - 1], [row.invoice_grand_total, row.invoiced]) + self.assertFalse(row.get("remarks")) # check invoice grand total, invoiced, paid and outstanding column's value after payment self.create_payment_entry(si.name) @@ -348,11 +352,12 @@ class TestAccountsReceivable(ERPNextTestSuite, AccountsTestMixin): report = execute(filters) - expected_data = [100, 100, "No Remarks"] + expected_data = [100, 100] self.assertEqual(len(report[1]), 1) row = report[1][0] - self.assertEqual(expected_data, [row.invoice_grand_total, row.invoiced, row.remarks]) + self.assertEqual(expected_data, [row.invoice_grand_total, row.invoiced]) + self.assertFalse(row.get("remarks")) # check invoice grand total, invoiced, paid and outstanding column's value after payment self.create_payment_entry(si.name)