diff --git a/l10n_br_account/__manifest__.py b/l10n_br_account/__manifest__.py
index f3a57170a6b9..c926d5268bad 100644
--- a/l10n_br_account/__manifest__.py
+++ b/l10n_br_account/__manifest__.py
@@ -24,9 +24,17 @@
         'views/fiscal_operation_line_view.xml',
         'views/account_invoice_view.xml',
         'views/account_invoice_line_view.xml',
+        'views/fiscal_invoice_view.xml',
+        'views/fiscal_invoice_line_view.xml',
 
         # Wizards
         'wizards/account_invoice_refund_view.xml',
+
+        # Actions
+        "views/l10n_br_account_action.xml",
+
+        # Menus
+        "views/l10n_br_account_menu.xml",
     ],
     "demo": [
         "demo/res_users_demo.xml",
diff --git a/l10n_br_account/models/__init__.py b/l10n_br_account/models/__init__.py
index 30970651bc03..1027d0157c5a 100644
--- a/l10n_br_account/models/__init__.py
+++ b/l10n_br_account/models/__init__.py
@@ -11,4 +11,5 @@
 from . import account_invoice
 from . import account_invoice_line
 from . import fiscal_document
+from . import account_move
 from . import account_move_line
diff --git a/l10n_br_account/models/account_invoice.py b/l10n_br_account/models/account_invoice.py
index 6cd15182ef43..b33edba5a529 100644
--- a/l10n_br_account/models/account_invoice.py
+++ b/l10n_br_account/models/account_invoice.py
@@ -2,7 +2,19 @@
 # Copyright (C) 2019 - TODAY Raphaël Valyi - Akretion
 # License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
 
-from odoo import api, fields, models
+from lxml import etree
+
+from odoo import _, api, fields, models
+from odoo.exceptions import UserError
+
+from odoo.addons.l10n_br_fiscal.constants.fiscal import (
+    FISCAL_OUT,
+    DOCUMENT_ISSUER_COMPANY,
+    DOCUMENT_ISSUER_PARTNER,
+    SITUACAO_EDOC_AUTORIZADA,
+    SITUACAO_EDOC_CANCELADA,
+    SITUACAO_EDOC_EM_DIGITACAO,
+)
 
 INVOICE_TO_OPERATION = {
     'out_invoice': 'out',
@@ -23,12 +35,21 @@
     'in': ['sale_return', 'out_return'],
 }
 
-SHADOWED_FIELDS = ['partner_id', 'company_id', 'date', 'currency_id']
+SHADOWED_FIELDS = [
+    'partner_id',
+    'company_id',
+    'date',
+    'currency_id',
+    'partner_shipping_id',
+]
 
 
 class AccountInvoice(models.Model):
     _name = 'account.invoice'
-    _inherit = 'account.invoice'
+    _inherit = [
+        _name,
+        'l10n_br_fiscal.document.mixin.methods',
+        'l10n_br_fiscal.document.invoice.mixin']
     _inherits = {'l10n_br_fiscal.document': 'fiscal_document_id'}
     _order = 'date_invoice DESC, number DESC'
 
@@ -63,6 +84,16 @@ class AccountInvoice(models.Model):
         compute='_compute_financial',
     )
 
+    document_electronic = fields.Boolean(
+        related='document_type_id.electronic',
+        string='Electronic?',
+    )
+
+    fiscal_number = fields.Char(
+        string='Fiscal Number',
+        copy=False,
+    )
+
     # this default should be overwritten to False in a module pretending to
     # create fiscal documents from the invoices. But this default here
     # allows to install the l10n_br_account module without creating issues
@@ -71,9 +102,8 @@ class AccountInvoice(models.Model):
         comodel_name='l10n_br_fiscal.document',
         string='Fiscal Document',
         required=True,
+        copy=False,
         ondelete='cascade',
-        default=lambda self: self.env.ref(
-            'l10n_br_fiscal.fiscal_document_dummy'),
     )
 
     @api.multi
@@ -99,9 +129,60 @@ def _prepare_shadowed_fields_dict(self, default=False):
             return {'default_%s' % (k,): vals[k] for k in vals.keys()}
         return vals
 
+    @api.model
+    def fields_view_get(self, view_id=None, view_type="form",
+                        toolbar=False, submenu=False):
+
+        order_view = super().fields_view_get(
+            view_id, view_type, toolbar, submenu
+        )
+
+        if view_type == 'form':
+            view = self.env['ir.ui.view']
+
+            if (view_id == self.env.ref(
+                    'l10n_br_account.fiscal_invoice_form').id):
+                invoice_line_form_id = self.env.ref(
+                    'l10n_br_account.fiscal_invoice_line_form').id
+            else:
+                invoice_line_form_id = self.env.ref(
+                    'l10n_br_account.invoice_line_form').id
+
+            sub_form_view = self.env['account.invoice.line'].fields_view_get(
+                view_id=invoice_line_form_id, view_type='form')['arch']
+
+            sub_form_node = etree.fromstring(
+                self.env['account.invoice.line'].fiscal_form_view(
+                    sub_form_view))
+
+            sub_arch, sub_fields = view.postprocess_and_fields(
+                'account.invoice.line', sub_form_node, None)
+
+            order_view['fields']['invoice_line_ids']['views']['form'] = {}
+
+            order_view['fields']['invoice_line_ids']['views']['form'][
+                'fields'] = sub_fields
+            order_view['fields']['invoice_line_ids']['views']['form'][
+                'arch'] = sub_arch
+
+        return order_view
+
+    @api.model
+    def default_get(self, fields_list):
+        defaults = super().default_get(fields_list)
+        invoice_type = self.env.context.get('type', 'out_invoice')
+        defaults['fiscal_operation_type'] = INVOICE_TO_OPERATION[invoice_type]
+        if defaults['fiscal_operation_type'] == FISCAL_OUT:
+            defaults['issuer'] = DOCUMENT_ISSUER_COMPANY
+        else:
+            defaults['issuer'] = DOCUMENT_ISSUER_PARTNER
+        return defaults
+
     @api.model
     def create(self, values):
         dummy_doc = self.env.ref('l10n_br_fiscal.fiscal_document_dummy')
+        if not values.get('document_type_id'):
+            values.update({'fiscal_document_id': dummy_doc.id})
         invoice = super().create(values)
         if invoice.fiscal_document_id != dummy_doc:
             shadowed_fiscal_vals = invoice._prepare_shadowed_fields_dict()
@@ -118,6 +199,14 @@ def write(self, values):
                 invoice.fiscal_document_id.write(shadowed_fiscal_vals)
         return result
 
+    @api.multi
+    def unlink(self):
+        """Allows delete a draft or cancelled invoices"""
+        self.filtered(lambda i: i.state in ('draft', 'cancel')).write(
+            {'move_name': False}
+        )
+        return super().unlink()
+
     @api.one
     @api.depends(
         'invoice_line_ids.price_total',
@@ -128,6 +217,7 @@ def write(self, values):
         'date_invoice',
         'type')
     def _compute_amount(self):
+        self.fiscal_document_id._compute_amount()
         for inv_line in self.invoice_line_ids:
             if inv_line.cfop_id:
                 if inv_line.cfop_id.finance_move:
@@ -137,7 +227,10 @@ def _compute_amount(self):
                 self.amount_untaxed += inv_line.price_subtotal
                 self.amount_tax += inv_line.price_tax
 
