odoo-addon-l10n-br-fiscal 16.0.2.17.0__py3-none-any.whl → 16.0.19.4.0__py3-none-any.whl

odoo/addons/l10n_br_fiscal/models/document_related.py

@@ -56,7 +56,7 @@ class DocumentRelated(models.Model):
         default="cnpj",
     )
 
-    inscr_est = fields.Char(string="Inscr. Estadual/RG", size=16)
+    l10n_br_ie_code = fields.Char(string="Inscr. Estadual/RG", size=16)
 
     document_date = fields.Date(string="Data")
 
@@ -87,11 +87,14 @@ class DocumentRelated(models.Model):
         for record in self:
             check_cnpj_cpf(record.env, record.cnpj_cpf, self.env.ref("base.br"))
 
-    @api.constrains("inscr_est", "state_id")
+    @api.constrains("l10n_br_ie_code", "state_id")
     def _check_ie(self):
         for record in self:
             check_ie(
-                record.env, record.inscr_est, record.state_id, self.env.ref("base.br")
+                record.env,
+                record.l10n_br_ie_code,
+                record.state_id,
+                self.env.ref("base.br"),
             )
 
     @api.onchange("document_related_id")
@@ -101,7 +104,7 @@ class DocumentRelated(models.Model):
             return False
 
         self.document_type_id = related.document_type_id
-        self.document_total_amount = related.amount_total
+        self.document_total_amount = related.fiscal_amount_total
         self.document_total_weight = related.total_weight
 
         if related.document_type_id.electronic:
@@ -112,10 +115,10 @@ class DocumentRelated(models.Model):
             self.cnpj_cpf = False
             self.cpfcnpj_type = False
             self.document_date = False
-            self.inscr_est = False
+            self.l10n_br_ie_code = False
 
         if related.document_type_id.code in ("01", "04"):
-            self.access_key = False
+            self.document_key = False
             self.document_serie = related.document_serie
             self.document_number = related.document_number
             self.state_id = (
@@ -125,7 +128,7 @@ class DocumentRelated(models.Model):
                 or False
             )
 
-            self.cnpj_cpf = related.partner_id and related.partner_id.cnpj_cpf or False
+            self.cnpj_cpf = related.partner_id and related.partner_id.vat or False
 
             if related.partner_id.is_company:
                 self.cpfcnpj_type = "cnpj"
@@ -135,8 +138,8 @@ class DocumentRelated(models.Model):
             self.document_date = related.document_date
 
         if related.document_type_id.code == "04":
-            self.inscr_est = (
-                related.partner_id and related.partner_id.inscr_est or False
+            self.l10n_br_ie_code = (
+                related.partner_id and related.partner_id.l10n_br_ie_code or False
             )
 
     @api.onchange("cnpj_cpf", "cpfcnpj_type")

odoo/addons/l10n_br_fiscal/models/document_serie.py

@@ -3,11 +3,13 @@
 # License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
 
 from odoo import _, api, fields, models
+from odoo.exceptions import ValidationError
 
 from ..constants.fiscal import (
     DOCUMENT_ISSUER_COMPANY,
     FISCAL_IN_OUT,
     FISCAL_IN_OUT_DEFAULT,
+    SITUACAO_EDOC_EM_DIGITACAO,
 )
 
 
@@ -55,6 +57,14 @@ class DocumentSerie(models.Model):
         string="Invalidate Number Range",
     )
 
