From 04938726d9ca1803505d118c0650d3df6e9f4f84 Mon Sep 17 00:00:00 2001 From: Nihantra Patel Date: Mon, 11 Mar 2024 16:34:44 +0530 Subject: [PATCH] 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 e9a6cc385d3c..749b12f96b35 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 {