odoo-addon-l10n-br-fiscal 17.0.1.0.0.11__py3-none-any.whl → 18.0.5.0.0.1__py3-none-any.whl

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",
@@ -107,6 +113,8 @@ class ResPartner(models.Model):
         tracking=True,
     )
 
+    rntrc_code = fields.Char(string="RNTRC Code", size=12, tracking=True)
+
     def _inverse_fiscal_profile(self):
         for p in self:
             p._onchange_fiscal_profile_id()
@@ -123,6 +131,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/tax.py

@@ -226,7 +226,11 @@ class Tax(models.Model):
     )
 
     _sql_constraints = [
-        ("fiscal_tax_code_uniq", "unique (name)", "Tax already exists with this name !")
+        (
+            "fiscal_tax_code_uniq",
+            "unique (name)",
+            "Tax already exists with this name!",
+        )
     ]
 
     @api.model
@@ -450,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

odoo/addons/l10n_br_fiscal/models/tax_group.py

@@ -1,7 +1,7 @@
 # Copyright (C) 2019  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
+from odoo import fields, models
 
 from ..constants.fiscal import TAX_DOMAIN
 
@@ -29,10 +29,10 @@ class TaxGroup(models.Model):
 
     tax_scope = fields.Selection(
         selection=[
-            ("city", _("City")),
-            ("state", _("State")),
-            ("federal", _("Federal")),
-            ("other", _("Other")),
+            ("city", "City"),
+            ("state", "State"),
+            ("federal", "Federal"),
+            ("other", "Other"),
         ],
         required=True,
     )
@@ -75,6 +75,6 @@ class TaxGroup(models.Model):
         (
             "fiscal_tax_group_code_uniq",
             "unique (name)",
-            _("Tax Group already exists with this name !"),
+            "Tax Group already exists with this name!",
         )
     ]

odoo/addons/l10n_br_fiscal/models/tax_pis_cofins.py

@@ -1,7 +1,7 @@
 # Copyright (C) 2019  Renato Lima - Akretion <renato.lima@akretion.com.br>
 # License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
 
