From 01fd29d52a6ed23d04bec8d763004fb2823940e0 Mon Sep 17 00:00:00 2001
From: "Andrea Grazioso (agr-odoo)" <agr@odoo.com>
Date: Wed, 14 Jun 2023 13:51:44 +0000
Subject: [PATCH] [FIX] account: payment wizard amount when payment in comp
curr
Have an invoice in foreign currency
Open "Register Payment" wizard
Have wizard currency as company currency
Change wizard date
Issue: amount will not recompute
opw-3357669
closes odoo/odoo#125049
Signed-off-by: Brice Bartoletti (bib) <bib@odoo.com>
---
.../tests/test_account_payment_register.py | 22 +++++++++++++++++++
.../wizard/account_payment_register.py | 7 +-----
2 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/addons/account/tests/test_account_payment_register.py b/addons/account/tests/test_account_payment_register.py
index 15c523a3a220..c2d91cf9ee88 100644
--- a/addons/account/tests/test_account_payment_register.py
+++ b/addons/account/tests/test_account_payment_register.py
@@ -2,6 +2,7 @@
from odoo.addons.account.tests.common import AccountTestInvoicingCommon
from odoo.exceptions import UserError
from odoo.tests import tagged, Form
+from odoo import fields
@tagged('post_install', '-at_install')
@@ -743,6 +744,27 @@ class TestAccountPaymentRegister(AccountTestInvoicingCommon):
.with_context(active_model='account.move', active_ids=self.out_invoice_2.ids)\
.create({})
+ def test_register_payment_multi_currency_conversion(self):
+ ''' When registering a payment using a different currency than the invoice, the amount should update when
+ changing wizard date
+ '''
+
+ PaymentRegister = self.env['account.payment.register']
+ data = [
+ (self.out_invoice_2, self.company_data['currency'], [1000.0, 666.67], "invoice is in foreign currency and payment is in company currency"),
+ (self.out_invoice_3, self.currency_data['currency'], [24.02, 36.03], "invoice is in company currency and payment is in foreign currency"),
+ (self.out_invoice_2, self.currency_data_3['currency'], [10.0, 2000.0], "invoice and payment are in different foreign currencies"),
+ ]
+ date = ('2017-01-01', '2016-01-01')
+
+ for invoice, pay_currency, expected_amounts, msg in data:
+ wizard = Form(PaymentRegister.with_context(active_model='account.move', active_ids=invoice.ids))
+ wizard.currency_id = pay_currency
+ for d, expected in zip(date, expected_amounts):
+ payment_date = fields.Date.from_string(d)
+ wizard.payment_date = payment_date
+ self.assertEqual(wizard.amount, expected, f"Amount in payment wizard when {msg} is not correct")
+
def test_register_payment_multi_currency_rounding_issue_positive_delta(self):
''' When registering a payment using a different currency than the invoice one, the invoice must be fully paid
at the end whatever the currency rate.
diff --git a/addons/account/wizard/account_payment_register.py b/addons/account/wizard/account_payment_register.py
index 56eea1ac90e4..09aadb5f2ede 100644
--- a/addons/account/wizard/account_payment_register.py
+++ b/addons/account/wizard/account_payment_register.py
@@ -391,13 +391,8 @@ class AccountPaymentRegister(models.TransientModel):
if wizard.source_currency_id == wizard.currency_id:
# Same currency.
wizard.amount = wizard.source_amount_currency
- elif wizard.currency_id == wizard.company_id.currency_id:
- # Payment expressed on the company's currency.
- wizard.amount = wizard.source_amount
else:
- # Foreign currency on payment different than the one set on the journal entries.
- amount_payment_currency = wizard.company_id.currency_id._convert(wizard.source_amount, wizard.currency_id, wizard.company_id, wizard.payment_date or fields.Date.today())
- wizard.amount = amount_payment_currency
+ wizard.amount = wizard.source_currency_id._convert(wizard.source_amount_currency, wizard.currency_id, wizard.company_id, wizard.payment_date or fields.Date.today())
@api.depends('amount')
def _compute_payment_difference(self):
--
GitLab