From c6cf1bec76581bbe653b191e983de1692254ef48 Mon Sep 17 00:00:00 2001 From: Nihantra Patel Date: Mon, 11 Mar 2024 16:34:44 +0530 Subject: [PATCH 1/2] fix: get address if multiple companies --- .../doctype/sales_order/sales_order.js | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js index 28f6edf5110..c8318ff7741 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.js +++ b/erpnext/selling/doctype/sales_order/sales_order.js @@ -157,6 +157,27 @@ frappe.ui.form.on("Sales Order", { ); }, + // When multiple companies are set up. in case company name is changed set default company address + company: function (frm) { + if (frm.doc.company) { + frappe.call({ + method: "erpnext.setup.doctype.company.company.get_default_company_address", + args: { + name: frm.doc.company, + existing_address: frm.doc.company_address || "" + }, + debounce: 2000, + callback: function (r) { + if (r.message) { + frm.set_value("company_address", r.message); + } else { + frm.set_value("company_address", ""); + } + }, + }); + } + }, + onload: function (frm) { if (!frm.doc.transaction_date) { frm.set_value("transaction_date", frappe.datetime.get_today()); From 655a1797bed38f87172aeb4589bc16c6490327a4 Mon Sep 17 00:00:00 2001 From: "Nihantra C. Patel" <141945075+Nihantra-Patel@users.noreply.github.com> Date: Mon, 11 Mar 2024 16:46:00 +0530 Subject: [PATCH 2/2] fix: get address if multiple companies --- erpnext/selling/doctype/sales_order/sales_order.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js index c8318ff7741..e7b35fb6f69 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.js +++ b/erpnext/selling/doctype/sales_order/sales_order.js @@ -164,7 +164,7 @@ frappe.ui.form.on("Sales Order", { method: "erpnext.setup.doctype.company.company.get_default_company_address", args: { name: frm.doc.company, - existing_address: frm.doc.company_address || "" + existing_address: frm.doc.company_address || "", }, debounce: 2000, callback: function (r) {