CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-13 09:43:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: enabling skip delivery option for order type maintenance

Browse Source 
(cherry picked from commit 1a22e3cb61)

# Conflicts:
#	erpnext/selling/doctype/sales_order/sales_order.json
#	erpnext/selling/doctype/sales_order/test_sales_order.py
This commit is contained in:
Nishka Gosalia
2026-01-30 12:23:38 +05:30
committed by Mergify
parent 3cf10fafdf
commit a8f05cadea
2 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/selling/doctype/sales_order/sales_order.json
View File

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

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

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