From 47e78bd4b93c5f1452efd81cda0a4da50620821e Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Tue, 14 Apr 2026 14:46:46 +0530 Subject: [PATCH 1/2] refactor(company): don't force set service expense account on save (cherry picked from commit 927f40b296d6dd6cf1d4337c81c9be4f65e61ccd) --- erpnext/setup/doctype/company/company.py | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/erpnext/setup/doctype/company/company.py b/erpnext/setup/doctype/company/company.py index 51eb71d6f79..e4e9c24aeaf 100644 --- a/erpnext/setup/doctype/company/company.py +++ b/erpnext/setup/doctype/company/company.py @@ -684,21 +684,6 @@ class Company(NestedSet): self.db_set("disposal_account", disposal_acct) - if not self.service_expense_account: - service_expense_acct = frappe.db.get_value( - "Account", - { - "account_name": _("Marketing Expenses"), - "company": self.name, - "is_group": 0, - "root_type": "Expense", - }, - "name", - ) - - if service_expense_acct: - self.db_set("service_expense_account", service_expense_acct) - def _set_default_account(self, fieldname, account_type): if self.get(fieldname): return From 6cc560a5794921daa8cbdcda045fa90b3f3889d6 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Wed, 15 Apr 2026 12:29:29 +0530 Subject: [PATCH 2/2] refactor(test): set dependant value in company master (cherry picked from commit 299e141cee28bb7e105ed82907ea63e622fc708d) --- .../test_repost_accounting_ledger.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/erpnext/accounts/doctype/repost_accounting_ledger/test_repost_accounting_ledger.py b/erpnext/accounts/doctype/repost_accounting_ledger/test_repost_accounting_ledger.py index 793bde5c99f..3200a83c122 100644 --- a/erpnext/accounts/doctype/repost_accounting_ledger/test_repost_accounting_ledger.py +++ b/erpnext/accounts/doctype/repost_accounting_ledger/test_repost_accounting_ledger.py @@ -203,6 +203,11 @@ class TestRepostAccountingLedger(ERPNextTestSuite): def test_06_repost_purchase_receipt(self): from erpnext.accounts.doctype.account.test_account import create_account + if not frappe.db.set_value("Company", "_Test Company", "service_expense_account"): + frappe.db.set_value( + "Company", "_Test Company", "service_expense_account", "Marketing Expenses - _TC" + ) + provisional_account = create_account( account_name="Provision Account", parent_account="Current Liabilities - _TC",