+    _sql_constraints = [
+        (
+            "document_serie_unique",
+            "unique(code, document_type_id, company_id)",
+            "A Fiscal Document Serie already exists for this document type.",
+        )
+    ]
+
     @api.model
     def _create_sequence(self, values):
         """Create new no_gap entry sequence for every
@@ -78,6 +88,29 @@ class DocumentSerie(models.Model):
                 vals.update({"internal_sequence_id": self._create_sequence(vals)})
         return super().create(vals_list)
 
+    def write(self, vals):
+        if "internal_sequence_id" in vals:
+            raise ValidationError(_("You cannot change the internal sequence."))
+        if "code" in vals:
+            for serie in self:
+                if serie.code == vals["code"]:
+                    continue
+                if self.env["l10n_br_fiscal.document"].search_count(
+                    [
+                        ("document_serie_id", "=", serie.id),
+                        ("state_edoc", "not in", [SITUACAO_EDOC_EM_DIGITACAO]),
+                    ],
+                    limit=1,
+                ):
+                    raise ValidationError(
+                        _(
+                            "You cannot change the code of a document "
+                            "serie %(name)s that is already in use.",
+                            name=serie.name,
+                        )
+                    )
+        return super().write(vals)
+
     def name_get(self):
         return [(r.id, f"{r.name}") for r in self]
 

odoo/addons/l10n_br_fiscal/models/document_type.py

@@ -35,12 +35,6 @@ class DocumentType(models.Model):
         required=True,
     )
 
-    document_email_ids = fields.One2many(
-        comodel_name="l10n_br_fiscal.document.email",
-        inverse_name="document_type_id",
-        string="Email Template Definition",
-    )
-
     document_serie_ids = fields.One2many(
         comodel_name="l10n_br_fiscal.document.serie",
         inverse_name="document_type_id",

odoo/addons/l10n_br_fiscal/models/ibpt.py

@@ -45,7 +45,7 @@ def _request(ws_url, params, ibpt_request_timeout=30):
         elif response.status_code == requests.codes.service_unavailable:
             raise UserError(_("IBPT Service Unavailable - {!r}").format(ws_url))
     except Exception as e:
-        raise UserError(_("Error in the request: {}").format(e)) from e
+        raise UserError(f"Error in the request: {e}") from e
 
 
 def get_ibpt_product(

odoo/addons/l10n_br_fiscal/models/icms_regulation.py

@@ -50,7 +50,7 @@ class ICMSRegulation(models.Model):
     _inherit = ["mail.thread", "mail.activity.mixin"]
     _description = "Tax ICMS Regulation"
 
-    name = fields.Text(required=True, index=True)
+    name = fields.Char(required=True, index=True)
 
     icms_imported_tax_id = fields.Many2one(
         comodel_name="l10n_br_fiscal.tax",
@@ -2101,7 +2101,7 @@ class ICMSRegulation(models.Model):
             company.state_id != partner.state_id
             and partner.ind_ie_dest == NFE_IND_IE_DEST_9
             and operation_line.fiscal_operation_type == FISCAL_OUT
-            or operation_line.fiscal_operation_id.fiscal_type == "return_in"
+            or operation_line.fiscal_operation_id.fiscal_type != "return_in"
             and operation_line.fiscal_operation_type == FISCAL_IN
         ):
             domain = self._build_map_tax_def_domain(

odoo/addons/l10n_br_fiscal/models/invalidate_number.py

@@ -105,11 +105,10 @@ class InvalidateNumber(models.Model):
     @api.depends("document_type_id", "document_serie_id", "number_start", "number_end")
     def _compute_name(self):
         for record in self:
-            record.name = "{type}/({serie}): {start} - {end}".format(
-                type=record.document_type_id.type,
-                serie=record.document_serie_id.name,
-                start=record.number_start,
-                end=record.number_end,
+            record.name = (
+                f"{record.document_type_id.type}/"
+                f"({record.document_serie_id.name}): "
+                f"{record.number_start} - {record.number_end}"
             )
 
     def unlink(self):

odoo/addons/l10n_br_fiscal/models/legal_nature.py

@@ -0,0 +1,20 @@
+# Copyright (C) 2025  Renato Lima - Akretion <renato.lima@akretion.com.br>
+# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
+
+from odoo import fields, models
+
+
+class LegalNature(models.Model):
+    _name = "l10n_br_fiscal.legal.nature"
+    _inherit = "l10n_br_fiscal.data.abstract"
+    _description = "Legal Nature"
+
+    code = fields.Char(size=5)
+
+    _sql_constraints = [
+        (
+            "fiscal_legal_nature_code_uniq",
+            "unique (code)",
+            "Legal Nature already exists with this code !",
+        )
+    ]

odoo/addons/l10n_br_fiscal/models/nbm.py

@@ -15,26 +15,18 @@ class Nbm(models.Model):
 
     code_unmasked = fields.Char(size=10, unaccent=False)
 
-    name = fields.Text(required=True, index=True)
-
     product_tmpl_ids = fields.One2many(inverse_name="nbm_id")
 
     ncms = fields.Char(string="NCM")
 
     ncm_ids = fields.Many2many(
         comodel_name="l10n_br_fiscal.ncm",
-        relation="fiscal_nbm_ncm_rel",
-        column1="nbm_id",
-        column2="ncm_id",
         readonly=True,
         string="NCMs",
     )
 
     tax_definition_ids = fields.Many2many(
         comodel_name="l10n_br_fiscal.tax.definition",
-        relation="tax_definition_nbm_rel",
-        column1="nbm_id",
-        column2="tax_definition_id",
         readonly=True,
         string="Tax Definition",
     )

odoo/addons/l10n_br_fiscal/models/ncm.py

@@ -44,36 +44,24 @@ class Ncm(models.Model):
 
     tax_definition_ids = fields.Many2many(
         comodel_name="l10n_br_fiscal.tax.definition",
-        relation="tax_definition_ncm_rel",
-        column1="ncm_id",
-        column2="tax_definition_id",
         readonly=True,
         string="Tax Definition",
     )
 
     cest_ids = fields.Many2many(
         comodel_name="l10n_br_fiscal.cest",
-        relation="fiscal_cest_ncm_rel",
-        column1="ncm_id",
-        column2="cest_id",
         readonly=True,
         string="CESTs",
     )
 
     nbm_ids = fields.Many2many(
         comodel_name="l10n_br_fiscal.nbm",
-        relation="fiscal_nbm_ncm_rel",
-        column1="ncm_id",
-        column2="nbm_id",
         readonly=True,
         string="NBMs",
     )
 
     piscofins_ids = fields.Many2many(
         comodel_name="l10n_br_fiscal.tax.pis.cofins",
-        relation="fiscal_pis_cofins_ncm_rel",
-        column1="ncm_id",
-        column2="piscofins_id",
         readonly=True,
         string="PIS/COFINS",
     )

odoo/addons/l10n_br_fiscal/models/operation.py

@@ -1,7 +1,7 @@
 # Copyright (C) 2013  Renato Lima - Akretion
 # License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
 
-from odoo import _, api, fields, models
+from odoo import _, fields, models
 from odoo.exceptions import UserError
 
 from ..constants.fiscal import (
@@ -17,6 +17,54 @@ from ..constants.fiscal import (
 
 
 class Operation(models.Model):
+    """
+    Defines a Fiscal Operation, representing the nature and fiscal intent of
+    a transaction (e.g., Sale, Return, Import, Industrialization).
+
+    A Fiscal Operation is a core configuration entity in the Brazilian
+    fiscal localization. It serves as a central point to orchestrate how
+    fiscal documents and their lines are processed by determining:
+
+    1.  **Transaction Type**: Specifies if the operation is an Inbound
+        (e.g., purchase, return from customer), Outbound (e.g., sale,
+        return to supplier), or Other type of fiscal movement.
+
+    2.  **Operation Lines (`line_ids`)**: Each Fiscal Operation contains
+        one or more `l10n_br_fiscal.operation.line` records. These lines
+        define specific rules or conditions (based on partner profiles,
+        product types, company tax regime, etc.) under which a
+        particular set of fiscal treatments apply. The system selects
+        the "best match" operation line based on the context of a
+        transaction.
+
+    3.  **CFOP (Código Fiscal de Operações e Prestações)**: The selected
+        `operation.line` determines the appropriate CFOP codes
+        (internal, external, export) for the transaction line. The CFOP
+        itself carries significant fiscal meaning and influences tax
+        calculations and reporting.
+
+    4.  **Tax Definitions (`tax_definition_ids` on `operation.line` and `cfop`)**:
+        The selected `operation.line` and the determined `cfop` can both
+        hold `l10n_br_fiscal.tax.definition` records. These tax
+        definitions specify which taxes (ICMS, IPI, PIS, COFINS, etc.)
+        apply, along with their respective CST/CSOSN codes and other
+        parameters. This linkage allows the Fiscal Operation to drive
+        the tax calculation engine.
+
+    5.  **Document Characteristics**: It can also define default behaviors
+        or properties for documents generated under this operation, such
+        as the electronic document purpose (`edoc_purpose`), default
+        price type (sale vs. cost), and links to inverse or return
+        operations.
+
+    Essentially, when a fiscal document is created, the user selects a
+    Fiscal Operation. The system then uses this operation and the
+    transactional context (partner, product, company) to find the most
+    suitable `operation.line`. This line, in turn, provides the CFOP
+    and a set of tax definitions, which are then used by the tax engine
+    to calculate all applicable taxes.
+    """
+
     _name = "l10n_br_fiscal.operation"
     _description = "Fiscal Operation"
     _inherit = ["mail.thread", "mail.activity.mixin"]
@@ -128,19 +176,10 @@ class Operation(models.Model):
 
     comment_ids = fields.Many2many(
         comodel_name="l10n_br_fiscal.comment",
-        relation="l10n_br_fiscal_operation_comment_rel",
-        column1="fiscal_operation_id",
-        column2="comment_id",
         domain=[("object", "=", FISCAL_COMMENT_DOCUMENT)],
         string="Comment",
     )
 
-    operation_subsequent_ids = fields.One2many(
-        comodel_name="l10n_br_fiscal.subsequent.operation",
-        inverse_name="fiscal_operation_id",
-        string="Subsequent Operation",
-    )
-
     _sql_constraints = [
         (
             "fiscal_operation_code_uniq",
@@ -265,11 +304,6 @@ class Operation(models.Model):
         best_line = max(lines, key=score)
         return best_line
 
-    @api.onchange("operation_subsequent_ids")
-    def _onchange_operation_subsequent_ids(self):
-        for sub_operation in self.operation_subsequent_ids:
-            sub_operation.fiscal_operation_id = self.id
-
     def copy(self, default=None):
         """
         Inherit copy to edit field code. This is needed because the field is

