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

Merge branch 'version-14-hotfix' into mergify/bp/version-14-hotfix/pr-35886

Browse Source
This commit is contained in:
Deepesh Garg
2023-06-27 12:02:30 +05:30
committed by GitHub
parent 851b8871b2 fc051d143c
commit 04fdaaffbd
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/stock/doctype/delivery_trip/delivery_trip.json
View File

@@ -66,8 +66,7 @@
"fieldname": "driver", "fieldname": "driver",
"fieldtype": "Link", "fieldtype": "Link",
"label": "Driver", "label": "Driver",
"options": "Driver", "options": "Driver"
"reqd": 1
}, },
{ {
"fetch_from": "driver.full_name", "fetch_from": "driver.full_name",
@@ -189,10 +188,11 @@
], ],
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
"modified": "2021-04-30 21:21:36.610142", "modified": "2023-06-27 11:22:27.927637",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Delivery Trip", "name": "Delivery Trip",
"naming_rule": "By \"Naming Series\" field",
"owner": "Administrator", "owner": "Administrator",
"permissions": [ "permissions": [
{ {
@@ -228,5 +228,6 @@
], ],
"sort_field": "modified", "sort_field": "modified",
"sort_order": "DESC", "sort_order": "DESC",
"states": [],
"title_field": "driver_name" "title_field": "driver_name"
} }

3
erpnext/stock/doctype/delivery_trip/delivery_trip.py
View File

@@ -24,6 +24,9 @@ class DeliveryTrip(Document):
) )
def validate(self): def validate(self):
if self._action == "submit" and not self.driver:
frappe.throw(_("A driver must be set to submit."))
self.validate_stop_addresses() self.validate_stop_addresses()
def on_submit(self): def on_submit(self):