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

Merge pull request #40515 from frappe/mergify/bp/version-14-hotfix/pr-40511

Browse Source 
fix: invalid exchange loss booking on invoice against base accounts (backport #40511)
This commit is contained in:
ruthra kumar
2024-03-18 21:05:51 +05:30
committed by GitHub
parent c4c0510a1b fe78214ea4
commit 8cb1293ffc
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -350,7 +350,9 @@ class PaymentEntry(AccountsController):
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
) )
if ref_exchange_rate:
# Only update exchange rate when the reference is Journal Entry
if ref_exchange_rate and d.reference_doctype == "Journal Entry":
ref_details.update({"exchange_rate": ref_exchange_rate}) ref_details.update({"exchange_rate": ref_exchange_rate})
for field, value in ref_details.items(): for field, value in ref_details.items():

11
erpnext/accounts/doctype/payment_reconciliation/test_payment_reconciliation.py
View File

@@ -1130,6 +1130,17 @@ class TestPaymentReconciliation(FrappeTestCase):
self.assertEqual(pr.allocation[0].allocated_amount, 85) self.assertEqual(pr.allocation[0].allocated_amount, 85)
self.assertEqual(pr.allocation[0].difference_amount, 0) self.assertEqual(pr.allocation[0].difference_amount, 0)
pr.reconcile()
si.reload()
self.assertEqual(si.outstanding_amount, 0)
# No Exchange Gain/Loss journal should be generated
exc_gain_loss_journals = frappe.db.get_all(
"Journal Entry Account",
filters={"reference_type": si.doctype, "reference_name": si.name, "docstatus": 1},
fields=["parent"],
)
self.assertEqual(exc_gain_loss_journals, [])
def test_reconciliation_purchase_invoice_against_return(self): def test_reconciliation_purchase_invoice_against_return(self):
self.supplier = "_Test Supplier USD" self.supplier = "_Test Supplier USD"
pi = self.create_purchase_invoice(qty=5, rate=50, do_not_submit=True) pi = self.create_purchase_invoice(qty=5, rate=50, do_not_submit=True)