chore: resolve conflicts

This commit is contained in:
ljain112
2025-06-24 15:52:24 +05:30
parent c2c5e45bc6
commit 0b96e1e3ef

View File

@@ -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