-        self.amount_total = self.amount_untaxed + self.amount_tax
+        self.amount_total = (
+            self.amount_untaxed + self.amount_tax -
+            self.amount_tax_withholding)
+
         amount_total_company_signed = self.amount_total
         amount_untaxed_signed = self.amount_untaxed
         if (self.currency_id and self.company_id and
@@ -182,6 +275,26 @@ def tax_line_move_line_get(self):
         #     new_tax_lines_dict.append(new_tax)
         return tax_lines_dict
 
+    @api.multi
+    def finalize_invoice_move_lines(self, move_lines):
+        lines = super().finalize_invoice_move_lines(move_lines)
+        dummy_doc = self.env.ref('l10n_br_fiscal.fiscal_document_dummy')
+        financial_lines = [
+            l for l in lines if l[2]['account_id'] == self.account_id.id]
+
+        count = 1
+
+        for l in financial_lines:
+            if l[2]['debit'] or l[2]['credit']:
+                if self.fiscal_document_id != dummy_doc:
+                    l[2]['name'] = '{}/{}-{}'.format(
+                        self.fiscal_number,
+                        count,
+                        len(financial_lines)
+                    )
+                    count += 1
+        return lines
+
     @api.multi
     def get_taxes_values(self):
         # uncomment these lines
@@ -229,3 +342,115 @@ def get_taxes_values(self):
                         tax_grouped[key]['amount'] += val['amount']
                         tax_grouped[key]['base'] += round_curr(val['base'])
         return tax_grouped
+
+    @api.onchange('fiscal_operation_id')
+    def _onchange_fiscal_operation_id(self):
+        super()._onchange_fiscal_operation_id()
+        if self.fiscal_operation_id and self.fiscal_operation_id.journal_id:
+            self.journal_id = self.fiscal_operation_id.journal_id
+
+    @api.multi
+    def open_fiscal_document(self):
+        if self.env.context.get('type', '') == 'out_invoice':
+            action = self.env.ref(
+                'l10n_br_account.fiscal_invoice_out_action').read()[0]
+        elif self.env.context.get('type', '') == 'in_invoice':
+            action = self.env.ref(
+                'l10n_br_account.fiscal_invoice_in_action').read()[0]
+        else:
+            action = self.env.ref(
+                'l10n_br_account.fiscal_invoice_all_action').read()[0]
+        form_view = [
+            (self.env.ref('l10n_br_account.fiscal_invoice_form').id, 'form')]
+        if 'views' in action:
+            action['views'] = form_view + [
+                (state, view) for state, view in action['views']
+                if view != 'form']
+        else:
+            action['views'] = form_view
+        action['res_id'] = self.id
+        return action
+
+    @api.multi
+    def action_date_assign(self):
+        """Usamos esse método para definir a data de emissão do documento
+        fiscal e numeração do documento fiscal para ser usado nas linhas
+        dos lançamentos contábeis."""
+        super().action_date_assign()
+        dummy_doc = self.env.ref('l10n_br_fiscal.fiscal_document_dummy')
+        for invoice in self:
+            if invoice.fiscal_document_id != dummy_doc:
+                if invoice.issuer == DOCUMENT_ISSUER_COMPANY:
+                    invoice.fiscal_document_id.document_date()
+                    invoice.fiscal_document_id.document_number()
+                    invoice.fiscal_number = invoice.fiscal_document_id.number
+                else:
+                    invoice.fiscal_document_id.number = invoice.fiscal_number
+
+    @api.multi
+    def action_move_create(self):
+        result = super().action_move_create()
+        dummy_doc = self.env.ref('l10n_br_fiscal.fiscal_document_dummy')
+        self.mapped('fiscal_document_id').filtered(
+            lambda d: d != dummy_doc).action_document_confirm()
+        return result
+
+    @api.multi
+    def action_invoice_draft(self):
+        dummy_doc = self.env.ref('l10n_br_fiscal.fiscal_document_dummy')
+        for i in self.filtered(lambda d: d.fiscal_document_id != dummy_doc):
+            if i.state_edoc == SITUACAO_EDOC_CANCELADA:
+                if i.issuer == DOCUMENT_ISSUER_COMPANY:
+                    raise UserError(_(
+                        "You can't set this document number: {} to draft "
+                        "because this document is cancelled in SEFAZ".format(
+                            i.fiscal_number)))
+            if i.state_edoc != SITUACAO_EDOC_EM_DIGITACAO:
+                i.fiscal_document_id.action_document_back2draft()
+        return super().action_invoice_draft()
+
+    @api.multi
+    def action_document_send(self):
+        dummy_doc = self.env.ref('l10n_br_fiscal.fiscal_document_dummy')
+        invoices = self.filtered(lambda d: d.fiscal_document_id != dummy_doc)
+        if invoices:
+            invoices.mapped('fiscal_document_id').action_document_send()
+            for invoice in invoices:
+                invoice.move_id.post(invoice=invoice)
+
+    @api.multi
+    def action_document_cancel(self):
+        dummy_doc = self.env.ref('l10n_br_fiscal.fiscal_document_dummy')
+        for i in self.filtered(lambda d: d.fiscal_document_id != dummy_doc):
+            if i.state_edoc == SITUACAO_EDOC_AUTORIZADA:
+                return i.fiscal_document_id.action_document_cancel()
+
+    @api.multi
+    def action_document_correction(self):
+        dummy_doc = self.env.ref('l10n_br_fiscal.fiscal_document_dummy')
+        for i in self.filtered(lambda d: d.fiscal_document_id != dummy_doc):
+            if i.state_edoc in SITUACAO_EDOC_AUTORIZADA:
+                if i.issuer == DOCUMENT_ISSUER_COMPANY:
+                    return i.fiscal_document_id.action_document_correction()
+                else:
+                    raise UserError(_(
+                        "You cannot create a fiscal correction document if "
+                        "this fical document you are not the document issuer"
+                    ))
+
+    @api.multi
+    def action_document_back2draft(self):
+        """Sets fiscal document to draft state and cancel and set to draft
+        the related invoice for both documents remain equivalent state."""
+        dummy_doc = self.env.ref('l10n_br_fiscal.fiscal_document_dummy')
+        for i in self.filtered(lambda d: d.fiscal_document_id != dummy_doc):
+            i.action_cancel()
+            i.action_invoice_draft()
+
+    def view_xml(self):
+        self.ensure_one()
+        return self.fiscal_document_id.view_xml()
+
+    def view_pdf(self):
+        self.ensure_one()
+        return self.fiscal_document_id.view_pdf()
diff --git a/l10n_br_account/models/account_invoice_line.py b/l10n_br_account/models/account_invoice_line.py
index 777705bf79e3..66421623b85a 100644
--- a/l10n_br_account/models/account_invoice_line.py
+++ b/l10n_br_account/models/account_invoice_line.py
@@ -4,6 +4,13 @@
 
 from odoo import api, fields, models
 
+from odoo.addons.l10n_br_fiscal.constants.fiscal import (
+    TAX_FRAMEWORK,
+    # FISCAL_IN_OUT,
+)
+
+from .account_invoice import INVOICE_TO_OPERATION
+
 # These fields that have the same name in account.invoice.line
 # and l10n_br_fiscal.document.line.mixin. So they won't be updated
 # by the _inherits system. An alternative would be changing their name
@@ -17,9 +24,7 @@
 
 class AccountInvoiceLine(models.Model):
     _name = 'account.invoice.line'
-    _inherit = ['account.invoice.line',
-                'l10n_br_fiscal.document.line.mixin.methods',
-                'l10n_br_account.document.line.mixin']
+    _inherit = [_name, 'l10n_br_fiscal.document.line.mixin.methods']
     _inherits = {'l10n_br_fiscal.document.line': 'fiscal_document_line_id'}
 
     # initial account.invoice.line inherits on fiscal.document.line that are
@@ -39,9 +44,69 @@ class AccountInvoiceLine(models.Model):
         comodel_name='l10n_br_fiscal.document.line',
         string='Fiscal Document Line',
         required=True,
+        copy=False,
         ondelete='cascade',
-        default=lambda self: self.env.ref(
-            'l10n_br_fiscal.fiscal_document_line_dummy'),
+    )
+
+    document_type_id = fields.Many2one(
+        comodel_name='l10n_br_fiscal.document.type',
+        related='invoice_id.document_type_id',
+    )
+
+    tax_framework = fields.Selection(
+        selection=TAX_FRAMEWORK,
+        related='invoice_id.company_id.tax_framework',
+        string='Tax Framework',
+    )
+
+    cfop_destination = fields.Selection(
+        related="cfop_id.destination",
+        string="CFOP Destination"
+    )
+
+    partner_id = fields.Many2one(
+        comodel_name='res.partner',
+        related='invoice_id.partner_id',
+        string='Partner',
+    )
+
+    partner_company_type = fields.Selection(
+        related="partner_id.company_type"
+    )
+
+    fiscal_genre_code = fields.Char(
+        related="fiscal_genre_id.code",
+        string="Fiscal Product Genre Code",
+    )
+
+    icms_cst_code = fields.Char(
+        related="icms_cst_id.code",
+        string="ICMS CST Code",
+    )
+
+    ipi_cst_code = fields.Char(
+        related="ipi_cst_id.code",
+        string="IPI CST Code",
+    )
+
+    cofins_cst_code = fields.Char(
+        related="cofins_cst_id.code",
+        string="COFINS CST Code",
+    )
+
+    cofinsst_cst_code = fields.Char(
+        related="cofinsst_cst_id.code",
+        string="COFINS ST CST Code",
+    )
+
+    pis_cst_code = fields.Char(
+        related="pis_cst_id.code",
+        string="PIS CST Code",
+    )
+
+    pisst_cst_code = fields.Char(
+        related="pisst_cst_id.code",
+        string="PIS ST CST Code",
     )
 
     @api.one
@@ -60,6 +125,7 @@ class AccountInvoiceLine(models.Model):
     def _compute_price(self):
         currency = self.invoice_id and self.invoice_id.currency_id or None
         taxes = {}
+        self._update_taxes()
         if self.invoice_line_tax_ids:
             taxes = self.invoice_line_tax_ids.compute_all(
                 price_unit=self.price_unit,
@@ -126,14 +192,24 @@ def _prepare_shadowed_fields_dict(self, default=False):
             return {"default_%s" % (k,): vals[k] for k in vals.keys()}
         return vals
 
+    @api.model
+    def default_get(self, fields_list):
+        defaults = super().default_get(fields_list)
+        inv_type = self.env.context.get('type', 'out_invoice')
+        defaults['fiscal_operation_type'] = INVOICE_TO_OPERATION[inv_type]
+        return defaults
+
     @api.model
     def create(self, values):
-        dummy_doc = self.env.ref('l10n_br_fiscal.fiscal_document_dummy')
-        if self.env['account.invoice'].browse(
-                values['invoice_id']).fiscal_document_id != dummy_doc:
-            values['fiscal_document_line_id'] = False
+        dummy_doc_line_id = self.env.ref(
+            'l10n_br_fiscal.fiscal_document_line_dummy').id
+        dummy_doc_id = self.env.ref('l10n_br_fiscal.fiscal_document_dummy').id
+        fiscal_doc_id = self.env['account.invoice'].browse(
+            values['invoice_id']).fiscal_document_id.id
+        if dummy_doc_id == fiscal_doc_id:
+            values['fiscal_document_line_id'] = dummy_doc_line_id
         line = super().create(values)
-        if line.invoice_id.fiscal_document_id != dummy_doc:
+        if dummy_doc_id != fiscal_doc_id:
             shadowed_fiscal_vals = line._prepare_shadowed_fields_dict()
             doc_id = line.invoice_id.fiscal_document_id.id
             shadowed_fiscal_vals['document_id'] = doc_id
@@ -146,10 +222,35 @@ def write(self, values):
             'l10n_br_fiscal.fiscal_document_line_dummy')
         if values.get('invoice_id'):
             values['document_id'] = self.env[
-                "account.invoice"].browse(values['invoice_id']).fiscal_document_id.id
+                "account.invoice"].browse(
+                    values['invoice_id']).fiscal_document_id.id
         result = super().write(values)
         for line in self:
             if line.fiscal_document_line_id != dummy_doc_line:
                 shadowed_fiscal_vals = line._prepare_shadowed_fields_dict()
                 line.fiscal_document_line_id.write(shadowed_fiscal_vals)
         return result
+
+    @api.multi
+    def unlink(self):
+        dummy_doc_line_id = self.env.ref(
+            'l10n_br_fiscal.fiscal_document_line_dummy').id
+        unlink_fiscal_lines = self.env['l10n_br_fiscal.document.line']
+        for inv_line in self:
+            if not inv_line.exists():
+                continue
+            if inv_line.fiscal_document_line_id.id != dummy_doc_line_id:
+                unlink_fiscal_lines |= inv_line.fiscal_document_line_id
+        result = super().unlink()
+        unlink_fiscal_lines.unlink()
+        self.clear_caches()
+        return result
+
+    @api.onchange('fiscal_tax_ids')
+    def _onchange_fiscal_tax_ids(self):
+        super()._onchange_fiscal_tax_ids()
+        user_type = 'sale'
+        if self.invoice_id.type in ('in_invoice', 'in_refund'):
+            user_type = 'purchase'
+        self.invoice_line_tax_ids |= self.fiscal_tax_ids.account_taxes(
+            user_type=user_type)
diff --git a/l10n_br_account/models/account_move.py b/l10n_br_account/models/account_move.py
new file mode 100644
index 000000000000..55dcde553985
--- /dev/null
+++ b/l10n_br_account/models/account_move.py
@@ -0,0 +1,25 @@
+# Copyright (C) 2021 - TODAY Renato Lima - Akretion
+# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
+
+from odoo import api, models
+
+from odoo.addons.l10n_br_fiscal.constants.fiscal import (
+    SITUACAO_EDOC_AUTORIZADA,
+    DOCUMENT_ISSUER_COMPANY,
+)
+
+
+class AccountMove(models.Model):
+    _inherit = 'account.move'
+
+    @api.multi
+    def post(self, invoice=False):
+        dummy_doc = self.env.ref('l10n_br_fiscal.fiscal_document_dummy')
+        result = super().post(invoice)
+        if invoice:
+            if (invoice.fiscal_document_id != dummy_doc
+                    and invoice.document_electronic
+                    and invoice.issuer == DOCUMENT_ISSUER_COMPANY
+                    and invoice.state_edoc != SITUACAO_EDOC_AUTORIZADA):
+                self.button_cancel()
+        return result
diff --git a/l10n_br_account/models/fiscal_document.py b/l10n_br_account/models/fiscal_document.py
index a34f649a5b3e..ee0e20ecc976 100644
--- a/l10n_br_account/models/fiscal_document.py
+++ b/l10n_br_account/models/fiscal_document.py
@@ -14,14 +14,10 @@ class FiscalDocument(models.Model):
 
     @api.multi
     def unlink(self):
-        draft_documents = self.filtered(
-            lambda d: d.state == SITUACAO_EDOC_EM_DIGITACAO)
+        non_draft_documents = self.filtered(
+            lambda d: d.state != SITUACAO_EDOC_EM_DIGITACAO)
 
-        if draft_documents:
+        if non_draft_documents:
             UserError(_("You cannot delete a fiscal document "
                         "which is not draft state."))
-
-        invoices = self.env['account.invoice'].search(
-            [('fiscal_document_id', 'in', self.ids)])
-        invoices.unlink()
         return super().unlink()
diff --git a/l10n_br_account/models/fiscal_operation.py b/l10n_br_account/models/fiscal_operation.py
index a989fec4950e..97bd745760b5 100644
--- a/l10n_br_account/models/fiscal_operation.py
+++ b/l10n_br_account/models/fiscal_operation.py
@@ -2,7 +2,18 @@
 # Copyright (C) 2019 - TODAY Raphaël Valyi - Akretion
 # License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
 
-from odoo import fields, models
+from odoo import api, fields, models
+from odoo.addons.account.models.account_invoice import TYPE2JOURNAL
+
+FISCAL_TYPE_INVOICE = {
+    'purchase': 'in_invoice',
+    'purchase_refund': 'in_refund',
+    'return_in': 'in_refund',
+    'sale': 'out_invoice',
+    'sale_refund': 'out_refund',
+    'return_out': 'out_refund',
+    'other': 'out_invoice',
+}
 
 
 class Operation(models.Model):