-from odoo import _, api, fields, models
+from odoo import api, fields, models
 
 from .. import tools
 from ..constants.fiscal import (
@@ -22,9 +22,9 @@ class TaxPisCofins(models.Model):
 
     piscofins_type = fields.Selection(
         selection=[
-            ("ncm", _("NCM")),
-            ("product", _("Product")),
-            ("company", _("Company")),
+            ("ncm", "NCM"),
+            ("product", "Product"),
+            ("company", "Company"),
         ],
         default="ncm",
         string="Type",

odoo/addons/l10n_br_fiscal/models/tax_pis_cofins_base.py

@@ -1,7 +1,7 @@
 # Copyright (C) 2019  Renato Lima - Akretion
 # License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
 
-from odoo import _, fields, models
+from odoo import fields, models
 
 
 class TaxPisCofinsBase(models.Model):
@@ -13,8 +13,8 @@ class TaxPisCofinsBase(models.Model):
 
     _sql_constraints = [
         (
-            "l10n_br_fiscal_tax_pis_cofins_base_uniq",
+            "code_unique",
             "unique (code)",
-            _("Already exists with this code !"),
+            "Already exists with this code!",
         )
     ]

odoo/addons/l10n_br_fiscal/models/tax_pis_cofins_credit.py

@@ -1,7 +1,7 @@
 # Copyright (C) 2019  Renato Lima - Akretion
 # License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
 
-from odoo import _, fields, models
+from odoo import fields, models
 
 
 class TaxPisCofinsCredit(models.Model):
@@ -13,8 +13,8 @@ class TaxPisCofinsCredit(models.Model):
 
     _sql_constraints = [
         (
-            "l10n_br_fiscal_tax_pis_cofins_code_uniq",
+            "code_unique",
             "unique (code)",
-            _("Already exists with this code !"),
+            "Already exists with this code!",
         )
     ]

odoo/addons/l10n_br_fiscal/security/fiscal_security.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo noupdate="1">
-
     <record id="module_category_l10n_br_fiscal_management" model="ir.module.category">
         <field name="name">Brazilian Fiscal</field>
         <field
@@ -39,45 +38,34 @@
         <field name="name">Fiscal Tax Estimate multi-company</field>
         <field name="model_id" ref="model_l10n_br_fiscal_tax_estimate" />
         <field eval="True" name="global" />
-        <field
-            name="domain_force"
-        >['|',('company_id','=',False),('company_id','in',company_ids)]</field>
+        <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
     </record>
 
-    <record id="l10n_br_fiscal_operation_line_rule" model="ir.rule">
+    <record id="l10n_br_fiscal_operation_rule" model="ir.rule">
         <field name="name">Fiscal Operation multi-company</field>
         <field name="model_id" ref="model_l10n_br_fiscal_operation" />
         <field eval="True" name="global" />
-        <field
-            name="domain_force"
-        >['|',('company_id','=',False),('company_id','in',company_ids)]</field>
+        <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
     </record>
 
     <record id="l10n_br_fiscal_document_serie_rule" model="ir.rule">
         <field name="name">Fiscal Document Serie multi-company</field>
         <field name="model_id" ref="model_l10n_br_fiscal_document_serie" />
         <field eval="True" name="global" />
-        <field
-            name="domain_force"
-        >['|',('company_id','=',False),('company_id','in',company_ids)]</field>
+        <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
     </record>
 
     <record id="l10n_br_fiscal_document_rule" model="ir.rule">
         <field name="name">Fiscal Document multi-company</field>
         <field name="model_id" ref="model_l10n_br_fiscal_document" />
         <field eval="True" name="global" />
-        <field
-            name="domain_force"
-        >['|',('company_id','=',False),('company_id','in',company_ids)]</field>
+        <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
     </record>
 
     <record id="l10n_br_fiscal_document_line_rule" model="ir.rule">
         <field name="name">Fiscal Document line multi-company</field>
         <field name="model_id" ref="model_l10n_br_fiscal_document_line" />
         <field eval="True" name="global" />
-        <field
-            name="domain_force"
-        >['|',('company_id','=',False),('company_id','in',company_ids)]</field>
+        <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
     </record>
-
 </odoo>

odoo/addons/l10n_br_fiscal/security/ir.model.access.csv

@@ -67,7 +67,7 @@
 "l10n_br_fiscal_operation_line_manager","Fiscal Operation Line for Manager","model_l10n_br_fiscal_operation_line","l10n_br_fiscal.group_manager",1,1,1,1
 "l10n_br_fiscal_operation_document_type_user","Fiscal Operation Document Type for User","model_l10n_br_fiscal_operation_document_type","l10n_br_fiscal.group_user",1,0,0,0
 "l10n_br_fiscal_operation_document_type_manager","Fiscal Operation Document Type for Manager","model_l10n_br_fiscal_operation_document_type","l10n_br_fiscal.group_manager",1,1,1,1
-"l10n_br_fiscal_partner_profile_user","Fiscal Partner Profile for User","model_l10n_br_fiscal_partner_profile","l10n_br_fiscal.group_user",1,0,0,0
+"l10n_br_fiscal_partner_profile_user","Fiscal Partner Profile for User","model_l10n_br_fiscal_partner_profile","base.group_user",1,0,0,0
 "l10n_br_fiscal_partner_profile_manager","Fiscal Partner Profile for Manager","model_l10n_br_fiscal_partner_profile","l10n_br_fiscal.group_manager",1,1,1,1
 "l10n_br_fiscal_document_user","Fiscal Document for User","model_l10n_br_fiscal_document","l10n_br_fiscal.group_user",1,1,1,0
 "l10n_br_fiscal_document_manager","Fiscal Document for Manager","model_l10n_br_fiscal_document","l10n_br_fiscal.group_manager",1,1,1,1
@@ -94,6 +94,5 @@
 "l10n_br_fiscal_invalidate_number_manager","manager_l10n_br_fiscal_invalidate_number","model_l10n_br_fiscal_invalidate_number","l10n_br_fiscal.group_manager",1,1,1,1
 "l10n_br_fiscal_city_taxation_code_user","Fiscal City Taxation Code for User","model_l10n_br_fiscal_city_taxation_code","l10n_br_fiscal.group_user",1,1,1,0
 "l10n_br_fiscal_city_taxation_code_manager","Fiscal City Taxation Code for Manager","model_l10n_br_fiscal_city_taxation_code","l10n_br_fiscal.group_user",1,1,1,1
-"l10n_br_fiscal_base_wizard_mixin_user",l10n_br_fiscal_base_wizard_mixin,model_l10n_br_fiscal_base_wizard_mixin,base.group_user,1,1,1,1
 "l10n_br_fiscal_document_status_wizard_user",l10n_br_fiscal_document_status_wizard,model_l10n_br_fiscal_document_status_wizard,base.group_user,1,1,1,1
 "l10n_br_fiscal_document_import_wizard_mixin_user",l10n_br_fiscal_document_import_wizard_mixin_user,model_l10n_br_fiscal_document_import_wizard_mixin,base.group_user,1,1,1,1

odoo/addons/l10n_br_fiscal/static/description/index.html

@@ -372,10 +372,10 @@ ul.auto-toc {
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:928d7da34d029adae99b285991053fc5c3783fcbcf7c5d1734189be78590faf8
+!! source digest: sha256:9b476f778818f11bdbac8619f6f6de8e9fd857792cfb19d7408154b19de9ca0b
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/l10n-brazil/tree/17.0/l10n_br_fiscal"><img alt="OCA/l10n-brazil" src="https://img.shields.io/badge/github-OCA%2Fl10n--brazil-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/l10n-brazil-17-0/l10n-brazil-17-0-l10n_br_fiscal"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/l10n-brazil&amp;target_branch=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
-<p><img alt="image" src="https://raw.githubusercontent.com/OCA/l10n-brazil/17.0/l10n_br_fiscal/static/img/fiscal_dashboard.png" /></p>
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/l10n-brazil/tree/18.0/l10n_br_fiscal"><img alt="OCA/l10n-brazil" src="https://img.shields.io/badge/github-OCA%2Fl10n--brazil-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/l10n-brazil-18-0/l10n-brazil-18-0-l10n_br_fiscal"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/l10n-brazil&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p><img alt="image" src="https://raw.githubusercontent.com/OCA/l10n-brazil/18.0/l10n_br_fiscal/static/img/fiscal_dashboard.png" /></p>
 <div class="section" id="classificacoes-fiscais">
 <h2>Classificações fiscais</h2>
 <p>Primeramente, este módulo traz uma variedade de cadastros fiscais para
@@ -513,8 +513,8 @@ como:</p>
 <li>ST</li>
 <li>retenções</li>
 </ul>
-<p><img alt="image1" src="https://raw.githubusercontent.com/OCA/l10n-brazil/17.0/l10n_br_fiscal/static/img/fiscal_line.png" /></p>
-<p><img alt="image2" src="https://raw.githubusercontent.com/OCA/l10n-brazil/17.0/l10n_br_fiscal/static/img/fiscal_total.png" /></p>
+<p><img alt="image1" src="https://raw.githubusercontent.com/OCA/l10n-brazil/18.0/l10n_br_fiscal/static/img/fiscal_line.png" /></p>
+<p><img alt="image2" src="https://raw.githubusercontent.com/OCA/l10n-brazil/18.0/l10n_br_fiscal/static/img/fiscal_total.png" /></p>
 <p>É notório que o cálculo dos impostos no Brasil é muito especial e muito
 trabalhoso. Geralmente é o motivo pelo qual os ERPs internacionais não
 tem grande fatia de mercado brasileiro.</p>
@@ -543,7 +543,7 @@ Tributária)…</p>
 <div class="section" id="operacoes-fiscais">
 <h2>Operações fiscais</h2>
 <blockquote>
-<img alt="image3" src="https://raw.githubusercontent.com/OCA/l10n-brazil/17.0/l10n_br_fiscal/static/img/fiscal_operation.png" /></blockquote>
+<img alt="image3" src="https://raw.githubusercontent.com/OCA/l10n-brazil/18.0/l10n_br_fiscal/static/img/fiscal_operation.png" /></blockquote>
 <p>No Odoo nativo, o conceito mais parecido com a operação fiscal e o
 <tt class="docutils literal">account.fiscal.position</tt>. E ate a versão 10.0, era o que a gente
 usava. Porém, a posição fiscal do Odoo não resolve muito os nossos
@@ -610,7 +610,7 @@ l10n_br_sale, l10n_br_purchase…</p>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/l10n-brazil/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/OCA/l10n-brazil/issues/new?body=module:%20l10n_br_fiscal%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<a class="reference external" href="https://github.com/OCA/l10n-brazil/issues/new?body=module:%20l10n_br_fiscal%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
@@ -659,7 +659,7 @@ mission is to support the collaborative development of Odoo features and
 promote its widespread use.</p>
 <p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainers</a>:</p>
 <p><a class="reference external image-reference" href="https://github.com/renatonlima"><img alt="renatonlima" src="https://github.com/renatonlima.png?size=40px" /></a> <a class="reference external image-reference" href="https://github.com/rvalyi"><img alt="rvalyi" src="https://github.com/rvalyi.png?size=40px" /></a></p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/l10n-brazil/tree/17.0/l10n_br_fiscal">OCA/l10n-brazil</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/l10n-brazil/tree/18.0/l10n_br_fiscal">OCA/l10n-brazil</a> project on GitHub.</p>
 <p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
 </div>
 </div>

odoo/addons/l10n_br_fiscal/tests/__init__.py

@@ -2,6 +2,7 @@
 
 from . import (
     test_cnae,
+    test_fiscal_document_serie,
     test_fiscal_document_generic,
     test_fiscal_document_nfse,
     test_fiscal_tax,

odoo/addons/l10n_br_fiscal/tests/test_document_edition.py

@@ -3,15 +3,43 @@
 
 from unittest import mock
 
-from odoo.tests import TransactionCase
-from odoo.tests.common import Form
+from odoo import Command
+from odoo.tests import Form, TransactionCase, tagged
 
 
+@tagged("post_install", "-at_install")
 class TestDocumentEdition(TransactionCase):
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
-        cls.env = cls.env(context=dict(cls.env.context, tracking_disable=True))
+        cls.user = cls.env["res.users"].create(
+            {
+                "name": "Fiscal User",
+                "login": "fiscaluser",
+                "password": "fiscaluser",
+                "groups_id": [
+                    Command.set(cls.env.user.groups_id.ids),
+                    Command.link(cls.env.ref("l10n_br_fiscal.group_user").id),
+                    Command.link(cls.env.ref("base.group_multi_company").id),
+                ],
+            }
+        )
+        cls.user.partner_id.email = "accountman@test.com"
+        companies = cls.env["res.company"].search([])
+        cls.user.write(
+            {
+                "company_ids": [Command.set(companies.ids)],
+                "company_id": cls.env.ref("l10n_br_base.empresa_lucro_presumido"),
+            }
+        )
+
+        cls.env = cls.env(
+            user=cls.user, context=dict(cls.env.context, tracking_disable=True)
+        )
+        cls.user = cls.env.user
+        cls.company = cls.env.ref("l10n_br_base.empresa_lucro_presumido")
+        cls.user.company_ids |= cls.company
+        cls.user.company_id = cls.company.id
 
     def test_basic_doc_edition(self):
         doc_form = Form(
@@ -75,20 +103,46 @@ class TestDocumentEdition(TransactionCase):
                 line_form.fiscal_operation_line_id,
                 self.env.ref("l10n_br_fiscal.fo_venda_revenda"),
             )
+            self.assertEqual(
+                line_form.ipi_tax_id, self.env.ref("l10n_br_fiscal.tax_ipi_nt")
+            )
 
-            # line_form.fiscal_operation_line_id = False
-            # self.assertEqual(len(line_form.fiscal_tax_ids), 0)
+            line_form.fiscal_operation_line_id = self.env.ref(
+                "l10n_br_fiscal.fo_venda_venda"
+            )
+            self.assertEqual(
+                line_form.ipi_tax_id, self.env.ref("l10n_br_fiscal.tax_ipi_3_25")
+            )
+
+            # ensure manually setting a xx_tax_id is properly saved (not recomputed):
+            line_form.icms_tax_id = self.env.ref("l10n_br_fiscal.tax_icms_18")
+            self.assertEqual(line_form.icms_value, 37.17)
+            self.assertEqual(
+                line_form.ipi_tax_id, self.env.ref("l10n_br_fiscal.tax_ipi_3_25")
+            )
+            line_form.icmsfcp_base = line_form.price_unit
+            line_form.icmsfcp_value = 3  # ensure manually setting FCP value works
 
         doc = doc_form.save()
-        self.assertEqual(doc.fiscal_line_ids[0].price_unit, 100)
-        self.assertEqual(doc.fiscal_line_ids[0].fiscal_price, 100)
-        self.assertEqual(doc.fiscal_line_ids[0].quantity, 2)
-        self.assertEqual(doc.fiscal_line_ids[0].fiscal_quantity, 2)
-        self.assertEqual(len(doc.fiscal_line_ids[0].fiscal_tax_ids), 4)
+        line = doc.fiscal_line_ids[0]
+        self.assertEqual(line.price_unit, 100)
+        self.assertEqual(line.fiscal_price, 100)
+        self.assertEqual(line.quantity, 2)
+        self.assertEqual(line.fiscal_quantity, 2)
+        self.assertEqual(len(line.fiscal_tax_ids), 4)
+
+        self.assertEqual(
+            line.fiscal_operation_line_id,
+            self.env.ref("l10n_br_fiscal.fo_venda_venda"),
+        )
         self.assertEqual(
-            doc.fiscal_line_ids[0].icms_tax_id.id,
-            self.ref("l10n_br_fiscal.tax_icms_12"),
+            line.icms_tax_id.id,
+            self.ref("l10n_br_fiscal.tax_icms_18"),
         )
+        self.assertEqual(line.ipi_tax_id, self.env.ref("l10n_br_fiscal.tax_ipi_3_25"))
+        self.assertEqual(line.icms_value, 37.17)
+        self.assertEqual(line.icmsfcp_base, line.price_unit)
+        self.assertEqual(line.icmsfcp_value, 3)
 
     def test_product_fiscal_factor(self):
         doc_form = Form(
@@ -96,7 +150,6 @@ class TestDocumentEdition(TransactionCase):
                 default_fiscal_operation_type="out",
             )
         )
-        doc_form.company_id = self.env.ref("l10n_br_base.empresa_lucro_presumido")
         doc_form.partner_id = self.env.ref("l10n_br_base.res_partner_cliente1_sp")
         doc_form.fiscal_operation_id = self.env.ref("l10n_br_fiscal.fo_venda")
         doc_form.ind_final = "1"
@@ -119,7 +172,6 @@ class TestDocumentEdition(TransactionCase):
                 default_fiscal_operation_type="out",
             )
         )
