odoo-addon-l10n-br-fiscal 17.0.2.1.0__py3-none-any.whl → 17.0.3.1.0__py3-none-any.whl

odoo/addons/l10n_br_fiscal/README.rst

@@ -11,7 +11,7 @@ Módulo fiscal brasileiro
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:486f72a947ff411ae1ec91ca2ada5d0f563c8421580c7d069ef01f3bbbd9b5f7
+   !! source digest: sha256:a94263259afc7260a25f60fd10ada9ac820d816d2f4a157bb688764b76b7fe27
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png

odoo/addons/l10n_br_fiscal/__manifest__.py

@@ -10,7 +10,7 @@
     "maintainers": ["renatonlima", "rvalyi"],
     "website": "https://github.com/OCA/l10n-brazil",
     "development_status": "Production/Stable",
-    "version": "17.0.2.1.0",
+    "version": "17.0.3.1.0",
     "depends": [
         "product",
         "uom_alias",

odoo/addons/l10n_br_fiscal/demo/fiscal_document_demo.xml

@@ -36,10 +36,6 @@
         <field name="fiscal_operation_line_id" ref="l10n_br_fiscal.fo_venda_venda" />
     </record>
 
-    <function model="l10n_br_fiscal.document.line" name="_onchange_product_id_fiscal">
-        <value eval="[ref('demo_nfe_line_same_state_1-1')]" />
-    </function>
-
     <record id="demo_nfe_line_same_state_1-1" model="l10n_br_fiscal.document.line">
     </record>
 
@@ -58,10 +54,6 @@
         <field name="fiscal_operation_line_id" ref="l10n_br_fiscal.fo_venda_venda" />
     </record>
 
-    <function model="l10n_br_fiscal.document.line" name="_onchange_product_id_fiscal">
-        <value eval="[ref('demo_nfe_line_same_state_1-2')]" />
-    </function>
-
     <record id="demo_nfe_line_same_state_1-2" model="l10n_br_fiscal.document.line">
     </record>
 
@@ -95,10 +87,6 @@
         <field name="fiscal_operation_line_id" ref="l10n_br_fiscal.fo_venda_venda" />
     </record>
 
-    <function model="l10n_br_fiscal.document.line" name="_onchange_product_id_fiscal">
-        <value eval="[ref('demo_nfe_line_other_state_1-3')]" />
-    </function>
-
     <record id="demo_nfe_line_other_state_1-3" model="l10n_br_fiscal.document.line">
     </record>
 
@@ -117,10 +105,6 @@
         <field name="fiscal_operation_line_id" ref="l10n_br_fiscal.fo_venda_venda" />
     </record>
 
-    <function model="l10n_br_fiscal.document.line" name="_onchange_product_id_fiscal">
-        <value eval="[ref('demo_nfe_line_other_state_2-3')]" />
-    </function>
-
     <record id="demo_nfe_line_other_state_2-3" model="l10n_br_fiscal.document.line">
     </record>
 
@@ -140,10 +124,6 @@
         <field name="fiscal_operation_line_id" ref="l10n_br_fiscal.fo_venda_venda" />
     </record>
 
-    <function model="l10n_br_fiscal.document.line" name="_onchange_product_id_fiscal">
-        <value eval="[ref('demo_nfe_line_other_state_3-3')]" />
-    </function>
-
     <record id="demo_nfe_line_other_state_3-3" model="l10n_br_fiscal.document.line">
     </record>
 
@@ -179,10 +159,6 @@
         <field name="fiscal_operation_line_id" ref="l10n_br_fiscal.fo_venda_venda" />
     </record>
 
-    <function model="l10n_br_fiscal.document.line" name="_onchange_product_id_fiscal">
-        <value eval="[ref('demo_nfe_line_export_3-1')]" />
-    </function>
-
     <record id="demo_nfe_line_export_3-1" model="l10n_br_fiscal.document.line">
     </record>
 
@@ -201,10 +177,6 @@
         <field name="fiscal_operation_line_id" ref="l10n_br_fiscal.fo_venda_venda" />
     </record>
 
-    <function model="l10n_br_fiscal.document.line" name="_onchange_product_id_fiscal">
-        <value eval="[ref('demo_nfe_line_export_3-2')]" />
-    </function>
-
     <record id="demo_nfe_line_export_3-2" model="l10n_br_fiscal.document.line">
     </record>
 
@@ -244,15 +216,11 @@
         />
         <field
             name="comment_ids"
-            eval="[(6,0,[ref('l10n_br_fiscal.fiscal_line_comment_dummy')])]"
+            eval="[Command.set([ref('l10n_br_fiscal.fiscal_line_comment_dummy')])]"
         />
         <field name="manual_additional_data">manual comment test</field>
     </record>
 
-    <function model="l10n_br_fiscal.document.line" name="_onchange_product_id_fiscal">
-        <value eval="[ref('demo_nfe_line_nao_contribuinte_4-1')]" />
-    </function>
-
     <record
         id="demo_nfe_line_nao_contribuinte_4-1"
         model="l10n_br_fiscal.document.line"
@@ -280,10 +248,6 @@
         />
     </record>
 
-    <function model="l10n_br_fiscal.document.line" name="_onchange_product_id_fiscal">
-        <value eval="[ref('demo_nfe_line_nao_contribuinte_4-2')]" />
-    </function>
-
     <record
         id="demo_nfe_line_nao_contribuinte_4-2"
         model="l10n_br_fiscal.document.line"
@@ -323,15 +287,11 @@
         />
         <field
             name="comment_ids"
-            eval="[(6,0,[ref('l10n_br_fiscal.fiscal_line_comment_dummy')])]"
+            eval="[Command.set([ref('l10n_br_fiscal.fiscal_line_comment_dummy')])]"
         />
         <field name="manual_additional_data">manual comment test</field>
     </record>
 
-    <function model="l10n_br_fiscal.document.line" name="_onchange_product_id_fiscal">
-        <value eval="[ref('demo_nfe_tax_benefit_4-1')]" />
-    </function>
-
     <record id="demo_nfe_tax_benefit_4-1" model="l10n_br_fiscal.document.line">
     </record>
 
@@ -368,10 +328,6 @@
         />
     </record>
 
-    <function model="l10n_br_fiscal.document.line" name="_onchange_product_id_fiscal">
-        <value eval="[ref('demo_nfe_nao_contribuinte_pf_1-2')]" />
-    </function>
-
     <record id="demo_nfe_nao_contribuinte_pf_1-2" model="l10n_br_fiscal.document.line">
     </record>
 
@@ -393,10 +349,6 @@
         />
     </record>
 
-    <function model="l10n_br_fiscal.document.line" name="_onchange_product_id_fiscal">
-        <value eval="[ref('demo_nfe_nao_contribuinte_pf_2-2')]" />
-    </function>
-
     <record id="demo_nfe_nao_contribuinte_pf_2-2" model="l10n_br_fiscal.document.line">
     </record>
 
@@ -430,10 +382,6 @@
         <field name="fiscal_operation_line_id" ref="l10n_br_fiscal.fo_venda_venda" />
     </record>
 
-    <function model="l10n_br_fiscal.document.line" name="_onchange_product_id_fiscal">
-        <value eval="[ref('demo_nfe_line_sn_same_state_5-1')]" />
-    </function>
-
     <record id="demo_nfe_line_sn_same_state_5-1" model="l10n_br_fiscal.document.line">
     </record>
 
@@ -452,10 +400,6 @@
         <field name="fiscal_operation_line_id" ref="l10n_br_fiscal.fo_venda_venda" />
     </record>
 
-    <function model="l10n_br_fiscal.document.line" name="_onchange_product_id_fiscal">
-        <value eval="[ref('demo_nfe_line_sn_same_state_5-2')]" />
-    </function>
-
     <record id="demo_nfe_line_sn_same_state_5-2" model="l10n_br_fiscal.document.line">
     </record>
 
@@ -489,10 +433,6 @@
         <field name="fiscal_operation_line_id" ref="l10n_br_fiscal.fo_venda_venda" />
     </record>
 
-    <function model="l10n_br_fiscal.document.line" name="_onchange_product_id_fiscal">
-        <value eval="[ref('demo_nfe_line_sn_other_state_6-1')]" />
-    </function>
-
     <record id="demo_nfe_line_sn_other_state_6-1" model="l10n_br_fiscal.document.line">
     </record>
 
@@ -511,10 +451,6 @@
         <field name="fiscal_operation_line_id" ref="l10n_br_fiscal.fo_venda_venda" />
     </record>
 
-    <function model="l10n_br_fiscal.document.line" name="_onchange_product_id_fiscal">
-        <value eval="[ref('demo_nfe_line_sn_other_state_6-2')]" />
-    </function>
-
     <record id="demo_nfe_line_sn_other_state_6-2" model="l10n_br_fiscal.document.line">
     </record>
 
@@ -548,10 +484,6 @@
         <field name="fiscal_operation_line_id" ref="l10n_br_fiscal.fo_venda_venda" />
     </record>
 
-    <function model="l10n_br_fiscal.document.line" name="_onchange_product_id_fiscal">
-        <value eval="[ref('demo_nfe_line_sn_export_7-1')]" />
-    </function>
-
     <record id="demo_nfe_line_sn_export_7-1" model="l10n_br_fiscal.document.line">
     </record>
 
@@ -570,10 +502,6 @@
         <field name="fiscal_operation_line_id" ref="l10n_br_fiscal.fo_venda_venda" />
     </record>
 
-    <function model="l10n_br_fiscal.document.line" name="_onchange_product_id_fiscal">
-        <value eval="[ref('demo_nfe_line_sn_export_7-2')]" />
-    </function>
-
     <record id="demo_nfe_line_sn_export_7-2" model="l10n_br_fiscal.document.line">
     </record>
 
@@ -610,10 +538,6 @@
         <field name="fiscal_operation_line_id" ref="l10n_br_fiscal.fo_venda_venda" />
     </record>
 
-    <function model="l10n_br_fiscal.document.line" name="_onchange_product_id_fiscal">
-        <value eval="[ref('demo_nfe_line_sn_nao_contribuinte_7-1')]" />
-    </function>
-
     <record
         id="demo_nfe_line_sn_nao_contribuinte_7-1"
         model="l10n_br_fiscal.document.line"
@@ -638,10 +562,6 @@
         <field name="fiscal_operation_line_id" ref="l10n_br_fiscal.fo_venda_venda" />
     </record>
 
-    <function model="l10n_br_fiscal.document.line" name="_onchange_product_id_fiscal">
-        <value eval="[ref('demo_nfe_line_sn_nao_contribuinte_7-2')]" />
-    </function>
-
     <record
         id="demo_nfe_line_sn_nao_contribuinte_7-2"
         model="l10n_br_fiscal.document.line"
@@ -689,10 +609,6 @@
         <field name="cfop_id" ref="l10n_br_fiscal.cfop_5922" />
     </record>
 
-    <function model="l10n_br_fiscal.document.line" name="_onchange_product_id_fiscal">
-        <value eval="[ref('demo_nfe_line_so_simples_faturamento_7-1')]" />
-    </function>
-
     <record
         id="demo_nfe_line_so_simples_faturamento_7-1"
         model="l10n_br_fiscal.document.line"
@@ -733,10 +649,6 @@
         />
     </record>
 
-    <function model="l10n_br_fiscal.document.line" name="_onchange_product_id_fiscal">
-        <value eval="[ref('demo_nfe_purchase_line_same_state_1-1')]" />
-    </function>
-
     <record
         id="demo_nfe_purchase_line_same_state_1-1"
         model="l10n_br_fiscal.document.line"

odoo/addons/l10n_br_fiscal/demo/fiscal_document_nfse_demo.xml

@@ -23,8 +23,4 @@
         <field name="fiscal_operation_line_id" ref="l10n_br_fiscal.fo_venda_servico" />
     </record>
 
-    <function model="l10n_br_fiscal.document.line" name="_onchange_product_id_fiscal">
-        <value eval="[ref('l10n_br_fiscal.demo_nfse_line_same_state_1-1')]" />
-    </function>
-
 </odoo>

odoo/addons/l10n_br_fiscal/demo/fiscal_operation_demo.xml

@@ -4,14 +4,14 @@
     <record id="fo_venda" model="l10n_br_fiscal.operation">
         <field
             name="comment_ids"
-            eval="[(6,0,[ref('l10n_br_fiscal.fiscal_comment_dummy')])]"
+            eval="[Command.set([ref('l10n_br_fiscal.fiscal_comment_dummy')])]"
         />
     </record>
 
     <record id="fo_venda_venda" model="l10n_br_fiscal.operation.line">
         <field
             name="comment_ids"
-            eval="[(6,0,[ref('l10n_br_fiscal.fiscal_line_comment_dummy')])]"
+            eval="[Command.set([ref('l10n_br_fiscal.fiscal_line_comment_dummy')])]"
         />
     </record>
 

odoo/addons/l10n_br_fiscal/i18n/l10n_br_fiscal.pot

@@ -799,14 +799,6 @@ msgstr ""
 msgid "Amount Gross"
 msgstr ""
 
-#. module: l10n_br_fiscal
-#: model:ir.model.fields,field_description:l10n_br_fiscal.field_l10n_br_fiscal_document__amount_tax
-#: model:ir.model.fields,field_description:l10n_br_fiscal.field_l10n_br_fiscal_document_line__amount_tax
-#: model:ir.model.fields,field_description:l10n_br_fiscal.field_l10n_br_fiscal_document_line_mixin__amount_tax
-#: model:ir.model.fields,field_description:l10n_br_fiscal.field_l10n_br_fiscal_document_mixin__amount_tax
-msgid "Amount Tax"
-msgstr ""
-
 #. module: l10n_br_fiscal
 #: model:ir.model.fields,field_description:l10n_br_fiscal.field_l10n_br_fiscal_document_line__amount_tax_included
 #: model:ir.model.fields,field_description:l10n_br_fiscal.field_l10n_br_fiscal_document_line_mixin__amount_tax_included
@@ -825,22 +817,6 @@ msgstr ""
 msgid "Amount Taxed"
 msgstr ""
 
-#. module: l10n_br_fiscal
-#: model:ir.model.fields,field_description:l10n_br_fiscal.field_l10n_br_fiscal_document__amount_total
-#: model:ir.model.fields,field_description:l10n_br_fiscal.field_l10n_br_fiscal_document_line__amount_total
-#: model:ir.model.fields,field_description:l10n_br_fiscal.field_l10n_br_fiscal_document_line_mixin__amount_total
-#: model:ir.model.fields,field_description:l10n_br_fiscal.field_l10n_br_fiscal_document_mixin__amount_total
-msgid "Amount Total"
-msgstr ""
-
-#. module: l10n_br_fiscal
-#: model:ir.model.fields,field_description:l10n_br_fiscal.field_l10n_br_fiscal_document__amount_untaxed
-#: model:ir.model.fields,field_description:l10n_br_fiscal.field_l10n_br_fiscal_document_line__amount_untaxed
-#: model:ir.model.fields,field_description:l10n_br_fiscal.field_l10n_br_fiscal_document_line_mixin__amount_untaxed
-#: model:ir.model.fields,field_description:l10n_br_fiscal.field_l10n_br_fiscal_document_mixin__amount_untaxed
-msgid "Amount Untaxed"
-msgstr ""
-
 #. module: l10n_br_fiscal
 #: model:ir.model.fields,field_description:l10n_br_fiscal.field_l10n_br_fiscal_simplified_tax_range__amount_deduced
 msgid "Amount to be Deducted"
@@ -2728,6 +2704,30 @@ msgstr ""
 msgid "Fiscal Additional data manually entered by user"
 msgstr ""
 
+#. module: l10n_br_fiscal
+#: model:ir.model.fields,field_description:l10n_br_fiscal.field_l10n_br_fiscal_document__fiscal_amount_tax
+#: model:ir.model.fields,field_description:l10n_br_fiscal.field_l10n_br_fiscal_document_line__fiscal_amount_tax
+#: model:ir.model.fields,field_description:l10n_br_fiscal.field_l10n_br_fiscal_document_line_mixin__fiscal_amount_tax
+#: model:ir.model.fields,field_description:l10n_br_fiscal.field_l10n_br_fiscal_document_mixin__fiscal_amount_tax
+msgid "Fiscal Amount Tax"
+msgstr ""
+
+#. module: l10n_br_fiscal
+#: model:ir.model.fields,field_description:l10n_br_fiscal.field_l10n_br_fiscal_document__fiscal_amount_total
+#: model:ir.model.fields,field_description:l10n_br_fiscal.field_l10n_br_fiscal_document_line__fiscal_amount_total
+#: model:ir.model.fields,field_description:l10n_br_fiscal.field_l10n_br_fiscal_document_line_mixin__fiscal_amount_total
+#: model:ir.model.fields,field_description:l10n_br_fiscal.field_l10n_br_fiscal_document_mixin__fiscal_amount_total
+msgid "Fiscal Amount Total"
+msgstr ""
+
+#. module: l10n_br_fiscal
+#: model:ir.model.fields,field_description:l10n_br_fiscal.field_l10n_br_fiscal_document__fiscal_amount_untaxed
+#: model:ir.model.fields,field_description:l10n_br_fiscal.field_l10n_br_fiscal_document_line__fiscal_amount_untaxed
+#: model:ir.model.fields,field_description:l10n_br_fiscal.field_l10n_br_fiscal_document_line_mixin__fiscal_amount_untaxed
+#: model:ir.model.fields,field_description:l10n_br_fiscal.field_l10n_br_fiscal_document_mixin__fiscal_amount_untaxed
+msgid "Fiscal Amount Untaxed"
+msgstr ""
+
 #. module: l10n_br_fiscal
 #: model:ir.model,name:l10n_br_fiscal.model_l10n_br_fiscal_base_wizard_mixin
 msgid "Fiscal Base Wizard Mixin"

odoo/addons/l10n_br_fiscal/migrations/17.0.3.0.0/pre-migration.py

@@ -0,0 +1,30 @@
+# Copyright (C) 2025 - Engenere (<https://engenere.one>).
+# @author Antônio S. Pereira Neto <neto@engenere.one>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from openupgradelib import openupgrade
+
+
+@openupgrade.migrate()
+def migrate(env, version):
+    field_spec = [
+        (
+            "l10n_br_fiscal.document",
+            "l10n_br_fiscal_document",
+            "amount_untaxed",
+            "fiscal_amount_untaxed",
+        ),
+        (
+            "l10n_br_fiscal.document",
+            "l10n_br_fiscal_document",
+            "amount_tax",
+            "fiscal_amount_tax",
+        ),
+        (
+            "l10n_br_fiscal.document",
+            "l10n_br_fiscal_document",
+            "amount_total",
+            "fiscal_amount_total",
+        ),
+    ]
+    openupgrade.rename_fields(env, field_spec)

odoo/addons/l10n_br_fiscal/models/document.py

@@ -186,9 +186,9 @@ class Document(models.Model):
     )
 
     currency_id = fields.Many2one(
+        related="company_id.currency_id",
         comodel_name="res.currency",
         string="Currency",
-        compute="_compute_currency_id",
     )
 
     # this related "state" field is required for the status bar widget
