From ff7e0eaba54307bf11edb1d6748bac69e95ffbe5 Mon Sep 17 00:00:00 2001 From: David Arnold Date: Tue, 30 Jan 2024 10:20:26 +0100 Subject: [PATCH] feat: add login user to driver if available for notifications --- erpnext/setup/doctype/driver/driver.json | 18 +++++++++++++++--- erpnext/setup/doctype/driver/driver.py | 6 ++++-- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/erpnext/setup/doctype/driver/driver.json b/erpnext/setup/doctype/driver/driver.json index 2e994b5ff9c..adde24b98a5 100644 --- a/erpnext/setup/doctype/driver/driver.json +++ b/erpnext/setup/doctype/driver/driver.json @@ -1,4 +1,5 @@ { + "actions": [], "allow_import": 1, "allow_rename": 1, "autoname": "naming_series:", @@ -16,6 +17,7 @@ "employee", "cell_number", "address", + "user", "license_details", "license_number", "column_break_8", @@ -115,14 +117,23 @@ "fieldtype": "Link", "label": "Address", "options": "Address" + }, + { + "fieldname": "user", + "fieldtype": "Link", + "in_list_view": 1, + "label": "User", + "options": "User", + "read_only_depends_on": "employee" } ], "icon": "fa fa-user", - "modified": "2022-06-28 10:29:14.151380", + "links": [], + "modified": "2024-01-23 21:47:12.507540", "modified_by": "Administrator", "module": "Setup", "name": "Driver", - "name_case": "Title Case", + "naming_rule": "By \"Naming Series\" field", "owner": "Administrator", "permissions": [ { @@ -180,6 +191,7 @@ "show_name_in_global_search": 1, "sort_field": "modified", "sort_order": "DESC", + "states": [], "title_field": "full_name", "track_changes": 1 -} +} \ No newline at end of file diff --git a/erpnext/setup/doctype/driver/driver.py b/erpnext/setup/doctype/driver/driver.py index 4faa8e3fdcf..9c5a3981e7a 100644 --- a/erpnext/setup/doctype/driver/driver.py +++ b/erpnext/setup/doctype/driver/driver.py @@ -1,7 +1,7 @@ # Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors # For license information, please see license.txt - +import frappe from frappe.model.document import Document @@ -31,4 +31,6 @@ class Driver(Document): transporter: DF.Link | None # end: auto-generated types - pass + def validate(self): + if self.employee: + self.user = frappe.get_value("Employee", self.employee, "user_id")