From 2bf75a2c24d8eceaed2c1d3280de560a519f4578 Mon Sep 17 00:00:00 2001 From: ljain112 Date: Mon, 19 Jan 2026 13:41:40 +0530 Subject: [PATCH] chore: resolve conflicts --- .../accounts/doctype/sales_invoice/test_sales_invoice.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py index b78145be995..bd8af98b16f 100644 --- a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py +++ b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py @@ -2974,9 +2974,6 @@ class TestSalesInvoice(FrappeTestCase): self.assertEqual(sales_invoice.items[0].item_tax_template, "_Test Account Excise Duty @ 10 - _TC") self.assertEqual(sales_invoice.items[0].item_tax_rate, item_tax_map) -<<<<<<< HEAD - @change_settings("Selling Settings", {"enable_discount_accounting": 1}) -======= def test_item_tax_template_change_with_grand_total_discount(self): """ Test that when item tax template changes due to discount on Grand Total, @@ -3031,8 +3028,7 @@ class TestSalesInvoice(FrappeTestCase): si.submit() - @IntegrationTestCase.change_settings("Selling Settings", {"enable_discount_accounting": 1}) ->>>>>>> f00aeec9b4 (Merge pull request #51787 from ljain112/fix-taxes-disc) + @change_settings("Selling Settings", {"enable_discount_accounting": 1}) def test_sales_invoice_with_discount_accounting_enabled(self): discount_account = create_account( account_name="Discount Account",