From 0b96e1e3ef3132a4a07505b09dcaf45cd0a76d32 Mon Sep 17 00:00:00 2001 From: ljain112 Date: Tue, 24 Jun 2025 15:52:24 +0530 Subject: [PATCH] chore: resolve conflicts --- erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py index 5045ff0d7e4..8fffd33903b 100644 --- a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py +++ b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py @@ -3429,7 +3429,7 @@ class TestSalesInvoice(FrappeTestCase): si.posting_date = getdate() si.submit() - @IntegrationTestCase.change_settings("Accounts Settings", {"over_billing_allowance": 0}) + @change_settings("Accounts Settings", {"over_billing_allowance": 0}) def test_over_billing_case_against_delivery_note(self): """ Test a case where duplicating the item with qty = 1 in the invoice