From 4078e252c28e68ed392866366dc25d86084ee910 Mon Sep 17 00:00:00 2001
From: Abdeali Chharchhoda <abdealiking786@gmail.com>
Date: Sat, 1 Nov 2025 20:18:52 +0530
Subject: [PATCH] refactor: fetch employee contact details in realtime

(cherry picked from commit 2ea6508fa5e61442d7789f3502c4b609f695af1f)
---
 .../doctype/payment_entry/payment_entry.js    |  4 ++
 erpnext/public/js/utils/party.js              | 64 +++++++++++--------
 2 files changed, 42 insertions(+), 26 deletions(-)

diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.js b/erpnext/accounts/doctype/payment_entry/payment_entry.js
index 6f89f02a1a7..60c8e47f8f0 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.js
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.js
@@ -516,12 +516,16 @@ frappe.ui.form.on("Payment Entry", {
 			frm.set_value("contact_email", "");
 			frm.set_value("contact_person", "");
 		}
+
 		if (frm.doc.payment_type && frm.doc.party_type && frm.doc.party && frm.doc.company) {
 			if (!frm.doc.posting_date) {
 				frappe.msgprint(__("Please select Posting Date before selecting Party"));
 				frm.set_value("party", "");
 				return;
 			}
+
+			erpnext.utils.get_employee_contact_details(frm);
+
 			frm.set_party_account_based_on_party = true;
 
 			let company_currency = frappe.get_doc(":Company", frm.doc.company).default_currency;
diff --git a/erpnext/public/js/utils/party.js b/erpnext/public/js/utils/party.js
index 4e74cc3d6e7..1652a849850 100644
--- a/erpnext/public/js/utils/party.js
+++ b/erpnext/public/js/utils/party.js
@@ -293,37 +293,49 @@ erpnext.utils.set_taxes = function (frm, triggered_from_field) {
 erpnext.utils.get_contact_details = function (frm) {
 	if (frm.updating_party_details) return;
 
-	if (frm.doc["contact_person"]) {
-		frappe.call({
-			method: "frappe.contacts.doctype.contact.contact.get_contact_details",
-			args: { contact: frm.doc.contact_person },
-			callback: function (r) {
-				if (r.message) frm.set_value(r.message);
-			},
-		});
-	} else {
-		frm.set_value({
-			contact_person: "",
-			contact_display: "",
-			contact_email: "",
-			contact_mobile: "",
-			contact_phone: "",
-			contact_designation: "",
-			contact_department: "",
-		});
+	if (!frm.doc.contact_person) {
+		reset_contact_fields(frm);
+		return;
 	}
-};
 
-erpnext.utils.get_employee_contact_details = async function (employee) {
-	if (!employee) return;
-
-	const response = await frappe.xcall("erpnext.setup.doctype.employee.employee.get_contact_details", {
-		employee,
+	frappe.call({
+		method: "frappe.contacts.doctype.contact.contact.get_contact_details",
+		args: { contact: frm.doc.contact_person },
+		callback: function (r) {
+			if (r.message) frm.set_value(r.message);
+		},
 	});
-
-	return response?.message;
 };
 
+erpnext.utils.get_employee_contact_details = function (frm) {
+	if (frm.updating_party_details || frm.doc.party_type !== "Employee") return;
+
+	if (!frm.doc.party) {
+		reset_contact_fields(frm);
+		return;
+	}
+
+	frappe.call({
+		method: "erpnext.setup.doctype.employee.employee.get_contact_details",
+		args: { employee: frm.doc.party },
+		callback: function (r) {
+			if (r.message) frm.set_value(r.message);
+		},
+	});
+};
+
+function reset_contact_fields(frm) {
+	frm.set_value({
+		contact_person: "",
+		contact_display: "",
+		contact_email: "",
+		contact_mobile: "",
+		contact_phone: "",
+		contact_designation: "",
+		contact_department: "",
+	});
+}
+
 erpnext.utils.validate_mandatory = function (frm, label, value, trigger_on) {
 	if (!value) {
 		frm.doc[trigger_on] = "";