-        doc_form.company_id = self.env.ref("l10n_br_base.empresa_lucro_presumido")
         doc_form.partner_id = self.env.ref("l10n_br_base.res_partner_cliente1_sp")
         doc_form.fiscal_operation_id = self.env.ref("l10n_br_fiscal.fo_venda")
         doc_form.ind_final = "1"
@@ -141,3 +193,137 @@ class TestDocumentEdition(TransactionCase):
         self.assertEqual(doc.fiscal_line_ids[0].fiscal_price, 112)
         self.assertEqual(doc.fiscal_line_ids[0].quantity, 10)
         self.assertEqual(doc.fiscal_line_ids[0].fiscal_quantity, 5)
+
+    def test_landed_costs_by_line_and_by_total(self):
+        """
+        Tests both landed cost scenarios: 'by line' and 'by total'.
+        1. By Line: Enters costs on lines and verifies the header totals.
+        2. By Total: Enters costs on the header and verifies lines distribution.
+        """
+        self.env.user.groups_id |= self.env.ref("l10n_br_fiscal.group_user")
+        product1 = self.env.ref("product.product_product_6")
+        product2 = self.env.ref("product.product_product_7")
+
+        # Part 1: Test with delivery_costs = 'line'
+        # ----------------------------------------------------
+        self.company.delivery_costs = "line"
+        doc_form = Form(self.env["l10n_br_fiscal.document"])
+        doc_form.company_id = self.company
+        doc_form.partner_id = self.env.ref("l10n_br_base.res_partner_cliente1_sp")
+        doc_form.fiscal_operation_id = self.env.ref("l10n_br_fiscal.fo_venda")
+
+        with doc_form.fiscal_line_ids.new() as line1:
+            line1.product_id = product1
+            line1.fiscal_operation_line_id = self.env.ref(
+                "l10n_br_fiscal.fo_venda_venda"
+            )
+            line1.price_unit = 1000.0
+            line1.quantity = 2.0  # Gross: 2000
+            line1.freight_value = 10.0
+            line1.insurance_value = 20.0
+            line1.other_value = 5.0
+
+        with doc_form.fiscal_line_ids.new() as line2:
+            line2.product_id = product2
+            line2.fiscal_operation_line_id = self.env.ref(
+                "l10n_br_fiscal.fo_venda_venda"
+            )
+            line2.price_unit = 500.0
+            line2.quantity = 1.0  # Gross: 500
+            line2.freight_value = 4.0
+            line2.insurance_value = 6.0
+            line2.other_value = 2.0
+
+        doc = doc_form.save()
+
+        self.assertEqual(doc.company_id.delivery_costs, "line")
+        # Assert header totals are the SUM of line values
+        self.assertAlmostEqual(doc.amount_freight_value, 14.0)  # 10.0 + 4.0
+        self.assertAlmostEqual(doc.amount_insurance_value, 26.0)  # 20.0 + 6.0
+        self.assertAlmostEqual(doc.amount_other_value, 7.0)  # 5.0 + 2.0
+
+        # Assert final fiscal totals (bottom-up calculation)
+        # price_gross = (1000*2) + (500*1) = 2500
+        # landed_costs = 14 + 26 + 7 = 47
+        # fiscal_amount_untaxed (IPI Base) = 2500 + 47 = 2547
+        self.assertAlmostEqual(doc.fiscal_amount_untaxed, 2547.00)
+        # fiscal_amount_tax (IPI) = (2035 * 3.25%) + (512 * 5%) = 66.14 + 25.60 = 91.74
+        self.assertAlmostEqual(doc.fiscal_amount_tax, 91.74, places=2)
+        # fiscal_amount_total = 2547.00 + 91.74 = 2638.74
+        self.assertAlmostEqual(doc.fiscal_amount_total, 2638.74, places=2)
+
+        # Part 2: Test with delivery_costs = 'total'
+        # ----------------------------------------------------
+        self.company.delivery_costs = "total"
+        doc_form_edit = Form(doc)
+        # Set new header totals, which should trigger inverse methods to distribute
+        doc_form_edit.amount_freight_value = 30.0
+        doc_form_edit.amount_insurance_value = 60.0
+        doc_form_edit.amount_other_value = 90.0
+        doc_after_total_update = doc_form_edit.save()
+
+        line1 = doc_after_total_update.fiscal_line_ids[0]
+        line2 = doc_after_total_update.fiscal_line_ids[1]
+
+        # Assert values were distributed proportionally to price_gross
+        # (2000 vs 500 -> 80% vs 20%)
+        # Freight: 30.0 * 0.8 = 24.0 | 30.0 * 0.2 = 6.0
+        self.assertAlmostEqual(line1.freight_value, 24.0)
+        self.assertAlmostEqual(line2.freight_value, 6.0)
+        # Insurance: 60.0 * 0.8 = 48.0 | 60.0 * 0.2 = 12.0
+        self.assertAlmostEqual(line1.insurance_value, 48.0)
+        self.assertAlmostEqual(line2.insurance_value, 12.0)
+        # Other: 90.0 * 0.8 = 72.0 | 90.0 * 0.2 = 18.0
+        self.assertAlmostEqual(line1.other_value, 72.0)
+        self.assertAlmostEqual(line2.other_value, 18.0)
+
+        # Assert final fiscal totals are recomputed correctly (top-down calculation)
+        # price_gross = 2500
+        # landed_costs = 30 + 60 + 90 = 180
+        # fiscal_amount_untaxed (IPI Base) = 2500 + 180 = 2680
+        self.assertAlmostEqual(doc_after_total_update.fiscal_amount_untaxed, 2680.00)
+        # Line 1 IPI Base = 2000 (product) + 24 (freight) + 48 (insurance)
+        # + 72 (other) = 2144
+        # Line 1 IPI Value = 2144 * 3.25% = 69.68
+        self.assertAlmostEqual(line1.ipi_base, 2144.00)
+        self.assertAlmostEqual(line1.ipi_value, 69.68, places=2)
+
+        # Line 2 IPI Base = 500 (product) + 6 (freight) + 12 (insurance)
+        # + 18 (other) = 536
+        # Line 2 IPI Value = 536 * 5% = 26.80
+        self.assertAlmostEqual(line2.ipi_base, 536.00)
+        self.assertAlmostEqual(line2.ipi_value, 26.80, places=2)
+
+        # fiscal_amount_tax (IPI) = 69.68 + 26.80 = 96.48
+        self.assertAlmostEqual(
+            doc_after_total_update.fiscal_amount_tax, 96.48, places=2
+        )
+        # fiscal_amount_total = 2680.00 + 96.48 = 2776.48
+        self.assertAlmostEqual(
+            doc_after_total_update.fiscal_amount_total, 2776.48, places=2
+        )
+
+    def test_difal_calculation(self):
+        partner = self.env.ref("l10n_br_base.res_partner_cliente5_pe")
+        partner.ind_ie_dest = "9"
+        doc_form = Form(
+            self.env["l10n_br_fiscal.document"].with_context(
+                default_fiscal_operation_type="out",
+            )
+        )
+        doc_form.company_id = self.company
+        doc_form.partner_id = partner
+        doc_form.fiscal_operation_id = self.env.ref("l10n_br_fiscal.fo_venda")
+
+        product = self.env.ref("product.product_product_6")
+        with doc_form.fiscal_line_ids.new() as line_form:
+            line_form.product_id = product
+            line_form.price_unit = 100.0
+            line_form.quantity = 1.0
+
+        doc = doc_form.save()
+        line = doc.fiscal_line_ids[0]
+        self.assertEqual(line.icms_destination_base, 100.0)
+        self.assertEqual(line.icms_origin_percent, 7.0)
+        self.assertEqual(line.icms_destination_percent, 20.5)
+        self.assertEqual(line.icms_destination_value, 13.5)