nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-25 16:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflict

Browse Source
This commit is contained in:
Diptanil Saha
2025-12-02 12:20:56 +05:30
committed by GitHub
parent 6bbb8ba2d5
commit df6ed84170
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/selling/doctype/sales_order/test_sales_order.py
View File

@@ -177,16 +177,10 @@ class TestSalesOrder(AccountsTestMixin, FrappeTestCase):
so.load_from_db() so.load_from_db()
self.assertEqual(so.per_billed, 0) self.assertEqual(so.per_billed, 0)
<<<<<<< HEAD
@change_settings( @change_settings(
"Accounts Settings", "Accounts Settings",
{"add_taxes_from_item_tax_template": 0, "add_taxes_from_taxes_and_charges_template": 1}, {"add_taxes_from_item_tax_template": 0, "add_taxes_from_taxes_and_charges_template": 1},
) )
=======
@IntegrationTestCase.change_settings(
"Accounts Settings", {"automatically_fetch_payment_terms": 1}
) # Enable auto fetch
>>>>>>> cf1d892d60 (fix: Payment Terms auto-fetched in Sales Invoice even when automatically_fetch_payment_terms is disabled)
def test_make_sales_invoice_with_terms(self): def test_make_sales_invoice_with_terms(self):
so = make_sales_order(do_not_submit=True) so = make_sales_order(do_not_submit=True)
@@ -215,7 +209,7 @@ class TestSalesOrder(AccountsTestMixin, FrappeTestCase):
si1 = make_sales_invoice(so.name) si1 = make_sales_invoice(so.name)
self.assertEqual(len(si1.get("items")), 0) self.assertEqual(len(si1.get("items")), 0)
@IntegrationTestCase.change_settings( @change_settings(
"Accounts Settings", {"automatically_fetch_payment_terms": 1} "Accounts Settings", {"automatically_fetch_payment_terms": 1}
) # Enable auto fetch ) # Enable auto fetch
def test_auto_fetch_terms_enable(self): def test_auto_fetch_terms_enable(self):
@@ -231,7 +225,7 @@ class TestSalesOrder(AccountsTestMixin, FrappeTestCase):
si.insert() si.insert()
si.submit() si.submit()
@IntegrationTestCase.change_settings( @change_settings(
"Accounts Settings", {"automatically_fetch_payment_terms": 0} "Accounts Settings", {"automatically_fetch_payment_terms": 0}
) # Disable auto fetch ) # Disable auto fetch
def test_auto_fetch_terms_disable(self): def test_auto_fetch_terms_disable(self):