@@ -22,3 +33,40 @@ class Operation(models.Model):
         string='Fiscal Position',
         company_dependent=True,
     )
+
+    @api.multi
+    def _change_action_view(self, action):
+        fiscal_op_type = action.get('context')
+        if fiscal_op_type == 'out':
+            new_action = self.env.ref(
+                'l10n_br_account.fiscal_invoice_out_action')
+        elif fiscal_op_type == 'in':
+            new_action = self.env.ref(
+                'l10n_br_account.fiscal_invoice_out_action')
+        else:
+            new_action = self.env.ref(
+                'l10n_br_account.fiscal_invoice_all_action')
+        invoice_type = FISCAL_TYPE_INVOICE[self.fiscal_type]
+        journal_type = TYPE2JOURNAL[invoice_type]
+        new_action['context'] = ({
+            'type': invoice_type,
+            'default_fiscal_operation_type': self.fiscal_type,
+            'default_fiscal_operation_id': self.id,
+            'journal_type': journal_type,
+        })
+        new_action['domain'] = action.get('domain', {})
+        return new_action.read()[0]
+
+    @api.multi
+    def action_create_new(self):
+        action = super().action_create_new()
+        action['res_model'] = 'account.invoice'
+        action['view_id'] = self.env.ref(
+            'l10n_br_account.fiscal_invoice_form').id
+        action['context'] = self._change_action_view(action)['context']
+        return action
+
+    @api.multi
+    def open_action(self):
+        action = super().open_action()
+        return self._change_action_view(action)
diff --git a/l10n_br_account/views/account_invoice_line_view.xml b/l10n_br_account/views/account_invoice_line_view.xml
index ce84c049d1dd..5264f7bbe3bb 100644
--- a/l10n_br_account/views/account_invoice_line_view.xml
+++ b/l10n_br_account/views/account_invoice_line_view.xml
@@ -1,74 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-    <!-- Customer Invoice views 
-    <record id="l10n_br_account_invoice_form" model="ir.ui.view">
-        <field name="name">l10n_br_account.invoice.form</field>
-        <field name="model">account.invoice</field>
-        <field name="inherit_id" ref="account.invoice_form"/>
+    <record id="invoice_line_form" model="ir.ui.view">
+        <field name="name">l10n_br_account.invoice.line.form</field>
+        <field name="model">account.invoice.line</field>
+        <field name="inherit_id" ref="account.view_invoice_line_form"/>
         <field name="arch" type="xml">
-            <xpath expr="//form/sheet/group" position="after">
-                <group name="l10n_br_fiscal">
-                </group>
-            </xpath>
-            <page name="other_info" position="before">
-                <page string="Vencimentos">
-                    <field colspan="4" nolabel="1" name="move_line_receivable_id">
-                        <tree string="Vencimentos">
-                            <field name="journal_id"/>
-                            <field name="date"/>
-                            <field name="date_maturity"/>
-                            <field name="name"/>
-                            <field name="ref"/>
-                            <field name="partner_id"/>
-                            <field name="move_id"/>
-                            <field name="debit"/>
-                            <field name="credit"/>
-                        </tree>
-                    </field>
-                </page>
-            </page>
-        </field>
-    </record>
-
-    <record id="l10n_br_account_invoice_tree" model="ir.ui.view">
-        <field name="name">l10n_br_account.invoice.tree</field>
-        <field name="model">account.invoice</field>
-        <field name="inherit_id" ref="account.invoice_tree"/>
-        <field name="arch" type="xml">
-            <field name="type" position="after">
-                <field name="fiscal_document_code" invisible="1"/>
-                <button class="oe_inline" type="object"
-                    attrs="{'invisible': [('fiscal_document_code', '=', False)]}"
-                    name="open_fiscal_document" icon="STOCK_REDO" help="Abrir documento fiscal"/>
+            <field name="invoice_line_tax_ids" position="replace"/>
+            <xpath expr="//form/group/group/field[@name='company_id']" position="replace"/>
+            <field name="price_unit" position="after">
+                <label for="fiscal_quantity" string="Fiscal Quantity" attrs="{'invisible': [('document_type_id', '=', False)]}"/>
+                <div>
+                    <field name="fiscal_quantity" class="oe_inline" attrs="{'invisible': [('document_type_id', '=', False)]}" context="{'partner_id':parent.partner_id, 'quantity':fiscal_quantity, 'pricelist':parent.pricelist_id, 'uom':uot_id, 'uom_qty_change':True, 'company_id': parent.company_id}"/>
+                    <field name="uot_id" force_save="1" groups="uom.group_uom" class="oe_inline oe_no_button" attrs="{'required': [('display_type', '=', False)], 'invisible': [('document_type_id', '=', False)]}"/>
+                </div>
+                <field name="fiscal_price" attrs="{'invisible': [('document_type_id', '=', False)]}"/>
+            </field>
+            <field name="analytic_tag_ids" position="after">
+                <field name="fiscal_operation_id" attrs="{'invisible': [('document_type_id', '=', False)], 'required': [('document_type_id', '!=', False)]}" domain="[('state', '=', 'approved')]"/>
+                <field name="fiscal_operation_line_id" attrs="{'invisible': [('document_type_id', '=', False)], 'required': [('document_type_id', '!=', False)]}"/>
+                <field name="cfop_id" attrs="{'invisible': ['|', ('document_type_id', '=', False), ('tax_icms_or_issqn', '=', 'issqn')], 'required': [('document_type_id', '!=', False), ('tax_icms_or_issqn', '=', 'icms')]}"/>
+                <field name="document_type_id" invisible="1"/>
+            </field>
+            <field name="name" position="after">
+              <group name="fiscal_fields" invisible="1">
+                  <field name="fiscal_operation_type" invisible="1" readonly="1"/>
+                  <field name="fiscal_genre_code" invisible="1"/>
+                  <field name="tax_framework" invisible="1"/>
+                  <field name="partner_id" invisible="1"/>
+                  <field name="company_id" invisible="1"/>
+                  <field name="tax_icms_or_issqn" invisible="1"/>
+              </group>
+                <notebook attrs="{'invisible': [('document_type_id', '=', False)]}">
+                    <page name="fiscal_taxes" string="Taxes"/>
+                    <page name="others" string="Others">
+                        <group>
+                            <field name="freight_value"/>
+                            <field name="insurance_value"/>
+                            <field name="other_costs_value"/>
+                        </group>
+                    </page>
+                    <page name="fiscal_line_extra_info" string="Extra Info"/>
+                    <page name="accounting" string="Accounting">
+                        <group>
+                            <field name="invoice_line_tax_ids" context="{'type': invoice_type}" domain="[('type_tax_use','!=','none'),('company_id', '=', company_id)]" widget="many2many_tags" options="{'no_create': True}"/>
+                        </group>
+                    </page>
+                </notebook>
             </field>
         </field>
     </record>
 
-    Vendor Invoice views
-    <record id="l10n_br_account_invoice_supplier_form" model="ir.ui.view">
-        <field name="name">l10n_br_account.invoice.supplier.form</field>
-        <field name="model">account.invoice</field>
-        <field name="inherit_id" ref="account.invoice_supplier_form"/>
-        <field name="arch" type="xml">
-            <page name="other_info" position="before">
-                <page string="Vencimentos">
-                    <field colspan="4" nolabel="1" name="move_line_receivable_id">
-                        <tree string="Vencimentos">
-                            <field name="journal_id"/>
-                            <field name="date"/>
-                            <field name="date_maturity"/>
-                            <field name="name"/>
-                            <field name="ref"/>
-                            <field name="partner_id"/>
-                            <field name="move_id"/>
-                            <field name="debit"/>
-                            <field name="credit"/>
-                        </tree>
-                    </field>
-                </page>
-            </page>
-        </field>
-    </record> -->
-
 </odoo>
diff --git a/l10n_br_account/views/account_invoice_view.xml b/l10n_br_account/views/account_invoice_view.xml
index 300c49a25e81..086a27a5562b 100644
--- a/l10n_br_account/views/account_invoice_view.xml
+++ b/l10n_br_account/views/account_invoice_view.xml
@@ -11,6 +11,23 @@
                 <field name="cnpj_cpf" string="CNPJ/CPF"/>
                 <field name="ie" string="State Tax Number"/>
             </field>
+            <field name="number" position="attributes">
+                <attribute name="filter_domain">['|','|','|', '|', ('fiscal_number','ilike',self), ('number','ilike',self), ('origin','ilike',self), ('reference', 'ilike', self), ('partner_id', 'child_of', self)]</attribute>
+                <attribute name="string">Account Number</attribute>
+            </field>
+        </field>
+    </record>
+
+    <record id="invoice_tree" model="ir.ui.view">
+        <field name="name">l10n_br_account.invoice.tree</field>
+        <field name="model">account.invoice</field>
+        <field name="inherit_id" ref="account.invoice_tree"/>
+        <field name="arch" type="xml">
+            <field name="number" position="before">
+                <field name="document_type_id" invisible="1"/>
+                <field name="fiscal_number"/>
+                <button name="open_fiscal_document" type="object" class="oe_stat_button" icon="fa-pencil-square-o" attrs="{'invisible': [('document_type_id', '=', False)]}"/>
+            </field>
         </field>
     </record>
 
@@ -20,6 +37,24 @@
         <field name="model">account.invoice</field>
         <field name="inherit_id" ref="account.invoice_form"/>
         <field name="arch" type="xml">
+            <div name="button_box" position="inside">
+                <button name="open_fiscal_document" type="object" class="oe_stat_button" icon="fa-pencil-square-o" attrs="{'invisible': [('document_type_id', '=', False)]}">
+                    <span>Fiscal Details</span>
+                </button>
+            </div>
+            <xpath expr="//form/sheet/h1[1]" position="attributes">
+                <attribute name="attrs">{'invisible': [('document_type_id', '!=', False)]}</attribute>
+            </xpath>
+            <xpath expr="//form/sheet/h1[1]" position="after">
+                <h1 class="mt0">
+                    <div attrs="{'invisible': [('document_type_id', '=', False)]}">
+                        <span class="oe_inline">
+                            <field readonly="1" name="document_type_id"/>:
+                            <field name="fiscal_number" readonly="1" attrs="{'invisible': [('state','in',('draft',))]}"/>
+                        </span>
+                    </div>
+                </h1>
+            </xpath>
             <xpath expr="//form/sheet/group" position="after">
                 <group name="l10n_br_fiscal">
                     <field name="id" invisible="1"/>
@@ -27,45 +62,61 @@
                     <field name="fiscal_operation_type" invisible="1"/>
                     <field name="document_section" invisible="1"/>
                     <field name="number" invisible="1"/>
-                    <field name="fiscal_operation_id" invisible="1"/>
                     <field name="edoc_purpose" invisible="1"/>
                     <field name="ind_final" invisible="1"/>
                     <field name="ind_pres" invisible="1"/>
-                    <field name="issuer" invisible="1"/>
-                    <field name="document_type_id" invisible="1"/>
-                    <field name="key" invisible="1"/>
-                    <field name="document_serie_id" invisible="1"/>
-                    <field name="document_serie" invisible="1"/>
+                    <field name="fiscal_document_id" required="0" invisible="1"/>
                 </group>
             </xpath>
