nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-02 19:59:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts #39748

Browse Source
This commit is contained in:
Smit Vora
2025-03-21 14:09:21 +05:30
parent f964178008
commit 7dc23d9733
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
erpnext/accounts/doctype/payment_entry/payment_entry.py
View File

@@ -37,11 +37,7 @@ from erpnext.accounts.general_ledger import (
make_reverse_gl_entries, make_reverse_gl_entries,
process_gl_map, process_gl_map,
) )
<<<<<<< HEAD
from erpnext.accounts.party import get_party_account
=======
from erpnext.accounts.party import complete_contact_details, get_party_account, set_contact_details from erpnext.accounts.party import complete_contact_details, get_party_account, set_contact_details
>>>>>>> 462204fc65 (fix(Payment Entry): get contact details from existing contact (#40556))
from erpnext.accounts.utils import ( from erpnext.accounts.utils import (
cancel_exchange_gain_loss_journal, cancel_exchange_gain_loss_journal,
get_account_currency, get_account_currency,
@@ -443,13 +439,12 @@ class PaymentEntry(AccountsController):
self.party_name = frappe.db.get_value(self.party_type, self.party, "name") self.party_name = frappe.db.get_value(self.party_type, self.party, "name")
if self.party: if self.party:
<<<<<<< HEAD
=======
if not self.contact_person: if not self.contact_person:
set_contact_details(self, party=frappe._dict({"name": self.party}), party_type=self.party_type) set_contact_details(
self, party=frappe._dict({"name": self.party}), party_type=self.party_type
)
else: else:
complete_contact_details(self) complete_contact_details(self)
>>>>>>> 462204fc65 (fix(Payment Entry): get contact details from existing contact (#40556))
if not self.party_balance: if not self.party_balance:
self.party_balance = get_balance_on( self.party_balance = get_balance_on(
party_type=self.party_type, party=self.party, date=self.posting_date, company=self.company party_type=self.party_type, party=self.party, date=self.posting_date, company=self.company