From 04938726d9ca1803505d118c0650d3df6e9f4f84 Mon Sep 17 00:00:00 2001
From: Nihantra Patel <nihantra@frappe.io>
Date: Mon, 11 Mar 2024 16:34:44 +0530
Subject: [PATCH 1/3] fix: get address if multiple companies

(cherry picked from commit c6cf1bec76581bbe653b191e983de1692254ef48)

# Conflicts:
#	erpnext/selling/doctype/sales_order/sales_order.js
---
 .../doctype/sales_order/sales_order.js        | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js
index e9a6cc385d3..749b12f96b3 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.js
+++ b/erpnext/selling/doctype/sales_order/sales_order.js
@@ -89,9 +89,36 @@ frappe.ui.form.on("Sales Order", {
 		}, __('Get Items From'));
 	},
 
+<<<<<<< HEAD
 	onload: function(frm) {
 		if (!frm.doc.transaction_date){
 			frm.set_value('transaction_date', frappe.datetime.get_today())
+=======
+	// 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());
+>>>>>>> c6cf1bec76 (fix: get address if multiple companies)
 		}
 		erpnext.queries.setup_queries(frm, "Warehouse", function() {
 			return {

From c2b6b64e2ecbd236d977a617a463258bc2ad20a1 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/3] fix: get address if multiple companies

(cherry picked from commit 655a1797bed38f87172aeb4589bc16c6490327a4)
---
 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 749b12f96b3..e622cd5346d 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.js
+++ b/erpnext/selling/doctype/sales_order/sales_order.js
@@ -101,7 +101,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) {

From ee06448f0d7f726461f2a9a95537755a2bb0b68c Mon Sep 17 00:00:00 2001
From: ruthra kumar <ruthra@erpnext.com>
Date: Tue, 16 Apr 2024 16:38:32 +0530
Subject: [PATCH 3/3] chore: resolve conflict

---
 erpnext/selling/doctype/sales_order/sales_order.js | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js
index e622cd5346d..2995a1e99bc 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.js
+++ b/erpnext/selling/doctype/sales_order/sales_order.js
@@ -89,11 +89,6 @@ frappe.ui.form.on("Sales Order", {
 		}, __('Get Items From'));
 	},
 
-<<<<<<< HEAD
-	onload: function(frm) {
-		if (!frm.doc.transaction_date){
-			frm.set_value('transaction_date', frappe.datetime.get_today())
-=======
 	// When multiple companies are set up. in case company name is changed set default company address
 	company: function (frm) {
 		if (frm.doc.company) {
@@ -115,10 +110,9 @@ frappe.ui.form.on("Sales Order", {
 		}
 	},
 
-	onload: function (frm) {
-		if (!frm.doc.transaction_date) {
-			frm.set_value("transaction_date", frappe.datetime.get_today());
->>>>>>> c6cf1bec76 (fix: get address if multiple companies)
+	onload: function(frm) {
+		if (!frm.doc.transaction_date){
+			frm.set_value('transaction_date', frappe.datetime.get_today())
 		}
 		erpnext.queries.setup_queries(frm, "Warehouse", function() {
 			return {