+            <field name="cash_rounding_id" position="after">
+                <field name="document_type_id" attrs="{'invisible': [('fiscal_document_id', '=', %(l10n_br_fiscal.fiscal_document_dummy)d)], 'readonly': [('state', '!=', 'draft')]}"/>
+                <field name="fiscal_operation_id" attrs="{'invisible': [('document_type_id', '=', False)], 'required': [('document_type_id', '!=', False)], 'readonly': [('state', '!=', 'draft')]}"/>
+                <field name="issuer" attrs="{'invisible': [('document_type_id', '=', False)], 'readonly': [('state', '!=', 'draft')]}"/>
+                <field name="document_serie_id" requied="0" attrs="{'invisible': ['|', ('document_type_id', '=', False), ('issuer', '=', 'partner')], 'required': [('issuer', '=', 'company'), ('document_type_id', '!=', False)], 'readonly': [('state', '!=', 'draft')]}"/>
+                <field name="document_serie" requied="0" attrs="{'invisible': ['|', ('document_type_id', '=', False), ('issuer', '=', 'company')], 'required': [('issuer', '=', 'partner'), ('document_type_id', '!=', False)], 'readonly': [('state', '!=', 'draft')]}"/>
+                <field name="fiscal_number" readonly="0" force_save="1" attrs="{'invisible': [('issuer', '=', 'company')], 'required': [('issuer', '=', 'partner'), ('document_type_id', '!=', False)], 'readonly': [('state', '!=', 'draft')]}"/>
+                <field name="key" attrs="{'invisible': [('document_electronic', '=', False)], 'readonly': ['|', ('issuer', '=', 'company'), ('state', '!=', 'draft')]}"/>
+            </field>
+            <xpath expr="//field[@name='invoice_line_ids']/tree" position="attributes">
+                <attribute name="editable"/>
+            </xpath>
+            <xpath expr="//field[@name='invoice_line_ids']" position="attributes">
+                <attribute name="context">{'default_company_id': company_id, 'default_partner_id': partner_id, 'default_fiscal_operation_id': fiscal_operation_id, 'default_document_type_id': document_type_id}</attribute>
+            </xpath>
+            <xpath expr="//field[@name='invoice_line_ids']/tree/field[@name='invoice_line_tax_ids']" position="after">
+                <field name="document_type_id" invisible="1"/>
+                <field name="fiscal_tax_ids" attrs="{'invisible': [('document_type_id', '=', False)]}" widget="many2many_tags" options="{'no_create': True}"/>
+            </xpath>
+            <xpath expr="//field[@name='invoice_line_ids']/tree/field[@name='invoice_line_tax_ids']" position="attributes">
+                <attribute name="invisible">1</attribute>
+            </xpath>
+            <field name="amount_tax" position="after">
+                <field string="(-) Tax Withholding" name="amount_tax_withholding"/>
+            </field>
             <notebook position="inside">
                 <page string="Receivable" name="financial_move_line_ids">
                     <field name="financial_move_line_ids"/>
                 </page>
+                <page string="Payments" name="payment_ids">
+                    <field name="payment_ids"/>
+                </page>
             </notebook>
         </field>
     </record>
 
-    <!--
-    <record id="l10n_br_account_invoice_tree" model="ir.ui.view">
-        <field name="name">l10n_br_account.invoice.tree</field>
-        <field name="model">account.invoice</field>
-        <field name="inherit_id" ref="account.invoice_tree"/>
-        <field name="arch" type="xml">
-            <field name="type" position="after">
-                <field name="fiscal_document_code" invisible="1"/>
-                <button class="oe_inline" type="object"
-                    attrs="{'invisible': [('fiscal_document_code', '=', False)]}"
-                    name="open_fiscal_document" icon="STOCK_REDO" help="Abrir documento fiscal"/>
-            </field>
-        </field>
-    </record> -->
-
+    <!-- Vendor Bill -->
     <record id="invoice_supplier_form" model="ir.ui.view">
         <field name="name">l10n_br_account.invoice.supplier.form</field>
         <field name="model">account.invoice</field>
         <field name="inherit_id" ref="account.invoice_supplier_form"/>
         <field name="arch" type="xml">
+            <xpath expr="//form/sheet/div[1]" position="before">
+                <div class="oe_button_box" name="button_box">
+                    <button name="open_fiscal_document" type="object" groups="l10n_br_fiscal.group_user" class="oe_stat_button" icon="fa-pencil-square-o" attrs="{'invisible': [('document_type_id', '=', False)]}">
+                        <span>Fiscal Details</span>
+                    </button>
+                </div>
+            </xpath>
             <xpath expr="//form/sheet/group" position="after">
                 <group name="l10n_br_fiscal">
                     <field name="id" invisible="1"/>
@@ -73,54 +124,46 @@
                     <field name="fiscal_operation_type" invisible="1"/>
                     <field name="document_section" invisible="1"/>
                     <field name="number" invisible="1"/>
-                    <field name="fiscal_operation_id"/>
                     <field name="edoc_purpose" invisible="1"/>
                     <field name="ind_final" invisible="1"/>
                     <field name="ind_pres" invisible="1"/>
-                    <field name="issuer" invisible="1"/>
-                    <field name="document_type_id" invisible="1"/>
-                    <field name="key" invisible="1"/>
-                    <field name="document_serie_id" invisible="1"/>
-                    <field name="document_serie" invisible="1"/>
+                    <field name="fiscal_document_id" required="0" invisible="1"/>
                 </group>
             </xpath>
+            <field name="vendor_bill_id" position="after">
+                <field name="document_type_id" attrs="{'invisible': [('fiscal_document_id', '=', %(l10n_br_fiscal.fiscal_document_dummy)d)], 'readonly': [('state', '!=', 'draft')]}"/>
+                <field name="fiscal_operation_id" attrs="{'invisible': [('document_type_id', '=', False)], 'readonly': [('state', '!=', 'draft')]}"/>
+                <field name="issuer" attrs="{'invisible': [('document_type_id', '=', False)], 'readonly': [('state', '!=', 'draft')]}"/>
+                <field name="document_serie_id" requied="0" attrs="{'invisible': ['|', ('document_type_id', '=', False), ('issuer', '=', 'partner')], 'required': [('issuer', '=', 'company'), ('document_type_id', '!=', False)], 'readonly': [('state', '!=', 'draft')]}"/>
+                <field name="document_serie" requied="0" attrs="{'invisible': ['|', ('document_type_id', '=', False), ('issuer', '=', 'company')], 'required': [('issuer', '=', 'partner'), ('document_type_id', '!=', False)], 'readonly': [('state', '!=', 'draft')]}"/>
+                <field name="fiscal_number" readonly="0" force_save="1" attrs="{'invisible': ['|', ('document_type_id', '=', False), ('issuer', '=', 'company')], 'required': [('issuer', '=', 'partner'), ('document_type_id', '!=', False)], 'readonly': [('state', '!=', 'draft')]}"/>
+                <field name="key" attrs="{'invisible': [('document_electronic', '=', False)], 'readonly': ['|', ('issuer', '=', 'company'), ('state', '!=', 'draft')]}"/>
+            </field>
+            <xpath expr="//field[@name='invoice_line_ids']/tree" position="attributes">
+                <attribute name="editable"/>
+            </xpath>
+            <xpath expr="//field[@name='invoice_line_ids']" position="attributes">
+                <attribute name="context">{'default_company_id': company_id, 'default_partner_id': partner_id, 'default_fiscal_operation_type': fiscal_operation_type, 'default_fiscal_operation_id': fiscal_operation_id, 'default_document_type_id': document_type_id}</attribute>
+            </xpath>
+            <xpath expr="//field[@name='invoice_line_ids']/tree/field[@name='invoice_line_tax_ids']" position="after">
+                <field name="document_type_id" invisible="1"/>
+                <field name="fiscal_tax_ids" attrs="{'invisible': [('document_type_id', '=', False)]}" widget="many2many_tags" options="{'no_create': True}"/>
+            </xpath>
+            <xpath expr="//field[@name='invoice_line_ids']/tree/field[@name='invoice_line_tax_ids']" position="attributes">
+                <attribute name="invisible">1</attribute>
+            </xpath>
+            <field name="amount_tax" position="after">
+                <field string="(-) Tax Withholding" name="amount_tax_withholding"/>
+            </field>
             <notebook position="inside">
                 <page string="Payable" name="financial_move_line_ids">
                     <field name="financial_move_line_ids"/>
                 </page>
+                <page string="Payments" name="payment_ids">
+                    <field name="payment_ids"/>
+                </page>
             </notebook>
         </field>
     </record>
 
-    <record id="invoice_line_form" model="ir.ui.view">
-        <field name="name">l10n_br_account.invoice.line.form</field>
-        <field name="model">account.invoice.line</field>
-        <field name="inherit_id" ref="account.view_invoice_line_form"/>
-        <field name="arch" type="xml">
-            <field name="invoice_line_tax_ids" position="replace">
-                <field name="fiscal_operation_id" required="1"/>
-                <field name="fiscal_operation_line_id" required="1"/>
-                <field name="cfop_id" invisible="1"/>
-                <group name="fiscal_fields" invisible="1">
-                    <field name="fiscal_operation_type" invisible="1" readonly="1"/>
-                    <field name="fiscal_genre_code" invisible="1"/>
-                    <field name="tax_framework" invisible="1"/>
-                </group>
-            </field>
-            <field name="name" position="after">
-                <notebook invisible="1">
-                    <page name="fiscal_taxes" string="Taxes"/>
-                    <page name="outros" string="Outros Custos">
-                        <group>
-                            <field name="invoice_line_tax_ids" context="{'type': invoice_type}" domain="[('type_tax_use','!=','none'),('company_id', '=', company_id)]" widget="many2many_tags" options="{'no_create': True}"/>
-                            <field name="insurance_value"/>
-                            <field name="other_costs_value"/>
-                            <field name="freight_value"/>
-                        </group>
-                    </page>
-                </notebook>
-            </field>
-        </field>
-    </record>
-
 </odoo>
