odoo-addon-l10n-br-fiscal 18.0.2.0.0.10__py3-none-any.whl → 18.0.7.1.0__py3-none-any.whl

odoo/addons/l10n_br_fiscal/models/document_mixin.py

@@ -8,7 +8,6 @@ from ..constants.fiscal import (
     DOCUMENT_ISSUER,
     DOCUMENT_ISSUER_COMPANY,
     FINAL_CUSTOMER,
-    FINAL_CUSTOMER_YES,
     FISCAL_COMMENT_DOCUMENT,
     NFE_IND_PRES,
     NFE_IND_PRES_DEFAULT,
@@ -42,7 +41,6 @@ class FiscalDocumentMixin(models.AbstractModel):
     """
 
     _name = "l10n_br_fiscal.document.mixin"
-    _inherit = "l10n_br_fiscal.document.mixin.methods"
     _description = "Document Fiscal Mixin Fields"
 
     def _date_server_format(self):
@@ -58,6 +56,218 @@ class FiscalDocumentMixin(models.AbstractModel):
         )
         return domain
 
+    def _prepare_br_fiscal_dict(self, default=False):
+        self.ensure_one()
+        fields = self.env["l10n_br_fiscal.document.mixin"]._fields.keys()
+
+        # we now read the record fiscal fields except the m2m tax:
+        vals = self._convert_to_write(self.read(fields)[0])
+
+        # remove id field to avoid conflicts
+        vals.pop("id", None)
+
+        if default:  # in case you want to use new rather than write later
+            return {f"default_{k}": vals[k] for k in vals.keys()}
+        return vals
+
+    @api.onchange("document_type_id")
+    def _onchange_document_type_id(self):
+        if self.document_type_id and self.issuer == DOCUMENT_ISSUER_COMPANY:
+            self.document_serie_id = self.document_type_id.get_document_serie(
+                self.company_id, self.fiscal_operation_id
+            )
+
+    @api.depends("fiscal_operation_id")
+    def _compute_document_type_id(self):
+        for doc in self.filtered(lambda doc: doc.fiscal_operation_id):
+            if doc.issuer == DOCUMENT_ISSUER_COMPANY and not doc.document_type_id:
+                doc.document_type_id = doc.company_id.document_type_id
+
+    def _get_amount_lines(self):
+        """Get object lines instances used to compute fiscal fields"""
+        return self.mapped(self._get_fiscal_lines_field_name())
+
+    def _get_product_amount_lines(self):
+        fiscal_line_ids = self._get_amount_lines()
+        return fiscal_line_ids.filtered(lambda line: line.product_id.type != "service")
+
+    @api.model
+    def _get_amount_fields(self):
+        """Get all fields with 'amount_' prefix"""
+        fields = self.env["l10n_br_fiscal.document.mixin"]._fields.keys()
+        prefixes = ("amount_", "fiscal_amount_")
+        amount_fields = [f for f in fields if f.startswith(prefixes)]
+        return amount_fields
+
+    @api.depends("document_serie_id", "issuer")
+    def _compute_document_serie(self):
+        for doc in self:
+            if doc.document_serie_id and doc.issuer == DOCUMENT_ISSUER_COMPANY:
+                doc.document_serie = doc.document_serie_id.code
+            elif doc.document_serie is None:
+                doc.document_serie = False
+
+    @api.depends("document_type_id", "issuer")
+    def _compute_document_serie_id(self):
+        for doc in self:
+            if (
+                not doc.document_serie_id
+                and doc.document_type_id
+                and doc.issuer == DOCUMENT_ISSUER_COMPANY
+            ):
+                doc.document_serie_id = doc.document_type_id.get_document_serie(
+                    doc.company_id, doc.fiscal_operation_id
+                )
+            elif doc.document_serie_id is None:
+                doc.document_serie_id = False
+
+    @api.model
+    def _get_fiscal_lines_field_name(self):
+        return "fiscal_line_ids"
+
+    def _get_fiscal_amount_field_dependencies(self):
+        """
+        Dynamically get the list of field dependencies.
+        """
+        if self._abstract:
+            return []
+        o2m_field_name = self._get_fiscal_lines_field_name()
+        target_fields = []
+        for field in self._get_amount_fields():
+            if (
+                field.replace("amount_", "")
+                in getattr(self, o2m_field_name)._fields.keys()
+            ):
+                target_fields.append(field.replace("amount_", ""))
+
+        return [o2m_field_name] + [
+            f"{o2m_field_name}.{target_field}" for target_field in target_fields
+        ]
+
+    @api.depends(lambda self: self._get_fiscal_amount_field_dependencies())
+    def _compute_fiscal_amount(self):
+        """
+        Compute and sum various fiscal amounts from the document lines.
+
+        This method iterates over fields prefixed with 'amount_' (as determined
+        by `_get_amount_fields`) and sums corresponding values from the lines
+        retrieved by `_get_amount_lines`.
+
+        It handles cases where delivery costs (freight, insurance, other) are
+        defined at the document total level rather than per line.
+        """
+
+        fields = self._get_amount_fields()
+        for doc in self.filtered(lambda m: m.fiscal_operation_id):
+            values = {key: 0.0 for key in fields}
+            for line in doc._get_amount_lines():
+                for field in fields:
+                    if field in line._fields.keys():
+                        values[field] += line[field]
+                    if field.replace("amount_", "") in line._fields.keys():
+                        # FIXME this field creates an error in invoice form
+                        if field == "amount_financial_discount_value":
+                            values["amount_financial_discount_value"] += (
+                                0  # line.financial_discount_value
+                            )
+                        else:
+                            values[field] += line[field.replace("amount_", "")]
+
+            # Valores definidos pelo Total e não pela Linha
+            if (
+                doc.company_id.delivery_costs == "total"
+                or doc.force_compute_delivery_costs_by_total
+            ):
+                values["amount_freight_value"] = doc.amount_freight_value
+                values["amount_insurance_value"] = doc.amount_insurance_value
+                values["amount_other_value"] = doc.amount_other_value
+
+            doc.update(values)
+
+    def _get_fiscal_partner(self):
+        """
+        Hook method to determine the fiscal partner for the document.
+
+        This method is designed to be overridden in implementing models if the
+        partner relevant for fiscal purposes (e.g., for tax calculations,
+        final consumer status) is different from the main `partner_id`
+        of the document record. For instance, an invoice might use a specific
+        invoicing contact derived from the main partner.
+
+        :return: A `res.partner` recordset representing the fiscal partner.
+        """
+
+        self.ensure_one()
+        return self.partner_id
+
+    @api.depends("partner_id")
+    def _compute_ind_final(self):
+        for doc in self:
+            partner = doc._get_fiscal_partner()
+            if partner:
+                doc.ind_final = partner.ind_final
+            else:
+                # Default Value
+                doc.ind_final = "1"  # Yes
+
+    @api.onchange("ind_final")
+    def _inverse_ind_final(self):
+        for doc in self:
+            for line in doc._get_amount_lines():
+                if line.ind_final != doc.ind_final:
+                    line.ind_final = doc.ind_final
+
+    @api.depends("fiscal_operation_id")
+    def _compute_operation_name(self):
+        for doc in self:
+            if doc.fiscal_operation_id:
+                doc.operation_name = doc.fiscal_operation_id.name
+            else:
+                doc.operation_name = False
+
+    @api.depends("fiscal_operation_id")
+    def _compute_comment_ids(self):
+        for doc in self:
+            if doc.fiscal_operation_id:
+                doc.comment_ids = doc.fiscal_operation_id.comment_ids
+            elif doc.comment_ids is None:
+                doc.comment_ids = []
+
+    def _distribute_amount_to_lines(self, amount_field_name, line_field_name):
+        for record in self:
+            if not (
+                record.delivery_costs == "total"
+                or record.force_compute_delivery_costs_by_total
+            ):
+                continue
+            lines = record._get_product_amount_lines()
+            if not lines:
+                continue
+            amount_to_distribute = record[amount_field_name]
+            total_gross = sum(lines.mapped("price_gross"))
+            if total_gross > 0:
+                distributed_amount = 0
+                for line in lines[:-1]:
+                    proportional_amount = record.currency_id.round(
+                        amount_to_distribute * (line.price_gross / total_gross)
+                    )
+                    line[line_field_name] = proportional_amount
+                    distributed_amount += proportional_amount
+                lines[-1][line_field_name] = amount_to_distribute - distributed_amount
+            else:
+                lines.write({line_field_name: 0.0})
+                if lines:
+                    lines[0][line_field_name] = amount_to_distribute
+
+    def _inverse_amount_freight(self):
+        self._distribute_amount_to_lines("amount_freight_value", "freight_value")
+
+    def _inverse_amount_insurance(self):
+        self._distribute_amount_to_lines("amount_insurance_value", "insurance_value")
+
+    def _inverse_amount_other(self):
+        self._distribute_amount_to_lines("amount_other_value", "other_value")
+
     fiscal_operation_id = fields.Many2one(
         comodel_name="l10n_br_fiscal.operation",
         string="Operation",
@@ -111,7 +321,11 @@ class FiscalDocumentMixin(models.AbstractModel):
     ind_final = fields.Selection(
         selection=FINAL_CUSTOMER,
         string="Final Consumption Operation",
-        default=FINAL_CUSTOMER_YES,
+        compute="_compute_ind_final",
+        inverse="_inverse_ind_final",
+        store=True,
+        precompute=True,
+        readonly=False,
     )
 
     currency_id = fields.Many2one(
@@ -126,7 +340,31 @@ class FiscalDocumentMixin(models.AbstractModel):
         help="Amount without discount.",
     )
 
-    amount_untaxed = fields.Monetary(
+    fiscal_amount_untaxed = fields.Monetary(
+        compute="_compute_fiscal_amount",
+        store=True,
+    )
+
+    amount_ibs_base = fields.Monetary(
+        string="IBS Base",
+        compute="_compute_fiscal_amount",
+        store=True,
+    )
+
+    amount_ibs_value = fields.Monetary(
+        string="IBS Value",
+        compute="_compute_fiscal_amount",
+        store=True,
+    )
+
+    amount_cbs_base = fields.Monetary(
+        string="CBS Base",
+        compute="_compute_fiscal_amount",
+        store=True,
+    )
+
+    amount_cbs_value = fields.Monetary(
+        string="CBS Value",
         compute="_compute_fiscal_amount",
         store=True,
     )
@@ -394,12 +632,12 @@ class FiscalDocumentMixin(models.AbstractModel):
         store=True,
     )
 
-    amount_tax = fields.Monetary(
+    fiscal_amount_tax = fields.Monetary(
         compute="_compute_fiscal_amount",
         store=True,
     )
 
-    amount_total = fields.Monetary(
+    fiscal_amount_total = fields.Monetary(
         compute="_compute_fiscal_amount",
         store=True,
     )

odoo/addons/l10n_br_fiscal/models/document_related.py

@@ -104,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:

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
@@ -83,6 +93,29 @@ class DocumentSerie(models.Model):
         for record in self:
             record.display_name = record.name
 
+    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 _is_invalid_number(self, document_number):
         self.ensure_one()
         is_invalid_number = True

odoo/addons/l10n_br_fiscal/models/icms_regulation.py

@@ -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/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.{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",
@@ -167,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
@@ -246,12 +258,15 @@ class OperationLine(models.Model):
               (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()
@@ -259,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,
@@ -273,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_template.py

@@ -106,6 +106,10 @@ class ProductTemplate(models.Model):
         comodel_name="l10n_br_fiscal.nbs", index=True, string="NBS"
     )
 
+    operation_indicator_id = fields.Many2one(
+        comodel_name="l10n_br_fiscal.operation.indicator",
+    )
+
     cest_id = fields.Many2one(
         comodel_name="l10n_br_fiscal.cest",
         index=True,

odoo/addons/l10n_br_fiscal/models/res_company.py

@@ -14,10 +14,12 @@ from ..constants.fiscal import (
     PROCESSADOR_NENHUM,
     PROFIT_CALCULATION,
     PROFIT_CALCULATION_PRESUMED,
+    TAX_DOMAIN_CBS,
     TAX_DOMAIN_COFINS,
     TAX_DOMAIN_COFINS_WH,
     TAX_DOMAIN_CSLL,
     TAX_DOMAIN_CSLL_WH,
+    TAX_DOMAIN_IBS,
     TAX_DOMAIN_ICMS,
     TAX_DOMAIN_ICMS_SN,
     TAX_DOMAIN_INSS,
@@ -297,6 +299,11 @@ class ResCompany(models.Model):
         domain=[("tax_domain", "=", TAX_DOMAIN_INSS_WH)],
     )
 
+    tax_classification_id = fields.Many2one(
+        comodel_name="l10n_br_fiscal.tax.classification",
+        string="Default Tax Classification",
+    )
+
     tax_definition_ids = fields.One2many(
         comodel_name="l10n_br_fiscal.tax.definition",
         inverse_name="company_id",
@@ -377,6 +384,7 @@ class ResCompany(models.Model):
             self.tax_icms_id = False
 
         self._onchange_piscofins_id()
+        self._onchange_tax_classification_id()
         self._onchange_ripi()
         self._onchange_tax_ipi_id()
         self._onchange_tax_icms_id()
@@ -502,3 +510,12 @@ class ResCompany(models.Model):
             self._set_tax_definition(self.tax_inss_wh_id)
         else:
             self._del_tax_definition(TAX_DOMAIN_INSS_WH)
+
+    @api.onchange("tax_classification_id")
+    def _onchange_tax_classification_id(self):
+        if self.tax_classification_id:
+            self._set_tax_definition(self.tax_classification_id.tax_cbs_id)
+            self._set_tax_definition(self.tax_classification_id.tax_ibs_id)
+        else:
+            self._del_tax_definition(TAX_DOMAIN_CBS)
+            self._del_tax_definition(TAX_DOMAIN_IBS)

odoo/addons/l10n_br_fiscal/models/res_partner.py

@@ -10,6 +10,7 @@ from ..constants.fiscal import (
     NFE_IND_IE_DEST,
     NFE_IND_IE_DEST_9,
     NFE_IND_IE_DEST_DEFAULT,
+    PUBLIC_ENTIRY_TYPE,
     TAX_FRAMEWORK,
     TAX_FRAMEWORK_NORMAL,
 )
@@ -76,6 +77,11 @@ class ResPartner(models.Model):
         "other government-controlled organizations.",
     )
 
+    public_entity_type = fields.Selection(
+        selection=PUBLIC_ENTIRY_TYPE,
+        string="Tipo de Entidade Governamental",
+    )
+
     ind_final = fields.Selection(
         selection=FINAL_CUSTOMER,
         string="Final Consumption Operation",
@@ -109,6 +115,16 @@ class ResPartner(models.Model):
 
     rntrc_code = fields.Char(string="RNTRC Code", size=12, tracking=True)
 
+    nif_motive_absence = fields.Selection(
+        selection=[
+            ("0", "Not informed in the origin note"),
+            ("1", "Exemption from NIF"),
+            ("2", "NIF not required"),
+        ],
+        default=False,
+        string="NIF motive absence",
+    )
+
     def _inverse_fiscal_profile(self):
         for p in self:
             p._onchange_fiscal_profile_id()
@@ -125,6 +141,7 @@ class ResPartner(models.Model):
                 p.tax_framework = p.fiscal_profile_id.tax_framework
                 p.ind_ie_dest = p.fiscal_profile_id.ind_ie_dest
                 p.is_public_entity = p.fiscal_profile_id.is_public_entity
+                p.public_entity_type = p.fiscal_profile_id.public_entity_type
 
     @api.onchange("ind_ie_dest")
     def _onchange_ind_ie_dest(self):

odoo/addons/l10n_br_fiscal/models/simplified_tax_range.py

@@ -66,3 +66,11 @@ class SimplifiedTaxRange(models.Model):
     tax_pis_percent = fields.Float(
         string="Tax PIS Percent", digits="Fiscal Tax Percent"
     )
+
+    tax_ibs_percent = fields.Float(
+        string="Tax IBS Percent", digits="Fiscal Tax Percent"
+    )
+
+    tax_cbs_percent = fields.Float(
+        string="Tax CBS Percent", digits="Fiscal Tax Percent"
+    )

odoo/addons/l10n_br_fiscal/models/tax.py

@@ -454,9 +454,13 @@ class Tax(models.Model):
             and cfop.destination == CFOP_DESTINATION_EXTERNAL
             and partner.ind_ie_dest == NFE_IND_IE_DEST_9
             and tax_dict.get("tax_value")
-            and operation_line.fiscal_operation_type == FISCAL_OUT
-            or operation_line.fiscal_operation_id.fiscal_type == "return_in"
-            and operation_line.fiscal_operation_type == FISCAL_IN
+            and (
+                operation_line.fiscal_operation_type == FISCAL_OUT
+                or (
+                    operation_line.fiscal_operation_type == FISCAL_IN
+                    and operation_line.fiscal_operation_id.fiscal_type != "return_in"
+                )
+            )
         ):
             icms_tax_difal, _ = company.icms_regulation_id.map_tax_def_icms_difal(
                 company, partner, product, ncm, nbm, cest, operation_line, ind_final