[IMP] l10n_it_vat_settlement_date: add XLSX report

Author: TheMule71

l10n_it_vat_registries/report/reports.xml

@@ -19,10 +19,10 @@
         <field name="report_type">xlsx</field>
         <field
             name="report_name"
-        >l10n_it_vat_registries_xlsx.report_registro_iva</field>
+        >l10n_it_vat_registries.report_registro_iva_xlsx</field>
         <field
             name="report_file"
-        >l10n_it_vat_registries_xlsx.report_registro_iva</field>
+        >l10n_it_vat_registries.report_registro_iva_xlsx</field>
     </record>
 
 </odoo>

l10n_it_vat_registries/tests/test_registry.py

@@ -8,71 +8,76 @@
 
 
 class TestRegistry(TransactionCase):
-    @classmethod
-    def setUpClass(cls):
-        super().setUpClass()
+    def setUp(self):
+        super().setUp()
 
-        cls.test_date = fields.Date.today()
-        cls.journal = cls.env["account.journal"].search(
+        self.test_date = fields.Date.today()
+        self.journal = self.env["account.journal"].search(
             [("type", "=", "sale")], limit=1
         )
-        cls.ova = cls.env["account.account"].search(
-            [("account_type", "=", "asset_current")],
+        self.ova = self.env["account.account"].search(
+            [
+                (
+                    "user_type_id",
+                    "=",
+                    self.env.ref("account.data_account_type_current_assets").id,
+                )
+            ],
             limit=1,
         )
-        cls.tax = cls.env["account.tax"].create(
+        self.tax = self.env["account.tax"].create(
             {
                 "name": "Tax 10.0",
                 "amount": 10.0,
                 "amount_type": "fixed",
             }
         )
-        cls.tax_registry = cls.env["account.tax.registry"].create(
+        self.tax_registry = self.env["account.tax.registry"].create(
             {
                 "name": "Sales",
                 "layout_type": "customer",
-                "journal_ids": [(6, 0, [cls.journal.id])],
+                "journal_ids": [(6, 0, [self.journal.id])],
             }
         )
 
-        cls.invoice_line_account = (
-            cls.env["account.account"]
+        self.invoice_line_account = (
+            self.env["account.account"]
             .search(
                 [
                     (
                         "user_type_id",
                         "=",
-                        cls.env.ref("account.data_account_type_expenses").id,
+                        self.env.ref("account.data_account_type_expenses").id,
                     )
                 ],
                 limit=1,
             )
             .id
         )
 
-        cls.invoice = cls.env["account.move"].create(
+        self.invoice = self.env["account.move"].create(
             {
-                "partner_id": cls.env.ref("base.res_partner_2").id,
-                "invoice_date": cls.test_date,
+                "partner_id": self.env.ref("base.res_partner_2").id,
+                "invoice_date": self.test_date,
                 "move_type": "out_invoice",
-                "journal_id": cls.journal.id,
+                "journal_id": self.journal.id,
                 "invoice_line_ids": [
                     (
                         0,
                         None,
                         {
-                            "product_id": cls.env.ref("product.product_product_4").id,
+                            "product_id": self.env.ref("product.product_product_4").id,
                             "quantity": 1.0,
                             "price_unit": 100.0,
                             "name": "product that cost 100",
-                            "account_id": cls.invoice_line_account,
-                            "tax_ids": [(6, 0, [cls.tax.id])],
+                            "account_id": self.invoice_line_account,
+                            "tax_ids": [(6, 0, [self.tax.id])],
                         },
                     )
                 ],
             }
         )
-        cls.invoice.action_post()
+        self.invoice.action_post()
 
     def test_invoice_and_report(self):
         wizard = self.env["wizard.registro.iva"].create(
@@ -100,7 +105,7 @@ def test_invoice_and_report(self):
         # XLSX
         res = wizard.print_registro_xlsx()
 
-        report_name = "l10n_it_vat_registries_xlsx.report_registro_iva"
+        report_name = "l10n_it_vat_registries.report_registro_iva_xlsx"
         domain = [
             ("report_type", "=", "xlsx"),
             ("report_name", "=", report_name),

l10n_it_vat_registries/wizard/report_registro_iva_xlsx.py

@@ -2,22 +2,23 @@
 
 import logging
 
-from odoo import _
+from odoo import _, models
 from odoo.tools.misc import formatLang
 
 from odoo.addons.report_xlsx_helper.report.report_xlsx_format import (
     FORMATS,
     XLS_HEADERS,
 )
 
-from ..models.vat_registry import ReportRegistroIva
-
 _logger = logging.getLogger(__name__)
 
 
-class ReportRegistroIvaXlsx(ReportRegistroIva):
-    _name = "report.l10n_it_vat_registries_xlsx.report_registro_iva"
-    _inherit = "report.report_xlsx.abstract"
+class ReportRegistroIvaXlsx(models.AbstractModel):
+    _name = "report.l10n_it_vat_registries.report_registro_iva_xlsx"
+    _inherit = [
+        "report.report_xlsx.abstract",
+        "report.l10n_it_vat_registries.report_registro_iva",
+    ]
     _description = "XLSX report for VAT registries"
 
     # to override

l10n_it_vat_settlement_date/__init__.py

@@ -2,3 +2,4 @@
 
 from . import models
 from . import reports
+from . import wizard

l10n_it_vat_settlement_date/wizard/__init__.py

@@ -0,0 +1,3 @@
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from . import report_registro_iva_xlsx

l10n_it_vat_settlement_date/wizard/report_registro_iva_xlsx.py

@@ -0,0 +1,21 @@
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import _, models
+
+
+class ReportRegistroIvaXlsx(models.AbstractModel):
+    _inherit = "report.l10n_it_vat_registries.report_registro_iva_xlsx"
+
+    def _get_vat_settlement_date_col_spec(self):
+        ret = {
+            "vat_settlement_date": {
+                "header": {"value": _("VAT settlement date")},
+                "lines": {
+                    "value": self._render(
+                        "format_date(move.l10n_it_vat_settlement_date, date_format)"
+                    )
+                },
+                "width": 20,
+            }
+        }
+        return ret