diff --git a/l10n_br_account/models/account_move.py b/l10n_br_account/models/account_move.py
index b9ebe11edf38..9ad472788566 100644
--- a/l10n_br_account/models/account_move.py
+++ b/l10n_br_account/models/account_move.py
@@ -424,7 +424,7 @@ def _compute_taxes_mapped(self, base_line):
                 tax_type == "purchase" and base_line.credit
             )
             price_unit_wo_discount = base_line.amount_currency
-
+        manual_tax_values = base_line._prepare_br_manual_tax_dict()
         balance_taxes_res = base_line.tax_ids._origin.with_context(
             force_sign=move._get_tax_force_sign()
         ).compute_all(
@@ -453,6 +453,7 @@ def _compute_taxes_mapped(self, base_line):
             icmssn_range=base_line.icmssn_range_id,
             icms_origin=base_line.icms_origin,
             ind_final=base_line.ind_final,
+            **manual_tax_values,
         )
         return balance_taxes_res
 
diff --git a/l10n_br_account/models/account_move_line.py b/l10n_br_account/models/account_move_line.py
index 157897a91db8..16fbfd673f79 100644
--- a/l10n_br_account/models/account_move_line.py
+++ b/l10n_br_account/models/account_move_line.py
@@ -5,6 +5,10 @@
 
 from odoo import api, fields, models
 
+from odoo.addons.l10n_br_fiscal.models.document_line_mixin_methods import (
+    FISCAL_TAX_PREFIXES,
+)
+
 from .account_move import InheritsCheckMuteLogger
 
 # These fields have the same name in account.move.line
@@ -381,6 +385,10 @@ def _get_price_total_and_subtotal(
         move_type=None,
     ):
         self.ensure_one()
