Merge PR #1151 into 16.0

Signed-off-by dhongu
OCA · Dec 12, 2024 · a02f7dc · a02f7dc
2 parents dcfe14e + c2242cb
commit a02f7dc
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 7 deletions.
diff --git a/l10n_ro_account_edi_ubl/models/account_edi_xml_cius_ro.py b/l10n_ro_account_edi_ubl/models/account_edi_xml_cius_ro.py
@@ -173,9 +173,10 @@ def _export_invoice_vals(self, invoice):
         vals_list["vals"].update(
             {
                 "customization_id": "urn:cen.eu:en16931:2017#compliant#urn:efactura.mfinante.ro:CIUS-RO:1.0.1",  # noqa
-                "tax_currency_code": "RON",
             }
         )
+        if invoice.move_type == "out_invoice" and invoice.currency_id.name != "RON":
+            vals_list["vals"]["tax_currency_code"] = invoice.currency_id.name
 
         index = 1
         for val in vals_list["vals"]["invoice_line_vals"]:

diff --git a/l10n_ro_account_edi_ubl/tests/credit_note.xml b/l10n_ro_account_edi_ubl/tests/credit_note.xml
@@ -9,7 +9,7 @@
     <cbc:ProfileID>urn:fdc:peppol.eu:2017:poacc:billing:01:1.0</cbc:ProfileID>
     <cbc:ID>FBRAO2093</cbc:ID>
     <cbc:IssueDate>2022-09-01</cbc:IssueDate>
-    <cbc:TaxCurrencyCode>RON</cbc:TaxCurrencyCode>
+
     <cbc:InvoiceTypeCode>380</cbc:InvoiceTypeCode>
     <cbc:DocumentCurrencyCode>RON</cbc:DocumentCurrencyCode>
     <cbc:BuyerReference>SCOALA GIMNAZIALA COMUNA FOENI</cbc:BuyerReference>

diff --git a/l10n_ro_account_edi_ubl/tests/credit_note_in.xml b/l10n_ro_account_edi_ubl/tests/credit_note_in.xml
@@ -9,7 +9,7 @@
     <cbc:ProfileID>urn:fdc:peppol.eu:2017:poacc:billing:01:1.0</cbc:ProfileID>
     <cbc:ID>FBRAO2095</cbc:ID>
     <cbc:IssueDate>2022-09-01</cbc:IssueDate>
-    <cbc:TaxCurrencyCode>RON</cbc:TaxCurrencyCode>
+
     <cbc:InvoiceTypeCode>389</cbc:InvoiceTypeCode>
     <cbc:DocumentCurrencyCode>RON</cbc:DocumentCurrencyCode>
     <cbc:BuyerReference>SCOALA GIMNAZIALA COMUNA FOENI</cbc:BuyerReference>

diff --git a/l10n_ro_account_edi_ubl/tests/credit_note_in_option.xml b/l10n_ro_account_edi_ubl/tests/credit_note_in_option.xml
@@ -9,7 +9,7 @@
     <cbc:ProfileID>urn:fdc:peppol.eu:2017:poacc:billing:01:1.0</cbc:ProfileID>
     <cbc:ID>FBRAO2095</cbc:ID>
     <cbc:IssueDate>2022-09-01</cbc:IssueDate>
-    <cbc:TaxCurrencyCode>RON</cbc:TaxCurrencyCode>
+
     <cbc:InvoiceTypeCode>389</cbc:InvoiceTypeCode>
     <cbc:DocumentCurrencyCode>RON</cbc:DocumentCurrencyCode>
     <cbc:BuyerReference>SCOALA GIMNAZIALA COMUNA FOENI</cbc:BuyerReference>

diff --git a/l10n_ro_account_edi_ubl/tests/credit_note_option.xml b/l10n_ro_account_edi_ubl/tests/credit_note_option.xml
@@ -9,7 +9,7 @@
     <cbc:ProfileID>urn:fdc:peppol.eu:2017:poacc:billing:01:1.0</cbc:ProfileID>
     <cbc:ID>FBRAO2093</cbc:ID>
     <cbc:IssueDate>2022-09-01</cbc:IssueDate>
-    <cbc:TaxCurrencyCode>RON</cbc:TaxCurrencyCode>
+
     <cbc:InvoiceTypeCode>380</cbc:InvoiceTypeCode>
     <cbc:DocumentCurrencyCode>RON</cbc:DocumentCurrencyCode>
     <cbc:BuyerReference>SCOALA GIMNAZIALA COMUNA FOENI</cbc:BuyerReference>

diff --git a/l10n_ro_account_edi_ubl/tests/invoice.xml b/l10n_ro_account_edi_ubl/tests/invoice.xml
@@ -10,7 +10,6 @@
     <cbc:ID>FBRAO2092</cbc:ID>
     <cbc:IssueDate>2022-09-01</cbc:IssueDate>
     <cbc:DueDate>2022-09-01</cbc:DueDate>
-    <cbc:TaxCurrencyCode>RON</cbc:TaxCurrencyCode>
     <cbc:InvoiceTypeCode>380</cbc:InvoiceTypeCode>
     <cbc:DocumentCurrencyCode>RON</cbc:DocumentCurrencyCode>
     <cbc:BuyerReference>SCOALA GIMNAZIALA COMUNA FOENI</cbc:BuyerReference>

diff --git a/l10n_ro_account_edi_ubl/tests/invoice_in.xml b/l10n_ro_account_edi_ubl/tests/invoice_in.xml
@@ -10,7 +10,7 @@
     <cbc:ID>FBRAO2094</cbc:ID>
     <cbc:IssueDate>2022-09-01</cbc:IssueDate>
     <cbc:DueDate>2022-09-01</cbc:DueDate>
-    <cbc:TaxCurrencyCode>RON</cbc:TaxCurrencyCode>
+
     <cbc:InvoiceTypeCode>389</cbc:InvoiceTypeCode>
     <cbc:DocumentCurrencyCode>RON</cbc:DocumentCurrencyCode>
     <cbc:BuyerReference>SCOALA GIMNAZIALA COMUNA FOENI</cbc:BuyerReference>

diff --git a/l10n_ro_account_edi_ubl/views/cius_template.xml b/l10n_ro_account_edi_ubl/views/cius_template.xml
@@ -4,6 +4,7 @@
     <template id="cius_InvoiceType" inherit_id="account_edi_ubl_cii.ubl_20_InvoiceType">
         <xpath expr="//*[local-name()='IssueDate']" position="after">
             <cbc:TaxCurrencyCode
+                t-if="tax_currency_code"
                 xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2"
                 xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
                 xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"