From 7e3be8c8c01f5f81faf25127f1962cbc1850fe31 Mon Sep 17 00:00:00 2001
From: ruthra kumar <ruthra@erpnext.com>
Date: Tue, 9 Jun 2026 11:27:23 +0530
Subject: [PATCH] chore: resolve conflict

---
 .../doctype/sales_invoice/sales_invoice.py     |  2 +-
 erpnext/accounts/party.py                      | 18 ------------------
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
index 856d6d01a2d..a7967de15a2 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
@@ -2994,7 +2994,7 @@ def update_taxes(
 	master_doctype=None,
 ):
 	# Update Party Details
-	party_details = _get_party_details(
+	party_details = get_party_details(
 		party=party,
 		party_type=party_type,
 		company=company,
diff --git a/erpnext/accounts/party.py b/erpnext/accounts/party.py
index 517b8cd412d..c97c1a9c1cd 100644
--- a/erpnext/accounts/party.py
+++ b/erpnext/accounts/party.py
@@ -74,7 +74,6 @@ class DuplicatePartyAccountError(frappe.ValidationError):
 
 @frappe.whitelist()
 def get_party_details(
-<<<<<<< HEAD
 	party=None,
 	account=None,
 	party_type="Customer",
@@ -91,23 +90,6 @@ def get_party_details(
 	shipping_address=None,
 	dispatch_address=None,
 	pos_profile=None,
-=======
-	party: str | None = None,
-	account: str | None = None,
-	party_type: str = "Customer",
-	company: str | None = None,
-	posting_date: str | None = None,
-	bill_date: str | None = None,
-	price_list: str | None = None,
-	currency: str | None = None,
-	doctype: str | None = None,
-	fetch_payment_terms_template: bool = True,
-	party_address: str | None = None,
-	company_address: str | None = None,
-	shipping_address: str | None = None,
-	dispatch_address: str | None = None,
-	pos_profile: str | None = None,
->>>>>>> efb8336bf8 (fix: remove ignore_permissions from get_party_details signature (#55491))
 ):
 	if not party:
 		return frappe._dict()