[IMP] l10n_es_aeat_sii_oca: Improve SII not sent filter to use sii_en…

…abled field

TT52143

l10n_es_aeat_sii_oca/models/account_move.py

@@ -17,6 +17,7 @@
 
 from odoo import _, api, exceptions, fields, models
 from odoo.modules.registry import Registry
+from odoo.osv.expression import AND
 
 SII_VALID_INVOICE_STATES = ["posted"]
 _logger = logging.getLogger(__name__)
@@ -810,6 +811,25 @@ def _compute_sii_enabled(self):
             else:
                 invoice.sii_enabled = False
 
+    @api.model
+    def _search_sii_enabled(self, operator, value):
+        domain = super()._search_sii_enabled(operator, value)
+        invoice_types = self.get_sale_types() + self.get_purchase_types()
+        final_domain = domain + [
+            ("journal_id.sii_enabled", operator, value),
+            ("move_type", "in", invoice_types),
+        ]
+        return AND(
+            [
+                final_domain,
+                [
+                    "|",
+                    ("fiscal_position_id", "=", False),
+                    ("fiscal_position_id.aeat_active", operator, value),
+                ],
+            ]
+        )
+
     def _reverse_moves(self, default_values_list=None, cancel=False):
         # OVERRIDE
         if not default_values_list:

l10n_es_aeat_sii_oca/models/sii_mixin.py

@@ -88,6 +88,7 @@ class SiiMixin(models.AbstractModel):
     sii_enabled = fields.Boolean(
         string="Enable SII",
         compute="_compute_sii_enabled",
+        search="_search_sii_enabled",
     )
     sii_macrodata = fields.Boolean(
         string="MacroData",
@@ -151,6 +152,10 @@ def _compute_sii_registration_key_code(self):
     def _compute_sii_enabled(self):
         raise NotImplementedError
 
+    @api.model
+    def _search_sii_enabled(self, operator, value):
+        return [("company_id.sii_enabled", operator, value)]
+
     def _compute_macrodata(self):
         for document in self:
             document.sii_macrodata = (

l10n_es_aeat_sii_oca/views/account_move_views.xml

@@ -202,7 +202,7 @@
                     <filter
                         name="sii_not_sent"
                         string="SII not sent"
-                        domain="[('aeat_state', '=', 'not_sent'), ('date', '>=', '2017-01-01')]"
+                        domain="[('aeat_state', '=', 'not_sent'), ('sii_enabled', '=', True), ('date', '>=', '2017-01-01')]"
                         help="Never sent to SII"
                     />
                     <filter