odoo/addons/l10n_br_fiscal/models/operation_dashboard.py

@@ -127,7 +127,7 @@ class Operation(models.Model):
         }
 
     def open_action(self):
-        """return action based on type for related journals"""
+        """Return action based on type for related journals"""
 
         _fiscal_type_map = {
             "purchase": "in",
@@ -157,7 +157,8 @@ class Operation(models.Model):
             }
         )
 
-        [action] = self.env.ref("l10n_br_fiscal.%s" % action_name).read()
+        xmlid = f"l10n_br_fiscal.{action_name}"
+        [action] = self.env.ref(xmlid).read()
         action["context"] = ctx
         action["domain"] = self._context.get("use_domain", [])
         action["domain"] += [

odoo/addons/l10n_br_fiscal/models/operation_indicator.py

@@ -0,0 +1,58 @@
+# Copyright (C) 2025  Marcel Savegnago <https://escodoo.com.br>
+# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
+
+from odoo import fields, models
+
+
+class OperationIndicator(models.Model):
+    """Operation Indicator
+
+    This model stores the Operation Indicators (cIndOp) table according to
+    Annex VII of Technical Note No. 004/2025 from NFS-e Nacional, which is
+    part of the Brazilian Tax Reform (Reforma Tributária do Consumo).
+
+    The cIndOp field is used in the Service Provision Declaration (DPS)
+    to categorize consumption operations, as required by Art. 11 of
+    Complementary Law No. 214/2025.
+
+    This table will become mandatory from January 1, 2026.
+    """
+
+    _name = "l10n_br_fiscal.operation.indicator"
+    _inherit = "l10n_br_fiscal.data.abstract"
+    _description = "Operation Indicator"
+    _order = "code"
+
+    code = fields.Char(
+        string="Operation Indicator Code",
+        required=True,
+        index=True,
+        size=6,
+        help="Operation indicator code according to Annex VII of NT 004/2025 "
+        "(e.g., 020101, 030101)",
+    )
+
+    operation_type = fields.Text(
+        required=True,
+        help="Type of operation according to Art. 11 of Complementary Law "
+        "No. 214/2025",
+    )
+
+    operation_location = fields.Text(
+        string="Operation Location Consideration",
+        help="Where the operation is considered to take place according to "
+        "the legislation",
+    )
+
+    supply_characteristic = fields.Text(
+        help="Specific characteristic of the supply execution that determines "
+        "the place of supply",
+    )
+
+    supply_location = fields.Text(
+        string="DFe Supply Location",
+        required=True,
+        help="Place of supply to be identified in the Digital Fiscal Document "
+        "(DFe), such as supplier establishment, acquirer address, "
+        "recipient address, or other locations depending on the operation",
+    )

odoo/addons/l10n_br_fiscal/models/operation_line.py

@@ -37,6 +37,11 @@ class OperationLine(models.Model):
 
     document_type_id = fields.Many2one(comodel_name="l10n_br_fiscal.document.type")
 
+    tax_classification_id = fields.Many2one(
+        comodel_name="l10n_br_fiscal.tax.classification",
+        string="Tax Classification",
+    )
+
     cfop_internal_id = fields.Many2one(
         comodel_name="l10n_br_fiscal.cfop",
         string="CFOP Internal",
@@ -65,14 +70,12 @@ class OperationLine(models.Model):
         related="fiscal_operation_id.fiscal_operation_type",
         string="Fiscal Operation Type",
         store=True,
-        readonly=True,
     )
 
     fiscal_type = fields.Selection(
         related="fiscal_operation_id.fiscal_type",
         string="Fiscal Type",
         store=True,
-        readonly=True,
     )
 
     tax_icms_or_issqn = fields.Selection(
@@ -120,9 +123,6 @@ class OperationLine(models.Model):
 
     comment_ids = fields.Many2many(
         comodel_name="l10n_br_fiscal.comment",
-        relation="l10n_br_fiscal_operation_line_comment_rel",
-        column1="fiscal_operation_line_id",
-        column2="comment_id",
         domain=[("object", "=", FISCAL_COMMENT_LINE)],
         string="Comment",
     )
@@ -155,7 +155,7 @@ class OperationLine(models.Model):
         else:
             if not company.document_type_id:
                 raise UserError(
-                    _("You need set a default fiscal document " "in your company !")
+                    _("You need to set a default fiscal document in your company!")
                 )
 
             document_type = company.document_type_id
@@ -172,6 +172,13 @@ class OperationLine(models.Model):
             cfop = self.cfop_export_id
         return cfop
 
+    def _get_tax_classification(self, company):
+        if self.tax_classification_id:
+            return self.tax_classification_id
+        elif company.tax_classification_id:
+            return company.tax_classification_id
+        return self.env["l10n_br_fiscal.tax.classification"]
+
     def _build_mapping_result_ipi(self, mapping_result, tax_definition):
         if tax_definition and tax_definition.ipi_guideline_id:
             mapping_result["ipi_guideline"] = tax_definition.ipi_guideline_id
@@ -206,11 +213,60 @@ class OperationLine(models.Model):
         service_type=None,
         ind_final=None,
     ):
+        """
+        Map and determine the applicable fiscal taxes, CFOP, IPI guideline,
+        and ICMS tax benefit for a given context.
+
+        The method aggregates tax definitions from various sources, applying a
+        precedence order:
+        1. Company-level tax definitions.
+        2. NCM-defined taxes (IPI, II).
+        3. ICMS Regulation specific taxes.
+        4. Taxes defined directly on this fiscal operation line.
+        5. Taxes defined on the determined CFOP.
+        6. Taxes from the partner's fiscal profile.
+
+        It also filters taxes based on whether the product is subject to
+        ICMS or ISSQN.
+
+        :param company: The company record (res.company).
+        :param partner: The partner record (res.partner).
+        :param product: Optional product record (product.product).
+        :param fiscal_price: (Unused in direct logic; kept for signature
+            consistency for overrides/extensions)
+        :param fiscal_quantity: (Unused in direct logic; kept for signature
+            consistency for overrides/extensions)
+        :param ncm: Optional NCM record (l10n_br_fiscal.ncm);
+            defaults to product's NCM.
+        :param nbm: Optional NBM record (l10n_br_fiscal.nbm);
+            defaults to product's NBM.
+        :param nbs: Optional NBS record (l10n_br_fiscal.nbs);
+            defaults to product's NBS.
+        :param cest: Optional CEST record (l10n_br_fiscal.cest);
+            defaults to product's CEST.
+        :param city_taxation_code: Optional City Taxation Code record
+            (l10n_br_fiscal.city.taxation.code).
+        :param service_type: Optional Service Type record
+            (l10n_br_fiscal.service.type).
+        :param ind_final: (Passed to icms_regulation_id.map_tax; not directly
+            used for tax calculation here)
+        :return: A dictionary containing:
+            - 'taxes': A dictionary of applicable tax records
+              (l10n_br_fiscal.tax) keyed by their tax_domain.
+            - 'cfop': The determined CFOP record (l10n_br_fiscal.cfop).
+            - 'ipi_guideline': The determined IPI guideline record
+              (l10n_br_fiscal.tax.ipi.guideline).
+            - 'icms_tax_benefit_id': The determined ICMS tax benefit record
+              ID (l10n_br_fiscal.tax.definition) or False.
+            - 'tax_classification': The determined Tax Classification record
+              (l10n_br_fiscal.tax.classification).
+        """
         mapping_result = {
             "taxes": {},
             "cfop": False,
             "ipi_guideline": self.env.ref("l10n_br_fiscal.tax_guideline_999"),
             "icms_tax_benefit_id": False,
+            "tax_classification": False,
         }
 
         self.ensure_one()
@@ -218,6 +274,9 @@ class OperationLine(models.Model):
         # Define CFOP
         mapping_result["cfop"] = self._get_cfop(company, partner)
 
+        # Define Tax Classification
+        mapping_result["tax_classification"] = self._get_tax_classification(company)
+
         # 1 Get Tax Defs from Company
         for tax_definition in company.tax_definition_ids.map_tax_definition(
             company,
@@ -232,6 +291,16 @@ class OperationLine(models.Model):
         ):
             self._build_mapping_result(mapping_result, tax_definition)
 
+        # 1_5 From Tax Classification
+        if mapping_result["tax_classification"]:
+            mapping_result["taxes"][
+                mapping_result["tax_classification"].tax_cbs_id.tax_domain
+            ] = mapping_result["tax_classification"].tax_cbs_id
+
+            mapping_result["taxes"][
+                mapping_result["tax_classification"].tax_ibs_id.tax_domain
+            ] = mapping_result["tax_classification"].tax_ibs_id
+
         # 2 From NCM
         if not ncm and product:
             ncm = product.ncm_id

odoo/addons/l10n_br_fiscal/models/partner_profile.py

@@ -8,6 +8,7 @@ from odoo.exceptions import ValidationError
 from ..constants.fiscal import (
     NFE_IND_IE_DEST,
     NFE_IND_IE_DEST_DEFAULT,
+    PUBLIC_ENTIRY_TYPE,
     TAX_FRAMEWORK,
     TAX_FRAMEWORK_NORMAL,
 )
@@ -32,6 +33,11 @@ class PartnerProfile(models.Model):
         "other government-controlled organizations.",
     )
 
