From 2a4a9fff3dbecd74b0f7be1604d497913c60a04f Mon Sep 17 00:00:00 2001
From: Mihir Kandoi <kandoimihir@gmail.com>
Date: Tue, 11 Aug 2026 15:09:48 +0530
Subject: [PATCH] fix(setup): fetch driver address by supplier link

(cherry picked from commit 3ffb888d266031f8411030b4bc89bd2521c28fe4)
---
 erpnext/setup/doctype/driver/driver.js | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/erpnext/setup/doctype/driver/driver.js b/erpnext/setup/doctype/driver/driver.js
index 35f8bff5874..3372b75bc35 100644
--- a/erpnext/setup/doctype/driver/driver.js
+++ b/erpnext/setup/doctype/driver/driver.js
@@ -23,15 +23,20 @@ frappe.ui.form.on("Driver", {
 	},
 
 	transporter: function (frm, cdt, cdn) {
-		// this assumes that supplier's address has same title as supplier's name
 		if (!frm.doc.transporter) return;
-		frappe.db
-			.get_doc("Address", null, { address_title: frm.doc.transporter })
-			.then((r) => {
-				frappe.model.set_value(cdt, cdn, "address", r.name);
-			})
-			.catch((err) => {
-				console.log(err);
-			});
+
+		const transporter = frm.doc.transporter;
+		frappe.call({
+			method: "frappe.contacts.doctype.address.address.get_default_address",
+			args: {
+				doctype: "Supplier",
+				name: transporter,
+			},
+			callback: function (r) {
+				if (frm.doc.transporter === transporter) {
+					frappe.model.set_value(cdt, cdn, "address", r.message);
+				}
+			},
+		});
 	},
 });