From 3bf84e14640bf6c63746d9da689e9f088e61b9be Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Sat, 18 Nov 2023 17:42:06 +0530 Subject: [PATCH] chore: fix conflicts --- erpnext/accounts/party.py | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/erpnext/accounts/party.py b/erpnext/accounts/party.py index 63cde169a48..6544c50215c 100644 --- a/erpnext/accounts/party.py +++ b/erpnext/accounts/party.py @@ -224,19 +224,13 @@ def set_address_details( elif doctype and doctype in ["Purchase Invoice", "Purchase Order", "Purchase Receipt"]: if shipping_address: party_details.update( -<<<<<<< HEAD { "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), } -======= - 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: