Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: set billing_address for purchases in get_party_details

Browse Source
This commit is contained in:
Sagar Vora 2022-07-29 12:41:40 +05:30
parent 03002f7431
commit a3625b3817
3 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
erpnext/accounts/party.py
View File

@ -207,7 +207,7 @@ def set_address_details(
) )
if company_address: if company_address:
party_details.update({"company_address": company_address}) party_details.company_address = company_address
else: else:
party_details.update(get_company_address(company)) party_details.update(get_company_address(company))
@ -219,12 +219,31 @@ def set_address_details(
get_regional_address_details(party_details, doctype, company) get_regional_address_details(party_details, doctype, company)
elif doctype and doctype in ["Purchase Invoice", "Purchase Order", "Purchase Receipt"]: elif doctype and doctype in ["Purchase Invoice", "Purchase Order", "Purchase Receipt"]:
if party_details.company_address: if shipping_address:
party_details["shipping_address"] = shipping_address or party_details["company_address"]
party_details.shipping_address_display = get_address_display(party_details["shipping_address"])
party_details.update( party_details.update(
get_fetch_values(doctype, "shipping_address", party_details.shipping_address) shipping_address=shipping_address,
shipping_address_display=get_address_display(shipping_address),
**get_fetch_values(doctype, "shipping_address", shipping_address)
) )
if party_details.company_address:
# billing address
party_details.update(
billing_address=party_details.company_address,
billing_address_display=(
party_details.company_address_display or get_address_display(party_details.company_address)
),
**get_fetch_values(doctype, "billing_address", party_details.company_address)
)
# shipping address - if not already set
if not party_details.shipping_address:
party_details.update(
shipping_address=party_details.billing_address,
shipping_address_display=party_details.billing_address_display,
**get_fetch_values(doctype, "shipping_address", party_details.billing_address)
)
get_regional_address_details(party_details, doctype, company) get_regional_address_details(party_details, doctype, company)
return party_details.get(billing_address_field), party_details.shipping_address_name return party_details.get(billing_address_field), party_details.shipping_address_name

1
erpnext/controllers/buying_controller.py
View File

@ -86,6 +86,7 @@ class BuyingController(SubcontractingController):
company=self.company, company=self.company,
party_address=self.get("supplier_address"), party_address=self.get("supplier_address"),
shipping_address=self.get("shipping_address"), shipping_address=self.get("shipping_address"),
company_address=self.get("billing_address"),
fetch_payment_terms_template=not self.get("ignore_default_payment_terms_template"), fetch_payment_terms_template=not self.get("ignore_default_payment_terms_template"),
ignore_permissions=self.flags.ignore_permissions, ignore_permissions=self.flags.ignore_permissions,
) )

19
erpnext/public/js/controllers/transaction.js
View File

@ -1,7 +1,6 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt // License: GNU General Public License v3. See license.txt
frappe.provide('erpnext.accounts.dimensions');
erpnext.TransactionController = class TransactionController extends erpnext.taxes_and_totals { erpnext.TransactionController = class TransactionController extends erpnext.taxes_and_totals {
setup() { setup() {
@ -794,24 +793,6 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
set_party_account(set_pricing); set_party_account(set_pricing);
}); });
// Get default company billing address in Purchase Invoice, Order and Receipt
if (this.frm.doc.company && frappe.meta.get_docfield(this.frm.doctype, "billing_address")) {
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 || ""},
debounce: 2000,
callback: function(r) {
if (r.message) {
me.frm.set_value("billing_address", r.message);
} else {
if (frappe.meta.get_docfield(me.frm.doctype, 'company_address')) {
me.frm.set_value("company_address", "");
}
}
}
});
}
} else { } else {
set_party_account(set_pricing); set_party_account(set_pricing);
} }