Integrating #5023

Author: Borruso

l10n_it_edi_oss/__init__.py

@@ -1,5 +1,6 @@
 from . import models
 from . import wizard
+from .hooks import pre_absorb_old_module
 
 OSS_EXEMPT_REASON = "N3.2"
 OSS_LAW_REFERENCE = "Art. 41 D.L. 331/1993"

l10n_it_edi_oss/__manifest__.py

@@ -14,6 +14,8 @@
         "l10n_it_edi",
         "l10n_eu_oss_oca",
     ],
+    "external_dependencies": {"python": ["openupgradelib"]},
     "installable": True,
+    "pre_init_hook": "pre_absorb_old_module",
     "post_init_hook": "_l10n_it_edi_oss_post_init_hook",
 }

l10n_it_edi_oss/hooks.py

@@ -0,0 +1,14 @@
+# Copyright 2025 Giuseppe Borruso - Dinamiche Aziendali srl
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from openupgradelib import openupgrade
+
+_old_module = "l10n_it_fatturapa_out_oss"
+_new_module = "l10n_it_edi_oss"
+
+
+def pre_absorb_old_module(env):
+    if openupgrade.is_module_installed(env, _old_module):
+        openupgrade.update_module_names(
+            env, [(_old_module, _new_module)], merge_modules=True
+        )

l10n_it_edi_oss/migrations/18.0.1.0.0/pre-migrate.py

@@ -0,0 +1,12 @@
+# Copyright 2025 Giuseppe Borruso - Dinamiche Aziendali srl
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from openupgradelib import openupgrade
+
+from odoo.addons.l10n_it_edi_oss import hooks
+
+
+@openupgrade.migrate()
+def migrate(env, version):
+    # Used by OpenUpgrade when module is in `apriori`
+    hooks.pre_absorb_old_module(env)

l10n_it_edi_oss/models/account_move.py

@@ -19,13 +19,13 @@ def _l10n_it_edi_grouping_function_tax_lines(self, base_line, tax_data):
         result = super()._l10n_it_edi_grouping_function_tax_lines(base_line, tax_data)
         if result and tax_data and tax_data["tax"].oss_country_id:
             result["tax_amount_field"] = 0.0
-            result["is_oss"] = True
+            result["oss_country_id"] = tax_data["tax"].oss_country_id
         return result
 
     def _l10n_it_edi_add_base_lines_xml_values(
         self, base_lines_aggregated_values, is_downpayment
     ):
-        super()._l10n_it_edi_add_base_lines_xml_values(
+        result = super()._l10n_it_edi_add_base_lines_xml_values(
             base_lines_aggregated_values, is_downpayment
         )
         for base_line, _aggregated_values in base_lines_aggregated_values:
@@ -39,6 +39,7 @@ def _l10n_it_edi_add_base_lines_xml_values(
                         "riferimento_data": None,
                     }
                 )
+        return result
 
     def _l10n_it_edi_get_tax_lines_xml_values(
         self, base_lines_aggregated_values, values_per_grouping_key
@@ -54,7 +55,7 @@ def _l10n_it_edi_get_tax_lines_xml_values(
             grouping_key = values["grouping_key"]
             if not grouping_key or grouping_key.get("skip"):
                 continue
-            if grouping_key.get("is_oss") and idx < len(tax_lines):
+            if grouping_key.get("oss_country_id") and idx < len(tax_lines):
                 tax_lines[idx]["imposta"] = 0.0
             idx += 1
         return tax_lines

l10n_it_edi_oss/tests/test_edi_oss_export.py

@@ -1,6 +1,8 @@
 # Copyright 2026 Lorenzo Battistini
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
+from lxml import etree
+
 from odoo.tests import tagged
 
 from odoo.addons.l10n_it_edi.tests.common import TestItEdi
@@ -56,3 +58,28 @@ def test_oss_invoice_export(self):
         invoice.invoice_date_due = invoice.date
         invoice.action_post()
         self._assert_export_invoice(invoice, "oss_invoice.xml")
+
+    def test_non_oss_invoice_export(self):
+        """Non-OSS invoices are not affected by this module."""
+        invoice = self.init_invoice(
+            "out_invoice",
+            amounts=[100],
+            company=self.company,
+            partner=self.italian_partner_a,
+            taxes=self.default_tax,
+        )
+        invoice.invoice_date_due = invoice.date
+        invoice.action_post()
+        xml = invoice._l10n_it_edi_render_xml()
+        tree = etree.fromstring(xml)
+        oss_nodes = [n for n in tree.iter("TipoDato") if n.text == "OSS"]
+        self.assertFalse(
+            oss_nodes, "Non-OSS invoice should not have OSS AltriDatiGestionali"
+        )
+        aliquota_nodes = list(tree.iter("AliquotaIVA"))
+        for node in aliquota_nodes:
+            self.assertNotEqual(
+                node.text,
+                "0.00",
+                "Non-OSS invoice should have actual tax rate",
+            )