+    public_entity_type = fields.Selection(
+        selection=PUBLIC_ENTIRY_TYPE,
+        string="Tipo de Entidade Governamental",
+    )
+
     default = fields.Boolean(string="Default Profile", default=True)
 
     ind_ie_dest = fields.Selection(

odoo/addons/l10n_br_fiscal/models/product_mixin.py

@@ -15,26 +15,29 @@ class ProductMixin(models.AbstractModel):
     _name = "l10n_br_fiscal.product.mixin"
     _description = "Fiscal Product Mixin"
 
-    @api.onchange("fiscal_type")
-    def _onchange_fiscal_type(self):
-        for r in self:
-            if r.fiscal_type == PRODUCT_FISCAL_TYPE_SERVICE:
-                r.ncm_id = self.env.ref(NCM_FOR_SERVICE_REF)
-                r.tax_icms_or_issqn = TAX_DOMAIN_ISSQN
-            else:
-                r.tax_icms_or_issqn = TAX_DOMAIN_ICMS
+    @api.depends("fiscal_type", "fiscal_genre_id")
+    def _compute_ncm_id(self):
+        for product in self:
+            if product.fiscal_type == PRODUCT_FISCAL_TYPE_SERVICE:
+                product.ncm_id = self.env.ref(NCM_FOR_SERVICE_REF)
+            elif product.fiscal_genre_id and product.ncm_id:
+                if product.fiscal_genre_id.code != product.ncm_id.code[0:2]:
+                    product.ncm_id = False
+            elif product.ncm_id is None:
+                product.ncm_id = False
 
-    @api.onchange("ncm_id")
-    def _onchange_ncm_id(self):
-        for r in self:
-            if r.ncm_id:
-                r.fiscal_genre_id = self.env["l10n_br_fiscal.product.genre"].search(
-                    [("code", "=", r.ncm_id.code[0:2])]
-                )
+    @api.depends("ncm_id")
+    def _compute_fiscal_genre_id(self):
+        for product in self:
+            if product.ncm_id:
+                product.fiscal_genre_id = self.env[
+                    "l10n_br_fiscal.product.genre"
+                ].search([("code", "=", product.ncm_id.code[0:2])])
 
-    @api.onchange("fiscal_genre_id")
-    def _onchange_fiscal_genre_id(self):
-        for r in self:
-            if r.fiscal_genre_id and r.ncm_id:
-                if r.fiscal_genre_id.code != r.ncm_id.code[0:2]:
-                    r.ncm_id = False
+    @api.depends("fiscal_type")
+    def _compute_tax_icms_or_issqn(self):
+        for product in self:
+            if product.fiscal_type == PRODUCT_FISCAL_TYPE_SERVICE:
+                product.tax_icms_or_issqn = TAX_DOMAIN_ISSQN
+            else:
+                product.tax_icms_or_issqn = TAX_DOMAIN_ICMS