Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into FIX-INTERNAL-PR-GL-ENTRIES

Browse Source
This commit is contained in:
Sagar Sharma 2023-04-20 11:00:22 +05:30 committed by GitHub
commit e1f5a5adea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,6 +60,7 @@ class PaymentEntry(AccountsController):
def validate(self): def validate(self):
self.setup_party_account_field() self.setup_party_account_field()
self.set_missing_values() self.set_missing_values()
self.set_missing_ref_details()
self.validate_payment_type() self.validate_payment_type()
self.validate_party_details() self.validate_party_details()
self.set_exchange_rate() self.set_exchange_rate()
@ -219,11 +220,16 @@ class PaymentEntry(AccountsController):
else self.paid_to_account_currency else self.paid_to_account_currency
) )
self.set_missing_ref_details() def set_missing_ref_details(
self, force: bool = False, update_ref_details_only_for: list | None = None
def set_missing_ref_details(self, force=False): ) -> None:
for d in self.get("references"): for d in self.get("references"):
if d.allocated_amount: if d.allocated_amount:
if update_ref_details_only_for and (
not (d.reference_doctype, d.reference_name) in update_ref_details_only_for
):
continue
ref_details = get_reference_details( ref_details = get_reference_details(
d.reference_doctype, d.reference_name, self.party_account_currency d.reference_doctype, d.reference_name, self.party_account_currency
) )
@ -1811,6 +1817,7 @@ def get_payment_entry(
pe.setup_party_account_field() pe.setup_party_account_field()
pe.set_missing_values() pe.set_missing_values()
pe.set_missing_ref_details()
update_accounting_dimensions(pe, doc) update_accounting_dimensions(pe, doc)

1
erpnext/accounts/utils.py
View File

@ -646,6 +646,7 @@ def update_reference_in_payment_entry(d, payment_entry, do_not_save=False):
payment_entry.flags.ignore_validate_update_after_submit = True payment_entry.flags.ignore_validate_update_after_submit = True
payment_entry.setup_party_account_field() payment_entry.setup_party_account_field()
payment_entry.set_missing_values() payment_entry.set_missing_values()
payment_entry.set_missing_ref_details()
payment_entry.set_amounts() payment_entry.set_amounts()
if not do_not_save: if not do_not_save: