chore: conflicts

frappe · Oct 18, 2023 · cb75d25 · cb75d25
1 parent 4918db9
commit cb75d25
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 22 deletions.
diff --git a/erpnext/accounts/party.py b/erpnext/accounts/party.py
@@ -225,38 +225,24 @@ 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": get_address_display(shipping_address),
+					"shipping_address_display": render_address(shipping_address),
 					**get_fetch_values(doctype, "shipping_address", shipping_address),
 				}
-=======
-				shipping_address=shipping_address,
-				shipping_address_display=render_address(shipping_address),
-				**get_fetch_values(doctype, "shipping_address", shipping_address)
->>>>>>> f4d74990fe (fix: E-commerce permissions)
 			)
 
 		if party_details.company_address:
 			# billing address
 			party_details.update(
-<<<<<<< HEAD
 				{
 					"billing_address": party_details.company_address,
 					"billing_address_display": (
-						party_details.company_address_display or get_address_display(party_details.company_address)
+						party_details.company_address_display
+						or render_address(party_details.company_address, check_permissions=True)
 					),
 					**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 render_address(party_details.company_address, check_permissions=False)
-				),
-				**get_fetch_values(doctype, "billing_address", party_details.company_address)
->>>>>>> f4d74990fe (fix: E-commerce permissions)
 			)
 
 			# shipping address - if not already set

diff --git a/erpnext/controllers/selling_controller.py b/erpnext/controllers/selling_controller.py
@@ -4,7 +4,6 @@
 
 import frappe
 from frappe import _, bold, throw
-from frappe.contacts.doctype.address.address import get_address_display
 from frappe.utils import cint, cstr, flt, get_link_to_form, nowtime
 
 from erpnext.accounts.party import render_address
@@ -584,13 +583,9 @@ def set_customer_address(self):
 
 		for address_field, address_display_field in address_dict.items():
 			if self.get(address_field):
-<<<<<<< HEAD
-				self.set(address_display_field, get_address_display(self.get(address_field)))
-=======
 				self.set(
 					address_display_field, render_address(self.get(address_field), check_permissions=False)
 				)
->>>>>>> f4d74990fe (fix: E-commerce permissions)
 
 	def validate_for_duplicate_items(self):
 		check_list, chk_dupl_itm = [], []