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

chore: resolve conflict

Browse Source
This commit is contained in:
ruthra kumar
2026-06-09 11:27:23 +05:30
parent b2e7fd7957
commit 7e3be8c8c0
2 changed files with 1 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/doctype/sales_invoice/sales_invoice.py
View File

@@ -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,

18
erpnext/accounts/party.py
View File

@@ -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()