From 70da05edb747ba31a1d36fb17b5c38ed504f915f Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Sun, 2 Aug 2026 12:26:50 +0530 Subject: [PATCH] fix: resolve version-15 backport conflict --- .../selling/doctype/sales_order/test_sales_order.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/erpnext/selling/doctype/sales_order/test_sales_order.py b/erpnext/selling/doctype/sales_order/test_sales_order.py index 2ac6d005547..7a796d090ff 100644 --- a/erpnext/selling/doctype/sales_order/test_sales_order.py +++ b/erpnext/selling/doctype/sales_order/test_sales_order.py @@ -1984,12 +1984,6 @@ class TestSalesOrder(AccountsTestMixin, FrappeTestCase): sales_order.save() self.assertEqual(sales_order.taxes[0].tax_amount, 0) -<<<<<<< HEAD - @change_settings( - "Accounts Settings", - {"add_taxes_from_item_tax_template": 0, "add_taxes_from_taxes_and_charges_template": 1}, - ) -======= def test_sales_order_with_shipping_rule_without_cost_center(self): from erpnext import get_default_cost_center @@ -2025,7 +2019,10 @@ class TestSalesOrder(AccountsTestMixin, FrappeTestCase): self.assertEqual(len(sales_order.taxes), 1) self.assertEqual(sales_order.taxes[0].cost_center, "") ->>>>>>> a4134af30b (fix: prevent duplicate shipping charges without cost center) + @change_settings( + "Accounts Settings", + {"add_taxes_from_item_tax_template": 0, "add_taxes_from_taxes_and_charges_template": 1}, + ) def test_sales_order_partial_advance_payment(self): from erpnext.accounts.doctype.payment_entry.test_payment_entry import ( create_payment_entry,