@@ -326,11 +326,6 @@ class Document(models.Model):
             self.fiscal_operation_id = False
         return {"domain": {"fiscal_operation_id": domain}}
 
-    @api.depends("company_id")
-    def _compute_currency_id(self):
-        for doc in self:
-            doc.currency_id = doc.company_id.currency_id or self.env.company.currency_id
-
     def _compute_document_name(self):
         self.ensure_one()
         name = ""

odoo/addons/l10n_br_fiscal/models/document_line.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 fields, models
+from odoo import api, fields, models
 
 
 class DocumentLine(models.Model):
@@ -30,7 +30,12 @@ class DocumentLine(models.Model):
         ondelete="cascade",
     )
 
-    name = fields.Char()
+    name = fields.Char(
+        compute="_compute_name",
+        store=True,
+        precompute=True,
+        readonly=False,
+    )
 
     company_id = fields.Many2one(
         comodel_name="res.company",
@@ -50,6 +55,15 @@ class DocumentLine(models.Model):
         precompute=True,
     )
 
+    uom_id = fields.Many2one(
+        comodel_name="uom.uom",
+        string="UOM",
+        compute="_compute_uom_id",
+        store=True,
+        readonly=False,
+        precompute=True,
+    )
+
     quantity = fields.Float(default=1.0)
 
     ind_final = fields.Selection(related="document_id.ind_final")
