schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: use reference type name to update exc rate

Browse Source 
(cherry picked from commit c15690e475)
This commit is contained in:
ruthra kumar
2024-04-04 11:58:05 +05:30
committed by Mergify
parent 81081663c4
commit 09cda60bdf
2 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -338,7 +338,7 @@ class PaymentEntry(AccountsController):
self, self,
force: bool = False, force: bool = False,
update_ref_details_only_for: list | None = None, update_ref_details_only_for: list | None = None,
ref_exchange_rate: float | None = None, reference_exchange_details: dict | None = None,
) -> None: ) -> None:
for d in self.get("references"): for d in self.get("references"):
if d.allocated_amount: if d.allocated_amount:
@@ -352,8 +352,12 @@ class PaymentEntry(AccountsController):
) )
# Only update exchange rate when the reference is Journal Entry # Only update exchange rate when the reference is Journal Entry
if ref_exchange_rate and d.reference_doctype == "Journal Entry": if (
ref_details.update({"exchange_rate": ref_exchange_rate}) reference_exchange_details
and d.reference_doctype == reference_exchange_details.reference_doctype
and d.reference_name == reference_exchange_details.reference_name
):
ref_details.update({"exchange_rate": reference_exchange_details.exchange_rate})
for field, value in ref_details.items(): for field, value in ref_details.items():
if d.exchange_gain_loss: if d.exchange_gain_loss:

14
erpnext/accounts/utils.py
View File

@@ -682,7 +682,19 @@ def update_reference_in_payment_entry(
payment_entry.setup_party_account_field() payment_entry.setup_party_account_field()
payment_entry.set_missing_values() payment_entry.set_missing_values()
if not skip_ref_details_update_for_pe: if not skip_ref_details_update_for_pe:
payment_entry.set_missing_ref_details(ref_exchange_rate=d.exchange_rate or None) reference_exchange_details = frappe._dict()
if d.against_voucher_type == "Journal Entry" and d.exchange_rate:
reference_exchange_details.update(
{
"reference_doctype": d.against_voucher_type,
"reference_name": d.against_voucher,
"exchange_rate": d.exchange_rate,
}
)
payment_entry.set_missing_ref_details(
update_ref_details_only_for=[(d.against_voucher_type, d.against_voucher)],
reference_exchange_details=reference_exchange_details,
)
payment_entry.set_amounts() payment_entry.set_amounts()
payment_entry.make_exchange_gain_loss_journal( payment_entry.make_exchange_gain_loss_journal(