From 98cce5003f4bcc32cbdd792631c4de432dd4029c Mon Sep 17 00:00:00 2001
From: eLBati <elbaddy@gmail.com>
Date: Tue, 13 Feb 2024 18:18:48 +0100
Subject: [PATCH 1/2] FIX l10n_it_reverse_charge in multi currency: use the
 supplier invoice date

Steps:

 - Configure reverse charge
 - Configure 2 different rate for USD: for 19/12/2023 and for 31/01/2024
 - Create a USD supplier invoice with invoice date 19/12/2023 and accounting date 31/01/2024
 - Validate

Observed:

the currency rate of self invoice is 31/01/2024

Desired:

the currency rate of self invoice is 19/12/2023
---
 l10n_it_reverse_charge/models/account_move.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/l10n_it_reverse_charge/models/account_move.py b/l10n_it_reverse_charge/models/account_move.py
index b5208036d78d..3eb7d884f729 100644
--- a/l10n_it_reverse_charge/models/account_move.py
+++ b/l10n_it_reverse_charge/models/account_move.py
@@ -36,6 +36,14 @@ def _compute_rc_flag(self):
             line.rc = is_rc
 
     rc = fields.Boolean("RC", compute="_compute_rc_flag", store=True, readonly=False)
+    rc_source_line_id = fields.Many2one("account.move.line", readonly=True)
+
+    def _compute_currency_rate(self):
+        res = super()._compute_currency_rate()
+        for line in self:
+            if line.currency_id and line.rc_source_line_id:
+                line.currency_rate = line.rc_source_line_id.currency_rate
+        return res
 
 
 class AccountMove(models.Model):
@@ -81,6 +89,7 @@ def rc_inv_line_vals(self, line):
             "price_unit": line.price_unit,
             "quantity": line.quantity,
             "discount": line.discount,
+            "rc_source_line_id": line.id,
         }
 
     def rc_inv_vals(self, partner, rc_type, lines, currency):
@@ -462,6 +471,7 @@ def generate_supplier_self_invoice(self):
         invoice_line_vals = []
         for inv_line in self.invoice_line_ids:
             line_vals = inv_line.copy_data()[0]