diff --git a/l10n_br_account/views/fiscal_invoice_line_view.xml b/l10n_br_account/views/fiscal_invoice_line_view.xml
new file mode 100644
index 000000000000..ce053614a7b6
--- /dev/null
+++ b/l10n_br_account/views/fiscal_invoice_line_view.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+  <record id="fiscal_invoice_line_form" model="ir.ui.view">
+    <field name="name">l10n_br_account.invoice.line.form</field>
+    <field name="model">account.invoice.line</field>
+    <field name="inherit_id" ref="l10n_br_fiscal.document_line_form"/>
+    <field name="mode">primary</field>
+    <field name="arch" type="xml">
+      <xpath expr="//group[@name='fiscal_infors']" position="after">
+          <group name="accounting_fields" string="Accounting" groups="account.group_account_user">
+              <field domain="[('company_id', '=', company_id)]" name="account_id" groups="account.group_account_user"/>
+              <field domain="[('company_id', '=', company_id)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
+              <field name="analytic_tag_ids" widget="many2many_tags" groups="analytic.group_analytic_tags" options="{'color_field': 'color'}"/>
+          </group>
+      </xpath>
+      <xpath expr="//page[@name='fiscal_line_extra_info']" position="after">
+          <field name="invoice_type" invisible="1"/>
+          <page name="accounting" string="Accounting">
+              <group>
+                  <field name="invoice_line_tax_ids" widget="many2many_tags" options="{'no_create': True}" context="{'type': invoice_type}" domain="[('type_tax_use','!=','none'),('company_id', '=', company_id)]"/>
+              </group>
+          </page>
+      </xpath>
+    </field>
+  </record>
+
+</odoo>
diff --git a/l10n_br_account/views/fiscal_invoice_view.xml b/l10n_br_account/views/fiscal_invoice_view.xml
new file mode 100644
index 000000000000..c4973e7c36af
--- /dev/null
+++ b/l10n_br_account/views/fiscal_invoice_view.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="fiscal_invoice_search" model="ir.ui.view">
+        <field name="name">l10n_br_account.fiscal.invoice.search</field>
+        <field name="model">account.invoice</field>
+        <field name="inherit_id" ref="l10n_br_fiscal.document_search"/>
+        <field name="mode">primary</field>
+        <field name="arch" type="xml">
+          <xpath expr="//field[@name='number']" position="replace">
+              <field name="fiscal_number" string="Number"/>
+              <field name="number" string="Account Number" invisible="1"/>
+              <field name="legal_name" string="Legal Name"/>
+              <field name="cnpj_cpf" string="CNPJ/CPF"/>
+              <field name="ie" string="State Tax Number"/>
+          </xpath>
+        </field>
+    </record>
+
+    <record id="fiscal_invoice_tree" model="ir.ui.view">
+        <field name="name">l10n_br_account.fiscal.invoice.tree</field>
+        <field name="model">account.invoice</field>
+        <field name="inherit_id" ref="l10n_br_fiscal.document_tree"/>
+        <field name="mode">primary</field>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='number']" position="replace">
+                <field name="fiscal_number" string="Number"/>
+                <field name="number" string="Account Number" invisible="1"/>
+                <field name="commercial_partner_id" invisible="1"/>
+                <field name="reference" invisible="1"/>
+                <field name="name" invisible="1"/>
+                <field name="journal_id" invisible="1"/>
+                <field name="type" invisible="context.get('type',True)"/>
+                <field name="currency_id" invisible="1"/>
+                <field name="company_currency_id" invisible="1"/>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="fiscal_invoice_form" model="ir.ui.view">
+      <field name="name">l10n_br_account.fiscal.invoice.form</field>
+      <field name="model">account.invoice</field>
+      <field name="inherit_id" ref="l10n_br_fiscal.document_form"/>
+      <field name="mode">primary</field>
+      <field name="arch" type="xml">
+        <xpath expr="//form/field[@name='state_edoc']" position="replace"/>
+        <xpath expr="//header/field[@name='state']" position="replace">
+            <field name="state" invisible="1"/>
+            <field name="state_edoc" widget="statusbar" statusbar_visible="em_digitacao,autorizada" readonly="1"/>
+        </xpath>
+        <xpath expr="//button[@name='action_document_send']" position="attributes">
+            <attribute name="states"/>
+            <attribute name="attrs">{'invisible': [('state_edoc', 'not in', ('a_enviar', 'rejeitada'))]}</attribute>
+        </xpath>
+        <xpath expr="//button[@name='action_document_correction']" position="attributes">
+            <attribute name="states"/>
+            <attribute name="attrs">{'invisible': [('state_edoc', '!=', 'autorizada')]}</attribute>
+        </xpath>
+        <xpath expr="//button[@name='action_document_invalidate']" position="attributes">
+            <attribute name="states"/>
+            <attribute name="attrs">{'invisible': ['|', ('state_edoc', 'in', ('autorizada', 'cancelada', 'denegada')), ('fiscal_number', '=', False)]}</attribute>
+        </xpath>
+        <xpath expr="//button[@name='view_pdf']" position="attributes">
+            <attribute name="states"/>
+            <attribute name="attrs">{'invisible': ['|', ('state_edoc', '=', 'em_digitacao'), ('document_electronic', '=', False)]}</attribute>
+        </xpath>
+        <xpath expr="//button[@name='view_xml']" position="attributes">
+            <attribute name="states"/>
+            <attribute name="attrs">{'invisible': ['|', ('state_edoc', '=', 'em_digitacao'), ('document_electronic', '=', False)]}</attribute>
+        </xpath>
+        <xpath expr="//button[@name='action_document_confirm']" position="before">
+            <field name="fiscal_document_id" required="0" invisible="1"/>
+            <button name="action_invoice_open" type="object" states="draft" string="Validate" class="oe_highlight o_invoice_validate" groups="account.group_account_invoice"/>
+            <button name="action_document_back2draft" type="object" string="Voltar para Digitação" groups="l10n_br_fiscal.group_user" attrs="{'invisible': ['|', ('state_edoc', 'not in', ('a_enviar', 'enviada', 'rejeitada')), ('document_electronic', '=', False)]}" class="btn-secondary"/>
+        </xpath>
+        <xpath expr="//button[@name='action_document_cancel']" position="attributes">
+            <attribute name="attrs">{'invisible': ['|', ('state_edoc', '!=', 'autorizada'), ('document_electronic', '=', False)]}</attribute>
+        </xpath>
+        <xpath expr="//h1/field[@name='number']" position="replace">
+            <field name="fiscal_number" class="oe_inline" readonly="1"/>
+        </xpath>
+        <xpath expr="//group/field[@name='number']" position="replace">
+            <field name="fiscal_number" class="oe_inline" force_save="1" attrs="{'invisible': [('issuer', '=', 'company')], 'readonly': [('issuer', '=', 'company')], 'required': [('issuer', '=', 'partner')]}"/>
+        </xpath>
+        <xpath expr="//page[@name='finance']" position="inside">
+            <group>
+                <field name="move_name" invisible="1"/>
+                <field name="type" invisible="1"/>
+                <group name="accounting_financial" groups="account.group_account_user">
+                    <field name="journal_id" groups="account.group_account_user"
+                        options="{'no_create': True}" attrs="{'readonly':[('move_name','!=',False)]}"/>
+                    <field domain="[('company_id', '=', company_id),('internal_type','=', 'receivable'), ('deprecated', '=', False)]"
+                        name="account_id" groups="account.group_account_user"/>
+                    <field name="company_id" options="{'no_create': True}" groups="base.group_multi_company"/>
+                    <field name="reference" attrs="{'readonly':[('state','!=','draft')]}"/>
+                    <field name="name"/>
+                </group>
+                <group groups="account.group_account_user">
+                    <field name="incoterm_id" options="{'no_create': True}"/>
+                    <field name="fiscal_position_id" options="{'no_create': True}" />
+                    <field name="move_id" groups="account.group_account_user" attrs="{'invisible': [('move_id', '=', False)]}"/>
+                    <field name="origin" groups="base.group_user" attrs="{'invisible': [('origin', '=', False)]}"/>
+                    <field name="partner_bank_id"/>
+                </group>
+            </group>
+            <field name="financial_move_line_ids"/>
+        </xpath>
+        <xpath expr="//field[@name='line_ids']" position="replace">
+            <field name="invoice_line_ids" context="{'form_view_ref': 'l10n_br_account.fiscal_invoice_line_form', 'default_document_id': fiscal_document_id, 'default_company_id': company_id, 'default_partner_id': partner_id, 'default_fiscal_operation_type': fiscal_operation_type, 'default_fiscal_operation_id': fiscal_operation_id, 'no_subcall': True}"/>
+        </xpath>
+      </field>
+    </record>
+
+</odoo>
diff --git a/l10n_br_account/views/l10n_br_account_action.xml b/l10n_br_account/views/l10n_br_account_action.xml
new file mode 100644
index 000000000000..f21defc3d6a6
--- /dev/null
+++ b/l10n_br_account/views/l10n_br_account_action.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+      <!-- Incomming Documents -->
+    <record id="fiscal_invoice_in_action" model="ir.actions.act_window">
+        <field name="name">Incomming Document</field>
+        <field name="res_model">account.invoice</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,kanban,form,calendar,pivot,graph,activity</field>
+        <field eval="False" name="view_id"/>
+        <field name="domain">[('type','=','in_invoice'), ('fiscal_operation_type', '=', 'in')]</field>
+        <field name="context">{'type':'in_invoice', 'journal_type': 'purchase'}</field>
+        <field name="search_view_id" ref="l10n_br_account.fiscal_invoice_search"/>
+        <field name="help" type="html">
+          <p class="o_view_nocontent_smiling_face">
+            Create a new Document
+          </p><p>
+            Odoo helps you easily track all activities
+            related to a fiscal operation.
+          </p>
+        </field>
+    </record>
+
+    <record id="fiscal_invoice_in_action_tree" model="ir.actions.act_window.view">
+        <field eval="1" name="sequence"/>
+        <field name="view_mode">tree</field>
+        <field name="view_id" ref="fiscal_invoice_tree"/>
+        <field name="act_window_id" ref="fiscal_invoice_in_action"/>
+    </record>
+
+    <record id="fiscal_invoice_in_action_form" model="ir.actions.act_window.view">
+        <field eval="2" name="sequence"/>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="fiscal_invoice_form"/>
+        <field name="act_window_id" ref="fiscal_invoice_in_action"/>
+    </record>
+
+    <!-- Outgoing Documents -->
+    <record id="fiscal_invoice_out_action" model="ir.actions.act_window">
+        <field name="name">Outgoing Document</field>
+        <field name="res_model">account.invoice</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,kanban,form,calendar,pivot,graph,activity</field>
+        <field eval="False" name="view_id"/>
+        <field name="domain">[('type','=','out_invoice'), ('fiscal_operation_type', '=', 'out')]</field>
+        <field name="context">{'type':'out_invoice', 'journal_type': 'sale', 'default_fiscal_operation_type': 'out'}</field>
+        <field name="search_view_id" ref="l10n_br_account.fiscal_invoice_search"/>
+        <field name="help" type="html">
+          <p class="o_view_nocontent_smiling_face">
+            Create a new Document
+          </p><p>
+            Odoo helps you easily track all activities
+            related to a fiscal operation.
+          </p>
+        </field>
+    </record>
+
+    <record id="fiscal_invoice_out_action_tree" model="ir.actions.act_window.view">
+        <field eval="1" name="sequence"/>
+        <field name="view_mode">tree</field>
+        <field name="view_id" ref="fiscal_invoice_tree"/>
+        <field name="act_window_id" ref="fiscal_invoice_out_action"/>
+    </record>
+
+    <record id="fiscal_invoice_out_action_form" model="ir.actions.act_window.view">
+        <field eval="2" name="sequence"/>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="fiscal_invoice_form"/>
+        <field name="act_window_id" ref="fiscal_invoice_out_action"/>
+    </record>
+
+    <!-- All Documents -->
+    <record id="fiscal_invoice_all_action" model="ir.actions.act_window">
+        <field name="name">All Documents</field>
+        <field name="res_model">account.invoice</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,kanban,form,calendar,pivot,graph,activity</field>
+        <field eval="False" name="view_id"/>
+        <field name="search_view_id" ref="l10n_br_account.fiscal_invoice_search"/>
+        <field name="help" type="html">
+          <p class="o_view_nocontent_smiling_face">
+            Create a new Document
+          </p><p>
+            Odoo helps you easily track all activities
+            related to a fiscal operation.
+          </p>
+        </field>
+    </record>
+
+    <record id="fiscal_invoice_all_action_tree" model="ir.actions.act_window.view">
+        <field eval="1" name="sequence"/>
+        <field name="view_mode">tree</field>
+        <field name="view_id" ref="fiscal_invoice_tree"/>
+        <field name="act_window_id" ref="fiscal_invoice_all_action"/>
+    </record>
+
+    <record id="fiscal_invoice_all_action_form" model="ir.actions.act_window.view">
+        <field eval="2" name="sequence"/>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="fiscal_invoice_form"/>
+        <field name="act_window_id" ref="fiscal_invoice_all_action"/>
+    </record>
+
+</odoo>
diff --git a/l10n_br_account/views/l10n_br_account_menu.xml b/l10n_br_account/views/l10n_br_account_menu.xml
new file mode 100644
index 000000000000..7c0a0a3c97ce
--- /dev/null
+++ b/l10n_br_account/views/l10n_br_account_menu.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <!-- Incomming Documents -->
+    <record id="l10n_br_fiscal.document_in_menu" model="ir.ui.menu">
+        <field name="action" ref="fiscal_invoice_in_action"/>
+    </record>
+
+    <!-- Outgoing Documents -->
+    <record id="l10n_br_fiscal.document_out_menu" model="ir.ui.menu">
+        <field name="action" ref="fiscal_invoice_out_action"/>
+    </record>
+
+    <!-- All Documents -->
+    <record id="l10n_br_fiscal.document_all_menu" model="ir.ui.menu">
+        <field name="action" ref="fiscal_invoice_all_action"/>
+    </record>
+
+</odoo>
diff --git a/l10n_br_account/wizards/__init__.py b/l10n_br_account/wizards/__init__.py
index 503cc6d9d285..4fd60cdccb73 100644
--- a/l10n_br_account/wizards/__init__.py
+++ b/l10n_br_account/wizards/__init__.py
@@ -1,3 +1,5 @@
 # License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
 
 from . import account_invoice_refund
