nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-24 15:39:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix conflicts

Browse Source
This commit is contained in:
Sagar Vora
2023-11-18 17:42:06 +05:30
parent 65ae8d9c05
commit 3bf84e1464
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/accounts/party.py
View File

@@ -224,19 +224,13 @@ def set_address_details(
elif doctype and doctype in ["Purchase Invoice", "Purchase Order", "Purchase Receipt"]: elif doctype and doctype in ["Purchase Invoice", "Purchase Order", "Purchase Receipt"]:
if shipping_address: if shipping_address:
party_details.update( party_details.update(
<<<<<<< HEAD
{ {
"shipping_address": shipping_address, "shipping_address": shipping_address,
"shipping_address_display": render_address(shipping_address), "shipping_address_display": render_address(
shipping_address, check_permissions=not ignore_permissions
),
**get_fetch_values(doctype, "shipping_address", shipping_address), **get_fetch_values(doctype, "shipping_address", shipping_address),
} }
=======
shipping_address=shipping_address,
shipping_address_display=render_address(
shipping_address, check_permissions=not ignore_permissions
),
**get_fetch_values(doctype, "shipping_address", shipping_address)
>>>>>>> 45299fe4b3 (fix: pass check permission in render_address)
) )
if party_details.company_address: if party_details.company_address: