Skip to content

Commit

Permalink
fix: get address if multiple companies
Browse files Browse the repository at this point in the history
(cherry picked from commit c6cf1be)

# Conflicts:
#	erpnext/selling/doctype/sales_order/sales_order.js
  • Loading branch information
Nihantra-Patel authored and mergify[bot] committed Apr 16, 2024
1 parent 153e0ba commit 0493872
Showing 1 changed file with 27 additions and 0 deletions.
27 changes: 27 additions & 0 deletions erpnext/selling/doctype/sales_order/sales_order.js
Expand Up @@ -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 {
Expand Down

0 comments on commit 0493872

Please sign in to comment.