From a8f05cadea5b744d1f687345ac2623e301c9921d Mon Sep 17 00:00:00 2001 From: Nishka Gosalia Date: Fri, 30 Jan 2026 12:23:38 +0530 Subject: [PATCH 1/3] fix: enabling skip delivery option for order type maintenance (cherry picked from commit 1a22e3cb6168c6e1850b7799ee6200c129a863d0) # Conflicts: # erpnext/selling/doctype/sales_order/sales_order.json # erpnext/selling/doctype/sales_order/test_sales_order.py --- .../doctype/sales_order/sales_order.json | 6 ++++- .../doctype/sales_order/test_sales_order.py | 26 +++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json index 1542721d117..c2667d2eb21 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.json +++ b/erpnext/selling/doctype/sales_order/sales_order.json @@ -1484,9 +1484,9 @@ }, { "default": "0", + "depends_on": "eval:doc.order_type == 'Maintenance';", "fieldname": "skip_delivery_note", "fieldtype": "Check", - "hidden": 1, "hide_days": 1, "hide_seconds": 1, "label": "Skip Delivery Note", @@ -1671,7 +1671,11 @@ "idx": 105, "is_submittable": 1, "links": [], +<<<<<<< HEAD "modified": "2025-07-28 12:14:29.760988", +======= + "modified": "2026-02-06 11:06:16.092658", +>>>>>>> 1a22e3cb61 (fix: enabling skip delivery option for order type maintenance) "modified_by": "Administrator", "module": "Selling", "name": "Sales Order", diff --git a/erpnext/selling/doctype/sales_order/test_sales_order.py b/erpnext/selling/doctype/sales_order/test_sales_order.py index 13759d0f7f7..8a82e79faae 100644 --- a/erpnext/selling/doctype/sales_order/test_sales_order.py +++ b/erpnext/selling/doctype/sales_order/test_sales_order.py @@ -57,7 +57,33 @@ class TestSalesOrder(AccountsTestMixin, FrappeTestCase): def tearDown(self): frappe.set_user("Administrator") +<<<<<<< HEAD @change_settings("Selling Settings", {"allow_negative_rates_for_items": 1}) +======= + def test_sales_order_skip_delivery_note(self): + so = make_sales_order(do_not_submit=True) + so.order_type = "Maintenance" + so.skip_delivery_note = 1 + so.append( + "items", + { + "item_code": "_Test Item 2", + "qty": 2, + "rate": 100, + }, + ) + so.save() + so.submit() + + so.reload() + si = make_sales_invoice(so.name) + si.insert() + si.submit() + so.reload() + self.assertEqual(so.status, "Completed") + + @IntegrationTestCase.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): """ Test if negative rate is allowed in Sales Order via doc submission and update items From 740dd878e9626e537aca3a21fa160fa27af819df Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Fri, 6 Feb 2026 12:12:24 +0530 Subject: [PATCH 2/3] chore: resolve conflicts --- erpnext/selling/doctype/sales_order/test_sales_order.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/erpnext/selling/doctype/sales_order/test_sales_order.py b/erpnext/selling/doctype/sales_order/test_sales_order.py index 8a82e79faae..d38473e4b69 100644 --- a/erpnext/selling/doctype/sales_order/test_sales_order.py +++ b/erpnext/selling/doctype/sales_order/test_sales_order.py @@ -57,9 +57,6 @@ class TestSalesOrder(AccountsTestMixin, FrappeTestCase): def tearDown(self): frappe.set_user("Administrator") -<<<<<<< HEAD - @change_settings("Selling Settings", {"allow_negative_rates_for_items": 1}) -======= def test_sales_order_skip_delivery_note(self): so = make_sales_order(do_not_submit=True) so.order_type = "Maintenance" @@ -82,8 +79,7 @@ class TestSalesOrder(AccountsTestMixin, FrappeTestCase): so.reload() self.assertEqual(so.status, "Completed") - @IntegrationTestCase.change_settings("Selling Settings", {"allow_negative_rates_for_items": 1}) ->>>>>>> 1a22e3cb61 (fix: enabling skip delivery option for order type maintenance) + @change_settings("Selling Settings", {"allow_negative_rates_for_items": 1}) def test_sales_order_with_negative_rate(self): """ Test if negative rate is allowed in Sales Order via doc submission and update items From 292f17b1b0d2c65e93f7410df5fd96072f1ef1c6 Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Fri, 6 Feb 2026 12:12:59 +0530 Subject: [PATCH 3/3] chore: resolve conflicts --- erpnext/selling/doctype/sales_order/sales_order.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json index c2667d2eb21..4bbdb20d311 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.json +++ b/erpnext/selling/doctype/sales_order/sales_order.json @@ -1671,11 +1671,7 @@ "idx": 105, "is_submittable": 1, "links": [], -<<<<<<< HEAD - "modified": "2025-07-28 12:14:29.760988", -======= "modified": "2026-02-06 11:06:16.092658", ->>>>>>> 1a22e3cb61 (fix: enabling skip delivery option for order type maintenance) "modified_by": "Administrator", "module": "Selling", "name": "Sales Order",