From 740dd878e9626e537aca3a21fa160fa27af819df Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Fri, 6 Feb 2026 12:12:24 +0530 Subject: [PATCH] chore: resolve conflicts --- erpnext/selling/doctype/sales_order/test_sales_order.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/erpnext/selling/doctype/sales_order/test_sales_order.py b/erpnext/selling/doctype/sales_order/test_sales_order.py index 8a82e79faae..d38473e4b69 100644 --- a/erpnext/selling/doctype/sales_order/test_sales_order.py +++ b/erpnext/selling/doctype/sales_order/test_sales_order.py @@ -57,9 +57,6 @@ class TestSalesOrder(AccountsTestMixin, FrappeTestCase): def tearDown(self): frappe.set_user("Administrator") -<<<<<<< HEAD - @change_settings("Selling Settings", {"allow_negative_rates_for_items": 1}) -======= def test_sales_order_skip_delivery_note(self): so = make_sales_order(do_not_submit=True) so.order_type = "Maintenance" @@ -82,8 +79,7 @@ class TestSalesOrder(AccountsTestMixin, FrappeTestCase): so.reload() self.assertEqual(so.status, "Completed") - @IntegrationTestCase.change_settings("Selling Settings", {"allow_negative_rates_for_items": 1}) ->>>>>>> 1a22e3cb61 (fix: enabling skip delivery option for order type maintenance) + @change_settings("Selling Settings", {"allow_negative_rates_for_items": 1}) def test_sales_order_with_negative_rate(self): """ Test if negative rate is allowed in Sales Order via doc submission and update items