From 73b8a294cfad149da5ebde3c2fb2b7bd058f98de Mon Sep 17 00:00:00 2001 From: Pugazhendhi Velu Date: Wed, 5 Nov 2025 08:09:56 +0000 Subject: [PATCH] fix: reset billing and shipping address when company changes (cherry picked from commit 0510f7e13ff91879b5fcd92be597cba0918869c2) --- erpnext/public/js/controllers/buying.js | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/erpnext/public/js/controllers/buying.js b/erpnext/public/js/controllers/buying.js index ba1e5348847..c8a61a0ca79 100644 --- a/erpnext/public/js/controllers/buying.js +++ b/erpnext/public/js/controllers/buying.js @@ -171,15 +171,13 @@ erpnext.buying = { shipping_address: this.frm.doc.shipping_address }, callback: (r) => { - if (!this.frm.doc.billing_address) - this.frm.set_value("billing_address", r.message.primary_address || ""); + if (!r.message) return; - if ( - !frappe.meta.has_field(this.frm.doc.doctype, "shipping_address") || - this.frm.doc.shipping_address - ) - return; - this.frm.set_value("shipping_address", r.message.shipping_address || ""); + this.frm.set_value("billing_address", r.message.primary_address || ""); + + if (frappe.meta.has_field(this.frm.doc.doctype, "shipping_address")) { + this.frm.set_value("shipping_address", r.message.shipping_address || ""); + } }, }); erpnext.utils.set_letter_head(this.frm)