fix: enabling skip delivery option for order type maintenance

(cherry picked from commit 1a22e3c)

# Conflicts:
#	erpnext/selling/doctype/sales_order/sales_order.json
#	erpnext/selling/doctype/sales_order/test_sales_order.py

Author: Nishka Gosalia

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",

erpnext/selling/doctype/sales_order/test_sales_order.py

@@ -57,7 +57,33 @@ def setUp(self):
 	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