From 80e6112549e4464c8d736c385113966672109359 Mon Sep 17 00:00:00 2001 From: Sanket322 Date: Fri, 3 Jan 2025 18:04:56 +0530 Subject: [PATCH] fix: pass right existing address (cherry picked from commit ce9976477220c8f2e72b27f507a61437c43d6a51) --- erpnext/public/js/controllers/buying.js | 6 +++++- erpnext/setup/doctype/company/company.py | 8 ++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/erpnext/public/js/controllers/buying.js b/erpnext/public/js/controllers/buying.js index 8bf679c68c3..a705ce62f2b 100644 --- a/erpnext/public/js/controllers/buying.js +++ b/erpnext/public/js/controllers/buying.js @@ -158,7 +158,11 @@ erpnext.buying = { frappe.call({ method: "erpnext.setup.doctype.company.company.get_billing_shipping_address", - args: { name: this.frm.doc.company, existing_address:this.frm.doc.billing_address }, + args: { + name: this.frm.doc.company, + billing_address:this.frm.doc.billing_address, + shipping_address: this.frm.doc.shipping_address + }, callback: (r) => { this.frm.set_value("billing_address", r.message.primary_address || ""); diff --git a/erpnext/setup/doctype/company/company.py b/erpnext/setup/doctype/company/company.py index 1929ce22334..27005d99301 100644 --- a/erpnext/setup/doctype/company/company.py +++ b/erpnext/setup/doctype/company/company.py @@ -915,11 +915,11 @@ def get_default_company_address(name, sort_key="is_primary_address", existing_ad @frappe.whitelist() -def get_billing_shipping_address(name, existing_address=None): - primart_address = get_default_company_address(name, "is_primary_address", existing_address) - shipping_address = get_default_company_address(name, "is_shipping_address", existing_address) +def get_billing_shipping_address(name, billing_address=None, shipping_address=None): + primary_address = get_default_company_address(name, "is_primary_address", billing_address) + shipping_address = get_default_company_address(name, "is_shipping_address", shipping_address) - return {"primary_address": primart_address, "shipping_address": shipping_address} + return {"primary_address": primary_address, "shipping_address": shipping_address} @frappe.whitelist()