CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-11 22:38:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #45074 from Sanket322/set_shipping_address

Browse Source 
fix: set billing and shipping address on change of company
This commit is contained in:
ruthra kumar
2025-01-14 10:04:13 +05:30
committed by GitHub
parent 4b483e176d ce99764772
commit 2e8723407f
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
erpnext/public/js/controllers/buying.js
View File

@@ -157,10 +157,17 @@ erpnext.buying = {
if(!frappe.meta.has_field(this.frm.doc.doctype, "billing_address")) return;
frappe.call({
method: "erpnext.setup.doctype.company.company.get_default_company_address",
args: { name: this.frm.doc.company, existing_address:this.frm.doc.billing_address },
method: "erpnext.setup.doctype.company.company.get_billing_shipping_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 || "");
this.frm.set_value("billing_address", r.message.primary_address || "");
if(!frappe.meta.has_field(this.frm.doc.doctype, "shipping_address")) return;
this.frm.set_value("shipping_address", r.message.shipping_address || "");
},
});
}

8
erpnext/setup/doctype/company/company.py
View File

@@ -909,6 +909,14 @@ def get_default_company_address(name, sort_key="is_primary_address", existing_ad
return None
@frappe.whitelist()
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": primary_address, "shipping_address": shipping_address}
@frappe.whitelist()
def create_transaction_deletion_request(company):
from erpnext.setup.doctype.transaction_deletion_record.transaction_deletion_record import (