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

fix: use old style for _dict.update

Browse Source
This commit is contained in:
Sagar Vora
2022-08-08 18:00:02 +05:30
parent d1de4b027c
commit 15654aae8b
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
erpnext/accounts/party.py
View File

@@ -222,27 +222,33 @@ def set_address_details(
elif doctype and doctype in ["Purchase Invoice", "Purchase Order", "Purchase Receipt"]:
if shipping_address:
party_details.update(
shipping_address=shipping_address,
shipping_address_display=get_address_display(shipping_address),
**get_fetch_values(doctype, "shipping_address", 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)
{
"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)
{
"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)