nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-03 04:09:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
Mihir Kandoi
2026-02-06 12:12:24 +05:30
committed by GitHub
parent a8f05cadea
commit 740dd878e9
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,9 +57,6 @@ class TestSalesOrder(AccountsTestMixin, FrappeTestCase):
def tearDown(self): def tearDown(self):
frappe.set_user("Administrator") frappe.set_user("Administrator")
<<<<<<< HEAD
@change_settings("Selling Settings", {"allow_negative_rates_for_items": 1})
=======
def test_sales_order_skip_delivery_note(self): def test_sales_order_skip_delivery_note(self):
so = make_sales_order(do_not_submit=True) so = make_sales_order(do_not_submit=True)
so.order_type = "Maintenance" so.order_type = "Maintenance"
@@ -82,8 +79,7 @@ class TestSalesOrder(AccountsTestMixin, FrappeTestCase):
so.reload() so.reload()
self.assertEqual(so.status, "Completed") self.assertEqual(so.status, "Completed")
@IntegrationTestCase.change_settings("Selling Settings", {"allow_negative_rates_for_items": 1}) @change_settings("Selling Settings", {"allow_negative_rates_for_items": 1})
>>>>>>> 1a22e3cb61 (fix: enabling skip delivery option for order type maintenance)
def test_sales_order_with_negative_rate(self): def test_sales_order_with_negative_rate(self):
""" """
Test if negative rate is allowed in Sales Order via doc submission and update items Test if negative rate is allowed in Sales Order via doc submission and update items