From 5a17dd8d6d47019b8528c420245357d63e490e9f Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Tue, 25 Nov 2025 12:58:52 +0530 Subject: [PATCH] fix: addresses not being carried forward --- erpnext/public/js/controllers/buying.js | 9 +++++++-- erpnext/selling/doctype/sales_order/sales_order.js | 3 ++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/erpnext/public/js/controllers/buying.js b/erpnext/public/js/controllers/buying.js index 873edfb7165..1ffa778d0b8 100644 --- a/erpnext/public/js/controllers/buying.js +++ b/erpnext/public/js/controllers/buying.js @@ -176,9 +176,14 @@ erpnext.buying = { callback: (r) => { if (!r.message) return; - 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")) { + if ( + frappe.meta.has_field(this.frm.doc.doctype, "shipping_address") && + !this.frm.doc.shipping_address + ) { this.frm.set_value("shipping_address", r.message.shipping_address || ""); } }, diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js index b1fc67e8d44..b6c0c496889 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.js +++ b/erpnext/selling/doctype/sales_order/sales_order.js @@ -1588,6 +1588,8 @@ erpnext.selling.SalesOrderController = class SalesOrderController extends erpnex fieldname: "items_for_po", fieldtype: "Table", label: __("Select Items"), + cannot_add_rows: true, + cannot_delete_rows: true, fields: [ { fieldtype: "Data", @@ -1698,7 +1700,6 @@ erpnext.selling.SalesOrderController = class SalesOrderController extends erpnex } set_po_items_data(dialog); - dialog.get_field("items_for_po").grid.only_sortable(); dialog.get_field("items_for_po").refresh(); dialog.wrapper.find(".grid-heading-row .grid-row-check").click(); dialog.show();