diff --git a/sale_order_invoice_amount/models/sale_order.py b/sale_order_invoice_amount/models/sale_order.py index e4e3d09e18c..9923c7a5812 100644 --- a/sale_order_invoice_amount/models/sale_order.py +++ b/sale_order_invoice_amount/models/sale_order.py @@ -37,7 +37,7 @@ def _compute_invoice_amount(self): and rec.currency_id != invoice.company_currency_id ): rec.invoiced_amount += invoice.currency_id._convert( - invoice.amount_total_signed, + invoice.amount_total_in_currency_signed, rec.currency_id, invoice.company_id, invoice.invoice_date or fields.Date.today(), diff --git a/sale_order_invoice_amount/tests/test_sale_order_invoice_amount.py b/sale_order_invoice_amount/tests/test_sale_order_invoice_amount.py index 08a7a4c6246..7add45add7d 100644 --- a/sale_order_invoice_amount/tests/test_sale_order_invoice_amount.py +++ b/sale_order_invoice_amount/tests/test_sale_order_invoice_amount.py @@ -196,10 +196,10 @@ def test_02_sale_order_invoiced_amount_different_currencies_invoice(self): } ) test_invoice.action_post() - self.assertAlmostEqual( + self.assertEqual( self.sale_order_1.invoiced_amount, - 242.0, - delta=1, + 242.11, + "Invoiced Amount should be 242.11.", ) self.assertEqual( self.sale_order_1.uninvoiced_amount, @@ -311,10 +311,10 @@ def test_03_sale_order_invoiced_amount_different_currencies_sale(self): } ) test_invoice.action_post() - self.assertAlmostEqual( + self.assertEqual( self.sale_order_1.invoiced_amount, - 242.0, - delta=40, + 242.13, + "Invoiced Amount should be 242.13.", ) self.assertEqual( self.sale_order_1.uninvoiced_amount, @@ -387,10 +387,10 @@ def test_03_sale_order_invoiced_amount_different_currencies_sale(self): ] ) test_invoice.action_post() - self.assertAlmostEqual( + self.assertEqual( self.sale_order_1.invoiced_amount, - 363.0, - delta=100, + 363.06, + "Invoiced Amount should be 363.06.", ) self.assertEqual( self.sale_order_1.uninvoiced_amount,