From aaf470cf5c223fd780d0e065a6d3cf478e42510f Mon Sep 17 00:00:00 2001 From: ravibharathi656 Date: Tue, 7 Oct 2025 12:46:09 +0530 Subject: [PATCH 1/2] fix: preserve address if present (cherry picked from commit 067863810629169698acc7fca5ab69370e247fbf) # Conflicts: # erpnext/public/js/controllers/transaction.js --- erpnext/public/js/controllers/buying.js | 14 ++++++++------ erpnext/public/js/controllers/transaction.js | 9 +++++++++ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/erpnext/public/js/controllers/buying.js b/erpnext/public/js/controllers/buying.js index 1afca307d94..8c0be8042ac 100644 --- a/erpnext/public/js/controllers/buying.js +++ b/erpnext/public/js/controllers/buying.js @@ -171,13 +171,15 @@ erpnext.buying = { shipping_address: this.frm.doc.shipping_address }, callback: (r) => { - this.frm.set_value("billing_address", r.message.primary_address || ""); + if (!this.frm.doc.billing_address) + 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 || this.frm.doc.shipping_address || "" - ); + 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 || ""); }, }); erpnext.utils.set_letter_head(this.frm) diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js index ae3b7404f7f..6f74f5c81d1 100644 --- a/erpnext/public/js/controllers/transaction.js +++ b/erpnext/public/js/controllers/transaction.js @@ -1023,6 +1023,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe set_pricing(); } +<<<<<<< HEAD } if (frappe.meta.get_docfield(this.frm.doctype, "shipping_address") && @@ -1034,6 +1035,14 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe set_party_account(set_pricing); }); } +======= + if ( + frappe.meta.get_docfield(this.frm.doctype, "shipping_address") && + ["Purchase Order", "Purchase Receipt", "Purchase Invoice"].includes(this.frm.doctype) && + !this.frm.doc.shipping_address + ) { + let is_drop_ship = me.frm.doc.items.some((item) => item.delivered_by_supplier); +>>>>>>> 0678638106 (fix: preserve address if present) } else { set_party_account(set_pricing); From 5d1aa4050d37304247a4f00a5a7e6e75c06b6e2f Mon Sep 17 00:00:00 2001 From: diptanilsaha Date: Mon, 13 Oct 2025 16:36:36 +0530 Subject: [PATCH 2/2] chore: resolve conflicts --- erpnext/public/js/controllers/transaction.js | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js index 6f74f5c81d1..66c54ec6639 100644 --- a/erpnext/public/js/controllers/transaction.js +++ b/erpnext/public/js/controllers/transaction.js @@ -1022,28 +1022,20 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe } else { set_pricing(); } + }; -<<<<<<< HEAD - } - - if (frappe.meta.get_docfield(this.frm.doctype, "shipping_address") && - ['Purchase Order', 'Purchase Receipt', 'Purchase Invoice'].includes(this.frm.doctype)) { - let is_drop_ship = me.frm.doc.items.some(item => item.delivered_by_supplier); - - if (!is_drop_ship) { - erpnext.utils.get_shipping_address(this.frm, function() { - set_party_account(set_pricing); - }); - } -======= if ( frappe.meta.get_docfield(this.frm.doctype, "shipping_address") && ["Purchase Order", "Purchase Receipt", "Purchase Invoice"].includes(this.frm.doctype) && !this.frm.doc.shipping_address ) { let is_drop_ship = me.frm.doc.items.some((item) => item.delivered_by_supplier); ->>>>>>> 0678638106 (fix: preserve address if present) + if (!is_drop_ship) { + erpnext.utils.get_shipping_address(this.frm, function() { + set_party_account(set_pricing); + }); + } } else { set_party_account(set_pricing); }