+from . import wizard_document_cancel
+from . import wizard_document_correction
diff --git a/l10n_br_account/wizards/wizard_document_cancel.py b/l10n_br_account/wizards/wizard_document_cancel.py
new file mode 100644
index 000000000000..d5c89c755599
--- /dev/null
+++ b/l10n_br_account/wizards/wizard_document_cancel.py
@@ -0,0 +1,46 @@
+# Copyright (C) 2021  Renato Lima - Akretion <renato.lima@akretion.com.br>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import api, fields, models
+
+
+class DocumentCancelWizard(models.TransientModel):
+    _inherit = 'l10n_br_fiscal.document.cancel.wizard'
+
+    @api.multi
+    def doit(self):
+        for wizard in self:
+            # TODO refactoring in fiscal event PR
+            document = self.env[self.env.context["active_model"]].browse(
+                self.env.context["active_id"])
+
+            if self.env.context["active_model"] == 'account.invoice':
+                invoice = document
+                fiscal_document = invoice.fiscal_document_id
+            else:
+                fiscal_document = document
+                invoice = self.env['account.invoice'].search(
+                    [('fiscal_document_id', '=', fiscal_document.id)], limit=1)
+
+            cancel = self.env[
+                'l10n_br_fiscal.document.cancel'].create({
+                    'document_id': fiscal_document.id,
+                    'justificative': wizard.justificative,
+                })
+            event_id = self.env['l10n_br_fiscal.document.event'].create({
+                'type': '2',
+                'response': 'Cancelamento da NFe %s' % fiscal_document.key,
+                'company_id': fiscal_document.company_id.id,
+                'origin': 'NFe-%s' % fiscal_document.number,
+                'create_date': fields.Datetime.now(),
+                'write_date': fields.Datetime.now(),
+                'end_date': fields.Datetime.now(),
+                'state': 'draft',
+                'cancel_document_event_id': cancel.id,
+                'fiscal_document_event_id': fiscal_document.id,
+            })
+
+            cancel.cancel_document(event_id)
+            if invoice:
+                invoice.action_cancel()
+        return {"type": "ir.actions.act_window_close"}
diff --git a/l10n_br_account/wizards/wizard_document_correction.py b/l10n_br_account/wizards/wizard_document_correction.py
new file mode 100644
index 000000000000..9030a06e1cda
--- /dev/null
+++ b/l10n_br_account/wizards/wizard_document_correction.py
@@ -0,0 +1,51 @@
+# Copyright (C) 2021  Renato Lima - Akretion <renato.lima@akretion.com.br>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import api, fields, models
+
+
+class DocumentCorrectionWizard(models.TransientModel):
+    _inherit = 'l10n_br_fiscal.document.correction.wizard'
+
+    @api.multi
+    def doit(self):
+        # TODO refactoring in fiscal event PR
+        for wizard in self:
+            document = self.env[self.env.context["active_model"]].browse(
+                self.env.context["active_id"])
+
+            if self.env.context["active_model"] == 'account.invoice':
+                fiscal_document = document.fiscal_document_id
+            else:
+                fiscal_document = document
+
+            fiscal_document.correction_reason = wizard.justificative
+            msg = "Carta de correção: {}".format(wizard.justificative)
+            fiscal_document.message_post(body=msg)
+
+            numeros = fiscal_document.fiscal_document_event_ids.filtered(
+                lambda e: e.type == '14').mapped(
+                'correction_document_event_id.sequencia')
+            sequencia = str(int(max(numeros)) + 1) if numeros else '1'
+
+            carta = self.env[
+                'l10n_br_fiscal.document.correction'].create({
+                    'document_id': fiscal_document.id,
+                    'justificative': wizard.justificative,
+                    'sequencia': sequencia,
+                })
+            event_id = self.env['l10n_br_fiscal.document.event'].create({
+                'type': '14',
+                'response': 'Correção da NFe %s' % fiscal_document.key,
+                'company_id': fiscal_document.company_id.id,
+                'origin': 'NFe-%s' % fiscal_document.number,
+                'create_date': fields.Datetime.now(),
+                'write_date': fields.Datetime.now(),
+                'end_date': fields.Datetime.now(),
+                'state': 'draft',
+                'correction_document_event_id': carta.id,
+                'fiscal_document_id': fiscal_document.id,
+            })
+
+            carta.correction(event_id)
+        return {'type': 'ir.actions.act_window_close'}
diff --git a/l10n_br_fiscal/models/__init__.py b/l10n_br_fiscal/models/__init__.py
index 0312416dd729..9f8babbc2b42 100644
--- a/l10n_br_fiscal/models/__init__.py
+++ b/l10n_br_fiscal/models/__init__.py
@@ -7,6 +7,7 @@
 from . import document_workflow
 from . import document_fiscal_mixin_methods
 from . import document_fiscal_mixin
+from . import document_fiscal_invoice_mixin
 from . import document_fiscal_line_mixin_methods
 from . import document_fiscal_line_mixin
 from . import document_event_abstract
diff --git a/l10n_br_fiscal/models/document.py b/l10n_br_fiscal/models/document.py
index e966c9a089bf..47e94a3cfb30 100644
--- a/l10n_br_fiscal/models/document.py
+++ b/l10n_br_fiscal/models/document.py
@@ -8,12 +8,10 @@
 from odoo.exceptions import ValidationError, UserError
 
 from ..constants.fiscal import (
-    TAX_FRAMEWORK,
     DOCUMENT_ISSUER,
     DOCUMENT_ISSUER_COMPANY,
     DOCUMENT_ISSUER_PARTNER,
     SITUACAO_EDOC_AUTORIZADA,
-    NFE_IND_IE_DEST,
 )
 
 
@@ -40,7 +38,8 @@ class Document(models.Model):
         'mail.thread',
         'mail.activity.mixin',
         'l10n_br_fiscal.document.mixin',
-        'l10n_br_fiscal.document.electronic']
+        'l10n_br_fiscal.document.electronic',
+        'l10n_br_fiscal.document.invoice.mixin']
     _description = 'Fiscal Document'
 
     @api.depends('line_ids')
@@ -227,107 +226,6 @@ def _compute_amount(self):
         string='Partner',
     )
 
-    partner_legal_name = fields.Char(
-        string='Legal Name',
-        related='partner_id.legal_name',
-    )
-
-    partner_name = fields.Char(
-        string='Name',
-        related='partner_id.name',
-    )
-
-    partner_cnpj_cpf = fields.Char(
-        string='CNPJ',
-        related='partner_id.cnpj_cpf',
-    )
-
-    partner_inscr_est = fields.Char(
-        string='State Tax Number',
-        related='partner_id.inscr_est',
-    )
-
-    partner_ind_ie_dest = fields.Selection(
-        selection=NFE_IND_IE_DEST,
-        string='Contribuinte do ICMS',
-        related='partner_id.ind_ie_dest',
-    )
-
-    partner_inscr_mun = fields.Char(
-        string='Municipal Tax Number',
-        related='partner_id.inscr_mun',
-    )
-
-    partner_suframa = fields.Char(
-        string='Suframa',
-        related='partner_id.suframa',
-    )
-
-    partner_cnae_main_id = fields.Many2one(
-        comodel_name='l10n_br_fiscal.cnae',
-        string='Main CNAE',
-        related='partner_id.cnae_main_id',
-    )
-
-    partner_tax_framework = fields.Selection(
-        selection=TAX_FRAMEWORK,
-        string='Tax Framework',
-        related='partner_id.tax_framework',
-    )
-
-    partner_street = fields.Char(
-        string='Partner Street',
-        related='partner_id.street',
-    )
-
-    partner_number = fields.Char(
-        string='Partner Number',
-        related='partner_id.street_number',
-    )
-
-    partner_street2 = fields.Char(
-        string='Partner Street2',
-        related='partner_id.street2',
-    )
-
-    partner_district = fields.Char(
-        string='Partner District',
-        related='partner_id.district',
-    )
-
-    partner_country_id = fields.Many2one(
-        comodel_name='res.country',
-        string='Partner Country',
-        related='partner_id.country_id',
-    )
-
-    partner_state_id = fields.Many2one(
-        comodel_name='res.country.state',
-        string='Partner State',
-        related='partner_id.state_id',
-    )
-
-    partner_city_id = fields.Many2one(
-        comodel_name='res.city',
-        string='Partner City',
-        related='partner_id.city_id',
-    )
-
-    partner_zip = fields.Char(
-        string='Partner Zip',
-        related='partner_id.zip',
-    )
-
-    partner_phone = fields.Char(
-        string='Partner Phone',
-        related='partner_id.phone',
-    )
-
-    partner_is_company = fields.Boolean(
-        string='Partner Is Company?',
-        related='partner_id.is_company',
-    )
-
     partner_shipping_id = fields.Many2one(
         comodel_name='res.partner',
         string='Shipping Address',
@@ -345,95 +243,6 @@ def _compute_amount(self):
         store=True,
     )
 
