From a503460bd5f2ac907140b79ebc1f60574f7eb94a Mon Sep 17 00:00:00 2001 From: Diptanil Saha Date: Tue, 2 Dec 2025 12:20:56 +0530 Subject: [PATCH] chore: resolve conflict --- .../selling/doctype/sales_order/test_sales_order.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/erpnext/selling/doctype/sales_order/test_sales_order.py b/erpnext/selling/doctype/sales_order/test_sales_order.py index a78367900eb..53832569812 100644 --- a/erpnext/selling/doctype/sales_order/test_sales_order.py +++ b/erpnext/selling/doctype/sales_order/test_sales_order.py @@ -200,16 +200,10 @@ class TestSalesOrder(AccountsTestMixin, FrappeTestCase): so.load_from_db() self.assertEqual(so.per_billed, 0) -<<<<<<< HEAD @change_settings( "Accounts Settings", {"add_taxes_from_item_tax_template": 0, "add_taxes_from_taxes_and_charges_template": 1}, ) -======= - @IntegrationTestCase.change_settings( - "Accounts Settings", {"automatically_fetch_payment_terms": 1} - ) # Enable auto fetch ->>>>>>> cf1d892d60 (fix: Payment Terms auto-fetched in Sales Invoice even when automatically_fetch_payment_terms is disabled) def test_make_sales_invoice_with_terms(self): so = make_sales_order(do_not_submit=True) @@ -238,7 +232,7 @@ class TestSalesOrder(AccountsTestMixin, FrappeTestCase): si1 = make_sales_invoice(so.name) self.assertEqual(len(si1.get("items")), 0) - @IntegrationTestCase.change_settings( + @change_settings( "Accounts Settings", {"automatically_fetch_payment_terms": 1} ) # Enable auto fetch def test_auto_fetch_terms_enable(self): @@ -254,7 +248,7 @@ class TestSalesOrder(AccountsTestMixin, FrappeTestCase): si.insert() si.submit() - @IntegrationTestCase.change_settings( + @change_settings( "Accounts Settings", {"automatically_fetch_payment_terms": 0} ) # Disable auto fetch def test_auto_fetch_terms_disable(self):