+            line_vals["rc_source_line_id"] = inv_line.id
             line_vals["move_id"] = supplier_invoice.id
             line_tax_ids = inv_line.tax_ids
             mapped_taxes = rc_type.map_tax(

From 758728dc9836197832749123a14c8127d4f71f11 Mon Sep 17 00:00:00 2001
From: eLBati <elbaddy@gmail.com>
Date: Wed, 31 Jan 2024 16:59:37 +0100
Subject: [PATCH 2/2] FIX l10n_it_fatturapa_out and l10n_it_fatturapa_out_rc
 avoiding to convert to EUR tax_base_amount as it is already in company
 currency (currency_field='company_currency_id')

Note: tests are not using tax_base_amount to compute ImponibileImporto (they use line.price_subtotal) because it is empty, while it sould not

Steps:

 - Configure reverse charge for extra UE suppliers
 - Create an USD invoice, with 1 line,  with fiscal position for extra UE suppliers
 - Confirm
 - Generate XML from self invocie

Observed: "Totale imponibile" is different from "Prezzo unitario"

FIX l10n_it_fatturapa_out_rc in multi currency: use the supplier invoice date

REF fpa_to_eur using move line currency_rate when available
---
 .../data/invoice_it_template.xml              | 29 +++----------------
 l10n_it_fatturapa_out/wizard/efattura.py      | 20 ++++++++-----
 .../wizard/wizard_export_fatturapa.py         | 23 +++++++++++----
 .../data/invoice_it_template.xml              |  2 +-
 .../views/invoice_it_template.xml             |  4 +--
 5 files changed, 36 insertions(+), 42 deletions(-)

diff --git a/l10n_it_fatturapa_out/data/invoice_it_template.xml b/l10n_it_fatturapa_out/data/invoice_it_template.xml
index 1ef2d45bee6d..dd3e7f0a8849 100644
--- a/l10n_it_fatturapa_out/data/invoice_it_template.xml
+++ b/l10n_it_fatturapa_out/data/invoice_it_template.xml
@@ -170,7 +170,7 @@ e 'line' per riga di fattura (a seconda del livello in cui sono chiamati)
                 t-call="l10n_it_fatturapa_out.account_invoice_line_it_sconto_maggiorazione"
             />
                 <PrezzoTotale
-                t-out="format_monetary(fpa_to_eur(line.price_subtotal, record), euro)"
+                t-out="format_monetary(fpa_to_eur(line.price_subtotal, record, line.currency_rate), euro)"
             />
                 <AliquotaIVA
                 t-if="not line_is_section_note"
@@ -219,27 +219,6 @@ e 'line' per riga di fattura (a seconda del livello in cui sono chiamati)
             </DettaglioLinee>
         </template>
 
-        <template id="account_invoice_line_it_dati_riepilogo">
-            <t t-set="tax" t-value="tax_line.tax_line_id" />
-            <DatiRiepilogo>
-                <!--2.2.2-->
-                <AliquotaIVA t-out="format_numbers(tax.amount)" />
-                <Natura t-if="tax.kind_id.code" t-out="tax.kind_id.code" />
-                <!--                <SpeseAccessorie t-out=""/>-->
-                <!--                <Arrotondamento t-out=""/>-->
-                <ImponibileImporto
-                t-out="format_monetary(fpa_to_eur(tax_line.tax_base_amount, record), euro)"
-            />
-                <Imposta
-                t-out="format_monetary(fpa_to_eur(tax_line.price_total, record), euro)"
-            />
-                <EsigibilitaIVA t-if="tax.payability" t-out="tax.payability" />
-                <RiferimentoNormativo
-                t-if="tax.law_reference"
-                t-out="encode_for_export(tax.law_reference, 100)"
-            />
-            </DatiRiepilogo>
-        </template>
         <template id="account_invoice_it_FatturaPA_sede">
             <t t-set="indirizzo"><t
                 t-if="partner_id.street2"
@@ -599,10 +578,10 @@ e 'line' per riga di fattura (a seconda del livello in cui sono chiamati)
                               <!--                <SpeseAccessorie t-out=""/>-->
                               <!--                <Arrotondamento t-out=""/>-->
                               <ImponibileImporto
-                            t-out="format_monetary(fpa_to_eur(tax_data['ImponibileImporto'], record), euro)"
+                            t-out="format_monetary(tax_data['ImponibileImporto'], euro)"
                         />
                               <Imposta
-                            t-out="format_monetary(fpa_to_eur(tax_data['Imposta'], record), euro)"
+                            t-out="format_monetary(tax_data['Imposta'], euro)"
                         />
                                 <EsigibilitaIVA
                             t-if="tax_data.get('EsigibilitaIVA', False)"
@@ -647,7 +626,7 @@ e 'line' per riga di fattura (a seconda del livello in cui sono chiamati)
                         />
                             <ImportoPagamento
                             t-if="not record.company_id.xml_divisa_value == 'keep_orig'"
-                            t-out="format_numbers_two(fpa_to_eur(payment.amount_currency or payment.debit, record))"
+                            t-out="format_numbers_two(fpa_to_eur(payment.amount_currency or payment.debit, record, payment.currency_rate))"
                         />
 
                             <!--                            <CodUfficioPostale t-out=""/>-->
diff --git a/l10n_it_fatturapa_out/wizard/efattura.py b/l10n_it_fatturapa_out/wizard/efattura.py
index 3d31918c1195..a891db5f7e12 100644
--- a/l10n_it_fatturapa_out/wizard/efattura.py
+++ b/l10n_it_fatturapa_out/wizard/efattura.py
@@ -33,6 +33,15 @@ def format_numbers(number):
     return float_repr(number, max(2, len(cents)))
 
 
+def fpaToEur(amount, invoice, euro, rate=None):
+    currency = invoice.currency_id
+    if currency == euro:
+        return amount
+    elif rate is not None:
+        return amount * (1 / rate)
+    return currency._convert(amount, euro, invoice.company_id, invoice.date, False)
+
+
 class EFatturaOut:
     def get_template_values(self):  # noqa: C901
         """Prepare values and helper functions for the template"""
@@ -78,7 +87,7 @@ def format_price(line, sign=1, original_currency=False):
 
             # force EUR unless we want the original currency
             if not original_currency:
-                res = fpa_to_eur(res, line.move_id)
+                res = fpa_to_eur(res, line.move_id, line.currency_rate)
 
             # XXX arrotondamento?
             res = "{prezzo:.{precision}f}".format(
@@ -207,14 +216,9 @@ def get_payments(invoice):
             wiz = self.env["wizard.export.fatturapa"]
             return wiz.getPayments(invoice)
 
-        def fpa_to_eur(amount, invoice):
-            currency = invoice.currency_id
+        def fpa_to_eur(amount, invoice, rate=None):
             euro = self.env.ref("base.EUR")
-            if currency == euro:
-                return amount
-            return currency._convert(
-                amount, euro, invoice.company_id, invoice.date, False
-            )
+            return fpaToEur(amount, invoice, euro, rate)
 
         if self.partner_id.commercial_partner_id.is_pa:
             # check value code
diff --git a/l10n_it_fatturapa_out/wizard/wizard_export_fatturapa.py b/l10n_it_fatturapa_out/wizard/wizard_export_fatturapa.py
index 7278efd7f70c..1dcc0e640744 100644
--- a/l10n_it_fatturapa_out/wizard/wizard_export_fatturapa.py
+++ b/l10n_it_fatturapa_out/wizard/wizard_export_fatturapa.py
@@ -17,7 +17,7 @@
 
 from odoo.addons.l10n_it_account.tools.account_tools import encode_for_export
 
-from .efattura import EFatturaOut, format_numbers
+from .efattura import EFatturaOut, format_numbers, fpaToEur
 
 _logger = logging.getLogger(__name__)
 
@@ -87,12 +87,13 @@ def getPayments(self, invoice):
         values w/o altering the original lines"""
 
         class _Payment:
-            __slots__ = "date_maturity", "amount_currency", "debit"
+            __slots__ = "date_maturity", "amount_currency", "debit", "currency_rate"
 
-            def __init__(self, date_maturity, amount_currency, debit):
+            def __init__(self, date_maturity, amount_currency, debit, currency_rate):
                 self.date_maturity = date_maturity
                 self.amount_currency = amount_currency
                 self.debit = debit
+                self.currency_rate = currency_rate
 
         payments = []
         for line in invoice.line_ids.filtered(
@@ -100,7 +101,12 @@ def __init__(self, date_maturity, amount_currency, debit):
             in ("asset_receivable", "liability_payable")
         ):
             payments.append(
-                _Payment(line.date_maturity, line.amount_currency, line.debit)
+                _Payment(
+                    line.date_maturity,
+                    line.amount_currency,
+                    line.debit,
+                    line.currency_rate,
+                )
             )
         return payments
 
@@ -131,6 +137,7 @@ def getAllTaxes(self, invoice):
         def _key(tax_id):
             return tax_id.id
 
+        euro = self.env.ref("base.EUR")
         out_computed = {}
         # existing tax lines
         tax_ids = invoice.line_ids.filtered(lambda line: line.tax_line_id)
@@ -170,7 +177,9 @@ def _key(tax_id):
                         "AliquotaIVA": aliquota,
                         "Natura": tax_id.kind_id.code,
                         # 'Arrotondamento':'',
-                        "ImponibileImporto": line.price_subtotal,
+                        "ImponibileImporto": fpaToEur(
+                            line.price_subtotal, invoice, euro, rate=line.currency_rate
+                        ),
                         "Imposta": 0.0,
                         "EsigibilitaIVA": tax_id.payability,
                     }
@@ -179,7 +188,9 @@ def _key(tax_id):
                             tax_id.law_reference, 100
                         )
                 else:
-                    out[key]["ImponibileImporto"] += line.price_subtotal
+                    out[key]["ImponibileImporto"] += fpaToEur(
+                        line.price_subtotal, invoice, euro, rate=line.currency_rate
+                    )
                     out[key]["Imposta"] += 0.0
         out.update(out_computed)
         return out
diff --git a/l10n_it_fatturapa_out_oss/data/invoice_it_template.xml b/l10n_it_fatturapa_out_oss/data/invoice_it_template.xml
index 1507f819a8c3..844f94bbc5ef 100644
--- a/l10n_it_fatturapa_out_oss/data/invoice_it_template.xml
+++ b/l10n_it_fatturapa_out_oss/data/invoice_it_template.xml
@@ -26,7 +26,7 @@
                     t-out="tax_data['Natura']"
                 />
                 <ImponibileImporto
-                    t-out="format_monetary(fpa_to_eur(tax_data['ImponibileImporto'], record), euro)"
+                    t-out="format_monetary(tax_data['ImponibileImporto'], euro)"
                 />
                 <Imposta>0.00</Imposta>
                 <EsigibilitaIVA
diff --git a/l10n_it_fatturapa_out_rc/views/invoice_it_template.xml b/l10n_it_fatturapa_out_rc/views/invoice_it_template.xml
index a9f00323301a..2558ce1a3d58 100644
--- a/l10n_it_fatturapa_out_rc/views/invoice_it_template.xml
+++ b/l10n_it_fatturapa_out_rc/views/invoice_it_template.xml
@@ -45,7 +45,7 @@
         </xpath>
         <xpath expr="//DatiRiepilogo/ImponibileImporto" position="attributes">
             <attribute name="t-out">
-                format_monetary(fpa_to_eur(get_sign(record) * tax_data['ImponibileImporto'], record), euro)
+                format_monetary(get_sign(record) * tax_data['ImponibileImporto'], euro)
             </attribute>
         </xpath>
         <xpath expr="//DatiRiepilogo/Imposta" position="attributes">
@@ -66,7 +66,7 @@
         </xpath>
         <xpath expr="//PrezzoTotale" position="attributes">
             <attribute name="t-out">
-                format_monetary(fpa_to_eur(get_sign(line.move_id) * line.price_subtotal, record), euro)
+                format_monetary(fpa_to_eur(get_sign(line.move_id) * line.price_subtotal, record, line.currency_rate), euro)
             </attribute>
         </xpath>
     </template>