+
+        # get the dict with the values of the taxes entered manually.
+        manual_tax_values = self._prepare_br_manual_tax_dict()
+
         return super(
             AccountMoveLine,
             self.with_context(
@@ -403,6 +411,7 @@ def _get_price_total_and_subtotal(
                 icms_origin=self.icms_origin,
                 ind_final=self.ind_final,
                 icms_relief_value=self.icms_relief_value,
+                **manual_tax_values,
             ),
         )._get_price_total_and_subtotal(
             price_unit=price_unit or self.price_unit,
@@ -415,6 +424,17 @@ def _get_price_total_and_subtotal(
             move_type=move_type or self.move_id.move_type,
         )
 
+    def _get_manual_tax_values_from_context(self):
+        tax_values = {}
+        suffixes = ["_base_manual", "_value_manual"]
+
+        for tax_prefix in FISCAL_TAX_PREFIXES:
+            for suffix in suffixes:
+                attr_name = tax_prefix + suffix
+                tax_values[attr_name] = self.env.context.get(attr_name)
+
+        return tax_values
+
     @api.model
     def _get_price_total_and_subtotal_model(
         self,
@@ -456,6 +476,7 @@ def _get_price_total_and_subtotal_model(
             force_sign = (
                 -1 if move_type in ("out_invoice", "in_refund", "out_receipt") else 1
             )
+            manual_tax_values = self._get_manual_tax_values_from_context()
             taxes_res = taxes._origin.with_context(force_sign=force_sign).compute_all(
                 line_discount_price_unit,
                 currency=currency,
@@ -482,6 +503,7 @@ def _get_price_total_and_subtotal_model(
                 icmssn_range=self.env.context.get("icmssn_range"),
                 icms_origin=self.env.context.get("icms_origin"),
                 ind_final=self.env.context.get("ind_final"),
+                **manual_tax_values,
             )
 
             result["price_subtotal"] = taxes_res["total_excluded"]
@@ -509,7 +531,47 @@ def _onchange_fiscal_document_line_id(self):
             # override the default product uom (set by the onchange):
             self.product_uom_id = self.fiscal_document_line_id.uom_id.id
 
-    @api.onchange("fiscal_tax_ids")
+    @api.onchange(
+        "fiscal_tax_ids",
+        "icms_base_manual",
+        "icms_value_manual",
+        "icmsst_base_manual",
+        "icmsst_value_manual",
+        "issqn_base_manual",
+        "issqn_value_manual",
+        "issqn_wh_base_manual",
+        "issqn_wh_value_manual",
+        "icmsst_wh_base_manual",
+        "icmsst_wh_value_manual",
+        "ipi_base_manual",
+        "ipi_value_manual",
+        "ii_base_manual",
+        "ii_value_manual",
+        "cofins_base_manual",
+        "cofins_value_manual",
+        "cofinsst_base_manual",
+        "cofinsst_value_manual",
+        "cofins_wh_base_manual",
+        "cofins_wh_value_manual",
+        "pis_base_manual",
+        "pis_value_manual",
+        "pisst_base_manual",
+        "pisst_value_manual",
+        "pis_wh_base_manual",
+        "pis_wh_value_manual",
+        "csll_base_manual",
+        "csll_value_manual",
+        "csll_wh_base_manual",
+        "csll_wh_value_manual",
+        "irpj_base_manual",
+        "irpj_value_manual",
+        "irpj_wh_base_manual",
+        "irpj_wh_value_manual",
+        "inss_base_manual",
+        "inss_value_manual",
+        "inss_wh_base_manual",
+        "inss_wh_value_manual",
+    )
     def _onchange_fiscal_tax_ids(self):
         """Ao alterar o campo fiscal_tax_ids que contém os impostos fiscais,
         são atualizados os impostos contábeis relacionados"""
diff --git a/l10n_br_account/models/account_tax.py b/l10n_br_account/models/account_tax.py
index 90aa2a1e3149..43679429fc7b 100644
--- a/l10n_br_account/models/account_tax.py
+++ b/l10n_br_account/models/account_tax.py
@@ -44,6 +44,7 @@ def compute_all(
         icmssn_range=None,
         icms_origin=None,
         ind_final=FINAL_CUSTOMER_NO,
+        **kwargs,
     ):
         """Returns all information required to apply taxes
             (in self + their children in case of a tax goup).
@@ -117,6 +118,7 @@ def compute_all(
             icmssn_range=icmssn_range,
             icms_origin=icms_origin or product.icms_origin,
             ind_final=ind_final,
+            **kwargs,
         )
 
         taxes_results["amount_tax_included"] = fiscal_taxes_results["amount_included"]
diff --git a/l10n_br_fiscal/models/document_line_mixin.py b/l10n_br_fiscal/models/document_line_mixin.py
index 1ac41117f2b5..1ce1724394b5 100644
--- a/l10n_br_fiscal/models/document_line_mixin.py
+++ b/l10n_br_fiscal/models/document_line_mixin.py
@@ -301,6 +301,18 @@ def _operation_domain(self):
         default=ISSQN_INCENTIVE_DEFAULT,
     )
 
+    issqn_base_manual = fields.Monetary(
+        string="Manual ISSQN Base",
+        help="Value of the ISSQN Base calculated manually. "
+        "Leave this field blank for automatic calculation.",
+    )
+
+    issqn_value_manual = fields.Monetary(
+        string="Manual ISSQN Value",
+        help="Value of the ISSQN Value calculated manually. "
+        "Leave this field blank for automatic calculation.",
+    )
+
     issqn_base = fields.Monetary(string="ISSQN Base")
 
     issqn_percent = fields.Float(string="ISSQN %")
@@ -315,6 +327,18 @@ def _operation_domain(self):
         domain=[("tax_domain", "=", TAX_DOMAIN_ISSQN_WH)],
     )
 
+    issqn_wh_base_manual = fields.Monetary(
+        string="Manual ISSQN RET Base",
+        help="Value of the ISSQN RET Base calculated manually. "
+        "Leave this field blank for automatic calculation.",
+    )
+
+    issqn_wh_value_manual = fields.Monetary(
+        string="Manual ISSQN RET Value",
+        help="Value of the ISSQN RET Value calculated manually. "
+        "Leave this field blank for automatic calculation.",
+    )
+
     issqn_wh_base = fields.Monetary(string="ISSQN RET Base")
 
     issqn_wh_percent = fields.Float(string="ISSQN RET %")
@@ -364,6 +388,18 @@ def _operation_domain(self):
         selection=ICMS_ORIGIN, string="ICMS Origin", default=ICMS_ORIGIN_DEFAULT
     )
 
+    icms_base_manual = fields.Monetary(
+        string="Manual ICMS Base",
+        help="Value of the ICMS Base calculated manually. "
+        "Leave this field blank for automatic calculation.",
+    )
+
+    icms_value_manual = fields.Monetary(
+        string="Manual ICMS Value",
+        help="Value of the ICMS Value calculated manually. "
+        "Leave this field blank for automatic calculation.",
+    )
+
     # vBC - Valor da base de cálculo do ICMS
     icms_base = fields.Monetary(string="ICMS Base")
 
@@ -404,6 +440,18 @@ def _operation_domain(self):
         default=ICMS_ST_BASE_TYPE_DEFAULT,
     )
 
+    icmsst_base_manual = fields.Monetary(
+        string="Manual ICMS ST Base",
+        help="Value of the ICMS ST Base calculated manually. "
+        "Leave this field blank for automatic calculation.",
+    )
+
+    icmsst_value_manual = fields.Monetary(
+        string="Manual ICMS ST Value",
+        help="Value of the ICMS ST Value calculated manually. "
+        "Leave this field blank for automatic calculation.",
+    )
+
     # pMVAST - Percentual da margem de valor Adicionado do ICMS ST
     icmsst_mva_percent = fields.Float(string="ICMS ST MVA %")
 
@@ -419,6 +467,18 @@ def _operation_domain(self):
     # vICMSST - Valor do ICMS ST
     icmsst_value = fields.Monetary(string="ICMS ST Value")
 
+    icmsst_wh_base_manual = fields.Monetary(
+        string="Manual ICMS ST RET Base",
+        help="Value of the ICMS ST RET Base calculated manually. "
+        "Leave this field blank for automatic calculation.",
+    )
+
+    icmsst_wh_value_manual = fields.Monetary(
+        string="Manual ICMS ST RET Value",
+        help="Value of the ICMS ST RET Value calculated manually. "
+        "Leave this field blank for automatic calculation.",
+    )
+
     # vBCSTRet - Valor da base de cálculo do ICMS ST retido
     icmsst_wh_base = fields.Monetary(string="ICMS ST WH Base")
 
@@ -553,6 +613,18 @@ def _operation_domain(self):
         selection=TAX_BASE_TYPE, string="IPI Base Type", default=TAX_BASE_TYPE_PERCENT
     )
 
+    ipi_base_manual = fields.Monetary(
+        string="Manual IPI Base",
+        help="Value of the IPI Base calculated manually. "
+        "Leave this field blank for automatic calculation.",
+    )
+
+    ipi_value_manual = fields.Monetary(
+        string="Manual IPI Value",
+        help="Value of the IPI Value calculated manually. "
+        "Leave this field blank for automatic calculation.",
+    )
+
     ipi_base = fields.Monetary(string="IPI Base")
 
     ipi_percent = fields.Float(string="IPI %")
@@ -575,6 +647,18 @@ def _operation_domain(self):
         domain=[("tax_domain", "=", TAX_DOMAIN_II)],
     )
 
+    ii_base_manual = fields.Monetary(
+        string="Manual II Base",
+        help="Value of the II Base calculated manually. "
+        "Leave this field blank for automatic calculation.",
+    )
+
+    ii_value_manual = fields.Monetary(
+        string="Manual II Value",
+        help="Value of the II Value calculated manually. "
+        "Leave this field blank for automatic calculation.",
+    )
+
     ii_base = fields.Monetary(string="II Base")
 
     ii_percent = fields.Float(string="II %")
@@ -611,6 +695,18 @@ def _operation_domain(self):
         default=TAX_BASE_TYPE_PERCENT,
     )
 
+    cofins_base_manual = fields.Monetary(
+        string="Manual COFINS Base",
+        help="Value of the COFINS Base calculated manually. "
+        "Leave this field blank for automatic calculation.",
+    )
+
+    cofins_value_manual = fields.Monetary(
+        string="Manual COFINS Value",
+        help="Value of the COFINS Value calculated manually. "
+        "Leave this field blank for automatic calculation.",
+    )
+
     cofins_base = fields.Monetary(string="COFINS Base")
 
     cofins_percent = fields.Float(string="COFINS %")
@@ -652,6 +748,18 @@ def _operation_domain(self):
         default=TAX_BASE_TYPE_PERCENT,
     )
 
+    cofinsst_base_manual = fields.Monetary(
+        string="Manual COFINS ST Base",
+        help="Value of the COFINS ST Base calculated manually. "
+        "Leave this field blank for automatic calculation.",
+    )
+
+    cofinsst_value_manual = fields.Monetary(
+        string="Manual COFINS ST Value",
+        help="Value of the COFINS ST Value calculated manually. "
+        "Leave this field blank for automatic calculation.",
+    )
+
     cofinsst_base = fields.Monetary(string="COFINS ST Base")
 
     cofinsst_percent = fields.Float(string="COFINS ST %")
@@ -672,6 +780,18 @@ def _operation_domain(self):
         default=TAX_BASE_TYPE_PERCENT,
     )
 
+    cofins_wh_base_manual = fields.Monetary(
+        string="Manual COFINS RET Base",
+        help="Value of the COFINS RET Base calculated manually. "
+        "Leave this field blank for automatic calculation.",
+    )
+
+    cofins_wh_value_manual = fields.Monetary(
+        string="Manual COFINS RET Value",
+        help="Value of the COFINS RET Value calculated manually. "
+        "Leave this field blank for automatic calculation.",
+    )
+
     cofins_wh_base = fields.Monetary(string="COFINS RET Base")
 
     cofins_wh_percent = fields.Float(string="COFINS RET %")
@@ -703,6 +823,18 @@ def _operation_domain(self):
         selection=TAX_BASE_TYPE, string="PIS Base Type", default=TAX_BASE_TYPE_PERCENT
     )
 
+    pis_base_manual = fields.Monetary(
+        string="Manual PIS Base",
+        help="Value of the PIS Base calculated manually. "
+        "Leave this field blank for automatic calculation.",
+    )
+
+    pis_value_manual = fields.Monetary(
+        string="Manual PIS Value",
+        help="Value of the PIS Value calculated manually. "
+        "Leave this field blank for automatic calculation.",
+    )
+
     pis_base = fields.Monetary(string="PIS Base")
 
     pis_percent = fields.Float(string="PIS %")
@@ -744,6 +876,18 @@ def _operation_domain(self):
         default=TAX_BASE_TYPE_PERCENT,
     )
 
+    pisst_base_manual = fields.Monetary(
+        string="Manual PIS ST Base",
+        help="Value of the PIS ST Base calculated manually. "
+        "Leave this field blank for automatic calculation.",
+    )
+
+    pisst_value_manual = fields.Monetary(
+        string="Manual PIS ST Value",
+        help="Value of the PIS ST Value calculated manually. "
+        "Leave this field blank for automatic calculation.",
+    )
+
     pisst_base = fields.Monetary(string="PIS ST Base")
 
     pisst_percent = fields.Float(string="PIS ST %")
@@ -764,6 +908,18 @@ def _operation_domain(self):
         default=TAX_BASE_TYPE_PERCENT,
     )
 
+    pis_wh_base_manual = fields.Monetary(
+        string="Manual PIS RET Base",
+        help="Value of the PIS RET Base calculated manually. "
+        "Leave this field blank for automatic calculation.",
+    )
+
+    pis_wh_value_manual = fields.Monetary(
+        string="Manual PIS RET Value",
+        help="Value of the PIS RET Value calculated manually. "
+        "Leave this field blank for automatic calculation.",
+    )
+
     pis_wh_base = fields.Monetary(string="PIS RET Base")
 
     pis_wh_percent = fields.Float(string="PIS RET %")
@@ -779,6 +935,18 @@ def _operation_domain(self):
         domain=[("tax_domain", "=", TAX_DOMAIN_CSLL)],
     )
 
+    csll_base_manual = fields.Monetary(
+        string="Manual CSLL Base",
+        help="Value of the CSLL Base calculated manually. "
+        "Leave this field blank for automatic calculation.",
+    )
+
+    csll_value_manual = fields.Monetary(
+        string="Manual CSLL Value",
+        help="Value of the CSLL Value calculated manually. "
+        "Leave this field blank for automatic calculation.",
+    )
+
     csll_base = fields.Monetary(string="CSLL Base")
 
     csll_percent = fields.Float(string="CSLL %")
@@ -793,6 +961,18 @@ def _operation_domain(self):
         domain=[("tax_domain", "=", TAX_DOMAIN_CSLL_WH)],
     )
 
+    csll_wh_base_manual = fields.Monetary(
+        string="Manual CSLL RET Base",
+        help="Value of the CSLL RET Base calculated manually. "
+        "Leave this field blank for automatic calculation.",
+    )
+
+    csll_wh_value_manual = fields.Monetary(
+        string="Manual CSLL RET Value",
+        help="Value of the CSLL RET Value calculated manually. "
+        "Leave this field blank for automatic calculation.",
+    )
+
     csll_wh_base = fields.Monetary(string="CSLL RET Base")
 
     csll_wh_percent = fields.Float(string="CSLL RET %")
@@ -807,6 +987,18 @@ def _operation_domain(self):
         domain=[("tax_domain", "=", TAX_DOMAIN_IRPJ)],
     )
 
+    irpj_base_manual = fields.Monetary(
+        string="Manual IRPJ Base",
+        help="Value of the IRPJ Base calculated manually. "
+        "Leave this field blank for automatic calculation.",
+    )
+
+    irpj_value_manual = fields.Monetary(
+        string="Manual IRPJ Value",
+        help="Value of the IRPJ Value calculated manually. "
+        "Leave this field blank for automatic calculation.",
+    )
+
     irpj_base = fields.Monetary(string="IRPJ Base")
 
     irpj_percent = fields.Float(string="IRPJ %")
@@ -821,6 +1013,18 @@ def _operation_domain(self):
         domain=[("tax_domain", "=", TAX_DOMAIN_IRPJ_WH)],
     )
 
+    irpj_wh_base_manual = fields.Monetary(
+        string="Manual IRPJ RET Base",
+        help="Value of the IRPJ RET Base calculated manually. "
+        "Leave this field blank for automatic calculation.",
+    )
+
+    irpj_wh_value_manual = fields.Monetary(
+        string="Manual IRPJ RET Value",
+        help="Value of the IRPJ RET Value calculated manually. "
+        "Leave this field blank for automatic calculation.",
+    )
+
     irpj_wh_base = fields.Monetary(string="IRPJ RET Base")
 
     irpj_wh_percent = fields.Float(string="IRPJ RET %")
@@ -835,6 +1039,18 @@ def _operation_domain(self):
         domain=[("tax_domain", "=", TAX_DOMAIN_INSS)],
     )
 
+    inss_base_manual = fields.Monetary(
+        string="Manual INSS Base",
+        help="Value of the INSS Base calculated manually. "
+        "Leave this field blank for automatic calculation.",
+    )
+
+    inss_value_manual = fields.Monetary(
+        string="Manual INSS Value",
+        help="Value of the INSS Value calculated manually. "
+        "Leave this field blank for automatic calculation.",
+    )
+
     inss_base = fields.Monetary(string="INSS Base")
 
     inss_percent = fields.Float(string="INSS %")
@@ -849,6 +1065,18 @@ def _operation_domain(self):
         domain=[("tax_domain", "=", TAX_DOMAIN_INSS_WH)],
     )
 
+    inss_wh_base_manual = fields.Monetary(
+        string="Manual INSS RET Base",
+        help="Value of the INSS RET Base calculated manually. "
+        "Leave this field blank for automatic calculation.",
+    )
+
+    inss_wh_value_manual = fields.Monetary(
+        string="Manual INSS Value",
+        help="Value of the INSS Value calculated manually. "
+        "Leave this field blank for automatic calculation.",
+    )
+
     inss_wh_base = fields.Monetary(string="INSS RET Base")
 
     inss_wh_percent = fields.Float(string="INSS RET %")
diff --git a/l10n_br_fiscal/models/document_line_mixin_methods.py b/l10n_br_fiscal/models/document_line_mixin_methods.py
index 902d55cc635d..8d32ecf1cbb9 100644
--- a/l10n_br_fiscal/models/document_line_mixin_methods.py
+++ b/l10n_br_fiscal/models/document_line_mixin_methods.py
@@ -44,6 +44,28 @@
     "cofinsst_cst_id",
 ]
 
+FISCAL_TAX_PREFIXES = [
+    "icms",
+    "icmsst",
+    "issqn",
+    "issqn_wh",
+    "icmsst_wh",
+    "ipi",
+    "ii",
+    "cofins",
+    "cofinsst",
+    "cofins_wh",
+    "pis",
+    "pisst",
+    "pis_wh",
+    "csll",
+    "csll_wh",
+    "irpj",
+    "irpj_wh",
+    "inss",
+    "inss_wh",
+]
+
 
 class FiscalDocumentLineMixinMethods(models.AbstractModel):
     _name = "l10n_br_fiscal.document.line.mixin.methods"
@@ -188,6 +210,10 @@ def _compute_amounts(self):
 
     def _compute_taxes(self, taxes, cst=None):
         self.ensure_one()
+
+        # get the dict with the values of the taxes entered manually.
+        manual_tax_values = self._prepare_br_manual_tax_dict()
+
         return taxes.compute_taxes(
             company=self.company_id,
             partner=self._get_fiscal_partner(),
@@ -213,6 +239,7 @@ def _compute_taxes(self, taxes, cst=None):
             icmssn_range=self.icmssn_range_id,
             icms_origin=self.icms_origin,
             icms_cst_id=self.icms_cst_id,
+            **manual_tax_values,
             ind_final=self.ind_final,
             icms_relief_id=self.icms_relief_id,
         )
@@ -244,6 +271,17 @@ def _prepare_br_fiscal_dict(self, default=False):
             return {f"default_{k}": vals[k] for k in vals.keys()}
         return vals
 
+    def _prepare_br_manual_tax_dict(self):
+        manual_tax_dict = {}
+        suffixes = ["_base_manual", "_value_manual"]
+
+        for tax_prefix in FISCAL_TAX_PREFIXES:
+            for suffix in suffixes:
+                attr_name = tax_prefix + suffix
+                manual_tax_dict[attr_name] = getattr(self, attr_name)
+
+        return manual_tax_dict
+
     def _get_all_tax_id_fields(self):
         self.ensure_one()
         taxes = self.env["l10n_br_fiscal.tax"]
@@ -852,6 +890,44 @@ def _onchange_cofinsst_fields(self):
         "insurance_value",
         "other_value",
         "freight_value",
+        "icms_base_manual",
+        "icms_value_manual",
+        "icmsst_base_manual",
+        "icmsst_value_manual",
+        "issqn_base_manual",
+        "issqn_value_manual",
+        "issqn_wh_base_manual",
+        "issqn_wh_value_manual",
+        "icmsst_wh_base_manual",
+        "icmsst_wh_value_manual",
+        "ipi_base_manual",
+        "ipi_value_manual",
+        "ii_base_manual",
+        "ii_value_manual",
+        "cofins_base_manual",
+        "cofins_value_manual",
+        "cofinsst_base_manual",
+        "cofinsst_value_manual",
+        "cofins_wh_base_manual",
+        "cofins_wh_value_manual",
+        "pis_base_manual",
+        "pis_value_manual",
+        "pisst_base_manual",
+        "pisst_value_manual",
+        "pis_wh_base_manual",
+        "pis_wh_value_manual",
+        "csll_base_manual",
+        "csll_value_manual",
+        "csll_wh_base_manual",
+        "csll_wh_value_manual",
+        "irpj_base_manual",
+        "irpj_value_manual",
+        "irpj_wh_base_manual",
+        "irpj_wh_value_manual",
+        "inss_base_manual",
+        "inss_value_manual",
+        "inss_wh_base_manual",
+        "inss_wh_value_manual",
     )
     def _onchange_fiscal_taxes(self):
         self._update_fiscal_tax_ids(self._get_all_tax_id_fields())
diff --git a/l10n_br_fiscal/models/tax.py b/l10n_br_fiscal/models/tax.py
index 1a583402aa80..29362f8ea09c 100644
--- a/l10n_br_fiscal/models/tax.py
+++ b/l10n_br_fiscal/models/tax.py
@@ -2,7 +2,6 @@
 # License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
 
 from odoo import api, fields, models
-from odoo.tools import float_is_zero
 
 from ..constants.fiscal import (
     CFOP_DESTINATION_EXPORT,
@@ -184,6 +183,8 @@ def cst_from_tax(self, fiscal_operation_type=FISCAL_OUT):
 
     @api.model
     def _compute_tax_base(self, tax, tax_dict, **kwargs):
+        """Calculates the base, percentage, and tax amount."""
+
         company = kwargs.get("company", tax.env.company)
         currency = kwargs.get("currency", company.currency_id)
         fiscal_price = kwargs.get("fiscal_price", 0.00)
@@ -194,53 +195,55 @@ def _compute_tax_base(self, tax, tax_dict, **kwargs):
         freight_value = kwargs.get("freight_value", 0.00)
         other_value = kwargs.get("other_value", 0.00)
 
-        if tax.tax_group_id.base_with_additional_values:
-            tax_dict["add_to_base"] += sum(
-                [freight_value, insurance_value, other_value]
-            )
-        tax_dict["remove_from_base"] += sum([discount_value])
-
-        base = 0.00
-
         if not tax_dict.get("percent_amount") and tax.percent_amount:
             tax_dict["percent_amount"] = tax.percent_amount
 
         if not tax_dict.get("value_amount") and tax.value_amount:
             tax_dict["value_amount"] = tax.value_amount
 
-        if tax_dict["base_type"] == "percent":
-            # Compute initial Tax Base for base_type Percent
-            base = currency.round(fiscal_price * fiscal_quantity)
-
-        if tax_dict["base_type"] == "quantity":
-            # Compute initial Tax Base for base_type Quantity
-            base = fiscal_quantity
-
-        if tax_dict["base_type"] == "fixed":
-            # Compute initial Tax Base
-            base = currency.round(tax_dict["value_amount"] * fiscal_quantity)
+        if tax_dict.get("base_manual"):
+            base_amount = tax_dict["base_manual"]
+        else:
+            # calculate base
+            if tax.tax_group_id.base_with_additional_values:
+                tax_dict["add_to_base"] += sum(
+                    [freight_value, insurance_value, other_value]
+                )
+            tax_dict["remove_from_base"] += sum([discount_value])
 
-        # Update Base Value
-        base_amount = currency.round(
-            (base + tax_dict["add_to_base"]) - tax_dict["remove_from_base"]
-        )
+            if tax_dict["base_type"] == "percent":
+                # Compute initial Tax Base for base_type Percent
+                base = currency.round(fiscal_price * fiscal_quantity)
 
-        # Compute Tax Base Reduction
-        base_reduction = base_amount * abs(tax.percent_reduction / 100)
+            if tax_dict["base_type"] == "quantity":
+                # Compute initial Tax Base for base_type Quantity
+                base = fiscal_quantity
 
-        # Compute Tax Base Amount
-        if compute_reduction:
-            base_amount = currency.round(base_amount - base_reduction)
+            if tax_dict["base_type"] == "fixed":
+                # Compute initial Tax Base
+                base = currency.round(tax_dict["value_amount"] * fiscal_quantity)
 
-        if tax_dict.get("icmsst_mva_percent"):
+            # Update Base Value
             base_amount = currency.round(
-                base_amount * (1 + (tax_dict["icmsst_mva_percent"] / 100))
+                (base + tax_dict["add_to_base"]) - tax_dict["remove_from_base"]
             )
 
-        if tax_dict.get("compute_with_tax_value"):
-            base_amount = currency.round(
-                base_amount / (1 - (tax_dict["percent_amount"] / 100))
-            )
+            # Compute Tax Base Reduction
+            base_reduction = base_amount * abs(tax.percent_reduction / 100)
+
+            # Compute Tax Base Amount
+            if compute_reduction:
+                base_amount = currency.round(base_amount - base_reduction)
+
+            if tax_dict.get("icmsst_mva_percent"):
+                base_amount = currency.round(
+                    base_amount * (1 + (tax_dict["icmsst_mva_percent"] / 100))
+                )
+
+            if tax_dict.get("compute_with_tax_value"):
+                base_amount = currency.round(
+                    base_amount / (1 - (tax_dict["percent_amount"] / 100))
+                )
 
         if (
             not tax.percent_amount
@@ -264,6 +267,11 @@ def _compute_tax(self, tax, taxes_dict, **kwargs):
         fiscal_operation_type = operation_line.fiscal_operation_type or FISCAL_OUT
 
         tax_dict = taxes_dict.get(tax.tax_domain)
+
+        # extract manual values
+        base_manual = kwargs.get(f"{tax.tax_domain}_base_manual")
+        tax_value_manual = kwargs.get(f"{tax.tax_domain}_value_manual")
+
         tax_dict.update(
             {
                 "name": tax.name,
@@ -275,6 +283,8 @@ def _compute_tax(self, tax, taxes_dict, **kwargs):
                 "percent_reduction": tax.percent_reduction,
                 "percent_amount": tax_dict.get("percent_amount", tax.percent_amount),
                 "cst_id": tax.cst_from_tax(fiscal_operation_type),
+                "base_manual": base_manual,
+                "tax_value_manual": tax_value_manual,
             }
         )
 
@@ -283,21 +293,22 @@ def _compute_tax(self, tax, taxes_dict, **kwargs):
             tax_dict_icms = taxes_dict.get("icms", {})
             tax_dict["remove_from_base"] += tax_dict_icms.get("tax_value", 0.00)
 
-        # TODO futuramente levar em consideração outros tipos de base de calculo
-        if float_is_zero(tax_dict.get("base", 0.00), currency.decimal_places):
-            tax_dict = self._compute_tax_base(tax, tax_dict, **kwargs)
+        tax_dict = self._compute_tax_base(tax, tax_dict, **kwargs)
 
         base_amount = tax_dict.get("base", 0.00)
 
-        if tax_dict["base_type"] == "percent":
-            tax_dict["tax_value"] = currency.round(
-                base_amount * (tax_dict["percent_amount"] / 100)
-            )
+        if tax_dict.get("tax_value_manual"):
+            tax_dict["tax_value"] = tax_dict["tax_value_manual"]
+        else:
+            if tax_dict["base_type"] == "percent":
+                tax_dict["tax_value"] = currency.round(
+                    base_amount * (tax_dict["percent_amount"] / 100)
+                )
 
-        if tax_dict["base_type"] in ("quantity", "fixed"):
-            tax_dict["tax_value"] = currency.round(
-                base_amount * tax_dict["value_amount"]
-            )
+            if tax_dict["base_type"] in ("quantity", "fixed"):
+                tax_dict["tax_value"] = currency.round(
+                    base_amount * tax_dict["value_amount"]
+                )
 
         return tax_dict
 
@@ -537,12 +548,8 @@ def _compute_icmsst(self, tax, taxes_dict, **kwargs):
         if taxes_dict.get(tax.tax_domain):
             taxes_dict[tax.tax_domain]["icmsst_mva_percent"] = tax.icmsst_mva_percent
 
-        taxes_dict[tax.tax_domain].update(
-            self._compute_tax_base(tax, taxes_dict.get(tax.tax_domain), **kwargs)
-        )
-
         tax_dict = self._compute_tax(tax, taxes_dict, **kwargs)
-        if tax_dict.get("icmsst_mva_percent"):
+        if tax_dict.get("icmsst_mva_percent") and not tax_dict.get("tax_value_manual"):
             tax_dict["tax_value"] -= taxes_dict.get("icms", {}).get("tax_value", 0.0)
 
         return tax_dict
diff --git a/l10n_br_fiscal/views/document_fiscal_line_mixin_view.xml b/l10n_br_fiscal/views/document_fiscal_line_mixin_view.xml
index a11242c6a9cd..267c63d7892b 100644
--- a/l10n_br_fiscal/views/document_fiscal_line_mixin_view.xml
+++ b/l10n_br_fiscal/views/document_fiscal_line_mixin_view.xml
@@ -1,351 +1,463 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
 
-  <record id="document_fiscal_line_mixin_form" model="ir.ui.view">
-    <field name="name">l10n_br_fiscal.document.line.mixin.form</field>
-    <field name="model">l10n_br_fiscal.document.line</field>
-    <field name="arch" type="xml">
-      <form>
-        <group name="fiscal_fields" invisible="1">
-          <field name="currency_id" force_save="1" invisible="1" />
-          <field name="fiscal_operation_type" force_save="1" invisible="1" />
-          <field name="company_id" force_save="1" invisible="1" />
-          <field name="partner_id" force_save="1" invisible="1" />
-          <field name="fiscal_type" force_save="1" invisible="1" />
-          <field name="partner_company_type" force_save="1" invisible="1" />
-          <field name="tax_framework" force_save="1" invisible="1" />
-          <field name="amount_tax_not_included" force_save="1" invisible="1" />
-          <field name="amount_tax_withholding" force_save="1" invisible="1" />
-          <field name="cfop_destination" force_save="1" invisible="1" />
-          <field name="fiscal_genre_id" force_save="1" invisible="1" />
-          <field name="fiscal_genre_code" force_save="1" invisible="1" />
-          <field name="ncm_id" force_save="1" invisible="1" />
-          <field name="nbm_id" force_save="1" invisible="1" />
-          <field name="cest_id" force_save="1" invisible="1" />
-          <field name="nbs_id" force_save="1" invisible="1" />
-          <field name="service_type_id" force_save="1" invisible="1" />
-          <field name="city_taxation_code_id" force_save="1" invisible="1" />
-          <field name="uot_id" force_save="1" invisible="1" />
-          <field name="fiscal_price" force_save="1" invisible="1" />
-          <field name="fiscal_quantity" force_save="1" invisible="1" />
-          <field name="fiscal_tax_ids" force_save="1" invisible="1" readonly="1" />
-          <field name="allow_csll_irpj" force_save="1" invisible="1" />
-        </group>
-        <notebook>
-          <field name="product_id" force_save="1" invisible="1" />
-          <page name="fiscal_taxes" string="Taxes">
-            <group>
-              <field name="tax_framework" invisible="1" />
-              <field
+    <record id="document_fiscal_line_mixin_form" model="ir.ui.view">
+        <field name="name">l10n_br_fiscal.document.line.mixin.form</field>
+        <field name="model">l10n_br_fiscal.document.line</field>
+        <field name="arch" type="xml">
+            <form>
+                <group name="fiscal_fields" invisible="1">
+                    <field name="currency_id" force_save="1" invisible="1" />
+                    <field name="fiscal_operation_type" force_save="1" invisible="1" />
+                    <field name="company_id" force_save="1" invisible="1" />
+                    <field name="partner_id" force_save="1" invisible="1" />
+                    <field name="fiscal_type" force_save="1" invisible="1" />
+                    <field name="partner_company_type" force_save="1" invisible="1" />
+                    <field name="tax_framework" force_save="1" invisible="1" />
+                    <field
+                        name="amount_tax_not_included"
+                        force_save="1"
+                        invisible="1"
+                    />
+                    <field name="amount_tax_withholding" force_save="1" invisible="1" />
+                    <field name="cfop_destination" force_save="1" invisible="1" />
+                    <field name="fiscal_genre_id" force_save="1" invisible="1" />
+                    <field name="fiscal_genre_code" force_save="1" invisible="1" />
+                    <field name="ncm_id" force_save="1" invisible="1" />
+                    <field name="nbm_id" force_save="1" invisible="1" />
+                    <field name="cest_id" force_save="1" invisible="1" />
+                    <field name="nbs_id" force_save="1" invisible="1" />
+                    <field name="service_type_id" force_save="1" invisible="1" />
+                    <field name="city_taxation_code_id" force_save="1" invisible="1" />
+                    <field name="uot_id" force_save="1" invisible="1" />
+                    <field name="fiscal_price" force_save="1" invisible="1" />
+                    <field name="fiscal_quantity" force_save="1" invisible="1" />
+                    <field
+                        name="fiscal_tax_ids"
+                        force_save="1"
+                        invisible="1"
+                        readonly="1"
+                    />
+                    <field name="allow_csll_irpj" force_save="1" invisible="1" />
+                </group>
+                <notebook>
+                    <field name="product_id" force_save="1" invisible="1" />
+                    <page name="fiscal_taxes" string="Taxes">
+                        <group>
+                            <field name="tax_framework" invisible="1" />
+                            <field
                                 name="tax_icms_or_issqn"
                                 force_save="1"
                                 attrs="{'readonly': [('product_id', '!=', False), ('tax_icms_or_issqn', '!=', False)], 'required': [('tax_icms_or_issqn', '!=', False), ('fiscal_tax_ids', '!=', False)]}"
                             />
-            </group>
-            <notebook>
-              <page
+                        </group>
+                        <notebook>
+                            <page
                                 name="issqn"
                                 string="ISSQN"
                                 attrs="{'invisible': [('tax_icms_or_issqn', '!=', 'issqn')]}"
                             >
-                <group>
-                  <field
+                                <group>
+                                    <field
                                         name="issqn_tax_id"
                                         options="{'no_create': True, 'no_create_edit': True}"
                                     />
-                  <field
+                                    <field
                                         name="issqn_fg_city_id"
                                         options="{'no_create': True, 'no_create_edit': True}"
                                     />
-                  <field
+                                    <field
                                         name="issqn_eligibility"
                                         attrs="{'required': [('tax_icms_or_issqn', '=', 'issqn')]}"
                                     />
-                  <field
+                                    <field
                                         name="issqn_incentive"
                                         attrs="{'required': [('tax_icms_or_issqn', '=', 'issqn')]}"
                                     />
-                </group>
-                <group>
-                  <group>
-                    <field
+                                </group>
+                                <group>
+                                    <group>
+                                        <field
                                             name="issqn_base"
                                             force_save="1"
                                             attrs="{'readonly': [('issqn_tax_id', '!=', False)]}"
                                         />
-                    <field
+                                        <field
                                             name="issqn_percent"
                                             force_save="1"
                                             attrs="{'readonly': [('issqn_tax_id', '!=', False)]}"
                                         />
-                    <field
+                                        <field
                                             name="issqn_reduction"
                                             force_save="1"
                                             attrs="{'readonly': [('issqn_tax_id', '!=', False)]}"
                                         />
-                    <field
+                                        <field
                                             name="issqn_value"
                                             force_save="1"
                                             attrs="{'readonly': [('issqn_tax_id', '!=', False)]}"
                                         />
-                  </group>
-                  <group>
-                    <field
+                                    </group>
+                                    <group name="issqn_manual" string="Manual">
+                                        <div
+                                            class="text-muted"
+                                            colspan="2"
+                                        >Keep empty for automatic
+                                            calculation</div>
+                                        <field
+                                            name="issqn_base_manual"
+                                            string="Base"
+                                            force_save="1"
+                                        />
+                                        <field
+                                            name="issqn_value_manual"
+                                            string="Value"
+                                            force_save="1"
+                                        />
+                                    </group>
+                                    <group>
+                                        <field
                                             name="issqn_deduction_amount"
                                             force_save="1"
                                             attrs="{'readonly': [('issqn_tax_id', '!=', False)]}"
                                         />
-                    <field
+                                        <field
                                             name="issqn_other_amount"
                                             force_save="1"
                                             attrs="{'readonly': [('issqn_tax_id', '!=', False)]}"
                                         />
-                    <field
+                                        <field
                                             name="issqn_desc_incond_amount"
                                             force_save="1"
                                             attrs="{'readonly': [('issqn_tax_id', '!=', False)]}"
                                         />
-                    <field
+                                        <field
                                             name="issqn_desc_cond_amount"
                                             force_save="1"
                                             attrs="{'readonly': [('issqn_tax_id', '!=', False)]}"
                                         />
-                    <field
+                                        <field
                                             name="issqn_desc_cond_amount"
                                             force_save="1"
                                             attrs="{'readonly': [('issqn_tax_id', '!=', False)]}"
                                         />
-                  </group>
-                </group>
-                <group string="Retenções">
-                   <field
+                                    </group>
+                                </group>
+                                <group string="Retenções">
+                                    <field
                                         name="issqn_wh_tax_id"
                                         options="{'no_create': True, 'no_create_edit': True}"
                                     />
-                  </group>
-                  <group>
-                      <group>
-                        <field
-                                            name="issqn_wh_base"
-                                            force_save="1"
-                                            attrs="{'readonly': [('issqn_wh_tax_id', '!=', False)]}"
-                                        />
-                        <field
+                                </group>
+                                <group>
+                                    <group>
+                                        <field name="issqn_wh_base" force_save="1" />
+                                        <field
                                             name="issqn_wh_percent"
                                             force_save="1"
                                             attrs="{'readonly': [('issqn_wh_tax_id', '!=', False)]}"
                                         />
-                      </group>
-                      <group>
-                        <field
+                                        <field
                                             name="issqn_wh_reduction"
                                             force_save="1"
                                             attrs="{'readonly': [('issqn_wh_tax_id', '!=', False)]}"
                                         />
-                        <field
+                                        <field
                                             name="issqn_wh_value"
                                             force_save="1"
                                             attrs="{'readonly': [('issqn_wh_tax_id', '!=', False)]}"
                                         />
-                      </group>
-                  </group>
-              </page>
-              <page
+                                    </group>
+                                    <group name="issqn_wh_manual" string="Manual">
+                                        <div
+                                            class="text-muted"
+                                            colspan="2"
+                                        >Keep empty for automatic
+                                            calculation</div>
+                                        <field
+                                            name="issqn_wh_base_manual"
+                                            string="Base"
+                                            force_save="1"
+                                        />
+                                        <field
+                                            name="issqn_wh_value_manual"
+                                            string="Value"
+                                            force_save="1"
+                                        />
+                                    </group>
+                                </group>
+                            </page>
+                            <page
                                 name="icms"
                                 string="ICMS"
                                 attrs="{'invisible': [('tax_icms_or_issqn', '!=', 'icms')]}"
                             >
-                  <group name="icms" string="ICMS">
-                    <field
+                                <group name="icms" string="ICMS">
+                                    <field
                                         name="icms_tax_id"
                                         attrs="{'invisible': [('tax_framework', 'in', ('1', '2'))]}"
                                         options="{'no_create': True, 'no_create_edit': True}"
                                     />
-                    <field
+                                    <field
                                         name="icmssn_tax_id"
                                         attrs="{'invisible': [('tax_framework', '=', '3')]}"
                                         options="{'no_create': True, 'no_create_edit': True}"
                                     />
-                    <field
+                                    <field
                                         name="icms_cst_id"
                                         force_save="1"
                                         attrs="{'readonly': [('icms_tax_id', '!=', False)]}"
                                         options="{'no_create': True, 'no_create_edit': True}"
                                     />
-                    <field name="icms_cst_code" readonly="1" invisible="1" />
-                    <field
+                                    <field
+                                        name="icms_cst_code"
+                                        readonly="1"
+                                        invisible="1"
+                                    />
+                                    <field
                                         name="icms_origin"
                                         force_save="1"
                                         attrs="{'readonly': ['|', ('icms_tax_id', '!=', False), ('icmssn_tax_id', '!=', False)]}"
                                     />
-                    <field name="icms_tax_benefit_id" force_save="1" />
-                  </group>
-                  <group>
-                      <group>
-                        <field
+                                    <field name="icms_tax_benefit_id" force_save="1" />
+                                </group>
+                                <group>
+                                    <group>
+                                        <field
                                             name="icmssn_range_id"
                                             force_save="1"
                                             readonly="1"
                                             attrs="{'invisible': [('tax_framework', '=', '3')]}"
                                             options="{'no_create': True, 'no_create_edit': True}"
                                         />
-                        <field
+                                        <field
                                             name="icms_base_type"
                                             force_save="1"
                                             attrs="{'readonly': ['|', ('icms_tax_id', '=', False), ('icmssn_tax_id', '=', False)]}"
                                         />
-                        <field
+                                        <field
                                             name="icmssn_base"
                                             force_save="1"
                                             attrs="{'readonly': [('icmssn_tax_id', '!=', False)], 'invisible': [('tax_framework', '=', '3')]}"
                                         />
-                        <field
+                                        <field
                                             name="icmssn_reduction"
                                             force_save="1"
                                             attrs="{'readonly': [('icmssn_tax_id', '!=', False)], 'invisible': [('tax_framework', '=', '3')]}"
                                         />
-                        <field
+                                        <field
                                             name="icms_base"
                                             force_save="1"
                                             attrs="{'readonly': [('icms_tax_id', '!=', False)], 'invisible': ['|', ('tax_framework', '=', '2'), ('icms_cst_code', 'not in', ('00', '10', '20', '30', '40', '41', '50', '51', '60', '70', '90', '900'))]}"
                                         />
-                        <field
+                                        <field
                                             name="icms_percent"
                                             force_save="1"
                                             attrs="{'readonly': [('icms_tax_id', '!=', False)], 'invisible': ['|', ('tax_framework', '=', '2'), ('icms_cst_code', 'not in', ('00', '10', '20', '30', '40', '41', '50', '51', '60', '70', '90', '900'))]}"
                                         />
-                      </group>
-                      <group>
-                        <field
+                                        <field
                                             name="icmssn_percent"
                                             force_save="1"
                                             attrs="{'readonly': [('icmssn_tax_id', '!=', False)], 'invisible': [('tax_framework', '=', '3')]}"
                                         />
-                        <field
+                                        <field
                                             name="icmssn_credit_value"
                                             force_save="1"
                                             attrs="{'readonly': [('icmssn_tax_id', '!=', False)], 'invisible': [('tax_framework', '=', '3')]}"
                                         />
-                        <field
+                                        <field
                                             name="icms_reduction"
                                             force_save="1"
                                             attrs="{'readonly': [('icms_tax_id', '!=', False)], 'invisible': ['|', ('tax_framework', '=', '3'), ('icms_cst_code', '!=', '900')]}"
                                         />
-                        <field
+                                        <field
                                             name="icms_value"
                                             force_save="1"
                                             attrs="{'readonly': [('icms_tax_id', '!=', False)], 'invisible': ['|', ('tax_framework', '=', '2'), ('icms_cst_code', 'not in', ('00', '10', '20', '30', '40', '41', '50', '51', '60', '70', '90', '900'))]}"
                                         />
-                        <field
+                                        <field
                                             name="icms_relief_id"
                                             force_save="1"
                                             attrs="{'readonly': [('icms_tax_id', '!=', False), ('icms_cst_code', 'not in', ('20', '30', '40', '41', '50', '70', '90'))], 'invisible': ['|', ('tax_framework', 'in', ('1', '2')), ('icms_cst_code', 'not in', ('20', '30', '40', '41', '50', '70', '90'))]}"
                                         />
-                        <field
+                                        <field
                                             name="icms_relief_value"
                                             force_save="1"
                                             attrs="{'readonly': [('icms_tax_id', '!=', False), ('icms_cst_code', 'not in', ('20', '30', '40', '41', '50', '70', '90'))], 'invisible': ['|', ('tax_framework', 'in', ('1', '2')), ('icms_cst_code', 'not in', ('20', '30', '40', '41', '50', '70', '90'))]}"
                                         />
-                          <field
+                                        <field
                                             name="icms_substitute"
                                             force_save="1"
                                             attrs="{'readonly': [('icms_cst_code', '!=', '500')]}"
                                         />
-                      </group>
-                  </group>
-                  <group>
-                      <group
-                                        name="icmsst"
-                                        string="ICMS ST"
-                                        attrs="{'invisible': [('icms_cst_code', 'not in', ('10', '30', '70', '90', '201', '202', '203', '500', '900'))]}"
-                                    >
-                        <field
-                                            name="icmsst_tax_id"
-                                            attrs="{'invisible': [('icms_cst_code', 'in', ('60', '500'))]}"
-                                            options="{'no_create': True, 'no_create_edit': True}"
-                                        />
-                        <field
-                                            name="icmsst_base_type"
+                                    </group>
+                                    <group name="icms_manual" string="Manual">
+                                        <div
+                                            class="text-muted"
+                                            colspan="2"
+                                        >Keep empty for automatic
+                                            calculation</div>
+                                        <field
+                                            name="icms_base_manual"
+                                            string="Base"
                                             force_save="1"
-                                            attrs="{'readonly': [('icmssn_tax_id', '!=', False)], 'invisible': ['|', ('tax_framework', '=', '3'), ('icms_cst_code', 'in', ('60', '500'))]}"
                                         />
-                        <field
-                                            name="icmsst_mva_percent"
+                                        <field
+                                            name="icms_value_manual"
+                                            string="Value"
                                             force_save="1"
-                                            attrs="{'readonly': [('icms_tax_id', '!=', False)], 'invisible': [('icms_cst_code', 'in', ('60', '500'))]}"
                                         />
-                        <field
-                                            name="icmsst_percent"
-                                            force_save="1"
-                                            attrs="{'readonly': [('icms_tax_id', '!=', False)], 'invisible': [('icms_cst_code', 'in', ('60', '500'))]}"
-                                        />
-                        <field
-                                            name="icmsst_reduction"
-                                            force_save="1"
-                                            attrs="{'readonly': [('icms_tax_id', '!=', False)], 'invisible': [('icms_cst_code', 'in', ('60', '500'))]}"
-                                        />
-                        <field
-                                            name="icmsst_base"
-                                            force_save="1"
-                                            attrs="{'readonly': [('icms_tax_id', '!=', False)], 'invisible': [('icms_cst_code', 'in', ('60', '500'))]}"
-                                        />
-                        <field
-                                            name="icmsst_value"
-                                            force_save="1"
-                                            attrs="{'readonly': [('icms_tax_id', '!=', False)], 'invisible': [('icms_cst_code', 'in', ('60', '500'))]}"
-                                        />
-                        <field
-                                            name="icmsst_wh_base"
-                                            force_save="1"
-                                            attrs="{'readonly': [('icms_tax_id', '!=', False)], 'invisible': [('icms_cst_code', 'not in', ('60', '500'))]}"
-                                        />
-                          <field
-                                            name="icmsst_wh_percent"
-                                            force_save="1"
-                                            attrs="{'readonly': [('icms_tax_id', '!=', False)], 'invisible': [('icms_cst_code', 'not in', ('60', '500'))]}"
-                                        />
-                        <field
-                                            name="icmsst_wh_value"
-                                            force_save="1"
-                                            attrs="{'readonly': [('icms_tax_id', '!=', False)], 'invisible': [('icms_cst_code', 'not in', ('60', '500'))]}"
-                                        />
-                      </group>
-                      <group
+                                    </group>
+                                </group>
+                                <group>
+                                    <group
+                                        name="icmsst"
+                                        colspan="2"
+                                        string="ICMS ST"
+                                        attrs="{'invisible': [('icms_cst_code', 'not in', ('10', '30', '70', '90', '201', '202', '203', '500', '900'))]}"
+                                    >
+                                        <group colspan="2">
+                                            <field
+                                                name="icmsst_tax_id"
+                                                attrs="{'invisible': [('icms_cst_code', 'in', ('60', '500'))]}"
+                                                options="{'no_create': True, 'no_create_edit': True}"
+                                            />
+                                        </group>
+                                        <group>
+                                            <field
+                                                name="icmsst_base_type"
+                                                force_save="1"
+                                                attrs="{'readonly': [('icmssn_tax_id', '!=', False)], 'invisible': ['|', ('tax_framework', '=', '3'), ('icms_cst_code', 'in', ('60', '500'))]}"
+                                            />
+                                            <field
+                                                name="icmsst_mva_percent"
+                                                force_save="1"
+                                                attrs="{'readonly': [('icms_tax_id', '!=', False)], 'invisible': [('icms_cst_code', 'in', ('60', '500'))]}"
+                                            />
+                                            <field
+                                                name="icmsst_percent"
+                                                force_save="1"
+                                                attrs="{'readonly': [('icms_tax_id', '!=', False)], 'invisible': [('icms_cst_code', 'in', ('60', '500'))]}"
+                                            />
+                                            <field
+                                                name="icmsst_reduction"
+                                                force_save="1"
+                                                attrs="{'readonly': [('icms_tax_id', '!=', False)], 'invisible': [('icms_cst_code', 'in', ('60', '500'))]}"
+                                            />
+                                            <field
+                                                name="icmsst_base"
+                                                force_save="1"
+                                                attrs="{'readonly': [('icms_tax_id', '!=', False)], 'invisible': [('icms_cst_code', 'in', ('60', '500'))]}"
+                                            />
+                                            <field
+                                                name="icmsst_value"
+                                                force_save="1"
+                                                attrs="{'readonly': [('icms_tax_id', '!=', False)], 'invisible': [('icms_cst_code', 'in', ('60', '500'))]}"
+                                            />
+                                        </group>
+                                        <group name="icmsst_wh_manual" string="Manual">
+                                            <div
+                                                class="text-muted"
+                                                colspan="2"
+                                            >Keep empty for
+                                                automatic calculation</div>
+                                            <field
+                                                name="icmsst_base_manual"
+                                                string="Base"
+                                                force_save="1"
+                                            />
+                                            <field
+                                                name="icmsst_value_manual"
+                                                string="Value"
+                                                force_save="1"
+                                            />
+                                        </group>
+                                        <group
+                                            name="icmsst_wh"
+                                            colspan="2"
+                                            string="Retenções"
+                                            attrs="{'invisible': [('icms_cst_code', 'not in', ('60', '500'))]}"
+                                        >
+                                            <group name="name" string="string">
+                                                <field
+                                                    name="icmsst_wh_base"
+                                                    force_save="1"
+                                                    attrs="{'readonly': [('icms_tax_id', '!=', False)]}"
+                                                />
+                                                <field
+                                                    name="icmsst_wh_percent"
+                                                    force_save="1"
+                                                    attrs="{'readonly': [('icms_tax_id', '!=', False)]}"
+                                                />
+                                                <field
+                                                    name="icmsst_wh_value"
+                                                    force_save="1"
+                                                    attrs="{'readonly': [('icms_tax_id', '!=', False)]}"
+                                                />
+                                            </group>
+                                            <group
+                                                name="icmsst_wh_manual"
+                                                string="Manual"
+                                            >
+                                                <div
+                                                    class="text-muted"
+                                                    colspan="2"
+                                                >Keep empty for
+                                                    automatic calculation</div>
+                                                <field
+                                                    name="icmsst_wh_base_manual"
+                                                    string="Base"
+                                                    force_save="1"
+                                                />
+                                                <field
+                                                    name="icmsst_wh_value_manual"
+                                                    string="Value"
+                                                    force_save="1"
+                                                />
+                                            </group>
+                                        </group>
+                                    </group>
+                                    <group
                                         name="icms_fcp"
                                         string="ICMS FCP"
                                         attrs="{'invisible': [('partner_company_type', 'in', ('company', False))], 'invisible': [('icms_cst_code', 'in', ('40', '41', '50', '101', '102', '103', '300', '400'))]}"
                                     >
-                          <field
+                                        <field
                                             name="icmsfcp_tax_id"
                                             attrs="{'invisible': [('icms_cst_code', '=', '500')]}"
                                             options="{'no_create': True, 'no_create_edit': True}"
                                         />
-                        <field
+                                        <field
                                             name="icmsfcp_base"
                                             force_save="1"
                                             attrs="{'readonly': [('icmsfcp_tax_id', '!=', False)], 'invisible': [('icms_cst_code', '=', '500')]}"
                                         />
-                        <field
+                                        <field
                                             name="icmsfcp_percent"
                                             force_save="1"
                                             attrs="{'readonly': [('icmsfcp_tax_id', '!=', False)], 'invisible': [('icms_cst_code', '=', '500')]}"
                                         />
-                        <field
+                                        <field
                                             name="icmsfcp_value"
                                             force_save="1"
                                             attrs="{'readonly': [('icmsfcp_tax_id', '!=', False)], 'invisible': [('icms_cst_code', '=', '500')]}"
                                         />
-                          <field
+                                        <field
+                                            name="icmsfcpst_value"
+                                            force_save="1"
+                                            attrs="{'readonly': [('icmsfcp_tax_id', '!=', False)], 'invisible': [('icms_cst_code', 'not in', ('10', '30', '70', '90', '201', '202', '203', '900'))]}"
+                                        />
+                                        <field
                                             name="icmsfcp_base_wh"
                                             force_save="1"
                                             attrs="{'invisible': [('icms_cst_code', 'not in', ('60', '500'))]}"
                                         />
-                          <field
+                                        <field
                                             name="icmsfcp_wh_percent"
                                             force_save="1"
                                             attrs="{'invisible': [('icms_cst_code', 'not in', ('60', '500'))]}"
                                         />
-                          <field
+                                        <field
                                             name="icmsfcp_value_wh"
                                             force_save="1"
                                             attrs="{'invisible': [('icms_cst_code', 'not in', ('60', '500'))]}"
@@ -382,634 +494,866 @@
                                         string="ICMS DIFAL"
                                         attrs="{'invisible': [('partner_company_type', 'in', ('company', False)), ('tax_framework', '=', '1'), ('cfop_destination', 'in', ('1', '3', False))]}"
                                     >
-                        <field
+                                        <field
                                             name="icms_destination_base"
                                             force_save="1"
                                             attrs="{'readonly': [('icms_tax_id', '!=', False)]}"
                                         />
-                        <field
+                                        <field
                                             name="icms_origin_percent"
                                             force_save="1"
                                             attrs="{'readonly': [('icms_tax_id', '!=', False)]}"
                                         />
-                        <field
+                                        <field
                                             name="icms_destination_percent"
                                             force_save="1"
                                             attrs="{'readonly': [('icms_tax_id', '!=', False)]}"
                                         />
-                        <field
+                                        <field
                                             name="icms_sharing_percent"
                                             force_save="1"
                                             attrs="{'readonly': [('icms_tax_id', '!=', False)]}"
                                         />
-                        <field
+                                        <field
                                             name="icms_origin_value"
                                             force_save="1"
                                             attrs="{'readonly': [('icms_tax_id', '!=', False)]}"
                                         />
-                        <field
+                                        <field
                                             name="icms_destination_value"
                                             force_save="1"
                                             attrs="{'readonly': [('icms_tax_id', '!=', False)]}"
                                         />
-                      </group>
-                      <group
+                                    </group>
+                                    <group
                                         name="icms_effective"
                                         string="ICMS Effective Calculation"
                                         attrs="{'invisible': [('icms_cst_code', 'not in', ('60', '500'))]}"
                                     >
-                          <field
+                                        <field
                                             name="icms_effective_reduction"
                                             force_save="1"
                                             attr="{'invisible': [('icms_cst_code', '!=', '500')]}"
                                         />
-                          <field
+                                        <field
                                             name="icms_effective_base"
                                             force_save="1"
                                             attr="{'invisible': [('icms_cst_code', '!=', '500')]}"
                                         />
-                          <field
+                                        <field
                                             name="icms_effective_percent"
                                             force_save="1"
                                             attr="{'invisible': [('icms_cst_code', '!=', '500')]}"
                                         />
-                          <field
+                                        <field
                                             name="icms_effective_value"
                                             force_save="1"
                                             attr="{'invisible': [('icms_cst_code', '!=', '500')]}"
                                         />
-                      </group>
-                  </group>
-              </page>
-              <page
+                                    </group>
+                                </group>
+                            </page>
+                            <page
                                 name="ipi"
                                 string="IPI"
                                 attrs="{'invisible': [('tax_icms_or_issqn', '=', 'issqn')]}"
                             >
-                  <group string="IPI">
-                      <field
+                                <group string="IPI">
+                                    <field
                                         name="ipi_tax_id"
                                         options="{'no_create': True, 'no_create_edit': True}"
                                     />
-                      <field
+                                    <field
                                         name="ipi_cst_id"
                                         force_save="1"
                                         attrs="{'readonly': [('ipi_tax_id', '!=', False)]}"
                                         options="{'no_create': True, 'no_create_edit': True}"
                                     />
-                      <field name="ipi_cst_code" readonly="1" invisible="1" />
-                      <field
+                                    <field
+                                        name="ipi_cst_code"
+                                        readonly="1"
+                                        invisible="1"
+                                    />
+                                    <field
                                         name="ipi_guideline_id"
                                         force_save="1"
                                         attrs="{'readonly': [('ipi_tax_id', '!=', False)]}"
                                         options="{'no_create': True, 'no_create_edit': True}"
                                     />
-                  </group>
-                  <group>
-                      <group>
-                        <field
+                                </group>
+                                <group>
+                                    <group>
+                                        <field
                                             name="ipi_base_type"
                                             force_save="1"
                                             attrs="{'readonly': [('ipi_tax_id', '!=', False)]}"
                                         />
-                        <field
+                                        <field
                                             name="ipi_percent"
                                             force_save="1"
                                             attrs="{'readonly': [('ipi_tax_id', '!=', False)]}"
                                         />
-                        <field
+                                        <field
                                             name="ipi_reduction"
                                             force_save="1"
                                             attrs="{'readonly': [('ipi_tax_id', '!=', False)]}"
                                         />
-                      </group>
-                      <group>
-                        <field
+                                        <field
                                             name="ipi_base"
                                             force_save="1"
                                             attrs="{'readonly': [('ipi_tax_id', '!=', False)]}"
                                         />
-                        <field
+                                        <field
                                             name="ipi_value"
                                             force_save="1"
                                             attrs="{'readonly': [('ipi_tax_id', '!=', False)]}"
                                         />
-                      </group>
-                  </group>
-              </page>
-              <page
+                                    </group>
+                                    <group name="ipi_manual" string="Manual">
+                                        <div
+                                            class="text-muted"
+                                            colspan="2"
+                                        >Keep empty for automatic
+                                            calculation</div>
+                                        <field
+                                            name="ipi_base_manual"
+                                            string="Base"
+                                            force_save="1"
+                                        />
+                                        <field
+                                            name="ipi_value_manual"
+                                            string="Value"
+                                            force_save="1"
+                                        />
+                                    </group>
+                                </group>
+                            </page>
+                            <page
                                 name="ii"
                                 string="II"
                                 attrs="{'invisible': [('cfop_destination', '!=', '3')]}"
                             >
-                <group string="II">
-                    <field
+                                <group string="II">
+                                    <field
                                         name="ii_tax_id"
                                         options="{'no_create': True, 'no_create_edit': True}"
                                     />
-                </group>
-                <group>
-                  <group>
-                    <field name="ii_base" />
-                    <field name="ii_value" />
-                  </group>
-                  <group>
-                    <field name="ii_iof_value" />
-                    <field name="ii_customhouse_charges" />
-                  </group>
-                </group>
-              </page>
-              <page name="pis" string="PIS">
-                  <group name="pis" string="PIS">
-                    <field
+                                </group>
+                                <group>
+                                    <group>
+                                        <field name="ii_base" />
+                                        <field name="ii_value" />
+                                    </group>
+                                    <group name="ii_manual" string="Manual">
+                                        <div
+                                            class="text-muted"
+                                            colspan="2"
+                                        >Keep empty for automatic
+                                            calculation</div>
+                                        <field
+                                            name="ii_base_manual"
+                                            string="Base"
+                                            force_save="1"
+                                        />
+                                        <field
+                                            name="ii_value_manual"
+                                            string="Value"
+                                            force_save="1"
+                                        />
+                                    </group>
+                                    <group>
+                                        <field name="ii_iof_value" />
+                                        <field name="ii_customhouse_charges" />
+                                    </group>
+                                </group>
+                            </page>
+                            <page name="pis" string="PIS">
+                                <group name="pis">
+                                    <field
                                         name="pis_tax_id"
                                         options="{'no_create': True, 'no_create_edit': True}"
                                     />
-                    <field
+                                    <field
                                         name="pis_cst_id"
                                         force_save="1"
                                         attrs="{'readonly': [('pis_tax_id', '!=', False)]}"
                                         options="{'no_create': True, 'no_create_edit': True}"
                                     />
-                    <field name="pis_cst_code" readonly="1" invisible="1" />
-                    <field
+                                    <field
+                                        name="pis_cst_code"
+                                        readonly="1"
+                                        invisible="1"
+                                    />
+                                    <field
                                         name="pis_credit_id"
                                         force_save="1"
                                         attrs="{'readonly': [('pis_tax_id', '!=', False)], 'invisible': [('fiscal_operation_type', '=', 'out')]}"
                                         options="{'no_create': True, 'no_create_edit': True}"
                                     />
-                  </group>
-                  <group>
-                    <group>
-                      <field
+                                </group>
+                                <group>
+                                    <group>
+                                        <field
                                             name="pis_base_id"
                                             force_save="1"
                                             attrs="{'readonly': [('pis_tax_id', '!=', False)], 'invisible': [('fiscal_operation_type', '=', 'out')]}"
                                             options="{'no_create': True, 'no_create_edit': True}"
                                         />
-                      <field
+                                        <field
                                             name="pis_base_type"
                                             force_save="1"
                                             attrs="{'readonly': [('pis_tax_id', '!=', False)]}"
                                         />
-                      <field
+                                        <field
                                             name="pis_percent"
                                             force_save="1"
                                             attrs="{'readonly': [('pis_tax_id', '!=', False)]}"
                                         />
-                      <field
+                                        <field
                                             name="pis_reduction"
                                             force_save="1"
                                             attrs="{'readonly': [('pis_tax_id', '!=', False)]}"
                                         />
-                    </group>
-                    <group>
-                      <field
+                                        <field
                                             name="pis_base"
                                             force_save="1"
                                             attrs="{'readonly': [('pis_tax_id', '!=', False)]}"
                                         />
-                      <field
+                                        <field
                                             name="pis_value"
                                             force_save="1"
                                             attrs="{'readonly': [('pis_tax_id', '!=', False)]}"
                                         />
-                    </group>
-                  </group>
-                  <group name="pis_st" string="PIS ST">
-                    <field
+                                    </group>
+                                    <group name="pis_manual" string="Manual">
+                                        <div
+                                            class="text-muted"
+                                            colspan="2"
+                                        >Keep empty for automatic
+                                            calculation</div>
+                                        <field
+                                            name="pis_base_manual"
+                                            string="Base"
+                                            force_save="1"
+                                        />
+                                        <field
+                                            name="pis_value_manual"
+                                            string="Value"
+                                            force_save="1"
+                                        />
+                                    </group>
+                                </group>
+                                <group name="pis_st" string="Substituição Tributária">
+                                    <field
                                         name="pisst_tax_id"
                                         options="{'no_create': True, 'no_create_edit': True}"
                                     />
-                    <field
+                                    <field
                                         name="pisst_cst_id"
                                         force_save="1"
                                         attrs="{'readonly': [('pisst_tax_id', '!=', False)]}"
                                         options="{'no_create': True, 'no_create_edit': True}"
                                     />
-                    <field name="pisst_cst_code" readonly="1" invisible="1" />
-                  </group>
-                  <group>
-                    <group>
-                      <field
+                                    <field
+                                        name="pisst_cst_code"
+                                        readonly="1"
+                                        invisible="1"
+                                    />
+                                </group>
+                                <group>
+                                    <group>
+                                        <field
                                             name="pisst_base_type"
                                             force_save="1"
                                             attrs="{'readonly': [('pisst_tax_id', '!=', False)]}"
                                         />
-                      <field
+                                        <field
                                             name="pisst_percent"
                                             force_save="1"
                                             attrs="{'readonly': [('pisst_tax_id', '!=', False)]}"
                                         />
-                      <field
+                                        <field
                                             name="pisst_reduction"
                                             force_save="1"
                                             attrs="{'readonly': [('pisst_tax_id', '!=', False)]}"
                                         />
-                    </group>
-                    <group>
-                      <field
+                                        <field
                                             name="pisst_base"
                                             force_save="1"
                                             attrs="{'readonly': [('pisst_tax_id', '!=', False)]}"
                                         />
-                      <field
+                                        <field
                                             name="pisst_value"
                                             force_save="1"
                                             attrs="{'readonly': [('pisst_tax_id', '!=', False)]}"
                                         />
-                    </group>
-                  </group>
-                  <group string="Retenções">
-                      <field
+                                    </group>
+                                    <group name="pisst_manual" string="Manual">
+                                        <div
+                                            class="text-muted"
+                                            colspan="2"
+                                        >Keep empty for automatic
+                                            calculation</div>
+                                        <field
+                                            name="pisst_base_manual"
+                                            string="Base"
+                                            force_save="1"
+                                        />
+                                        <field
+                                            name="pisst_value_manual"
+                                            string="Value"
+                                            force_save="1"
+                                        />
+                                    </group>
+                                </group>
+                                <group string="Retenções">
+                                    <field
                                         name="pis_wh_tax_id"
                                         options="{'no_create': True, 'no_create_edit': True}"
                                     />
-                  </group>
-                  <group>
-                      <group>
-                          <field
+                                </group>
+                                <group>
+                                    <group>
+                                        <field
                                             name="pis_wh_base"
                                             force_save="1"
                                             attrs="{'readonly': [('pis_wh_tax_id', '!=', False)]}"
                                         />
-                          <field
+                                        <field
                                             name="pis_wh_percent"
                                             force_save="1"
                                             attrs="{'readonly': [('pis_wh_tax_id', '!=', False)]}"
                                         />
-                      </group>
-                      <group>
-                          <field
+                                        <field
                                             name="pis_wh_reduction"
                                             force_save="1"
                                             attrs="{'readonly': [('pis_wh_tax_id', '!=', False)]}"
                                         />
-                          <field
+                                        <field
                                             name="pis_wh_value"
                                             force_save="1"
                                             attrs="{'readonly': [('pis_wh_tax_id', '!=', False)]}"
                                         />
-                      </group>
-                  </group>
-              </page>
-              <page name="cofins" string="COFINS">
-                <group name="cofins" string="COFINS">
-                  <field
+                                    </group>
+                                    <group name="pis_wh_manual" string="Manual">
+                                        <div
+                                            class="text-muted"
+                                            colspan="2"
+                                        >Keep empty for automatic
+                                            calculation</div>
+                                        <field
+                                            name="pis_wh_base_manual"
+                                            string="Base"
+                                            force_save="1"
+                                        />
+                                        <field
+                                            name="pis_wh_value_manual"
+                                            string="Value"
+                                            force_save="1"
+                                        />
+                                    </group>
+                                </group>
+                            </page>
+                            <page name="cofins" string="COFINS">
+                                <group name="cofins" string="COFINS">
+                                    <field
                                         name="cofins_tax_id"
                                         options="{'no_create': True, 'no_create_edit': True}"
                                     />
-                  <field
+                                    <field
                                         name="cofins_cst_id"
                                         force_save="1"
                                         attrs="{'readonly': [('cofins_tax_id', '!=', False)]}"
                                         options="{'no_create': True, 'no_create_edit': True}"
                                     />
-                  <field name="cofins_cst_code" readonly="1" invisible="1" />
-                  <field
+                                    <field
+                                        name="cofins_cst_code"
+                                        readonly="1"
+                                        invisible="1"
+                                    />
+                                    <field
                                         name="cofins_credit_id"
                                         force_save="1"
                                         attrs="{'readonly': [('cofins_tax_id', '!=', False)], 'invisible': [('fiscal_operation_type', '=', 'out')]}"
                                         options="{'no_create': True, 'no_create_edit': True}"
                                     />
-                </group>
-                <group>
-                  <group>
-                    <field
+                                </group>
+                                <group>
+                                    <group>
+                                        <field
                                             name="cofins_base_id"
                                             force_save="1"
                                             attrs="{'readonly': [('cofins_tax_id', '!=', False)], 'invisible': [('fiscal_operation_type', '=', 'out')]}"
                                             options="{'no_create': True, 'no_create_edit': True}"
                                         />
-                    <field
+                                        <field
                                             name="cofins_base_type"
                                             force_save="1"
                                             attrs="{'readonly': [('cofins_tax_id', '!=', False)]}"
                                         />
-                    <field
+                                        <field
                                             name="cofins_percent"
                                             force_save="1"
                                             attrs="{'readonly': [('cofins_tax_id', '!=', False)]}"
                                         />
-                    <field
+                                        <field
                                             name="cofins_reduction"
                                             force_save="1"
                                             attrs="{'readonly': [('cofins_tax_id', '!=', False)]}"
                                         />
-                  </group>
-                  <group>
-                    <field
+                                        <field
                                             name="cofins_base"
                                             force_save="1"
                                             attrs="{'readonly': [('cofins_tax_id', '!=', False)]}"
                                         />
-                    <field
+                                        <field
                                             name="cofins_value"
                                             force_save="1"
                                             attrs="{'readonly': [('cofins_tax_id', '!=', False)]}"
                                         />
-                  </group>
-                </group>
-                <group name="cofins_st" string="COFINS ST">
-                  <field
+                                    </group>
+                                    <group name="cofins_manual" string="Manual">
+                                        <div
+                                            class="text-muted"
+                                            colspan="2"
+                                        >Keep empty for automatic
+                                            calculation</div>
+                                        <field
+                                            name="cofins_base_manual"
+                                            string="Base"
+                                            force_save="1"
+                                        />
+                                        <field
+                                            name="cofins_value_manual"
+                                            string="Value"
+                                            force_save="1"
+                                        />
+                                    </group>
+                                </group>
+                                <group name="cofins_st" string="COFINS ST">
+                                    <field
                                         name="cofinsst_tax_id"
                                         options="{'no_create': True, 'no_create_edit': True}"
                                     />
-                  <field
+                                    <field
                                         name="cofinsst_cst_id"
                                         force_save="1"
                                         attrs="{'readonly': [('cofinsst_tax_id', '!=', False)]}"
                                         options="{'no_create': True, 'no_create_edit': True}"
                                     />
-                  <field name="cofinsst_cst_code" readonly="1" invisible="1" />
-                </group>
-                <group>
-                  <group>
-                    <field
+                                    <field
+                                        name="cofinsst_cst_code"
+                                        readonly="1"
+                                        invisible="1"
+                                    />
+                                </group>
+                                <group>
+                                    <group>
+                                        <field
                                             name="cofinsst_base_type"
                                             force_save="1"
                                             attrs="{'readonly': [('cofinsst_tax_id', '!=', False)]}"
                                         />
-                    <field
+                                        <field
                                             name="cofinsst_percent"
                                             force_save="1"
                                             attrs="{'readonly': [('cofinsst_tax_id', '!=', False)]}"
                                         />
-                    <field
+                                        <field
                                             name="cofinsst_reduction"
                                             force_save="1"
                                             attrs="{'readonly': [('cofinsst_tax_id', '!=', False)]}"
                                         />
-                  </group>
-                  <group>
-                    <field
+                                        <field
                                             name="cofinsst_base"
                                             force_save="1"
                                             attrs="{'readonly': [('cofinsst_tax_id', '!=', False)]}"
                                         />
-                    <field
+                                        <field
                                             name="cofinsst_value"
                                             force_save="1"
                                             attrs="{'readonly': [('cofinsst_tax_id', '!=', False)]}"
                                         />
-                  </group>
-                </group>
-                  <group string="Retenções">
-                      <field
+                                    </group>
+                                    <group name="cofinsst_manual" string="Manual">
+                                        <div
+                                            class="text-muted"
+                                            colspan="2"
+                                        >Keep empty for automatic
+                                            calculation</div>
+                                        <field
+                                            name="cofinsst_base_manual"
+                                            string="Base"
+                                            force_save="1"
+                                        />
+                                        <field
+                                            name="cofinsst_value_manual"
+                                            string="Value"
+                                            force_save="1"
+                                        />
+                                    </group>
+                                </group>
+                                <group string="Retenções">
+                                    <field
                                         name="cofins_wh_tax_id"
                                         options="{'no_create': True, 'no_create_edit': True}"
                                     />
-                  </group>
-                  <group>
-                      <group>
-                          <field
+                                </group>
+                                <group>
+                                    <group>
+                                        <field
                                             name="cofins_wh_base"
                                             force_save="1"
                                             attrs="{'readonly': [('cofins_wh_tax_id', '!=', False)]}"
                                         />
-                          <field
+                                        <field
                                             name="cofins_wh_percent"
                                             force_save="1"
                                             attrs="{'readonly': [('cofins_wh_tax_id', '!=', False)]}"
                                         />
-                      </group>
-                      <group>
-                          <field
+                                        <field
                                             name="cofins_wh_reduction"
                                             force_save="1"
                                             attrs="{'readonly': [('cofins_wh_tax_id', '!=', False)]}"
                                         />
-                          <field
+                                        <field
                                             name="cofins_wh_value"
                                             force_save="1"
                                             attrs="{'readonly': [('cofins_wh_tax_id', '!=', False)]}"
                                         />
-                      </group>
-                  </group>
-              </page>
-                <page
+                                    </group>
+                                    <group name="cofins_wh_manual" string="Manual">
+                                        <div
+                                            class="text-muted"
+                                            colspan="2"
+                                        >Keep empty for automatic
+                                            calculation</div>
+                                        <field
+                                            name="cofins_wh_base_manual"
+                                            string="Base"
+                                            force_save="1"
+                                        />
+                                        <field
+                                            name="cofins_wh_value_manual"
+                                            string="Value"
+                                            force_save="1"
+                                        />
+                                    </group>
+                                </group>
+                            </page>
+                            <page
                                 name="csll"
                                 string="CSLL"
                                 attrs="{'invisible': [('allow_csll_irpj', '=', False)]}"
                             >
-                    <group>
-                        <field name="csll_tax_id" />
-                    </group>
-                    <group>
-                        <group>
-                            <field
+                                <group>
+                                    <field name="csll_tax_id" />
+                                </group>
+                                <group>
+                                    <group>
+                                        <field
                                             name="csll_base"
                                             force_save="1"
                                             attrs="{'readonly': [('csll_tax_id', '!=', False)]}"
                                         />
-                            <field
+                                        <field
                                             name="csll_percent"
                                             force_save="1"
                                             attrs="{'readonly': [('csll_tax_id', '!=', False)]}"
                                         />
-                        </group>
-                        <group>
-                            <field
+                                        <field
                                             name="csll_reduction"
                                             force_save="1"
                                             attrs="{'readonly': [('csll_tax_id', '!=', False)]}"
                                         />
-                            <field
+                                        <field
                                             name="csll_value"
                                             force_save="1"
                                             attrs="{'readonly': [('csll_tax_id', '!=', False)]}"
                                         />
-                        </group>
-                    </group>
-                    <group string="Retenções">
-                        <field
+                                    </group>
+                                    <group name="csll_manual" string="Manual">
+                                        <div
+                                            class="text-muted"
+                                            colspan="2"
+                                        >Keep empty for automatic
+                                            calculation</div>
+                                        <field
+                                            name="csll_base_manual"
+                                            string="Base"
+                                            force_save="1"
+                                        />
+                                        <field
+                                            name="csll_value_manual"
+                                            string="Value"
+                                            force_save="1"
+                                        />
+                                    </group>
+                                </group>
+                                <group string="Retenções">
+                                    <field
                                         name="csll_wh_tax_id"
                                         options="{'no_create': True, 'no_create_edit': True}"
                                     />
-                    </group>
-                    <group>
-                        <group>
-                            <field
+                                </group>
+                                <group>
+                                    <group>
+                                        <field
                                             name="csll_wh_base"
                                             force_save="1"
                                             attrs="{'readonly': [('csll_wh_tax_id', '!=', False)]}"
                                         />
-                            <field
+                                        <field
                                             name="csll_wh_percent"
                                             force_save="1"
                                             attrs="{'readonly': [('csll_wh_tax_id', '!=', False)]}"
                                         />
-                        </group>
-                        <group>
-                            <field
+                                        <field
                                             name="csll_wh_reduction"
                                             force_save="1"
                                             attrs="{'readonly': [('csll_wh_tax_id', '!=', False)]}"
                                         />
-                            <field
+                                        <field
                                             name="csll_wh_value"
                                             force_save="1"
                                             attrs="{'readonly': [('csll_wh_tax_id', '!=', False)]}"
                                         />
-                        </group>
-                    </group>
-                </page>
-                <page
+                                    </group>
+                                    <group name="csll_wh_manual" string="Manual">
+                                        <div
+                                            class="text-muted"
+                                            colspan="2"
+                                        >Keep empty for automatic
+                                            calculation</div>
+                                        <field
+                                            name="csll_wh_base_manual"
+                                            string="Base"
+                                            force_save="1"
+                                        />
+                                        <field
+                                            name="csll_wh_value_manual"
+                                            string="Value"
+                                            force_save="1"
+                                        />
+                                    </group>
+                                </group>
+                            </page>
+                            <page
                                 name="irpj"
                                 string="IRPJ"
                                 attrs="{'invisible': [('allow_csll_irpj', '=', False)]}"
                             >
-                    <group>
-                        <field
+                                <group>
+                                    <field
                                         name="irpj_tax_id"
                                         options="{'no_create': True, 'no_create_edit': True}"
                                     />
-                    </group>
-                    <group>
-                        <group>
-                            <field
+                                </group>
+                                <group>
+                                    <group>
+                                        <field
                                             name="irpj_base"
                                             force_save="1"
                                             attrs="{'readonly': [('irpj_tax_id', '!=', False)]}"
                                         />
-                            <field
+                                        <field
                                             name="irpj_percent"
                                             force_save="1"
                                             attrs="{'readonly': [('irpj_tax_id', '!=', False)]}"
                                         />
-                        </group>
-                        <group>
-                            <field
+                                        <field
                                             name="irpj_reduction"
                                             force_save="1"
                                             attrs="{'readonly': [('irpj_tax_id', '!=', False)]}"
                                         />
-                            <field
+                                        <field
                                             name="irpj_value"
                                             force_save="1"
                                             attrs="{'readonly': [('irpj_tax_id', '!=', False)]}"
                                         />
-                        </group>
-                    </group>
-                    <group string="Retenções">
-                        <field
+                                    </group>
+                                    <group name="irpj_manual" string="Manual">
+                                        <div
+                                            class="text-muted"
+                                            colspan="2"
+                                        >Keep empty for automatic
+                                            calculation</div>
+                                        <field
+                                            name="irpj_base_manual"
+                                            string="Base"
+                                            force_save="1"
+                                        />
+                                        <field
+                                            name="irpj_value_manual"
+                                            string="Value"
+                                            force_save="1"
+                                        />
+                                    </group>
+                                </group>
+                                <group string="Retenções">
+                                    <field
                                         name="irpj_wh_tax_id"
                                         options="{'no_create': True, 'no_create_edit': True}"
                                     />
-                    </group>
-                    <group>
-                        <group>
-                            <field
+                                </group>
+                                <group>
+                                    <group>
+                                        <field
                                             name="irpj_wh_base"
                                             force_save="1"
                                             attrs="{'readonly': [('irpj_wh_tax_id', '!=', False)]}"
                                         />
-                            <field
+                                        <field
                                             name="irpj_wh_percent"
                                             force_save="1"
                                             attrs="{'readonly': [('irpj_wh_tax_id', '!=', False)]}"
                                         />
-                        </group>
-                        <group>
-                            <field
+                                        <field
                                             name="irpj_wh_reduction"
                                             force_save="1"
                                             attrs="{'readonly': [('irpj_wh_tax_id', '!=', False)]}"
                                         />
-                            <field
+                                        <field
                                             name="irpj_wh_value"
                                             force_save="1"
                                             attrs="{'readonly': [('irpj_wh_tax_id', '!=', False)]}"
                                         />
-                        </group>
-                    </group>
-                </page>
-                <page
+                                    </group>
+                                    <group name="irpj_wh_manual" string="Manual">
+                                        <div
+                                            class="text-muted"
+                                            colspan="2"
+                                        >Keep empty for automatic
+                                            calculation</div>
+                                        <field
+                                            name="irpj_wh_base_manual"
+                                            string="Base"
+                                            force_save="1"
+                                        />
+                                        <field
+                                            name="irpj_wh_value_manual"
+                                            string="Value"
+                                            force_save="1"
+                                        />
+                                    </group>
+                                </group>
+                            </page>
+                            <page
                                 name="inss"
                                 string="INSS"
                                 attrs="{'invisible': [('fiscal_genre_code', '!=', '00')]}"
                             >
-                    <group>
-                        <field
+                                <group>
+                                    <field
                                         name="inss_tax_id"
                                         options="{'no_create': True, 'no_create_edit': True}"
                                     />
-                    </group>
-                    <group>
-                        <group>
-                            <field
+                                </group>
+                                <group>
+                                    <group>
+                                        <field
                                             name="inss_base"
                                             force_save="1"
                                             attrs="{'readonly': [('inss_tax_id', '!=', False)]}"
                                         />
-                            <field
+                                        <field
                                             name="inss_percent"
                                             force_save="1"
                                             attrs="{'readonly': [('inss_tax_id', '!=', False)]}"
                                         />
-                        </group>
-                        <group>
-                            <field
+                                        <field
                                             name="inss_reduction"
                                             force_save="1"
                                             attrs="{'readonly': [('inss_tax_id', '!=', False)]}"
                                         />
-                            <field
+                                        <field
                                             name="inss_value"
                                             force_save="1"
                                             attrs="{'readonly': [('inss_tax_id', '!=', False)]}"
                                         />
-                        </group>
-                    </group>
-                    <group string="Retenções">
-                        <field
+                                    </group>
+                                    <group name="inss_manual" string="Manual">
+                                        <div
+                                            class="text-muted"
+                                            colspan="2"
+                                        >Keep empty for automatic
+                                            calculation</div>
+                                        <field
+                                            name="inss_base_manual"
+                                            string="Base"
+                                            force_save="1"
+                                        />
+                                        <field
+                                            name="inss_value_manual"
+                                            string="Value"
+                                            force_save="1"
+                                        />
+                                    </group>
+                                </group>
+                                <group string="Retenções">
+                                    <field
                                         name="inss_wh_tax_id"
                                         options="{'no_create': True, 'no_create_edit': True}"
                                     />
-                    </group>
-                    <group>
-                        <group>
-                            <field
+                                </group>
+                                <group>
+                                    <group>
+                                        <field
                                             name="inss_wh_base"
                                             force_save="1"
                                             attrs="{'readonly': [('inss_wh_tax_id', '!=', False)]}"
                                         />
-                            <field
+                                        <field
                                             name="inss_wh_percent"
                                             force_save="1"
                                             attrs="{'readonly': [('inss_wh_tax_id', '!=', False)]}"
                                         />
-                        </group>
-                        <group>
-                            <field
+                                        <field
                                             name="inss_wh_reduction"
                                             force_save="1"
                                             attrs="{'readonly': [('inss_wh_tax_id', '!=', False)]}"
                                         />
-                            <field
+                                        <field
                                             name="inss_wh_value"
                                             force_save="1"
                                             attrs="{'readonly': [('inss_wh_tax_id', '!=', False)]}"
                                         />
+                                    </group>
+                                    <group name="inss_wh_manual" string="Manual">
+                                        <div
+                                            class="text-muted"
+                                            colspan="2"
+                                        >Keep empty for automatic
+                                            calculation</div>
+                                        <field
+                                            name="inss_wh_base_manual"
+                                            string="Base"
+                                            force_save="1"
+                                        />
+                                        <field
+                                            name="inss_wh_value_manual"
+                                            string="Value"
+                                            force_save="1"
+                                        />
+                                    </group>
+                                </group>
+                            </page>
+                        </notebook>
+                    </page>
+                    <page name="fiscal_line_extra_info" string="Extra Info">
+                        <group>
+                            <field name="partner_order" />
+                            <field name="partner_order_line" />
+                        </group>
+                        <group>
+                            <field name="comment_ids" widget="many2many_tags" />
+                            <field name="manual_additional_data" />
+                            <field name="additional_data" readonly="1" />
                         </group>
-                    </group>
-                </page>
-            </notebook>
-          </page>
-          <page name="fiscal_line_extra_info" string="Extra Info">
-            <group>
-                <field name="partner_order" />
-                <field name="partner_order_line" />
-            </group>
-            <group>
-                <field name="comment_ids" widget="many2many_tags" />
-                <field name="manual_additional_data" />
-                <field name="additional_data" readonly="1" />
-            </group>
-          </page>
-        </notebook>
-      </form>
-    </field>
-  </record>
+                    </page>
+                </notebook>
+            </form>
+        </field>
+    </record>
 
 </odoo>