-    company_legal_name = fields.Char(
-        string='Company Legal Name',
-        related='company_id.legal_name',
-    )
-
-    company_name = fields.Char(
-        string='Company Name',
-        size=128,
-        related='company_id.name',
-    )
-
-    company_cnpj_cpf = fields.Char(
-        string='Company CNPJ',
-        related='company_id.cnpj_cpf',
-    )
-
-    company_inscr_est = fields.Char(
-        string='Company State Tax Number',
-        related='company_id.inscr_est',
-    )
-
-    company_inscr_mun = fields.Char(
-        string='Company Municipal Tax Number',
-        related='company_id.inscr_mun',
-    )
-
-    company_suframa = fields.Char(
-        string='Company Suframa',
-        related='company_id.suframa',
-    )
-
-    company_cnae_main_id = fields.Many2one(
-        comodel_name='l10n_br_fiscal.cnae',
-        string='Company Main CNAE',
-        related='company_id.cnae_main_id',
-    )
-
-    company_tax_framework = fields.Selection(
-        selection=TAX_FRAMEWORK,
-        string='Company Tax Framework',
-        related='company_id.tax_framework',
-    )
-
-    company_street = fields.Char(
-        string='Company Street',
-        related='company_id.street',
-    )
-
-    company_number = fields.Char(
-        string='Company Number',
-        related='company_id.street_number',
-    )
-
-    company_street2 = fields.Char(
-        string='Company Street2',
-        related='company_id.street2',
-    )
-    company_district = fields.Char(
-        string='Company District',
-        related='company_id.district',
-    )
-
-    company_country_id = fields.Many2one(
-        comodel_name='res.country',
-        string='Company Country',
-        related='company_id.country_id',
-    )
-
-    company_state_id = fields.Many2one(
-        comodel_name='res.country.state',
-        string='Company State',
-        related='company_id.state_id',
-    )
-
-    company_city_id = fields.Many2one(
-        comodel_name='res.city',
-        string='Company City',
-        related='company_id.city_id',
-    )
-    company_zip = fields.Char(
-        string='Company ZIP',
-        related='company_id.zip',
-    )
-
-    company_phone = fields.Char(
-        string='Company Phone',
-        related='company_id.phone',
-    )
-
     currency_id = fields.Many2one(
         comodel_name='res.currency',
         default=lambda self: self.env.user.company_id.currency_id,
diff --git a/l10n_br_fiscal/models/document_fiscal_invoice_mixin.py b/l10n_br_fiscal/models/document_fiscal_invoice_mixin.py
new file mode 100644
index 000000000000..739128e7bb76
--- /dev/null
+++ b/l10n_br_fiscal/models/document_fiscal_invoice_mixin.py
@@ -0,0 +1,230 @@
+# Copyright (C) 2021  Renato Lima - Akretion <renato.lima@akretion.com.br>
+# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
+
+from odoo import api, fields, models
+
+from ..constants.fiscal import (
+    DOCUMENT_ISSUER_COMPANY,
+    NFE_IND_IE_DEST,
+    TAX_FRAMEWORK,
+)
+
+
+class FiscalDocumentInvoiceMixin(models.AbstractModel):
+    _name = 'l10n_br_fiscal.document.invoice.mixin'
+    _description = 'Invoice Document Fiscal Mixin'
+
+    partner_id = fields.Many2one(
+        comodel_name='res.partner',
+    )
+
+    partner_legal_name = fields.Char(
+        string='Legal Name',
+        related='partner_id.legal_name',
+    )
+
+    partner_name = fields.Char(
+        string='Name',
+        related='partner_id.name',
+    )
+
+    partner_cnpj_cpf = fields.Char(
+        string='CNPJ',
+        related='partner_id.cnpj_cpf',
+    )
+
+    partner_inscr_est = fields.Char(
+        string='State Tax Number',
+        related='partner_id.inscr_est',
+    )
+
+    partner_ind_ie_dest = fields.Selection(
+        selection=NFE_IND_IE_DEST,
+        string='Contribuinte do ICMS',
+        related='partner_id.ind_ie_dest',
+    )
+
+    partner_inscr_mun = fields.Char(
+        string='Municipal Tax Number',
+        related='partner_id.inscr_mun',
+    )
+
+    partner_suframa = fields.Char(
+        string='Suframa',
+        related='partner_id.suframa',
+    )
+
+    partner_cnae_main_id = fields.Many2one(
+        comodel_name='l10n_br_fiscal.cnae',
+        string='Main CNAE',
+        related='partner_id.cnae_main_id',
+    )
+
+    partner_tax_framework = fields.Selection(
+        selection=TAX_FRAMEWORK,
+        string='Tax Framework',
+        related='partner_id.tax_framework',
+    )
+
+    partner_street = fields.Char(
+        string='Partner Street',
+        related='partner_id.street',
+    )
+
+    partner_number = fields.Char(
+        string='Partner Number',
+        related='partner_id.street_number',
+    )
+
+    partner_street2 = fields.Char(
+        string='Partner Street2',
+        related='partner_id.street2',
+    )
+
+    partner_district = fields.Char(
+        string='Partner District',
+        related='partner_id.district',
+    )
+
+    partner_country_id = fields.Many2one(
+        comodel_name='res.country',
+        string='Partner Country',
+        related='partner_id.country_id',
+    )
+
+    partner_state_id = fields.Many2one(
+        comodel_name='res.country.state',
+        string='Partner State',
+        related='partner_id.state_id',
+    )
+
+    partner_city_id = fields.Many2one(
+        comodel_name='res.city',
+        string='Partner City',
+        related='partner_id.city_id',
+    )
+
+    partner_zip = fields.Char(
+        string='Partner Zip',
+        related='partner_id.zip',
+    )
+
+    partner_phone = fields.Char(
+        string='Partner Phone',
+        related='partner_id.phone',
+    )
+
+    partner_is_company = fields.Boolean(
+        string='Partner Is Company?',
+        related='partner_id.is_company',
+    )
+
+    company_id = fields.Many2one(
+        comodel_name='res.company',
+    )
+
+    processador_edoc = fields.Selection(
+        related='company_id.processador_edoc',
+    )
+
+    company_legal_name = fields.Char(
+        string='Company Legal Name',
+        related='company_id.legal_name',
+    )
+
+    company_name = fields.Char(
+        string='Company Name',
+        size=128,
+        related='company_id.name',
+    )
+
+    company_cnpj_cpf = fields.Char(
+        string='Company CNPJ',
+        related='company_id.cnpj_cpf',
+    )
+
+    company_inscr_est = fields.Char(
+        string='Company State Tax Number',
+        related='company_id.inscr_est',
+    )
+
+    company_inscr_mun = fields.Char(
+        string='Company Municipal Tax Number',
+        related='company_id.inscr_mun',
+    )
+
+    company_suframa = fields.Char(
+        string='Company Suframa',
+        related='company_id.suframa',
+    )
+
+    company_cnae_main_id = fields.Many2one(
+        comodel_name='l10n_br_fiscal.cnae',
+        string='Company Main CNAE',
+        related='company_id.cnae_main_id',
+    )
+
+    company_tax_framework = fields.Selection(
+        selection=TAX_FRAMEWORK,
+        string='Company Tax Framework',
+        related='company_id.tax_framework',
+    )
+
+    company_street = fields.Char(
+        string='Company Street',
+        related='company_id.street',
+    )
+
+    company_number = fields.Char(
+        string='Company Number',
+        related='company_id.street_number',
+    )
+
+    company_street2 = fields.Char(
+        string='Company Street2',
+        related='company_id.street2',
+    )
+
+    company_district = fields.Char(
+        string='Company District',
+        related='company_id.district',
+    )
+
+    company_country_id = fields.Many2one(
+        comodel_name='res.country',
+        string='Company Country',
+        related='company_id.country_id',
+    )
+
+    company_state_id = fields.Many2one(
+        comodel_name='res.country.state',
+        string='Company State',
+        related='company_id.state_id',
+    )
+
+    company_city_id = fields.Many2one(
+        comodel_name='res.city',
+        string='Company City',
+        related='company_id.city_id',
+    )
+
+    company_zip = fields.Char(
+        string='Company ZIP',
+        related='company_id.zip',
+    )
+
+    company_phone = fields.Char(
+        string='Company Phone',
+        related='company_id.phone',
+    )
+
+    @api.onchange('document_type_id')
+    def _onchange_document_type_id(self):
+        if self.document_type_id and self.issuer == DOCUMENT_ISSUER_COMPANY:
+            self.document_serie_id = self.document_type_id.get_document_serie(
+                self.company_id, self.fiscal_operation_id)
+
+    @api.onchange('document_serie_id')
+    def _onchange_document_serie_id(self):
+        if self.document_serie_id and self.issuer == DOCUMENT_ISSUER_COMPANY:
+            self.document_serie = self.document_serie_id.code
diff --git a/l10n_br_fiscal/models/document_fiscal_line_mixin_methods.py b/l10n_br_fiscal/models/document_fiscal_line_mixin_methods.py
index ab8f7fa082ac..7200fae9798a 100644
--- a/l10n_br_fiscal/models/document_fiscal_line_mixin_methods.py
+++ b/l10n_br_fiscal/models/document_fiscal_line_mixin_methods.py
@@ -163,9 +163,6 @@ def _prepare_br_fiscal_dict(self, default=False):
         # remove id field to avoid conflicts
         vals.pop('id', None)
 
-        # this will force to create a new fiscal document line:
-        vals['fiscal_document_line_id'] = False
-
         if default:  # in case you want to use new rather than write later
             return {"default_%s" % (k,): vals[k] for k in vals.keys()}
         return vals
diff --git a/l10n_br_fiscal/models/document_fiscal_mixin_methods.py b/l10n_br_fiscal/models/document_fiscal_mixin_methods.py
index 822e0dbc1a04..6a4ba3bd03ed 100644
--- a/l10n_br_fiscal/models/document_fiscal_mixin_methods.py
+++ b/l10n_br_fiscal/models/document_fiscal_mixin_methods.py
@@ -24,9 +24,6 @@ def _prepare_br_fiscal_dict(self, default=False):
         # remove id field to avoid conflicts
         vals.pop('id', None)
 
-        # this will force to create a new fiscal document line:
-        vals['fiscal_document_id'] = False
-
         if default:  # in case you want to use new rather than write later
             return {"default_%s" % (k,): vals[k] for k in vals.keys()}
         return vals
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 5328554b5e1b..87808e1e8d83 100644
--- a/l10n_br_fiscal/views/document_fiscal_line_mixin_view.xml
+++ b/l10n_br_fiscal/views/document_fiscal_line_mixin_view.xml
@@ -122,7 +122,7 @@
                       </group>
                   </group>
               </page>
-              <page name="ipi" string="IPI">
+              <page name="ipi" string="IPI" attrs="{'invisible': [('tax_icms_or_issqn', '=', 'issqn')]}">
                   <group string="IPI">
                       <field name="ipi_tax_id"/>
                       <field name="ipi_cst_id" force_save="1" attrs="{'readonly': [('ipi_tax_id', '!=', False)]}"/>
diff --git a/l10n_br_fiscal/views/document_view.xml b/l10n_br_fiscal/views/document_view.xml
index 0424b8cb5d15..314a2e36d6b2 100644
--- a/l10n_br_fiscal/views/document_view.xml
+++ b/l10n_br_fiscal/views/document_view.xml
@@ -41,6 +41,7 @@
     <field name="arch" type="xml">
       <form string="Fiscal Document">
         <field name="id" invisible="1"/>
+        <field name="state_edoc" invisible="1"/>
         <field name="currency_id" invisible="1"/>
         <field name="document_electronic" invisible="1"/>
         <field name="fiscal_operation_type" invisible="1"/>
@@ -72,6 +73,7 @@
             Fiscal Document: <field name="document_type_id" readonly="1"/> is <strong>Cancelled</strong>
         </div>
         <sheet string="Fiscal Document">
+          <div class="oe_button_box" name="button_box"/>
           <div class="oe_title">
             <h1>
                 <field name="document_type_id" readonly="1"/>:
diff --git a/l10n_br_purchase/models/purchase_order.py b/l10n_br_purchase/models/purchase_order.py
index 661d54f06458..0f8db5737a8e 100644
--- a/l10n_br_purchase/models/purchase_order.py
+++ b/l10n_br_purchase/models/purchase_order.py
@@ -5,7 +5,6 @@
 from lxml import etree
 from odoo import api, fields, models
 from odoo.addons import decimal_precision as dp
-from odoo.addons.l10n_br_fiscal.constants.fiscal import DOCUMENT_ISSUER_PARTNER
 
 
 class PurchaseOrder(models.Model):
@@ -46,12 +45,6 @@ def _fiscal_operation_domain(self):
         related='partner_id.inscr_est',
     )
 