@@ -70,6 +84,22 @@ class DocumentLine(models.Model):
 
     additional_data = fields.Text()
 
+    @api.depends("product_id")
+    def _compute_name(self):
+        for line in self:
+            if line.product_id:
+                line.name = line.product_id.display_name
+            else:
+                line.name = False
+
+    @api.depends("product_id")
+    def _compute_uom_id(self):
+        for line in self:
+            if line.fiscal_operation_type == "in":
+                line.uom_id = line.product_id.uom_po_id
+            else:
+                line.uom_id = line.product_id.uom_id
+
     def __document_comment_vals(self):
         self.ensure_one()
         return {
@@ -80,7 +110,7 @@ class DocumentLine(models.Model):
         }
 
     def _document_comment(self):
-        for d in self:
-            d.additional_data = d.comment_ids.compute_message(
-                d.__document_comment_vals(), d.manual_additional_data
+        for line in self:
+            line.additional_data = line.comment_ids.compute_message(
+                line.__document_comment_vals(), line.manual_additional_data
             )

odoo/addons/l10n_br_fiscal/models/document_line_mixin.py

@@ -36,7 +36,6 @@ from ..constants.icms import (
     ICMS_BASE_TYPE,
     ICMS_BASE_TYPE_DEFAULT,
     ICMS_ORIGIN,
-    ICMS_ORIGIN_DEFAULT,
     ICMS_ST_BASE_TYPE,
     ICMS_ST_BASE_TYPE_DEFAULT,
 )
@@ -135,16 +134,31 @@ class FiscalDocumentLineMixin(models.AbstractModel):
 
     partner_company_type = fields.Selection(related="partner_id.company_type")
 
-    uom_id = fields.Many2one(comodel_name="uom.uom", string="UOM")
+    uom_id = fields.Many2one(
+        comodel_name="uom.uom",
+        string="UOM",
+    )
 
     quantity = fields.Float(
         digits="Product Unit of Measure",
     )
 
-    fiscal_type = fields.Selection(selection=PRODUCT_FISCAL_TYPE)
+    fiscal_type = fields.Selection(
+        selection=PRODUCT_FISCAL_TYPE,
+        compute="_compute_product_fiscal_fields",
+        store=True,
+        readonly=False,
+        precompute=True,
+    )
 
     ncm_id = fields.Many2one(
-        comodel_name="l10n_br_fiscal.ncm", index=True, string="NCM"
+        comodel_name="l10n_br_fiscal.ncm",
+        index=True,
+        string="NCM",
+        compute="_compute_product_fiscal_fields",
+        store=True,
+        readonly=False,
+        precompute=True,
     )
 
     nbm_id = fields.Many2one(
@@ -152,6 +166,10 @@ class FiscalDocumentLineMixin(models.AbstractModel):
         index=True,
         string="NBM",
         domain="[('ncm_ids', '=', ncm_id)]",
+        compute="_compute_product_fiscal_fields",
+        store=True,
+        readonly=False,
+        precompute=True,
     )
 
     cest_id = fields.Many2one(
@@ -159,10 +177,20 @@ class FiscalDocumentLineMixin(models.AbstractModel):
         index=True,
         string="CEST",
         domain="[('ncm_ids', '=', ncm_id)]",
+        compute="_compute_product_fiscal_fields",
+        store=True,
+        readonly=False,
+        precompute=True,
     )
 
     nbs_id = fields.Many2one(
-        comodel_name="l10n_br_fiscal.nbs", index=True, string="NBS"
+        comodel_name="l10n_br_fiscal.nbs",
+        index=True,
+        string="NBS",
+        compute="_compute_product_fiscal_fields",
+        store=True,
+        readonly=False,
+        precompute=True,
     )
 
     fiscal_operation_id = fields.Many2one(
@@ -258,11 +286,11 @@ class FiscalDocumentLineMixin(models.AbstractModel):
         compute="_compute_fiscal_amounts",
     )
 
-    amount_untaxed = fields.Monetary(
+    fiscal_amount_untaxed = fields.Monetary(
         compute="_compute_fiscal_amounts",
     )
 
-    amount_tax = fields.Monetary(
+    fiscal_amount_tax = fields.Monetary(
         compute="_compute_fiscal_amounts",
     )
 
@@ -270,7 +298,7 @@ class FiscalDocumentLineMixin(models.AbstractModel):
         compute="_compute_fiscal_amounts",
     )
 
-    amount_total = fields.Monetary(
+    fiscal_amount_total = fields.Monetary(
         compute="_compute_fiscal_amounts",
     )
 
@@ -296,7 +324,12 @@ class FiscalDocumentLineMixin(models.AbstractModel):
     amount_tax_withholding = fields.Monetary(string="Tax Withholding")
 
     fiscal_genre_id = fields.Many2one(
-        comodel_name="l10n_br_fiscal.product.genre", string="Fiscal Product Genre"
+        comodel_name="l10n_br_fiscal.product.genre",
+        string="Fiscal Product Genre",
+        compute="_compute_product_fiscal_fields",
+        store=True,
+        readonly=False,
+        precompute=True,
     )
 
     fiscal_genre_code = fields.Char(
@@ -307,10 +340,19 @@ class FiscalDocumentLineMixin(models.AbstractModel):
         comodel_name="l10n_br_fiscal.service.type",
         string="Service Type LC 166",
         domain="[('internal_type', '=', 'normal')]",
+        compute="_compute_product_fiscal_fields",
+        store=True,
+        readonly=False,
+        precompute=True,
     )
 
     city_taxation_code_id = fields.Many2one(
-        comodel_name="l10n_br_fiscal.city.taxation.code", string="City Taxation Code"
+        comodel_name="l10n_br_fiscal.city.taxation.code",
+        string="City Taxation Code",
+        compute="_compute_product_fiscal_fields",
+        store=True,
+        readonly=False,
+        precompute=True,
     )
 
     partner_order = fields.Char(string="Partner Order (xPed)", size=15)
@@ -331,6 +373,10 @@ class FiscalDocumentLineMixin(models.AbstractModel):
     issqn_fg_city_id = fields.Many2one(
         comodel_name="res.city",
         string="ISSQN City",
+        compute="_compute_product_fiscal_fields",
+        store=True,
+        readonly=False,
+        precompute=True,
     )
 
     # vDeducao
@@ -487,7 +533,12 @@ class FiscalDocumentLineMixin(models.AbstractModel):
     )
 
     icms_origin = fields.Selection(
-        selection=ICMS_ORIGIN, string="ICMS Origin", default=ICMS_ORIGIN_DEFAULT
+        selection=ICMS_ORIGIN,
+        string="ICMS Origin",
+        compute="_compute_product_fiscal_fields",
+        store=True,
+        readonly=False,
+        precompute=True,
     )
 
     # vBC - Valor da base de cálculo do ICMS
@@ -1620,7 +1671,7 @@ class FiscalDocumentLineMixin(models.AbstractModel):
         comodel_name="l10n_br_fiscal.comment",
         string="Comments",
         domain=[("object", "=", FISCAL_COMMENT_LINE)],
-        compute="_compute_fiscal_tax_ids",
+        compute="_compute_comment_ids",
         store=True,
         precompute=True,
         readonly=False,