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

fix(Payment Entry): get contact details from existing contact (#40556)

Browse Source
This commit is contained in:
David Arnold
2024-03-25 20:12:44 +01:00
committed by GitHub
parent e04a3b107a
commit 462204fc65
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,7 +30,7 @@ from erpnext.accounts.general_ledger import (
make_reverse_gl_entries, make_reverse_gl_entries,
process_gl_map, process_gl_map,
) )
from erpnext.accounts.party import get_party_account, set_contact_details from erpnext.accounts.party import complete_contact_details, get_party_account, set_contact_details
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,
@@ -446,6 +446,8 @@ class PaymentEntry(AccountsController):
if self.party: if self.party:
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:
complete_contact_details(self)
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
@@ -2295,7 +2297,7 @@ def get_payment_entry(
pe.party_type = party_type pe.party_type = party_type
pe.party = doc.get(scrub(party_type)) pe.party = doc.get(scrub(party_type))
pe.contact_person = doc.get("contact_person") pe.contact_person = doc.get("contact_person")
pe.contact_email = doc.get("contact_email") complete_contact_details(pe)
pe.ensure_supplier_is_not_blocked() pe.ensure_supplier_is_not_blocked()
pe.paid_from = party_account if payment_type == "Receive" else bank.account pe.paid_from = party_account if payment_type == "Receive" else bank.account

9
erpnext/accounts/party.py
View File

@@ -282,9 +282,7 @@ def get_regional_address_details(party_details, doctype, company):
pass pass
def set_contact_details(party_details, party, party_type): def complete_contact_details(party_details):
party_details.contact_person = get_default_contact(party_type, party.name)
if not party_details.contact_person: if not party_details.contact_person:
party_details.update( party_details.update(
{ {
@@ -315,6 +313,11 @@ def set_contact_details(party_details, party, party_type):
party_details.update(contact_details) party_details.update(contact_details)
def set_contact_details(party_details, party, party_type):
party_details.contact_person = get_default_contact(party_type, party.name)
complete_contact_details(party_details)
def set_other_values(party_details, party, party_type): def set_other_values(party_details, party, party_type):
# copy # copy
if party_type == "Customer": if party_type == "Customer":