-    fiscal_document_count = fields.Integer(
-        string='Fiscal Document Count',
-        related='invoice_count',
-        readonly=True,
-    )
-
     amount_freight = fields.Monetary(
         compute='_amount_all',
         store=True,
@@ -110,58 +103,38 @@ def fields_view_get(self, view_id=None, view_type="form",
 
         return order_view
 
-    @api.multi
-    def action_view_document(self):
-        invoices = self.mapped('invoice_ids')
-        action = self.env.ref('l10n_br_fiscal.document_in_action').read()[0]
-        if len(invoices) > 1:
-            action['domain'] = [
-                ('id', 'in', invoices.mapped('fiscal_document_id').ids),
-            ]
-        elif len(invoices) == 1:
-            form_view = [
-                (self.env.ref('l10n_br_fiscal.document_form').id, 'form'),
-            ]
-            if 'views' in action:
-                action['views'] = form_view + [(state, view) for state, view
-                                               in action['views'] if
-                                               view != 'form']
-            else:
-                action['views'] = form_view
-            action['res_id'] = invoices.fiscal_document_id.id
-        else:
-            action = {'type': 'ir.actions.act_window_close'}
-        return action
-
-    @api.multi
-    def action_view_invoice(self):
-        result = super().action_view_invoice()
-        fiscal_dict = self._prepare_br_fiscal_dict(default=True)
-
-        document_type_id = self._context.get('document_type_id')
-
-        if document_type_id:
-            document_type = self.env['l10n_br_fiscal.document.type'].browse(
-                document_type_id)
-        else:
-            document_type = self.company_id.document_type_id
-            document_type_id = self.company_id.document_type_id.id
-
-        fiscal_dict['default_document_type_id'] = document_type_id
-        document_serie = document_type.get_document_serie(
-            self.company_id, self.fiscal_operation_id)
-
-        if document_serie:
-            fiscal_dict['default_document_serie_id'] = document_serie.id
-
-        fiscal_dict['default_issuer'] = DOCUMENT_ISSUER_PARTNER
-
-        if self.fiscal_operation_id and self.fiscal_operation_id.journal_id:
-            fiscal_dict['default_journal_id'] = (
-                self.fiscal_operation_id.journal_id.id)
-
-        result['context'].update(fiscal_dict)
-        return result
+    # TODO open by default Invoice view with Fiscal Details Button
+    # You can add a group to select default view Fiscal Invoice or
+    # Account invoice.
+    # @api.multi
+    # def action_view_invoice(self):
+    #     result = super().action_view_invoice()
+    #     fiscal_dict = self._prepare_br_fiscal_dict(default=True)
+    #
+    #     document_type_id = self._context.get('document_type_id')
+    #
+    #     if document_type_id:
+    #         document_type = self.env['l10n_br_fiscal.document.type'].browse(
+    #             document_type_id)
+    #     else:
+    #         document_type = self.company_id.document_type_id
+    #         document_type_id = self.company_id.document_type_id.id
+    #
+    #     fiscal_dict['default_document_type_id'] = document_type_id
+    #     document_serie = document_type.get_document_serie(
+    #         self.company_id, self.fiscal_operation_id)
+    #
+    #     if document_serie:
+    #         fiscal_dict['default_document_serie_id'] = document_serie.id
+    #
+    #     fiscal_dict['default_issuer'] = DOCUMENT_ISSUER_PARTNER
+    #
+    #     if self.fiscal_operation_id and self.fiscal_operation_id.journal_id:
+    #         fiscal_dict['default_journal_id'] = (
+    #             self.fiscal_operation_id.journal_id.id)
+    #
+    #     result['context'].update(fiscal_dict)
+    #     return result
 
     @api.onchange('fiscal_operation_id')
     def _onchange_fiscal_operation_id(self):
diff --git a/l10n_br_purchase/views/purchase_view.xml b/l10n_br_purchase/views/purchase_view.xml
index 087489e035fc..9eb6db0c155f 100644
--- a/l10n_br_purchase/views/purchase_view.xml
+++ b/l10n_br_purchase/views/purchase_view.xml
@@ -20,11 +20,6 @@
           <field name="inherit_id" ref="purchase.purchase_order_form"/>
           <field name="priority">36</field>
           <field name="arch" type="xml">
-              <xpath expr="//sheet/div[@name='button_box']/button" position="after">
-                <button type="object" name="action_view_document" class="oe_stat_button" icon="fa-pencil-square-o" attrs="{'invisible':['|', ('invoice_count', '=', 0), ('state', 'in', ('draft','sent','to approve'))]}">
-                    <field name="fiscal_document_count" widget="statinfo" string="Documents"/>
-                </button>
-              </xpath>
               <xpath expr="//field[@name='company_id']" position="after">
                   <field name="fiscal_operation_id" required="1"/>
               </xpath>
diff --git a/l10n_br_repair/models/repair_order.py b/l10n_br_repair/models/repair_order.py
index 2e2f7b37e008..a9850cd680c0 100644
--- a/l10n_br_repair/models/repair_order.py
+++ b/l10n_br_repair/models/repair_order.py
@@ -515,7 +515,7 @@ def action_invoice_create(self, group=False):
 
                 # Check if there more than one Document Type
                 if ((fiscal_document_type !=
-                        invoice_created_by_super.document_type_id.id) or
+                        invoice_created_by_super.document_type_id) or
                         (len(document_type_list) > 1)):
                     # Remove the First Document Type,
                     # already has Invoice created
diff --git a/l10n_br_sale/models/sale_order.py b/l10n_br_sale/models/sale_order.py
index 6d8851fea94d..2e8bdb9f3e27 100644
--- a/l10n_br_sale/models/sale_order.py
+++ b/l10n_br_sale/models/sale_order.py
@@ -108,12 +108,6 @@ def _fiscal_operation_domain(self):
         digits=dp.get_precision('Account'),
     )
 
-    fiscal_document_count = fields.Integer(
-        string='Fiscal Document Count',
-        related='invoice_count',
-        readonly=True,
-    )
-
     comment_ids = fields.Many2many(
         comodel_name='l10n_br_fiscal.comment',
         relation='sale_order_comment_rel',
@@ -191,29 +185,6 @@ def _onchange_fiscal_operation_id(self):
         super()._onchange_fiscal_operation_id()
         self.fiscal_position_id = self.fiscal_operation_id.fiscal_position_id
 
-    @api.multi
-    def action_view_document(self):
-        invoices = self.mapped('invoice_ids')
-        action = self.env.ref('l10n_br_fiscal.document_out_action').read()[0]
-        if len(invoices) > 1:
-            action['domain'] = [
-                ('id', 'in', invoices.mapped('fiscal_document_id').ids),
-            ]
-        elif len(invoices) == 1:
-            form_view = [
-                (self.env.ref('l10n_br_fiscal.document_form').id, 'form'),
-            ]
-            if 'views' in action:
-                action['views'] = form_view + [(state, view) for state, view
-                                               in action['views'] if
-                                               view != 'form']
-            else:
-                action['views'] = form_view
-            action['res_id'] = invoices.fiscal_document_id.id
-        else:
-            action = {'type': 'ir.actions.act_window_close'}
-        return action
-
     @api.multi
     def _prepare_invoice(self):
         self.ensure_one()
@@ -259,6 +230,9 @@ def action_invoice_create(self, grouped=False, final=False):
             # Identify how many Document Types exist
             for inv_line in invoice_created_by_super.invoice_line_ids:
 
+                if inv_line.display_type:
+                    continue
+
                 fiscal_document_type = \
                     inv_line.fiscal_operation_line_id.get_document_type(
                         inv_line.invoice_id.company_id)
@@ -318,3 +292,31 @@ def action_invoice_create(self, grouped=False, final=False):
                             inv_line.invoice_id = invoice.id
 
         return inv_ids
+
+    # TODO open by default Invoice view with Fiscal Details Button
+    # You can add a group to select default view Fiscal Invoice or
+    # Account invoice.
+    # @api.multi
+    # def action_view_invoice(self):
+    #     action = super().action_view_invoice()
+    #     invoices = self.mapped('invoice_ids')
+    #     if any(invoices.filtered(lambda i: i.document_type_id)):
+    #         action = self.env.ref(
+    #             'l10n_br_account.fiscal_invoice_out_action').read()[0]
+    #         if len(invoices) > 1:
+    #             action['domain'] = [('id', 'in', invoices.ids)]
+    #         elif len(invoices) == 1:
+    #             form_view = [
+    #                 (self.env.ref(
+    #                     'l10n_br_account.fiscal_invoice_form').id, 'form')
+    #             ]
+    #             if 'views' in action:
+    #                 action['views'] = form_view + [
+    #                     (state, view) for state, view in action['views']
+    #                     if view != 'form']
+    #             else:
+    #                 action['views'] = form_view
+    #             action['res_id'] = invoices.ids[0]
+    #         else:
+    #             action = {'type': 'ir.actions.act_window_close'}
+    #     return action
diff --git a/l10n_br_sale/views/sale_view.xml b/l10n_br_sale/views/sale_view.xml
index 08ceabbfd1c1..a695a82f30fb 100644
--- a/l10n_br_sale/views/sale_view.xml
+++ b/l10n_br_sale/views/sale_view.xml
@@ -21,11 +21,6 @@
         <field name="inherit_id" ref="sale.view_order_form"/>
         <field name="priority">99</field>
         <field name="arch" type="xml">
-            <button name="action_view_invoice" position="after">
-                <button name="action_view_document" type="object" class="oe_stat_button" icon="fa-pencil-square-o" attrs="{'invisible': [('invoice_count', '=', 0)]}">
-                    <field name="fiscal_document_count" widget="statinfo" string="Fiscal Documents" modifiers="{'readonly':true}"/>
-                </button>
-            </button>
             <field name="amount_untaxed" position="before">
                 <field name="amount_gross" widget='monetary' options="{'currency_field': 'currency_id'}"/>
                 <field name="amount_discount" groups="l10n_br_sale.group_discount_per_value" widget='monetary' options="{'currency_field': 'currency_id'}"/>
diff --git a/l10n_br_sale_stock/models/stock_move.py b/l10n_br_sale_stock/models/stock_move.py
index b933b1768e0a..7e2c9196f72d 100644
--- a/l10n_br_sale_stock/models/stock_move.py
+++ b/l10n_br_sale_stock/models/stock_move.py
@@ -31,9 +31,4 @@ def _get_new_picking_values(self):
                 self.sale_line_id.order_id._prepare_br_fiscal_dict()
 
         values.update(super()._get_new_picking_values())
-        # TODO - remover o pop abaixo depois do merge
-        #  https://github.com/OCA/l10n-brazil/pull/1099
-        #  , não é necessário
-        # Remover o dummy
-        values.pop('fiscal_document_id')
         return values
diff --git a/l10n_br_stock_account/models/stock_picking.py b/l10n_br_stock_account/models/stock_picking.py
index 81d73cc8ba13..647c70edb3fb 100644
--- a/l10n_br_stock_account/models/stock_picking.py
+++ b/l10n_br_stock_account/models/stock_picking.py
@@ -49,26 +49,3 @@ def _fiscal_operation_domain(self):
     invoice_state = fields.Selection(
         copy=True,
     )
-
-    @api.multi
-    def action_view_document(self):
-        invoices = self.mapped('invoice_ids')
-        action = self.env.ref('l10n_br_fiscal.document_out_action').read()[0]
-        if len(invoices) > 1:
-            action['domain'] = [
-                ('id', 'in', invoices.mapped('fiscal_document_id').ids),
-            ]
-        elif len(invoices) == 1:
-            form_view = [
-                (self.env.ref('l10n_br_fiscal.document_form').id, 'form'),
-            ]
-            if 'views' in action:
-                action['views'] = form_view + [(state, view) for state, view
-                                               in action['views'] if
-                                               view != 'form']
-            else:
-                action['views'] = form_view
-            action['res_id'] = invoices.fiscal_document_id.id
-        else:
-            action = {'type': 'ir.actions.act_window_close'}
-        return action
diff --git a/l10n_br_stock_account/views/stock_picking.xml b/l10n_br_stock_account/views/stock_picking.xml
index 33bdcb57d1fe..4fc67a6ecdd0 100644
--- a/l10n_br_stock_account/views/stock_picking.xml
+++ b/l10n_br_stock_account/views/stock_picking.xml
@@ -35,17 +35,6 @@
                 <field name="fiscal_operation_id" attrs="{'invisible': [('invoice_state', '=', 'none')], 'required': [('invoice_state', '=', '2binvoiced')], 'readonly': [('invoice_state', '=', 'invoiced')]}"/>
                 <field name="fiscal_operation_line_id" attrs="{'invisible': [('invoice_state', '=', 'none')], 'required': [('invoice_state', '=', '2binvoiced')], 'readonly': [('invoice_state', '=', 'invoiced')]}"/>
             </xpath>
-            <div name="button_box" position="inside">
-                <button name="action_view_document"
-                    type="object"
-                    class="oe_stat_button"
-                    icon="fa-pencil-square-o"
-                    attrs="{'invisible': [('invoice_ids', '=', [])]}" groups="base.group_user">
-                    <div class="o_form_field o_stat_info">
-                        <span class="o_stat_text">Documents</span>
-                    </div>
-                </button>
-            </div>
         </field>
     </record>