From 20c21a4dc089dd81acc340e1cfee6e1bf7b6bac8 Mon Sep 17 00:00:00 2001 From: ravibharathi656 Date: Fri, 3 Oct 2025 17:04:49 +0530 Subject: [PATCH] fix: retain shipping address in doc (cherry picked from commit 039f5e614319c3feadb4c7b2078bc653ee2a8e89) # Conflicts: # erpnext/public/js/controllers/buying.js --- erpnext/public/js/controllers/buying.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/erpnext/public/js/controllers/buying.js b/erpnext/public/js/controllers/buying.js index e7ee7d505a1..1afca307d94 100644 --- a/erpnext/public/js/controllers/buying.js +++ b/erpnext/public/js/controllers/buying.js @@ -173,8 +173,11 @@ erpnext.buying = { callback: (r) => { this.frm.set_value("billing_address", r.message.primary_address || ""); - if(!frappe.meta.has_field(this.frm.doc.doctype, "shipping_address")) return; - this.frm.set_value("shipping_address", r.message.shipping_address || ""); + if (!frappe.meta.has_field(this.frm.doc.doctype, "shipping_address")) return; + this.frm.set_value( + "shipping_address", + r.message.shipping_address || this.frm.doc.shipping_address || "" + ); }, }); erpnext.utils.set_letter_head(this.frm)