diff --git a/l10n_br_account/__manifest__.py b/l10n_br_account/__manifest__.py
index ca1b44ad85cc..8940a90963fe 100644
--- a/l10n_br_account/__manifest__.py
+++ b/l10n_br_account/__manifest__.py
@@ -29,6 +29,7 @@
 
         # Wizards
         'wizards/account_invoice_refund_view.xml',
+        'wizards/wizard_document_status.xml',
 
         # Actions
         "views/l10n_br_account_action.xml",
diff --git a/l10n_br_account/models/account_invoice.py b/l10n_br_account/models/account_invoice.py
index cc7060720fd4..8bc626c5ccde 100644
--- a/l10n_br_account/models/account_invoice.py
+++ b/l10n_br_account/models/account_invoice.py
@@ -12,7 +12,6 @@
     FISCAL_OUT,
     DOCUMENT_ISSUER_COMPANY,
     DOCUMENT_ISSUER_PARTNER,
-    SITUACAO_EDOC_AUTORIZADA,
     SITUACAO_EDOC_CANCELADA,
     SITUACAO_EDOC_EM_DIGITACAO,
 )
@@ -90,11 +89,6 @@ class AccountInvoice(models.Model):
         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
@@ -107,6 +101,16 @@ class AccountInvoice(models.Model):
         ondelete='cascade',
     )
 
+    document_type = fields.Char(
+        related='document_type_id.code',
+        stored=True,
+    )
+
+    @api.multi
+    def _get_amount_lines(self):
+        """Get object lines instaces used to compute fields"""
+        return self.mapped('invoice_line_ids')
+
     @api.multi
     def _get_amount_lines(self):
         """Get object lines instaces used to compute fields"""
@@ -309,7 +313,9 @@ def finalize_invoice_move_lines(self, move_lines):
             if l[2]['debit'] or l[2]['credit']:
                 if self.fiscal_document_id != dummy_doc:
                     l[2]['name'] = '{}/{}-{}'.format(
-                        self.fiscal_number,
+                        self.fiscal_document_id.with_context(
+                            fiscal_document_no_company=True
+                        )._compute_document_name(),
                         count,
                         len(financial_lines)
                     )
@@ -404,11 +410,8 @@ def action_date_assign(self):
         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
+                    invoice.fiscal_document_id._document_date()
+                    invoice.fiscal_document_id._document_number()
 
     @api.multi
     def action_move_create(self):
@@ -427,7 +430,7 @@ def action_invoice_draft(self):
                     raise UserError(_(
                         "You can't set this document number: {} to draft "
                         "because this document is cancelled in SEFAZ".format(
-                            i.fiscal_number)))
+                            i.document_number)))
             if i.state_edoc != SITUACAO_EDOC_EM_DIGITACAO:
                 i.fiscal_document_id.action_document_back2draft()
         return super().action_invoice_draft()
@@ -445,21 +448,19 @@ def action_document_send(self):
     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()
+            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"
-                    ))
+            return i.fiscal_document_id.action_document_correction()
+
+    @api.multi
+    def action_document_invalidate(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):
+            return i.fiscal_document_id.action_document_invalidate()
 
     @api.multi
     def action_document_back2draft(self):
@@ -470,6 +471,13 @@ def action_document_back2draft(self):
             i.action_cancel()
             i.action_invoice_draft()
 
+    @api.multi
+    def action_invoice_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):
+            return i.fiscal_document_id.action_document_cancel()
+        return super().action_invoice_cancel()
+
     def view_xml(self):
         self.ensure_one()
         return self.fiscal_document_id.view_xml()
diff --git a/l10n_br_account/views/account_invoice_view.xml b/l10n_br_account/views/account_invoice_view.xml
index ffd95b4305f2..9bca68b17499 100644
--- a/l10n_br_account/views/account_invoice_view.xml
+++ b/l10n_br_account/views/account_invoice_view.xml
@@ -12,7 +12,7 @@
                 <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="filter_domain">['|','|','|', '|', ('document_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>
@@ -25,7 +25,7 @@
         <field name="arch" type="xml">
             <field name="number" position="before">
                 <field name="document_type_id" invisible="1"/>
-                <field name="fiscal_number"/>
+                <field name="document_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>
@@ -50,7 +50,7 @@
                     <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',))]}"/>
+                            <field name="document_number" readonly="1" attrs="{'invisible': [('state','in',('draft',))]}"/>
                         </span>
                     </div>
                 </h1>
@@ -60,7 +60,6 @@
                     <field name="id" invisible="1"/>
                     <field name="document_electronic" invisible="1"/>
                     <field name="fiscal_operation_type" invisible="1"/>
-                    <field name="document_section" invisible="1"/>
                     <field name="number" invisible="1"/>
                     <field name="edoc_purpose" invisible="1"/>
                     <field name="ind_final" invisible="1"/>
@@ -69,13 +68,14 @@
                 </group>
             </xpath>
             <field name="cash_rounding_id" position="after">
+                <field name="document_type" invisible="1"/>
                 <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 name="document_number" readonly="0" force_save="1" attrs="{'invisible': [('issuer', '=', 'company')], 'required': [('issuer', '=', 'partner'), ('document_type_id', '!=', False)], 'readonly': [('state', '!=', 'draft')]}"/>
+                <field name="document_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"/>
@@ -125,7 +125,6 @@
                     <field name="id" invisible="1"/>
                     <field name="document_electronic" invisible="1"/>
                     <field name="fiscal_operation_type" invisible="1"/>
-                    <field name="document_section" invisible="1"/>
                     <field name="number" invisible="1"/>
                     <field name="edoc_purpose" invisible="1"/>
                     <field name="ind_final" invisible="1"/>
@@ -139,8 +138,8 @@
                 <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 name="document_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="document_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"/>
diff --git a/l10n_br_account/views/fiscal_invoice_view.xml b/l10n_br_account/views/fiscal_invoice_view.xml
index c4973e7c36af..8c899ac69555 100644
--- a/l10n_br_account/views/fiscal_invoice_view.xml
+++ b/l10n_br_account/views/fiscal_invoice_view.xml
@@ -7,8 +7,7 @@
         <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"/>
+          <xpath expr="//field[@name='document_number']" position="after">
               <field name="number" string="Account Number" invisible="1"/>
               <field name="legal_name" string="Legal Name"/>
               <field name="cnpj_cpf" string="CNPJ/CPF"/>
@@ -23,8 +22,7 @@
         <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"/>
+            <xpath expr="//field[@name='document_number']" position="after">
                 <field name="number" string="Account Number" invisible="1"/>
                 <field name="commercial_partner_id" invisible="1"/>
                 <field name="reference" invisible="1"/>
@@ -43,44 +41,18 @@
       <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">
+        <xpath expr="//header" position="inside">
             <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 expr="//button[@name='action_document_confirm']" position="replace">
+            <button name="action_invoice_open" type="object" states="draft" string="Validate" class="oe_highlight o_invoice_validate" groups="account.group_account_invoice"/>
         </xpath>
-        <xpath expr="//h1/field[@name='number']" position="replace">
-            <field name="fiscal_number" class="oe_inline" readonly="1"/>
+        <xpath expr="//button[@name='action_document_back2draft']" position="replace">
+          <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="//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 expr="//button[@name='action_create_return']" position="replace">
+          <button name="%(account.action_account_invoice_refund)d" type='action' string='Devolver' groups="account.group_account_invoice" attrs="{'invisible': ['|',('type', 'in', ['in_refund','out_refund']),('state','not in',('open','in_payment','paid'))]}"/>
         </xpath>
         <xpath expr="//page[@name='finance']" position="inside">
             <group>
diff --git a/l10n_br_account/views/l10n_br_account_action.xml b/l10n_br_account/views/l10n_br_account_action.xml
index 52156c850817..87fa22178062 100644
--- a/l10n_br_account/views/l10n_br_account_action.xml
+++ b/l10n_br_account/views/l10n_br_account_action.xml
@@ -1,7 +1,75 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-      <!-- Incomming Documents -->
+    <!-- NF-e Documents -->
+    <record id="fiscal_invoice_nfe_action" model="ir.actions.act_window">
+        <field name="name">NF-e</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" eval="[('document_type_id', '=', ref('l10n_br_fiscal.document_55'))]"/>
+        <field name="context" eval="{'default_document_type_id': ref('l10n_br_fiscal.document_55')}"/>
+        <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 NF-e
+          </p><p>
+            Odoo helps you easily track all activities
+            related to a fiscal operation.
+          </p>
+        </field>
+    </record>
+
+    <record id="fiscal_invoice_nfe_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_nfe_action"/>
+    </record>
+
+    <record id="fiscal_invoice_nfe_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_nfe_action"/>
+    </record>
+
+    <!-- NFS-e Documents -->
+    <record id="fiscal_invoice_nfse_action" model="ir.actions.act_window">
+        <field name="name">NFS-e</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" eval="[('document_type_id', '=', ref('l10n_br_fiscal.document_SE'))]"/>
+        <field name="context" eval="{'default_document_type_id': ref('l10n_br_fiscal.document_SE')}"/>
+        <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 NFS-e
+          </p><p>
+            Odoo helps you easily track all activities
+            related to a fiscal operation.
+          </p>
+        </field>
+    </record>
+
+    <record id="fiscal_invoice_nfse_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_nfse_action"/>
+    </record>
+
+    <record id="fiscal_invoice_nfse_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_nfse_action"/>
+    </record>
+
+    <!-- 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>
diff --git a/l10n_br_account/views/l10n_br_account_menu.xml b/l10n_br_account/views/l10n_br_account_menu.xml
index 7c0a0a3c97ce..560e625fff54 100644
--- a/l10n_br_account/views/l10n_br_account_menu.xml
+++ b/l10n_br_account/views/l10n_br_account_menu.xml
@@ -1,6 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
+    <!-- Incomming Documents -->
+    <record id="l10n_br_fiscal.document_nfe_menu" model="ir.ui.menu">
+        <field name="action" ref="fiscal_invoice_nfe_action"/>
+    </record>
+
+        <!-- Incomming Documents -->
+    <record id="l10n_br_fiscal.document_nfse_menu" model="ir.ui.menu">
+        <field name="action" ref="fiscal_invoice_nfse_action"/>
+    </record>
+
     <!-- Incomming Documents -->
     <record id="l10n_br_fiscal.document_in_menu" model="ir.ui.menu">
         <field name="action" ref="fiscal_invoice_in_action"/>
diff --git a/l10n_br_account/wizards/__init__.py b/l10n_br_account/wizards/__init__.py
index 4fd60cdccb73..0f8121d4111a 100644
--- a/l10n_br_account/wizards/__init__.py
+++ b/l10n_br_account/wizards/__init__.py
@@ -1,5 +1,6 @@
 # License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
 
+from . import base_wizard_mixin
 from . import account_invoice_refund
 from . import wizard_document_cancel
-from . import wizard_document_correction
+from . import wizard_document_invalidate
diff --git a/l10n_br_account/wizards/base_wizard_mixin.py b/l10n_br_account/wizards/base_wizard_mixin.py
new file mode 100644
index 000000000000..07373c569182
--- /dev/null
+++ b/l10n_br_account/wizards/base_wizard_mixin.py
@@ -0,0 +1,27 @@
+# Copyright (C) 2020  Luis Felipe Mileo <mileo@kmee.com.br>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import api, fields, models
+
+
+class BaseWizardMixin(models.TransientModel):
+    _inherit = 'l10n_br_fiscal.base.wizard.mixin'
+
+    invoice_id = fields.Many2one(
+        comodel_name='account.invoice',
+        string='Invoice',
+    )
+
+    @api.model
+    def default_get(self, fields_list):
+        default_values = super().default_get(fields_list)
+        if default_values.get('invoice_id'):
+            invoice_id = \
+                self.invoice_id.browse(default_values.get('invoice_id'))
+            default_values['document_id'] = invoice_id.fiscal_document_id.id
+        return default_values
+
+    def _prepare_key_fields(self):
+        vals = super()._prepare_key_fields()
+        vals['account.invoice'] = 'invoice_id'
+        return vals
diff --git a/l10n_br_account/wizards/wizard_document_cancel.py b/l10n_br_account/wizards/wizard_document_cancel.py
index d5c89c755599..155d30a02563 100644
--- a/l10n_br_account/wizards/wizard_document_cancel.py
+++ b/l10n_br_account/wizards/wizard_document_cancel.py
@@ -1,46 +1,14 @@
 # Copyright (C) 2021  Renato Lima - Akretion <renato.lima@akretion.com.br>
+# Copyright (C) 2021  Luis Felipe Mileo - KMEE <mileo@kmee.com.br>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo import api, fields, models
+from odoo import 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"}
+    def do_cancel(self):
+        super().do_cancel()
+        if self.invoice_id:
+            self.invoice_id.action_cancel()
diff --git a/l10n_br_account/wizards/wizard_document_correction.py b/l10n_br_account/wizards/wizard_document_correction.py
deleted file mode 100644
index 9030a06e1cda..000000000000
--- a/l10n_br_account/wizards/wizard_document_correction.py
+++ /dev/null
@@ -1,51 +0,0 @@
-# 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_account/wizards/wizard_document_invalidate.py b/l10n_br_account/wizards/wizard_document_invalidate.py
new file mode 100644
index 000000000000..afb33881bee2
--- /dev/null
+++ b/l10n_br_account/wizards/wizard_document_invalidate.py
@@ -0,0 +1,13 @@
+# Copyright (C) 2021  Luis Felipe Mileo - KMEE <mileo@kmee.com.br>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import models
+
+
+class InvalidateNumberWizard(models.TransientModel):
+    _inherit = 'l10n_br_fiscal.invalidate.number.wizard'
+
+    def do_invalidate(self):
+        super().do_invalidate()
+        if self.invoice_id:
+            self.invoice_id.action_cancel()
diff --git a/l10n_br_account/wizards/wizard_document_status.xml b/l10n_br_account/wizards/wizard_document_status.xml
new file mode 100644
index 000000000000..5549d6f5a479
--- /dev/null
+++ b/l10n_br_account/wizards/wizard_document_status.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2020 KMEE
+     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
+
+<odoo>
+
+    <record model="ir.actions.act_window" id="wizard_document_status_act_multi">
+        <field name="name">Document Status</field>
+        <field name="res_model">l10n_br_fiscal.document.status.wizard</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">form</field>
+        <field name="binding_model_id" ref="model_account_invoice" />
+        <field name="target">new</field>
+    </record>
+
+</odoo>
diff --git a/l10n_br_contract/models/contract_contract.py b/l10n_br_contract/models/contract_contract.py
index 4743f6764507..8f361bf2d9d4 100644
--- a/l10n_br_contract/models/contract_contract.py
+++ b/l10n_br_contract/models/contract_contract.py
@@ -81,12 +81,6 @@ def _finalize_invoice_creation(self, invoices):
             invoice.fiscal_document_id._onchange_document_serie_id()
             invoice.fiscal_document_id._onchange_company_id()
 
-            if (hasattr(invoice.fiscal_document_id, 'rps_number') and
-                    invoice.fiscal_document_id.number):
-                invoice.fiscal_document_id.rps_number = \
-                    invoice.fiscal_document_id.number
-                invoice.fiscal_document_id.number = False
-
             for line in invoice.invoice_line_ids:
                 line._onchange_product_id_fiscal()
                 line.price_unit = line.contract_line_id.price_unit
@@ -106,12 +100,6 @@ def _prepare_recurring_invoices_values(self, date_ref=False):
 
         inv_ids = []
         document_type_list = []
-        document_type = {
-            '55': 'nfe',
-            'SE': 'nfse_recibos',
-            '59': 'nfce_cfe',
-            '57': 'cte'
-        }
 
         for invoice_id in super_inv_id:
 
@@ -131,8 +119,6 @@ def _prepare_recurring_invoices_values(self, date_ref=False):
                     inv_to_append = invoice_id.copy()
                     inv_to_append['invoice_line_ids'] = [inv_line]
                     inv_to_append['document_type_id'] = fiscal_document_type.id
-                    inv_to_append['document_section'] = document_type.get(
-                        inv_to_append['document_type_id'], False)
                     inv_to_append['document_serie_id'] = \
                         self.env['l10n_br_fiscal.document.serie'].search([
                             ('document_type_id', '=',
diff --git a/l10n_br_fiscal/__manifest__.py b/l10n_br_fiscal/__manifest__.py
index 95cfe2de0b2f..9cdf05f76ab2 100644
--- a/l10n_br_fiscal/__manifest__.py
+++ b/l10n_br_fiscal/__manifest__.py
@@ -9,7 +9,7 @@
     "author": "Akretion, Odoo Community Association (OCA)",
     "maintainers": ["renatonlima"],
     "website": "http://github.com/OCA/l10n-brazil",
-    "version": "12.0.11.3.0",
+    "version": "12.0.12.0.1",
     "depends": [
         "uom",
         "decimal_precision",
@@ -86,9 +86,7 @@
         "views/subsequent_document_view.xml",
         "views/uom_uom.xml",
         "views/closing.xml",
-        "views/document_invalidate_number.xml",
-        "views/document_cancel.xml",
-        "views/document_correction.xml",
+        "views/invalidate_number_view.xml",
         "views/city_taxation_code.xml",
         'views/mdfe/mdfe_views.xml',
         'views/dfe/dfe_views.xml',
@@ -96,10 +94,10 @@
         "views/document_event_view.xml",
 
         # Wizards
-        "wizards/wizard_document_cancel_view.xml",
-        "wizards/wizard_document_correction_view.xml",
-        "wizards/wizard_document_invalidate_view.xml",
-        "wizards/wizard_document_status_view.xml",
+        "wizards/document_cancel_wizard.xml",
+        "wizards/document_correction_wizard.xml",
+        "wizards/document_status_wizard.xml",
+        "wizards/invalidate_number_wizard.xml",
 
         # Actions
         "views/l10n_br_fiscal_action.xml",
diff --git a/l10n_br_fiscal/constants/fiscal.py b/l10n_br_fiscal/constants/fiscal.py
index f43cc36c3de6..c05995811537 100644
--- a/l10n_br_fiscal/constants/fiscal.py
+++ b/l10n_br_fiscal/constants/fiscal.py
@@ -205,8 +205,9 @@
 CERTIFICATE_SUBTYPE_DEFAULT = "a1"
 
 
-FISCAL_IN_OUT = (("in", "In"), ("out", "Out"))
+FISCAL_IN_OUT = (("in", _("In")), ("out", _("Out")))
 
+FISCAL_IN_OUT_DICT = dict(FISCAL_IN_OUT)
 
 FISCAL_IN_OUT_ALL = (("in", "In"), ("out", "Out"), ("all", "All"))
 
@@ -224,8 +225,9 @@
 DOCUMENT_TYPE = (("icms", "ICMS"), ("service", "Serviço Municipal"))
 
 
-DOCUMENT_ISSUER = (("company", "Company"), ("partner", "Partner"))
+DOCUMENT_ISSUER = (("company", _("Company")), ("partner", _("Partner")))
 
+DOCUMENT_ISSUER_DICT = dict(DOCUMENT_ISSUER)
 
 DOCUMENT_ISSUER_COMPANY = "company"
 DOCUMENT_ISSUER_PARTNER = "partner"
@@ -367,6 +369,10 @@
 
 AUTORIZADO_OU_DENEGADO = AUTORIZADO + DENEGADO
 
+EVENTO_REGISTRADO_E_VINCULADO = '135'
+EVENTO_REGISTRADO_NAO_VINCULADO = '136'
+
+EVENTO_RECEBIDO = ['135', '136']
 
 SITUACAO_EDOC_EM_DIGITACAO = "em_digitacao"
 SITUACAO_EDOC_A_ENVIAR = "a_enviar"
@@ -482,3 +488,11 @@
 FISCAL_COMMENT_DOCUMENT = 'l10n_br_fiscal.document.mixin'
 
 FISCAL_COMMENT_LINE = 'l10n_br_fiscal.document.line.mixin'
+
+EVENT_ENV_PROD = 'prod'
+EVENT_ENV_HML = 'hml'
+
+EVENT_ENVIRONMENT = [
+    (EVENT_ENV_PROD, 'Production'),
+    (EVENT_ENV_HML, 'Homologation'),
+]
diff --git a/l10n_br_fiscal/data/l10n_br_fiscal_email_template.xml b/l10n_br_fiscal/data/l10n_br_fiscal_email_template.xml
index e01f97e6f111..cc211d0f4c6e 100644
--- a/l10n_br_fiscal/data/l10n_br_fiscal_email_template.xml
+++ b/l10n_br_fiscal/data/l10n_br_fiscal_email_template.xml
@@ -6,7 +6,7 @@
       <field name="model_id" ref="model_l10n_br_fiscal_document"/>
       <field name="email_from">${object.company_id.partner_id.email}</field>
       <field name="email_cc">${not object.partner_id and object.partner_email or ''|safe},</field>
-      <field name="subject">${object.document_type_id.name}: ${object.number} Serie: ${object.document_serie} is: ${dict(object.fields_get('state').get('state').get('selection')).get(object.state, '')}</field>
+      <field name="subject">${object.document_type_id.name}: ${object.document_number} Serie: ${object.document_serie} is: ${dict(object.fields_get('state').get('state').get('selection')).get(object.state, '')}</field>
       <field name="partner_to">${object.partner_id.id}</field>
       <field name="auto_delete" eval="False"/>
       <field name="lang">${object.partner_id.lang}</field>
@@ -35,12 +35,12 @@
                               <tr>
                                 <td valign="top" style="font-family:Arial,Helvetica,sans-serif; color: #555; font-size: 14px;">
                                   <p>Hello ${object.partner_id.name},</p>
-                                  <p>The Fiscal Document ${object.number} has changed.</p>
+                                  <p>The Fiscal Document ${object.document_number} has changed.</p>
                                 </td>
                               </tr>
                               <tr>
                                 <td style="font-family:Arial,Helvetica,sans-serif; color: #555; font-size: 14px;" valign="top">
-                                  Document Number: ${object.number}
+                                  Document Number: ${object.document_number}
                                 </td>
                               </tr>
                               <tr>
@@ -50,7 +50,7 @@
                               </tr>
                               <tr>
                                 <td style="font-family:Arial,Helvetica,sans-serif; color: #555; font-size: 14px;" valign="top">
-                                  Document Key: ${object.key}
+                                  Document Key: ${object.document_key}
                                 </td>
                               </tr>
                               <tr>
@@ -92,7 +92,7 @@
       <field name="model_id" ref="model_l10n_br_fiscal_document"/>
       <field name="email_from">${object.company_id.partner_id.email}</field>
       <field name="email_cc">${not object.partner_id and object.partner_email or ''|safe},</field>
-      <field name="subject">${object.document_type_id.name}: ${object.number} Serie: ${object.document_serie} is: ${dict(object.fields_get('state').get('state').get('selection')).get(object.state, '')}</field>
+      <field name="subject">${object.document_type_id.name}: ${object.document_number} Serie: ${object.document_serie} is: ${dict(object.fields_get('state').get('state').get('selection')).get(object.state, '')}</field>
       <field name="partner_to">${object.partner_id.id}</field>
       <field name="auto_delete" eval="False"/>
       <field name="lang">${object.partner_id.lang}</field>
@@ -121,12 +121,12 @@
                               <tr>
                                 <td valign="top" style="font-family:Arial,Helvetica,sans-serif; color: #555; font-size: 14px;">
                                   <p>Hello ${object.partner_id.name},</p>
-                                  <p>The Fiscal Document ${object.number} has changed.</p>
+                                  <p>The Fiscal Document ${object.document_number} has changed.</p>
                                 </td>
                               </tr>
                               <tr>
                                 <td style="font-family:Arial,Helvetica,sans-serif; color: #555; font-size: 14px;" valign="top">
-                                  Document Number: ${object.number}
+                                  Document Number: ${object.document_number}
                                 </td>
                               </tr>
                               <tr>
@@ -136,7 +136,7 @@
                               </tr>
                               <tr>
                                 <td style="font-family:Arial,Helvetica,sans-serif; color: #555; font-size: 14px;" valign="top">
-                                  Document Key: ${object.key}
+                                  Document Key: ${object.document_key}
                                 </td>
                               </tr>
                               <tr>
diff --git a/l10n_br_fiscal/data/operation_data.xml b/l10n_br_fiscal/data/operation_data.xml
index 7eccf831f676..62858d4b1970 100644
--- a/l10n_br_fiscal/data/operation_data.xml
+++ b/l10n_br_fiscal/data/operation_data.xml
@@ -10,8 +10,8 @@
     </record>
 
     <record id="fiscal_document_dummy" model="l10n_br_fiscal.document">
-        <field name="key">dummy</field>
-        <field name="number">0</field>
+        <field name="document_key">dummy</field>
+        <field name="document_number">0</field>
         <field name="active">False</field>
         <field name="partner_id" ref="base.main_partner"/>
         <field name="document_type_id" ref="l10n_br_fiscal.document_55"/>
diff --git a/l10n_br_fiscal/demo/fiscal_document_demo.xml b/l10n_br_fiscal/demo/fiscal_document_demo.xml
index 4e0aa7517ab0..29702a13a0ad 100644
--- a/l10n_br_fiscal/demo/fiscal_document_demo.xml
+++ b/l10n_br_fiscal/demo/fiscal_document_demo.xml
@@ -14,7 +14,6 @@
         <field name="document_serie_id" ref="l10n_br_fiscal.empresa_lc_document_55_serie_1"/>
         <field name="company_id" ref="l10n_br_base.empresa_lucro_presumido"/>
         <field name="document_serie">1</field>
-        <field name="document_section">nfe</field>
         <field name="partner_id" ref="l10n_br_base.res_partner_cliente1_sp"/>
         <field name="user_id" ref="base.user_demo"/>
         <field name="fiscal_operation_type">out</field>
@@ -69,7 +68,6 @@
         <field name="document_serie_id" ref="l10n_br_fiscal.empresa_lc_document_55_serie_1"/>
         <field name="company_id" ref="l10n_br_base.empresa_lucro_presumido"/>
         <field name="document_serie">1</field>
-        <field name="document_section">nfe</field>
         <field name="partner_id" ref="l10n_br_base.res_partner_cliente5_pe"/>
         <field name="user_id" ref="base.user_demo"/>
         <field name="fiscal_operation_type">out</field>
@@ -142,10 +140,9 @@
         <field name="document_type_id" ref="l10n_br_fiscal.document_55"/>
         <field name="document_serie_id" ref="l10n_br_fiscal.empresa_lc_document_55_serie_1"/>
         <field name="document_serie">1</field>
-        <field name="document_section">nfe</field>
         <field name="user_id" ref="base.user_demo"/>
-        <field name="key">26180812984794000154550010000016871192213339</field>
-        <field name="number">19221333</field>
+        <field name="document_key">26180812984794000154550010000016871192213339</field>
+        <field name="document_number">19221333</field>
         <field name="partner_id" ref="base.res_partner_2"/>
         <field name="fiscal_operation_type">out</field>
     </record>
@@ -197,8 +194,7 @@
         <field name="document_serie_id" ref="l10n_br_fiscal.empresa_lc_document_55_serie_1"/>
         <field name="company_id" ref="l10n_br_base.empresa_lucro_presumido"/>
         <field name="document_serie">1</field>
-        <field name="document_section">nfe</field>
-        <field name="partner_id" ref="l10n_br_base.res_partner_cliente9_mg"/>
+                <field name="partner_id" ref="l10n_br_base.res_partner_cliente9_mg"/>
         <field name="user_id" ref="base.user_demo"/>
         <field name="fiscal_operation_type">out</field>
     </record>
@@ -250,7 +246,6 @@
         <field name="document_serie_id" ref="l10n_br_fiscal.empresa_lc_document_55_serie_1"/>
         <field name="company_id" ref="l10n_br_base.empresa_lucro_presumido"/>
         <field name="document_serie">1</field>
-        <field name="document_section">nfe</field>
         <field name="partner_id" ref="l10n_br_base.res_partner_cliente10_mg"/>
         <field name="user_id" ref="base.user_demo"/>
         <field name="fiscal_operation_type">out</field>
@@ -303,7 +298,6 @@
         <field name="document_type_id" ref="l10n_br_fiscal.document_55"/>
         <field name="document_serie_id" ref="l10n_br_fiscal.empresa_sn_document_55_serie_1"/>
         <field name="document_serie">1</field>
-        <field name="document_section">nfe</field>
         <field name="partner_id" ref="l10n_br_base.res_partner_cliente1_sp"/>
         <field name="user_id" ref="base.user_demo"/>
         <field name="fiscal_operation_type">out</field>
@@ -356,7 +350,6 @@
         <field name="document_type_id" ref="l10n_br_fiscal.document_55"/>
         <field name="document_serie_id" ref="l10n_br_fiscal.empresa_sn_document_55_serie_1"/>
         <field name="document_serie">1</field>
-        <field name="document_section">nfe</field>
         <field name="partner_id" ref="l10n_br_base.res_partner_cliente5_pe"/>
         <field name="user_id" ref="base.user_demo"/>
         <field name="fiscal_operation_type">out</field>
@@ -409,7 +402,6 @@
         <field name="document_type_id" ref="l10n_br_fiscal.document_55"/>
         <field name="document_serie_id" ref="l10n_br_fiscal.empresa_sn_document_55_serie_1"/>
         <field name="document_serie">1</field>
-        <field name="document_section">nfe</field>
         <field name="user_id" ref="base.user_demo"/>
         <field name="partner_id" ref="base.res_partner_2"/>
         <field name="fiscal_operation_type">out</field>
@@ -462,7 +454,6 @@
         <field name="document_type_id" ref="l10n_br_fiscal.document_55"/>
         <field name="document_serie_id" ref="l10n_br_fiscal.empresa_sn_document_55_serie_1"/>
         <field name="document_serie">1</field>
-        <field name="document_section">nfe</field>
         <field name="partner_id" ref="l10n_br_base.res_partner_cliente9_mg"/>
         <field name="user_id" ref="base.user_demo"/>
         <field name="fiscal_operation_type">out</field>
@@ -515,8 +506,7 @@
         <field name="document_type_id" ref="l10n_br_fiscal.document_55"/>
         <field name="document_serie_id" ref="l10n_br_fiscal.empresa_lc_document_55_serie_1"/>
         <field name="document_serie">1</field>
-        <field name="document_section">nfe</field>
-        <field name="key">NFe35200497231608000169550010000000371161029083</field>
+        <field name="document_key">NFe35200497231608000169550010000000371161029083</field>
         <field name="partner_id" ref="l10n_br_base.res_partner_cliente1_sp"/>
         <field name="user_id" ref="base.user_demo"/>
         <field name="fiscal_operation_type">out</field>
diff --git a/l10n_br_fiscal/demo/fiscal_document_nfse_demo.xml b/l10n_br_fiscal/demo/fiscal_document_nfse_demo.xml
index ef308ffa8c9c..1a04e7da0117 100644
--- a/l10n_br_fiscal/demo/fiscal_document_nfse_demo.xml
+++ b/l10n_br_fiscal/demo/fiscal_document_nfse_demo.xml
@@ -7,8 +7,6 @@
         <field name="document_type_id" ref="l10n_br_fiscal.document_SE"/>
         <field name="document_serie_id" ref="l10n_br_fiscal.document_SE_serie_1"/>
         <field name="document_serie">001</field>
-        <field name="document_section">nfse_recibos</field>
-        <field name="key">1</field>
         <field name="partner_id" ref="l10n_br_base.res_partner_cliente1_sp"/>
         <field name="user_id" ref="base.user_demo"/>
         <field name="partner_legal_name">Cliente 1 SP</field>
diff --git a/l10n_br_fiscal/demo/subsequent_operation_demo.xml b/l10n_br_fiscal/demo/subsequent_operation_demo.xml
index 1553656274a4..033bea6b9140 100644
--- a/l10n_br_fiscal/demo/subsequent_operation_demo.xml
+++ b/l10n_br_fiscal/demo/subsequent_operation_demo.xml
@@ -5,6 +5,6 @@
         <field name="fiscal_operation_id" ref="l10n_br_fiscal.fo_simples_faturamento"/>
         <field name="subsequent_operation_id" ref="l10n_br_fiscal.fo_entrega_futura"/>
         <field name="operation_document_type_id" ref="l10n_br_fiscal.document_55"/>
-        <field name="generation_situation">autorizada</field>
+        <field name="generation_situation">a_enviar</field>
     </record>
 </odoo>
diff --git a/l10n_br_fiscal/i18n/l10n_br_fiscal.pot b/l10n_br_fiscal/i18n/l10n_br_fiscal.pot
index 8147004427dc..191d75146424 100644
--- a/l10n_br_fiscal/i18n/l10n_br_fiscal.pot
+++ b/l10n_br_fiscal/i18n/l10n_br_fiscal.pot
@@ -21,7 +21,7 @@ msgstr ""
 #. module: l10n_br_fiscal
 #: model:mail.template,subject:l10n_br_fiscal.fiscal_document_change_state_template
 #: model:mail.template,subject:l10n_br_fiscal.fiscal_document_change_state_template_nfse
-msgid "${object.document_type_id.name}: ${object.number} Serie: ${object.document_serie} is: ${dict(object.fields_get('state').get('state').get('selection')).get(object.state, '')}"
+msgid "${object.document_type_id.name}: ${object.document_number} Serie: ${object.document_serie} is: ${dict(object.fields_get('state').get('state').get('selection')).get(object.state, '')}"
 msgstr ""
 
 #. module: l10n_br_fiscal
@@ -298,12 +298,12 @@ msgid "<html>\n"
 "                              <tr>\n"
 "                                <td valign=\"top\" style=\"font-family:Arial,Helvetica,sans-serif; color: #555; font-size: 14px;\">\n"
 "                                  <p>Hello ${object.partner_id.name},</p>\n"
-"                                  <p>The Fiscal Document ${object.number} has changed.</p>\n"
+"                                  <p>The Fiscal Document ${object.document_number} has changed.</p>\n"
 "                                </td>\n"
 "                              </tr>\n"
 "                              <tr>\n"
 "                                <td style=\"font-family:Arial,Helvetica,sans-serif; color: #555; font-size: 14px;\" valign=\"top\">\n"
-"                                  Document Number: ${object.number}\n"
+"                                  Document Number: ${object.document_number}\n"
 "                                </td>\n"
 "                              </tr>\n"
 "                              <tr>\n"
@@ -313,7 +313,7 @@ msgid "<html>\n"
 "                              </tr>\n"
 "                              <tr>\n"
 "                                <td style=\"font-family:Arial,Helvetica,sans-serif; color: #555; font-size: 14px;\" valign=\"top\">\n"
-"                                  Document Key: ${object.key}\n"
+"                                  Document Key: ${object.document_key}\n"
 "                                </td>\n"
 "                              </tr>\n"
 "                              <tr>\n"
@@ -352,7 +352,7 @@ msgstr ""
 
 #. module: l10n_br_fiscal
 #: model_terms:ir.ui.view,arch_db:l10n_br_fiscal.l10n_br_fiscal_res_config_settings_form
-msgid "<i class=\"fa fa-arrow-right\"/> Generate an Access Key"
+msgid "<i class=\"fa fa-arrow-right\"/> Generate an Access document_key"
 msgstr ""
 
 #. module: l10n_br_fiscal
@@ -1616,7 +1616,6 @@ msgstr ""
 
 #. module: l10n_br_fiscal
 #: model:ir.model.fields,field_description:l10n_br_fiscal.field_res_config_settings__module_l10n_br_cte
-#: selection:l10n_br_fiscal.document,document_section:0
 msgid "CT-e"
 msgstr ""
 
@@ -2794,11 +2793,6 @@ msgstr ""
 msgid "Document Related"
 msgstr ""
 
-#. module: l10n_br_fiscal
-#: model:ir.model.fields,field_description:l10n_br_fiscal.field_l10n_br_fiscal_document__document_section
-msgid "Document Section"
-msgstr ""
-
 #. module: l10n_br_fiscal
 #: model:ir.model.fields,field_description:l10n_br_fiscal.field_l10n_br_fiscal_document__document_serie_id
 #: model:ir.model.fields,field_description:l10n_br_fiscal.field_l10n_br_fiscal_operation_document_type__document_serie_id
@@ -3411,7 +3405,7 @@ msgstr ""
 
 #. module: l10n_br_fiscal
 #: model:ir.model,name:l10n_br_fiscal.model_l10n_br_fiscal_document_related
-#: model:ir.model.fields,field_description:l10n_br_fiscal.field_l10n_br_fiscal_document__fiscal_document_related_ids
+#: model:ir.model.fields,field_description:l10n_br_fiscal.field_l10n_br_fiscal_document__document_related_ids
 #: model:ir.model.fields,field_description:l10n_br_fiscal.field_l10n_br_fiscal_document_related__document_related_id
 #: model_terms:ir.ui.view,arch_db:l10n_br_fiscal.document_related_form
 #: model_terms:ir.ui.view,arch_db:l10n_br_fiscal.document_related_tree
@@ -5367,7 +5361,7 @@ msgid "Inutilização"
 msgstr ""
 
 #. module: l10n_br_fiscal
-#: model:ir.actions.act_window,name:l10n_br_fiscal.wizard_document_invalidate_action
+#: model:ir.actions.act_window,name:l10n_br_fiscal.invalidate_number_wizard_action
 #: model_terms:ir.ui.view,arch_db:l10n_br_fiscal.wizard_document_invalidate_form
 msgid "Inutilização de documento fiscal"
 msgstr ""
@@ -6111,7 +6105,6 @@ msgstr ""
 
 #. module: l10n_br_fiscal
 #: selection:l10n_br_fiscal.certificate,type:0
-#: selection:l10n_br_fiscal.document,document_section:0
 msgid "NF-e"
 msgstr ""
 
@@ -6126,7 +6119,6 @@ msgid "NF-e/NFC-e"
 msgstr ""
 
 #. module: l10n_br_fiscal
-#: selection:l10n_br_fiscal.document,document_section:0
 msgid "NFC-e e CF-e"
 msgstr ""
 
@@ -6151,10 +6143,6 @@ msgstr ""
 msgid "NFS-e"
 msgstr ""
 
-#. module: l10n_br_fiscal
-#: selection:l10n_br_fiscal.document,document_section:0
-msgid "NFS-e e Recibos"
-msgstr ""
 
 #. module: l10n_br_fiscal
 #: model_terms:ir.ui.view,arch_db:l10n_br_fiscal.fiscal_closing_form
@@ -8765,11 +8753,6 @@ msgstr ""
 msgid "Today"
 msgstr ""
 
-#. module: l10n_br_fiscal
-#: selection:l10n_br_fiscal.document,document_section:0
-msgid "Todos"
-msgstr ""
-
 #. module: l10n_br_fiscal
 #: selection:l10n_br_fiscal.closing,export_type:0
 msgid "Tudo"
diff --git a/l10n_br_fiscal/i18n/pt_BR.po b/l10n_br_fiscal/i18n/pt_BR.po
index 09a7542989a9..a6da27079265 100644
--- a/l10n_br_fiscal/i18n/pt_BR.po
+++ b/l10n_br_fiscal/i18n/pt_BR.po
@@ -25,11 +25,11 @@ msgstr " Documentos NFe"
 #: model:mail.template,subject:l10n_br_fiscal.fiscal_document_change_state_template
 #: model:mail.template,subject:l10n_br_fiscal.fiscal_document_change_state_template_nfse
 msgid ""
-"${object.document_type_id.name}: ${object.number} Serie: ${object."
+"${object.document_type_id.name}: ${object.document_number} Serie: ${object."
 "document_serie} is: ${dict(object.fields_get('state').get('state')."
 "get('selection')).get(object.state, '')}"
 msgstr ""
-"${object.document_type_id.name}: ${object.number} Série: ${object."
+"${object.document_type_id.name}: ${object.document_number} Série: ${object."
 "document_serie} é: ${dict(object.fields_get('state').get('state')."
 "get('selection')).get(object.state, '')}"
 
@@ -291,14 +291,14 @@ msgid ""
 "                                <td valign=\"top\" style=\"font-family:Arial,"
 "Helvetica,sans-serif; color: #555; font-size: 14px;\">\n"
 "                                  <p>Hello ${object.partner_id.name},</p>\n"
-"                                  <p>The Fiscal Document ${object.number} "
+"                                  <p>The Fiscal Document ${object.document_number} "
 "has changed.</p>\n"
 "                                </td>\n"
 "                              </tr>\n"
 "                              <tr>\n"
 "                                <td style=\"font-family:Arial,Helvetica,sans-"
 "serif; color: #555; font-size: 14px;\" valign=\"top\">\n"
-"                                  Document Number: ${object.number}\n"
+"                                  Document Number: ${object.document_number}\n"
 "                                </td>\n"
 "                              </tr>\n"
 "                              <tr>\n"
@@ -310,7 +310,7 @@ msgid ""
 "                              <tr>\n"
 "                                <td style=\"font-family:Arial,Helvetica,sans-"
 "serif; color: #555; font-size: 14px;\" valign=\"top\">\n"
-"                                  Document Key: ${object.key}\n"
+"                                  Document Key: ${object.document_key}\n"
 "                                </td>\n"
 "                              </tr>\n"
 "                              <tr>\n"
@@ -387,14 +387,14 @@ msgstr ""
 "                                <td valign=\"top\" style=\"font-family:Arial,"
 "Helvetica,sans-serif; color: #555; font-size: 14px;\">\n"
 "                                  <p>Olá ${object.partner_id.name},</p>\n"
-"                                  <p>O Documento Fiscal ${object.number} foi "
+"                                  <p>O Documento Fiscal ${object.document_number} foi "
 "alterado.</p>\n"
 "                                </td>\n"
 "                              </tr>\n"
 "                              <tr>\n"
 "                                <td style=\"font-family:Arial,Helvetica,sans-"
 "serif; color: #555; font-size: 14px;\" valign=\"top\">\n"
-"                                  Número do Documento: ${object.number}\n"
+"                                  Número do Documento: ${object.document_number}\n"
 "                                </td>\n"
 "                              </tr>\n"
 "                              <tr>\n"
@@ -407,7 +407,7 @@ msgstr ""
 "                              <tr>\n"
 "                                <td style=\"font-family:Arial,Helvetica,sans-"
 "serif; color: #555; font-size: 14px;\" valign=\"top\">\n"
-"                                  Chave do Documento: ${object.key}\n"
+"                                  Chave do Documento: ${object.document_key}\n"
 "                                </td>\n"
 "                              </tr>\n"
 "                              <tr>\n"
@@ -1806,7 +1806,6 @@ msgstr "CSTs"
 
 #. module: l10n_br_fiscal
 #: model:ir.model.fields,field_description:l10n_br_fiscal.field_res_config_settings__module_l10n_br_cte
-#: selection:l10n_br_fiscal.document,document_section:0
 msgid "CT-e"
 msgstr "CT-e"
 
@@ -3057,11 +3056,6 @@ msgstr "Número do Documento"
 msgid "Document Related"
 msgstr "Documentos Relacionados"
 
-#. module: l10n_br_fiscal
-#: model:ir.model.fields,field_description:l10n_br_fiscal.field_l10n_br_fiscal_document__document_section
-msgid "Document Section"
-msgstr "Seção de documentos"
-
 #. module: l10n_br_fiscal
 #: model:ir.model.fields,field_description:l10n_br_fiscal.field_l10n_br_fiscal_document__document_serie_id
 #: model:ir.model.fields,field_description:l10n_br_fiscal.field_l10n_br_fiscal_operation_document_type__document_serie_id
@@ -3698,7 +3692,7 @@ msgstr "Linha de Documentos Fiscais"
 
 #. module: l10n_br_fiscal
 #: model:ir.model,name:l10n_br_fiscal.model_l10n_br_fiscal_document_related
-#: model:ir.model.fields,field_description:l10n_br_fiscal.field_l10n_br_fiscal_document__fiscal_document_related_ids
+#: model:ir.model.fields,field_description:l10n_br_fiscal.field_l10n_br_fiscal_document__document_related_ids
 #: model:ir.model.fields,field_description:l10n_br_fiscal.field_l10n_br_fiscal_document_related__document_related_id
 #: model_terms:ir.ui.view,arch_db:l10n_br_fiscal.document_related_form
 #: model_terms:ir.ui.view,arch_db:l10n_br_fiscal.document_related_tree
@@ -5670,7 +5664,7 @@ msgid "Inutilização"
 msgstr "Inutilização"
 
 #. module: l10n_br_fiscal
-#: model:ir.actions.act_window,name:l10n_br_fiscal.wizard_document_invalidate_action
+#: model:ir.actions.act_window,name:l10n_br_fiscal.invalidate_number_wizard_action
 #: model_terms:ir.ui.view,arch_db:l10n_br_fiscal.wizard_document_invalidate_form
 msgid "Inutilização de documento fiscal"
 msgstr "Inutilização de documento fiscal"
@@ -6437,7 +6431,6 @@ msgstr "NCMs"
 
 #. module: l10n_br_fiscal
 #: selection:l10n_br_fiscal.certificate,type:0
-#: selection:l10n_br_fiscal.document,document_section:0
 msgid "NF-e"
 msgstr "NF-e"
 
@@ -6451,11 +6444,6 @@ msgstr "NF-e/CT-e"
 msgid "NF-e/NFC-e"
 msgstr "NF-e/NFC-e"
 
-#. module: l10n_br_fiscal
-#: selection:l10n_br_fiscal.document,document_section:0
-msgid "NFC-e e CF-e"
-msgstr "NFC-e e CF-e"
-
 #. module: l10n_br_fiscal
 #: selection:l10n_br_fiscal.document,ind_pres:0
 #: selection:l10n_br_fiscal.document.mixin,ind_pres:0
@@ -6477,11 +6465,6 @@ msgstr "Documentos NFCe"
 msgid "NFS-e"
 msgstr "NFS-e"
 
-#. module: l10n_br_fiscal
-#: selection:l10n_br_fiscal.document,document_section:0
-msgid "NFS-e e Recibos"
-msgstr "NFS-e e Recibos"
-
 #. module: l10n_br_fiscal
 #: model_terms:ir.ui.view,arch_db:l10n_br_fiscal.fiscal_closing_form
 msgid "NFSe"
@@ -9211,17 +9194,6 @@ msgstr "Situações"
 msgid "Today"
 msgstr "Hoje"
 
-#. module: l10n_br_fiscal
-#: selection:l10n_br_fiscal.document,document_section:0
-msgid "Todos"
-msgstr "Todos"
-
-#. module: l10n_br_fiscal
-#: model:ir.model.fields,field_description:l10n_br_fiscal.field_l10n_br_fiscal_payment__amount_change
-#: model_terms:ir.ui.view,arch_db:l10n_br_fiscal.document_form
-msgid "Troco"
-msgstr ""
-
 #. module: l10n_br_fiscal
 #: selection:l10n_br_fiscal.closing,export_type:0
 msgid "Tudo"
diff --git a/l10n_br_fiscal/migrations/12.0.12.0.0/pre-migration.py b/l10n_br_fiscal/migrations/12.0.12.0.0/pre-migration.py
new file mode 100644
index 000000000000..ee307f3a1148
--- /dev/null
+++ b/l10n_br_fiscal/migrations/12.0.12.0.0/pre-migration.py
@@ -0,0 +1,51 @@
+# Copyright (C) 2021 - TODAY Luis Felipe Mileo - KMEE
+# License AGPL-3.0 or later (
+# http://www.gnu.org/licenses/agpl.html).
+
+from openupgradelib import openupgrade
+
+_model_renames = [
+    ("l10n_br_fiscal.document.invalidate.number", "l10n_br_fiscal.invalidate.number"),
+    ("l10n_br_fiscal.document.event", "l10n_br_fiscal.event"),
+]
+
+_table_renames = [
+    ("l10n_br_fiscal_document_invalidate_number", "l10n_br_fiscal_invalidate_number"),
+    ("l10n_br_fiscal_document_event", "l10n_br_fiscal_event"),
+]
+
+_field_renames = [
+    ('l10n_br_fiscal.document.related',
+     'l10n_br_fiscal_document_related', 'fiscal_document_id', 'document_id'),
+    ('l10n_br_fiscal.document.related',
+     'l10n_br_fiscal_document_related', 'key', 'document_key'),
+    ('l10n_br_fiscal.document.related', 'l10n_br_fiscal_document_related', 'number',
+     'document_number'),
+    ('l10n_br_fiscal.document.related', 'l10n_br_fiscal_document_related', 'serie',
+     'document_serie'),
+    ('l10n_br_fiscal.event', 'l10n_br_fiscal_event', 'fiscal_document_id',
+     'document_id'),
+    ('l10n_br_fiscal.event', 'l10n_br_fiscal_event', 'file_sent', 'file_request_id'),
+    ('l10n_br_fiscal.event', 'l10n_br_fiscal_event', 'file_returned',
+     'file_response_id'),
+    ('l10n_br_fiscal.event', 'l10n_br_fiscal_event', 'status', 'status_code'),
+    ('l10n_br_fiscal.event', 'l10n_br_fiscal_event', 'end_date', 'protocol_date'),
+    ('l10n_br_fiscal.document', 'l10n_br_fiscal_document', 'codigo_situacao',
+     'status_code'),
+    ('l10n_br_fiscal.document', 'l10n_br_fiscal_document', 'motivo_situacao',
+     'status_name'),
+    ('l10n_br_fiscal.document', 'l10n_br_fiscal_document', 'autorizacao_event_id',
+     'authorization_event_id'),
+    ('l10n_br_fiscal.document', 'l10n_br_fiscal_document', 'file_pdf_id',
+     'file_report_id'),
+    ('l10n_br_fiscal.document', 'l10n_br_fiscal_document', 'key', 'document_key'),
+    ('l10n_br_fiscal.document',
+     'l10n_br_fiscal_document', 'number', 'document_number'),
+]
+
+
+@openupgrade.migrate(use_env=True)
+def migrate(env, version):
+    openupgrade.rename_models(env.cr, _model_renames)
+    openupgrade.rename_tables(env.cr, _table_renames)
+    openupgrade.rename_fields(env, _field_renames)
diff --git a/l10n_br_fiscal/migrations/12.0.12.0.1/pre-migration.py b/l10n_br_fiscal/migrations/12.0.12.0.1/pre-migration.py
new file mode 100644
index 000000000000..92b28332a091
--- /dev/null
+++ b/l10n_br_fiscal/migrations/12.0.12.0.1/pre-migration.py
@@ -0,0 +1,18 @@
+# Copyright (C) 2021 - TODAY Luis Felipe Mileo - KMEE
+# License AGPL-3.0 or later (
+# http://www.gnu.org/licenses/agpl.html).
+
+from openupgradelib import openupgrade
+
+
+_field_renames = [
+    ('l10n_br_fiscal.document.related',
+     'l10n_br_fiscal_document_related', 'date', 'document_date'),
+    ('l10n_br_fiscal.document', 'l10n_br_fiscal_document', 'date',
+     'document_date'),
+]
+
+
+@openupgrade.migrate(use_env=True)
+def migrate(env, version):
+    openupgrade.rename_fields(env, _field_renames)
diff --git a/l10n_br_fiscal/models/__init__.py b/l10n_br_fiscal/models/__init__.py
index 9f8babbc2b42..9638eea41022 100644
--- a/l10n_br_fiscal/models/__init__.py
+++ b/l10n_br_fiscal/models/__init__.py
@@ -10,12 +10,9 @@
 from . import document_fiscal_invoice_mixin
 from . import document_fiscal_line_mixin_methods
 from . import document_fiscal_line_mixin
-from . import document_event_abstract
-from . import document_cancel
-from . import document_correction
 from . import document_event
 from . import document_eletronic
-from . import document_invalidate_number
+from . import invalidate_number
 from . import comment
 from . import ibpt
 from . import cfop
diff --git a/l10n_br_fiscal/models/closing.py b/l10n_br_fiscal/models/closing.py
index 8417ec734913..72157c83d2ff 100644
--- a/l10n_br_fiscal/models/closing.py
+++ b/l10n_br_fiscal/models/closing.py
@@ -53,13 +53,6 @@
     SITUACAO_EDOC_INUTILIZADA,
 ]
 
-XMLS_IMPORTANTES = [
-    'file_xml_autorizacao_id',
-    'file_xml_autorizacao_cancelamento_id',
-    'file_xml_autorizacao_inutilizacao_id',
-    'file_pdf_id',
-]
-
 
 class FiscalClosing(models.Model):
     _name = 'l10n_br_fiscal.closing'
@@ -219,11 +212,11 @@ def _create_tempfile_path(self, document):
         fsc_op_type = {'out': 'Saída', 'in': 'Entrada', 'all': 'Todos'}
         document_path = '/'.join([
             misc.punctuation_rm(document.company_cnpj_cpf),
-            document.date.strftime("%m-%Y"),
+            document.document_date.strftime("%m-%Y"),
             PATH_MODELO[document.document_type_id.code],
             fsc_op_type.get(document.fiscal_operation_type),
             (document.document_serie or '').zfill(3) +
-            ('-' + misc.punctuation_rm(str(document.number)).zfill(9)
+            ('-' + misc.punctuation_rm(str(document.document_number)).zfill(9)
                 if self.group_folder else '')
         ])
         return document_path
@@ -246,16 +239,17 @@ def _save_tempfile(self, document_path, anexo, temp_dir):
         with open(filename, 'wb') as file:
             file.write(base64.b64decode(anexo.datas))
 
-    def _document_domain(self, periodic_export):
+    def _document_domain(self):
         domain = [
             ('document_type', 'in', MODELO_FISCAL_EMISSAO_PRODUTO +
                 MODELO_FISCAL_EMISSAO_SERVICO),
             ('state_edoc', 'in', SITUACAO_EDOC),
         ]
 
-        domain += [
-            ('close_id', '=', False)
-        ] if periodic_export else []
+        if self.export_type == 'period':
+            domain += [
+                ('close_id', '=', False)
+            ]
 
         domain += [
             ('company_id', 'in', self.company_id.ids)
@@ -271,24 +265,44 @@ def _document_domain(self, periodic_export):
 
         return domain
 
-    def _prepare_files(self, temp_dir, periodic_export=False):
-        domain = self._document_domain(periodic_export)
+    def _prepare_files(self, temp_dir):
+        domain = self._document_domain()
         documents = self.env['l10n_br_fiscal.document'].search(domain)
-        # documents += self.env['l10n_br_fiscal.document_correction'].search(domain)
-        # documents += self.env['l10n_br_fiscal.document_cancel'].search(domain)
+
+        attachment_ids = self.env['ir.attachment']
+
+        attachment_ids |= documents.mapped('invalidate_event_id').mapped(
+            'file_response_id')
+
+        if attachment_ids:
+            try:
+                path = '/'.join([
+                    misc.punctuation_rm(self.company_id.cnpj_cpf),
+                    'invalidate_numbers'])
+                for attachment in attachment_ids:
+                    self._save_tempfile(path, attachment, temp_dir)
+            except OSError:
+                raise RedirectWarning(
+                    _('Error!'),
+                    _('I/O Error'))
+            except PermissionError:
+                raise RedirectWarning(
+                    _('Error!'),
+                    _('Check write permissions in your system temp folder'))
 
         for document in documents:
-            anexos = [getattr(document, campo) for campo in XMLS_IMPORTANTES
-                      if hasattr(document, campo)
-                      and getattr(document, campo).id is not False]
+            attachment_ids = document.authorization_event_id.mapped('file_response_id')
+            attachment_ids |= document.cancel_event_id.mapped('file_response_id')
+            attachment_ids |= document.correction_event_ids.mapped('file_response_id')
+
+            if self.export_type == 'period':
+                document.close_id = self.id
 
-            document.close_id = self.id
             try:
                 document_path = self._create_tempfile_path(document)
 
-                for anexo in anexos:
-                    self._save_tempfile(document_path, anexo, temp_dir)
-
+                for attachment in attachment_ids:
+                    self._save_tempfile(document_path, attachment, temp_dir)
             except OSError:
                 raise RedirectWarning(
                     _('Error!'),
@@ -310,9 +324,13 @@ def action_export(self):
 
         with zipfile.ZipFile(archive, 'w') as zip_archive:
             for dirname, subdirs, files in os.walk(files_dir):
-                zip_archive.write(dirname)
-                for filename in files:
-                    zip_archive.write(os.path.join(dirname, filename))
+                for subdir in subdirs:
+                    path_subdir = files_dir+'/'+subdir
+                    for cnpj_dirname, cnpj_subdirs, cnpj_files in os.walk(path_subdir):
+                        for filename in cnpj_files:
+                            zip_archive.write(
+                                os.path.join(cnpj_dirname, filename),
+                                arcname=cnpj_dirname.replace(dirname, "")+'/'+filename)
 
         temp_dir.cleanup()
 
diff --git a/l10n_br_fiscal/models/document.py b/l10n_br_fiscal/models/document.py
index 205af0ac66d6..2b437b904866 100644
--- a/l10n_br_fiscal/models/document.py
+++ b/l10n_br_fiscal/models/document.py
@@ -9,8 +9,10 @@
 
 from ..constants.fiscal import (
     DOCUMENT_ISSUER,
+    DOCUMENT_ISSUER_DICT,
     DOCUMENT_ISSUER_COMPANY,
     DOCUMENT_ISSUER_PARTNER,
+    FISCAL_IN_OUT_DICT,
     SITUACAO_EDOC_AUTORIZADA,
 )
 
@@ -49,6 +51,12 @@ class Document(models.Model):
         default=True,
     )
 
+    name = fields.Char(
+        compute="_compute_name",
+        store=True,
+        index=True,
+    )
+
     fiscal_operation_id = fields.Many2one(
         domain="[('state', '=', 'approved'), "
                "'|', ('fiscal_operation_type', '=', fiscal_operation_type),"
@@ -59,19 +67,20 @@ class Document(models.Model):
         related=False,
     )
 
-    is_edoc_printed = fields.Boolean(
-        string='Printed',
-        readonly=True,
+    document_number = fields.Char(
+        string='Document Number',
+        copy=False,
+        index=True,
     )
 
-    number = fields.Char(
-        string='Number',
+    rps_number = fields.Char(
+        string='RPS Number',
         copy=False,
         index=True,
     )
 
-    key = fields.Char(
-        string='key',
+    document_key = fields.Char(
+        string='Key',
         copy=False,
         index=True,
     )
@@ -83,8 +92,8 @@ class Document(models.Model):
         string='Issuer',
     )
 
-    date = fields.Datetime(
-        string='Date',
+    document_date = fields.Datetime(
+        string='Document Date',
         copy=False,
     )
 
@@ -125,9 +134,9 @@ class Document(models.Model):
         string='Serie Number',
     )
 
-    fiscal_document_related_ids = fields.One2many(
+    document_related_ids = fields.One2many(
         comodel_name='l10n_br_fiscal.document.related',
-        inverse_name='fiscal_document_id',
+        inverse_name='document_id',
         string='Fiscal Document Related',
     )
 
@@ -159,21 +168,6 @@ class Document(models.Model):
         copy=True,
     )
 
-    # TODO esse campo deveria ser calculado de
-    # acordo com o fiscal_document_id
-    document_section = fields.Selection(
-        selection=[
-            ('nfe', 'NF-e'),
-            ('nfse_recibos', 'NFS-e e Recibos'),
-            ('nfce_cfe', 'NFC-e e CF-e'),
-            ('cte', 'CT-e'),
-            ('todos', 'Todos'),
-        ],
-        string='Document Section',
-        readonly=True,
-        copy=True,
-    )
-
     edoc_purpose = fields.Selection(
         selection=[
             ('1', 'Normal'),
@@ -185,14 +179,23 @@ class Document(models.Model):
         default='1',
     )
 
-    document_event_ids = fields.One2many(
-        comodel_name='l10n_br_fiscal.document.event',
-        inverse_name='fiscal_document_id',
+    event_ids = fields.One2many(
+        comodel_name='l10n_br_fiscal.event',
+        inverse_name='document_id',
         string='Events',
         copy=False,
         readonly=True,
     )
 
+    correction_event_ids = fields.One2many(
+        comodel_name='l10n_br_fiscal.event',
+        inverse_name='document_id',
+        domain=[('type', '=', '14')],
+        string='Correction Events',
+        copy=False,
+        readonly=True,
+    )
+
     close_id = fields.Many2one(
         comodel_name='l10n_br_fiscal.closing',
         string='Close ID')
@@ -227,10 +230,10 @@ class Document(models.Model):
     )
 
     @api.multi
-    @api.constrains('number')
+    @api.constrains('document_number')
     def _check_number(self):
         for record in self:
-            if not record.number:
+            if not record.document_number:
                 return
             domain = [
                 ('id', '!=', record.id),
@@ -239,28 +242,77 @@ def _check_number(self):
                 ('issuer', '=', record.issuer),
                 ('document_type_id', '=', record.document_type_id.id),
                 ('document_serie', '=', record.document_serie),
-                ('number', '=', record.number)]
+                ('document_number', '=', record.document_number)]
+
+            invalid_number = False
 
             if record.issuer == DOCUMENT_ISSUER_PARTNER:
                 domain.append(('partner_id', '=', record.partner_id.id))
+            else:
+                if record.document_serie_id:
+                    invalid_number = record.document_serie_id._is_invalid_number(
+                        record.document_number)
 
-            if record.env["l10n_br_fiscal.document"].search(domain):
+            documents = record.env["l10n_br_fiscal.document"].search_count(domain)
+
+            if documents or invalid_number:
                 raise ValidationError(_(
                     "There is already a fiscal document with this "
                     "Serie: {0}, Number: {1} !".format(
-                        record.document_serie, record.number)))
+                        record.document_serie, record.document_number)))
+
+    def _compute_document_name(self):
+        name = ''
+        type_serie_number = ''
+
+        if self.document_type:
+            type_serie_number += self.document_type
+        if self.document_serie:
+            type_serie_number += '/' + self.document_serie.zfill(3)
+        if self.document_number or self.rps_number:
+            type_serie_number += '/' + (self.document_number or self.rps_number)
+
+        if self._context.get("fiscal_document_complete_name"):
+            name += DOCUMENT_ISSUER_DICT.get(self.issuer, '')
+            if self.issuer == DOCUMENT_ISSUER_COMPANY and self.fiscal_operation_type:
+                name += '/' + FISCAL_IN_OUT_DICT.get(self.fiscal_operation_type, '')
+            name += '/' + type_serie_number
+            if self.document_date:
+                name += ' - ' + self.document_date.strftime('%d/%m/%Y')
+            if not self.partner_cnpj_cpf:
+                name += ' - ' + _('Unidentified Consumer')
+            elif self.partner_legal_name:
+                name += ' - ' + self.partner_legal_name
+                name += ' - ' + self.partner_cnpj_cpf
+            else:
+                name += ' - ' + self.partner_name
+                name += ' - ' + self.partner_cnpj_cpf
+        elif self._context.get("fiscal_document_no_company"):
+            name += type_serie_number
+        else:
+            name += '{name}/{type_serie_number}'.format(
+                name=self.company_name or '',
+                type_serie_number=type_serie_number,
+            )
+        return name
 
     @api.multi
     def name_get(self):
-        return [(r.id, '{0} - Série: {1} - Número: {2}'.format(
-            r.document_type_id.name,
-            r.document_serie,
-            r.number)) for r in self]
+        res = []
+        for record in self:
+            res.append((record.id, record._compute_document_name()))
+        return res
+
+    @api.depends('issuer', 'fiscal_operation_type', 'document_type', 'document_serie',
+                 'document_number', 'document_date', 'partner_id')
+    def _compute_name(self):
+        for r in self:
+            r.name = r._compute_document_name()
 
     @api.model
     def create(self, values):
-        if not values.get('date'):
-            values['date'] = self._date_server_format()
+        if not values.get('document_date'):
+            values['document_date'] = self._date_server_format()
         return super().create(values)
 
     @api.multi
@@ -274,38 +326,6 @@ def _onchange_company_id(self):
         if self.company_id:
             self.currency_id = self.company_id.currency_id
 
-    @api.multi
-    @api.onchange('document_section')
-    def _onchange_document_section(self):
-        if self.document_section:
-            domain = dict()
-            if self.document_section == 'nfe':
-                domain['document_type_id'] = [('code', '=', '55')]
-                self.document_type_id = \
-                    self.env['l10n_br_fiscal.document.type'].search([
-                        ('code', '=', '55')
-                    ])[0]
-            elif self.document_section == 'nfse_recibos':
-                domain['document_type_id'] = [('code', '=', 'SE')]
-                self.document_type_id = \
-                    self.env['l10n_br_fiscal.document.type'].search([
-                        ('code', '=', 'SE')
-                    ])[0]
-            elif self.document_section == 'nfce_cfe':
-                domain['document_type_id'] = [('code', 'in', ('59', '65'))]
-                self.document_type_id = \
-                    self.env['l10n_br_fiscal.document.type'].search([
-                        ('code', '=', '59')
-                    ])[0]
-            elif self.document_section == 'cte':
-                domain['document_type_id'] = [('code', '=', '57')]
-                self.document_type_id = \
-                    self.env['l10n_br_fiscal.document.type'].search([
-                        ('code', '=', '57')
-                    ])[0]
-
-            return {'domain': domain}
-
     def _create_return(self):
         return_docs = self.env[self._name]
         for record in self:
@@ -364,10 +384,6 @@ def _after_change_state(self, old_state, new_state):
         super()._after_change_state(old_state, new_state)
         self.send_email(new_state)
 
-    def _exec_after_SITUACAO_EDOC_A_ENVIAR(self, old_state, new_state):
-        super()._exec_after_SITUACAO_EDOC_A_ENVIAR(old_state, new_state)
-        self.document_comment()
-
     @api.onchange('fiscal_operation_id')
     def _onchange_fiscal_operation_id(self):
         super()._onchange_fiscal_operation_id()
@@ -401,29 +417,23 @@ 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
 
-    def _exec_after_SITUACAO_EDOC_AUTORIZADA(self, old_state, new_state):
-        super(Document, self)._exec_after_SITUACAO_EDOC_AUTORIZADA(
-            old_state, new_state
-        )
-        self._generates_subsequent_operations()
-
     def _prepare_referenced_subsequent(self):
         vals = {
             'fiscal_document_id': self.id,
             'partner_id': self.partner_id.id,
             'document_type_id': self.document_type,
             'serie': self.document_serie,
-            'number': self.number,
-            'date': self.date,
-            'document_key': self.key,
+            'document_number': self.document_number,
+            'document_date': self.document_date,
+            'document_key': self.document_key,
         }
         reference_id = self.env['l10n_br_fiscal.document.related'].create(vals)
         return reference_id
 
     def _document_reference(self, reference_ids):
         for referenced_item in reference_ids:
-            referenced_item.fiscal_document_related_ids = self.id
-            self.fiscal_document_related_ids |= referenced_item
+            referenced_item.document_related_ids = self.id
+            self.document_related_ids |= referenced_item
 
     @api.depends('document_subsequent_ids.subsequent_document_id')
     def _compute_document_subsequent_generated(self):
diff --git a/l10n_br_fiscal/models/document_cancel.py b/l10n_br_fiscal/models/document_cancel.py
deleted file mode 100644
index 7089b982a7a2..000000000000
--- a/l10n_br_fiscal/models/document_cancel.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (C) 2009 - TODAY Renato Lima - Akretion
-# Copyright (C) 2014  KMEE - www.kmee.com.br
-# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
-
-from odoo import api, fields, models
-
-
-class DocumentCancel(models.Model):
-    _name = "l10n_br_fiscal.document.cancel"
-    _inherit = "l10n_br_fiscal.event.abstract"
-    _description = "Fiscal Document Cancel Record"
-
-    cancel_document_event_ids = fields.One2many(
-        comodel_name="l10n_br_fiscal.document.event",
-        inverse_name="cancel_document_event_id",
-        string=u"Eventos",
-    )
-
-    @api.multi
-    def cancel_document(self, event_id):
-        for record in self:
-            if not record.document_id or not record.justificative:
-                continue
-
-            if not record.document_id._document_cancel(record.justificative):
-                continue
-
-            event_id.write({
-                'state': 'done',
-            })
diff --git a/l10n_br_fiscal/models/document_correction.py b/l10n_br_fiscal/models/document_correction.py
deleted file mode 100644
index 18e9ab541c2b..000000000000
--- a/l10n_br_fiscal/models/document_correction.py
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright (C) 2009 - TODAY Renato Lima - Akretion
-# Copyright (C) 2014  KMEE - www.kmee.com.br
-# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
-
-from odoo import api, fields, models
-
-
-class DocumentCorrection(models.Model):
-    _name = "l10n_br_fiscal.document.correction"
-    _inherit = "l10n_br_fiscal.event.abstract"
-    _description = "Fiscal Document Correction Record"
-
-    sequencia = fields.Char(
-        string=u"Sequência", help=u"Indica a sequência da carta de correcão"
-    )
-
-    cce_document_event_ids = fields.One2many(
-        comodel_name="l10n_br_fiscal.document.event",
-        inverse_name="correction_document_event_id",
-        string=u"Eventos",
-    )
-
-    @api.multi
-    def correction(self, event_id):
-        for record in self:
-            if not record.document_id or not record.justificative:
-                continue
-
-            event_id.write({
-                'state': 'done',
-            })
diff --git a/l10n_br_fiscal/models/document_eletronic.py b/l10n_br_fiscal/models/document_eletronic.py
index 43e69fb49075..73529ad44af9 100644
--- a/l10n_br_fiscal/models/document_eletronic.py
+++ b/l10n_br_fiscal/models/document_eletronic.py
@@ -10,10 +10,6 @@
     PROCESSADOR_NENHUM
 )
 
-import logging
-
-_logger = logging.getLogger(__name__)
-
 
 def filter_processador(record):
     if record.document_electronic and \
@@ -23,106 +19,142 @@ def filter_processador(record):
 
 
 class DocumentEletronic(models.AbstractModel):
-    _name = "l10n_br_fiscal.document.electronic"
-    _description = "Fiscal Eletronic Document"
+    _name = 'l10n_br_fiscal.document.electronic'
+    _description = 'Fiscal Eletronic Document'
+    _inherit = 'l10n_br_fiscal.document.workflow'
 
-    _inherit = "l10n_br_fiscal.document.workflow"
+    status_code = fields.Char(
+        string='Status Code',
+        copy=False,
+    )
 
-    @api.depends('codigo_situacao', 'motivo_situacao')
-    def _compute_codigo_motivo_situacao(self):
-        for record in self:
-            if record.motivo_situacao and record.codigo_situacao:
-                record.codigo_motivo_situacao = '{} - {}'.format(
-                    record.codigo_situacao,
-                    record.motivo_situacao
-                )
+    status_name = fields.Char(
+        string='Status Name',
+        copy=False,
+    )
 
-    codigo_situacao = fields.Char(
-        string='Código situação',
-        copy=False,)
+    status_description = fields.Char(
+        compute='_compute_status_description',
+        string='Status Description',
+        copy=False,
+    )
 
-    motivo_situacao = fields.Char(
-        string='Motivo situação',
-        copy=False,)
+    # Authorization Event Related Fields
+    authorization_event_id = fields.Many2one(
+        comodel_name='l10n_br_fiscal.event',
+        string='Authorization Event',
+        readonly=True,
+        copy=False,
+    )
 
-    codigo_motivo_situacao = fields.Char(
-        compute='_compute_codigo_motivo_situacao',
-        string='Situação',
-        copy=False,)
+    authorization_date = fields.Datetime(
+        string='Authorization Date',
+        readonly=True,
+        related='authorization_event_id.protocol_date',
+    )
 
-    # Eventos de envio
-    data_hora_autorizacao = fields.Datetime(
-        string="Data Hora",
+    authorization_protocol = fields.Char(
+        string='Authorization Protocol',
+        related='authorization_event_id.protocol_number',
         readonly=True,
-        copy=False)
+    )
 
-    protocolo_autorizacao = fields.Char(
-        string="Protocolo",
+    send_file_id = fields.Many2one(
+        comodel_name='ir.attachment',
+        related='authorization_event_id.file_request_id',
+        string='Send Document File XML',
+        ondelete='restrict',
         readonly=True,
-        copy=False)
+    )
 
-    autorizacao_event_id = fields.Many2one(
-        comodel_name="l10n_br_fiscal.document.event",
-        string="Autorização",
+    authorization_file_id = fields.Many2one(
+        comodel_name='ir.attachment',
+        related='authorization_event_id.file_response_id',
+        string='Authorization File XML',
+        ondelete='restrict',
         readonly=True,
-        copy=False)
+    )
 
-    file_xml_id = fields.Many2one(
-        comodel_name="ir.attachment",
-        related="autorizacao_event_id.xml_sent_id",
-        string="XML envio",
-        ondelete="restrict",
+    # Cancel Event Related Fields
+    cancel_event_id = fields.Many2one(
+        comodel_name='l10n_br_fiscal.event',
+        string='Cancel Event',
         copy=False,
-        readonly=True)
+    )
 
-    file_xml_autorizacao_id = fields.Many2one(
-        comodel_name="ir.attachment",
-        related="autorizacao_event_id.xml_returned_id",
-        string="XML de autorização",
-        ondelete="restrict",
-        copy=False,
-        readonly=True)
+    cancel_date = fields.Datetime(
+        string='Cancel Date',
+        readonly=True,
+        related='cancel_event_id.protocol_date',
+    )
 
-    file_pdf_id = fields.Many2one(
-        comodel_name="ir.attachment",
-        string="PDF",
-        ondelete="restrict",
-        copy=False)
+    cancel_protocol_number = fields.Char(
+        string='Cancel Protocol Number',
+        related='cancel_event_id.protocol_number',
+        readonly=True,
+    )
 
-    # Eventos de cancelamento
-    data_hora_cancelamento = fields.Datetime(
-        string="Data Hora Autorização",
-        readonly=True)
+    cancel_file_id = fields.Many2one(
+        comodel_name='ir.attachment',
+        related='cancel_event_id.file_response_id',
+        string='Cancel File XML',
+        ondelete='restrict',
+        readonly=True,
+    )
 
-    protocolo_cancelamento = fields.Char(
-        string="Protocolo Autorização",
-        readonly=True)
+    # Invalidate Event Related Fields
+    invalidate_event_id = fields.Many2one(
+        comodel_name='l10n_br_fiscal.event',
+        string='Invalidate Event',
+        copy=False,
+    )
 
-    cancel_document_event_id = fields.Many2one(
-        comodel_name="l10n_br_fiscal.document.cancel", string="Cancelamento"
+    invalidate_date = fields.Datetime(
+        string='Invalidate Date',
+        readonly=True,
+        related='invalidate_event_id.protocol_date',
     )
 
-    file_xml_cancelamento_id = fields.Many2one(
-        comodel_name="ir.attachment",
-        string="XML de cancelamento",
-        ondelete="restrict",
-        copy=False)
+    invalidate_protocol_number = fields.Char(
+        string='Invalidate Protocol Number',
+        related='invalidate_event_id.protocol_number',
+        readonly=True,
+    )
 
-    file_xml_autorizacao_cancelamento_id = fields.Many2one(
-        comodel_name="ir.attachment",
-        string="XML de autorização de cancelamento",
-        ondelete="restrict",
-        copy=False)
+    invalidate_file_id = fields.Many2one(
+        comodel_name='ir.attachment',
+        related='invalidate_event_id.file_response_id',
+        string='Invalidate File XML',
+        ondelete='restrict',
+        readonly=True,
+    )
 
     document_version = fields.Char(
-        string='Versão',
+        string='Version',
         default='4.00',
         readonly=True)
 
     is_edoc_printed = fields.Boolean(
-        string="Impresso",
+        string="Is Printed?",
         readonly=True)
 
+    file_report_id = fields.Many2one(
+        comodel_name='ir.attachment',
+        string='Document Report',
+        ondelete='restrict',
+        readonly=True,
+        copy=False,
+    )
+
+    @api.depends('status_code', 'status_name')
+    def _compute_status_description(self):
+        for record in self:
+            if record.status_code:
+                record.status_description = '{} - {}'.format(
+                    record.status_code or '',
+                    record.status_name or '',
+                )
+
     def _eletronic_document_send(self):
         """ Implement this method in your transmission module,
         to send the electronic document and use the method _change_state
@@ -140,31 +172,10 @@ def _eletronic_document_send(self):
 
     def _document_send(self):
         no_electronic = self.filtered(lambda d: not d.document_electronic)
-        super(DocumentEletronic, no_electronic)._document_send()
-
+        no_electronic._no_eletronic_document_send()
         electronic = self - no_electronic
         electronic._eletronic_document_send()
 
-    def _gerar_evento(self, arquivo_xml, event_type):
-        event_obj = self.env["l10n_br_fiscal.document.event"]
-
-        vals = {
-            "type": event_type,
-            "company_id": self.company_id.id,
-            "origin": self.document_type_id.code + "/" + self.number,
-            "create_date": fields.Datetime.now(),
-            "fiscal_document_id": self.id,
-        }
-        event_id = event_obj.create(vals)
-        event_id._grava_anexo(arquivo_xml, "xml")
-        return event_id
-
-    def _exec_after_SITUACAO_EDOC_A_ENVIAR(self, old_state, new_state):
-        super(DocumentEletronic, self)._exec_before_SITUACAO_EDOC_A_ENVIAR(
-            old_state, new_state
-        )
-        self._document_export()
-
     def serialize(self):
         edocs = []
         self._serialize(edocs)
@@ -176,19 +187,29 @@ def _serialize(self, edocs):
     def _target_new_tab(self, attachment_id):
         if attachment_id:
             return {
-                'type' : 'ir.actions.act_url',
+                'type': 'ir.actions.act_url',
                 'url': '/web/content/{id}/{nome}'.format(
                     id=attachment_id.id,
                     nome=attachment_id.name),
                 'target': 'new',
-                }
+            }
 
     def view_xml(self):
-        xml_file = self.file_xml_autorizacao_id or self.file_xml_id
+        xml_file = self.authorization_file_id or self.send_file_id
         if not xml_file:
             self._document_export()
-            xml_file = self.file_xml_autorizacao_id or self.file_xml_id
+            xml_file = self.authorization_file_id or self.send_file_id
         return self._target_new_tab(xml_file)
 
+    def make_pdf(self):
+        pass
+
     def view_pdf(self):
-        return self._target_new_tab(self.file_pdf_id)
+        if not self.file_report_id:
+            self.make_pdf()
+        return self._target_new_tab(self.file_report_id)
+
+    def _document_status(self):
+        """ Retorna o status do docuemnto em texto e se necessário,
+        atualiza o status do documento"""
+        return
diff --git a/l10n_br_fiscal/models/document_event.py b/l10n_br_fiscal/models/document_event.py
index ecb2975fd95d..7fcdbf6cc8ae 100644
--- a/l10n_br_fiscal/models/document_event.py
+++ b/l10n_br_fiscal/models/document_event.py
@@ -2,197 +2,250 @@
 # Copyright (C) 2014  KMEE - www.kmee.com.br
 # License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
 
-import os
 import base64
-from erpbrasil.base import misc
+import logging
+import os
 
 from odoo import _, api, fields, models
 from odoo.exceptions import UserError
-from odoo.tools import config
-
-CODIGO_NOME = {"55": "nf-e", "SE": "nfs-e", "65": "nfc-e"}
 
+from ..constants.fiscal import (
+    EVENT_ENVIRONMENT,
+)
+from ..tools.misc import build_edoc_path
+
+_logger = logging.getLogger(__name__)
+
+FILE_SUFIX_EVENT = {
+    '0': 'env',
+    '1': 'con-rec',
+    '2': 'can',
+    '3': 'inu',
+    '4': 'con-edoc',
+    '5': 'con-status',
+    '6': 'con-cad',
+    '7': 'dpec-rec',
+    '8': 'dpec-con',
+    '9': 'rec-eve',
+    '10': 'dow',
+    '11': 'con-dest',
+    '12': 'dist-dfe',
+    '13': 'man',
+    '14': 'cce',
+}
+
+
+class Event(models.Model):
+    _name = 'l10n_br_fiscal.event'
+    _description = 'Fiscal Event'
 
-def caminho_empresa(company_id, document):
-    db_name = company_id._cr.dbname
-    cnpj = misc.punctuation_rm(company_id.cnpj_cpf)
-
-    filestore = config.filestore(db_name)
-    path = "/".join([filestore, "edoc", document, cnpj])
-    if not os.path.exists(path):
-        try:
-            os.makedirs(path)
-        except OSError:
-            raise UserError(
-                _("Erro!"),
-                _(
-                    """Verifique as permissões de escrita
-                    e o caminho da pasta"""
-                ),
-            )
-    return path
+    @api.multi
+    @api.depends('document_id.name',
+                 'invalidate_number_id.name')
+    def _compute_display_name(self):
+        for record in self:
+            if record.document_id:
+                names = [
+                    _('Fiscal Document'),
+                    record.document_id.name,
+                ]
+                record.display_name = " / ".join(filter(None, names))
+            elif record.invalidate_number_id:
+                names = [
+                    _('Invalidate Number'),
+                    record.invalidate_number_id.name,
+                ]
+                record.display_name = " / ".join(filter(None, names))
+            else:
+                record.display_name = ''
 
+    create_date = fields.Datetime(
+        string='Create Date',
+        readonly=True,
+        index=True,
+        default=fields.Datetime.now,
+    )
 
-class DocumentEvent(models.Model):
-    _name = "l10n_br_fiscal.document.event"
-    _description = "Fiscal Document Event"
-    _order = "write_date desc"
+    write_date = fields.Datetime(
+        string='Write Date',
+        readonly=True,
+        index=True,
+    )
 
     type = fields.Selection(
         selection=[
-            ("-1", "Exception"),
-            ("0", "Envio Lote"),
-            ("1", "Consulta Recibo"),
-            ("2", "Cancelamento"),
-            ("3", "Inutilização"),
-            ("4", "Consulta NFE"),
-            ("5", "Consulta Situação"),
-            ("6", "Consulta Cadastro"),
-            ("7", "DPEC Recepção"),
-            ("8", "DPEC Consulta"),
-            ("9", "Recepção Evento"),
-            ("10", "Download"),
-            ("11", "Consulta Destinadas"),
-            ("12", "Distribuição DFe"),
-            ("13", "Manifestação"),
-            ("14", "Carta de Correção"),
+            ('-1', 'Exception'),
+            ('0', 'Envio Lote'),
+            ('1', 'Consulta Recibo'),
+            ('2', 'Cancelamento'),
+            ('3', 'Inutilização'),
+            ('4', 'Consulta NFE'),
+            ('5', 'Consulta Situação'),
+            ('6', 'Consulta Cadastro'),
+            ('7', 'DPEC Recepção'),
+            ('8', 'DPEC Consulta'),
+            ('9', 'Recepção Evento'),
+            ('10', 'Download'),
+            ('11', 'Consulta Destinadas'),
+            ('12', 'Distribuição DFe'),
+            ('13', 'Manifestação'),
+            ('14', 'Carta de Correção'),
         ],
-        string="Service")
-
-    response = fields.Char(
-        string="Description",
-        size=64,
-        readonly=True)
-
-    company_id = fields.Many2one(
-        comodel_name="res.company",
-        string="Company",
-        readonly=True,
-        states={"draft": [("readonly", False)]})
+        string='Service',
+    )
 
     origin = fields.Char(
-        string="Source Document",
+        string='Source Document',
         size=64,
         readonly=True,
-        states={"draft": [("readonly", False)]},
-        help="Referência ao documento que gerou o evento.")
-
-    file_sent = fields.Char(
-        string="Dispatch File",
-        readonly=True)
+        help='Document reference that generated this event.',
+    )
 
-    file_returned = fields.Char(
-        string="Return file",
-        readonly=True)
+    document_id = fields.Many2one(
+        comodel_name='l10n_br_fiscal.document',
+        string='Fiscal Document',
+        index=True,
+    )
 
-    status = fields.Char(
-        string="Status Code",
-        readonly=True)
+    document_type_id = fields.Many2one(
+        comodel_name='l10n_br_fiscal.document.type',
+        string='Fiscal Document Type',
+        index=True,
+        required=True,
+    )
 
-    message = fields.Char(
-        string="Mensagem",
-        readonly=True)
+    document_serie_id = fields.Many2one(
+        comodel_name='l10n_br_fiscal.document.serie',
+        required=True,
+    )
 
-    create_date = fields.Datetime(
-        string="Create Date",
-        readonly=True)
+    document_number = fields.Char(
+        required=True,
+    )
 
-    write_date = fields.Datetime(
-        string="Write Date",
-        readonly=True)
+    partner_id = fields.Many2one(
+        comodel_name='res.partner',
+        string='Partner',
+        index=True,
+    )
 
-    end_date = fields.Datetime(
-        string="Completion Date",
-        readonly=True)
+    invalidate_number_id = fields.Many2one(
+        comodel_name='l10n_br_fiscal.invalidate.number',
+        string='Invalidate Number',
+        index=True,
+    )
 
-    state = fields.Selection(
-        selection=[
-            ("draft", "Rascunho"),
-            ("send", "Enviado"),
-            ("wait", "Aguardando Retorno"),
-            ("done", "Recebido Retorno")],
-        string="Status",
+    company_id = fields.Many2one(
+        comodel_name='res.company',
+        string='Company',
         index=True,
-        readonly=True,
-        default="draft")
+        required=True,
+    )
 
-    fiscal_document_id = fields.Many2one(
-        comodel_name="l10n_br_fiscal.document",
-        string="Fiscal Document",
+    sequence = fields.Char(
+        string='Sequence',
+        help='Fiscal Document Event Sequence',
     )
 
-    cancel_document_event_id = fields.Many2one(
-        comodel_name="l10n_br_fiscal.document.cancel",
-        string="Cancelamento"
+    justification = fields.Char(
+        string='Justification',
+        size=255,
     )
 
-    correction_document_event_id = fields.Many2one(
-        comodel_name="l10n_br_fiscal.document.correction",
-        string="Carta de correção"
+    display_name = fields.Char(
+        string='name',
+        compute='_compute_display_name',
+        store=True,
     )
 
-    invalid_number_document_event_id = fields.Many2one(
-        comodel_name="l10n_br_fiscal.document.invalidate.number",
-        string=u"Inutilização"
+    file_request_id = fields.Many2one(
+        comodel_name='ir.attachment',
+        string='XML',
+        copy=False,
+        readony=True,
     )
 
-    document_invalidate_number_id = fields.Many2one(
-        comodel_name="l10n_br_fiscal.document.invalidate.number",
-        string="Invalidate Document"
+    file_response_id = fields.Many2one(
+        comodel_name='ir.attachment',
+        string='XML Response',
+        copy=False,
+        readony=True,
     )
 
-    display_name = fields.Char(
-        string="Nome",
-        compute="_compute_display_name")
+    file_path = fields.Char(
+        string='File Path',
+        readonly=True,
+    )
 
-    xml_sent_id = fields.Many2one(
-        comodel_name="ir.attachment",
-        string="XML", copy=False,
-        readony=True)
+    status_code = fields.Char(
+        string='Status Code',
+        readonly=True,
+    )
 
-    xml_returned_id = fields.Many2one(
-        comodel_name="ir.attachment",
-        string="XML de autorização",
-        copy=False,
-        readony=True)
+    response = fields.Char(
+        string='Response Message',
+        readonly=True,
+    )
 
-    @api.multi
-    @api.depends("company_id.name", "origin")
-    def _compute_display_name(self):
-        for r in self:
-            names = ["Evento", r.company_id.name, r.origin]
-            r.display_name = " / ".join(filter(None, names))
+    message = fields.Char(
+        string='Message',
+        readonly=True,
+    )
 
-    @staticmethod
-    def monta_caminho(ambiente, company_id, chave):
-        caminho = caminho_empresa(company_id, chave[:2])
+    protocol_date = fields.Datetime(
+        string='Protocol Date',
+        readonly=True,
+        index=True,
+    )
 
-        if ambiente == 1:
-            caminho = os.path.join(caminho, "producao/")
-        else:
-            caminho = os.path.join(caminho, "homologacao/")
+    protocol_number = fields.Char(
+        string='Protocol Number',
+    )
 
-        data = "20" + chave[2:4] + "-" + chave[4:6]
-        serie = chave[22:25]
-        numero = chave[25:34]
+    state = fields.Selection(
+        selection=[
+            ('draft', _('Draft')),
+            ('send', _('Sending')),
+            ('wait', _('Waiting Response')),
+            ('done', _('Response received')),
+        ],
+        string='Status',
+        readonly=True,
+        index=True,
+        default='draft',
+    )
 
-        caminho = os.path.join(caminho, data + "/")
-        caminho = os.path.join(caminho, serie + "-" + numero + "/")
+    environment = fields.Selection(
+        selection=EVENT_ENVIRONMENT,
+    )
 
-        try:
-            os.makedirs(caminho)
-        except:
-            pass
-        return caminho
-
-    def _grava_arquivo_disco(self, arquivo, file_name):
-        save_dir = self.monta_caminho(
-            ambiente=False,
+    @api.multi
+    @api.constrains('justification')
+    def _check_justification(self):
+        if len(self.justification) < 15:
+            raise UserError(_('Justification must be at least 15 characters.'))
+        return True
+
+    def _save_event_2disk(self, arquivo, file_name):
+        tipo_documento = self.document_type_id.prefix
+        serie = self.document_serie_id.code
+        numero = self.document_number
+
+        if self.document_id:
+            ano = self.document_id.document_date.strftime("%Y")
+            mes = self.document_id.document_date.strftime("%m")
+        elif self.invalidate_number_id:
+            ano = self.invalidate_number_id.date.strftime("%Y")
+            mes = self.invalidate_number_id.date.strftime("%m")
+
+        save_dir = build_edoc_path(
+            ambiente=self.environment,
             company_id=self.company_id,
-            chave=(
-                self.fiscal_document_id.key
-                or self.fiscal_document_id.number
-            ),  # FIXME:
+            tipo_documento=tipo_documento,
+            ano=ano,
+            mes=mes,
+            serie=serie,
+            numero=numero,
         )
         file_path = os.path.join(save_dir, file_name)
         try:
@@ -211,57 +264,112 @@ def _grava_arquivo_disco(self, arquivo, file_name):
         else:
             f.write(arquivo)
             f.close()
-        return file_path
-
-    def _grava_anexo(
-        self, arquivo, extensao_sem_ponto, autorizacao=False, sequencia=False
-    ):
-        self.ensure_one()
+        return save_dir
 
-        file_name = ""
-        file_name += (
-            self.fiscal_document_id.key or self.fiscal_document_id.number
-        )  # FIXME:
-        file_name += "-"
-        if autorizacao:
-            file_name += "proc-"
-        if sequencia:
-            file_name += str(sequencia) + "-"
-        file_name += CODIGO_NOME[
-            self.fiscal_document_id.document_type_id.code]
-        file_name += "." + extensao_sem_ponto
-
-        file_path = self._grava_arquivo_disco(arquivo, file_name)
-
-        ir_attachment_id = self.env["ir.attachment"].search(
-            [
-                ("res_model", "=", self._name),
-                ("res_id", "=", self.id),
-                ("name", "=", file_name),
-            ]
-        )
-        ir_attachment_id.unlink()
-
-        attachment_id = ir_attachment_id.create(
-            {
-                "name": file_name,
-                "datas_fname": file_name,
-                "res_model": self._name,
-                "res_id": self.id,
-                "datas": base64.b64encode(arquivo.encode("utf-8")),
-                "mimetype": "application/" + extensao_sem_ponto,
-                "type": "binary",
-            }
-        )
+    def _compute_file_name(self):
+        if (self.document_id and self.document_id.document_key and
+                self.document_id.document_electronic):
+            file_name = self.document_id.document_key
+        else:
+            file_name = self.document_number
+        return file_name
 
-        if autorizacao:
-            vals = {"file_returned": file_path, "xml_returned_id": attachment_id.id}
+    def _save_event_file(self, file, file_extension, authorization=False,
+                         rejected=False):
+        self.ensure_one()
+        file_name = self._compute_file_name()
+
+        if authorization:
+            file_name += "-proc"
+        if rejected:
+            file_name += '-rej'
+
+        if self.type:
+            file_name += '-' + FILE_SUFIX_EVENT[self.type]
+
+        if self.sequence:
+            file_name += '-' + str(self.sequence)
+        if file_extension:
+            file_name += ('.' + file_extension)
+
+        if self.company_id.document_save_disk:
+            file_path = self._save_event_2disk(file, file_name)
+            self.file_path = file_path
+
+        attachment_id = self.env["ir.attachment"].create({
+            "name": file_name,
+            "datas_fname": file_name,
+            "res_model": self._name,
+            "res_id": self.id,
+            "datas": base64.b64encode(file.encode("utf-8")),
+            "mimetype": "application/" + file_extension,
+            "type": "binary",
+        })
+
+        if authorization:
+            # Nâo deletamos um aquivo de autorização já
+            # Existente por segurança
+            self.file_response_id = False
+            self.file_response_id = attachment_id
         else:
-            vals = {"file_sent": file_path, "xml_sent_id": attachment_id.id}
-        self.write(vals)
+            self.file_request_id.unlink()
+            self.file_request_id = attachment_id
         return attachment_id
 
     @api.multi
-    def set_done(self, arquivo_xml):
-        self._grava_anexo(arquivo_xml, "xml", autorizacao=True)
-        self.write({"state": "done", "end_date": fields.Datetime.now()})
+    def set_done(self, status_code, response, protocol_date,
+                 protocol_number, file_response_xml):
+        self._save_event_file(file_response_xml, 'xml', authorization=True)
+        self.write({
+            'state': 'done',
+            'status_code': status_code,
+            'response': response,
+            'protocol_date': protocol_date,
+            'protocol_number': protocol_number,
+        })
+
+    def create_event_save_xml(
+        self, company_id, environment, event_type, xml_file, document_id=False,
+        invalidate_number_id=False, sequence=False, justification=False
+    ):
+        vals = {
+            "company_id": company_id.id,
+            "environment": environment,
+            "type": event_type,
+        }
+        if sequence:
+            vals['sequence'] = sequence
+        if document_id:
+            #
+            #  Aplicado para envio, cancelamento, carta de correcao
+            # e outras operações em que o documento esta presente.
+            #
+            vals['document_id'] = document_id.id
+            vals['document_type_id'] = document_id.document_type_id.id
+            vals['document_serie_id'] = document_id.document_serie_id.id
+
+            if document_id.rps_number:
+                vals['document_number'] = document_id.rps_number
+                if document_id.document_number:
+                    vals['document_number'] += '-' + document_id.document_number
+            else:
+                vals['document_number'] = document_id.document_number
+
+        if invalidate_number_id:
+            #
+            #  Aplicado para inutilização
+            #
+            vals['invalidate_number_id'] = invalidate_number_id.id
+            vals['document_type_id'] = invalidate_number_id.document_type_id.id
+            vals['document_serie_id'] = invalidate_number_id.document_serie_id.id
+            if invalidate_number_id.number_end != invalidate_number_id.number_start:
+                vals['document_number'] = \
+                    str(invalidate_number_id.number_start) + \
+                    '-' + str(invalidate_number_id.number_end)
+            else:
+                vals['document_number'] = invalidate_number_id.number_start
+        if justification:
+            vals['justification'] = justification
+        event_id = self.create(vals)
+        event_id._save_event_file(xml_file, "xml")
+        return event_id
diff --git a/l10n_br_fiscal/models/document_event_abstract.py b/l10n_br_fiscal/models/document_event_abstract.py
deleted file mode 100644
index 5a3ad5c5668a..000000000000
--- a/l10n_br_fiscal/models/document_event_abstract.py
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright (C) 2020  KMEE - www.kmee.com.br
-# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
-
-from odoo import api, fields, models, _
-from odoo.exceptions import UserError
-
-
-class EventAbstract(models.AbstractModel):
-    _name = "l10n_br_fiscal.event.abstract"
-    _description = "Evento Abstrato"
-
-    document_id = fields.Many2one(
-        comodel_name="l10n_br_fiscal.document",
-        string="Documento",
-        index=True,
-    )
-
-    partner_id = fields.Many2one(
-        comodel_name="res.partner",
-        related="document_id.partner_id",
-        string="Partner",
-        index=True,
-    )
-
-    company_id = fields.Many2one(
-        comodel_name="res.company",
-        related="document_id.company_id",
-        string="Company",
-        index=True,
-    )
-
-    justificative = fields.Char(
-        string="Justificativa", size=255, required=True
-    )
-
-    display_name = fields.Char(string=u"Nome", compute="_compute_display_name")
-
-    @api.multi
-    @api.depends("document_id.number", "document_id.partner_id.name")
-    def _compute_display_name(self):
-        self.ensure_one()
-        names = ["Fatura", self.document_id.number, self.document_id.partner_id.name]
-        self.display_name = " / ".join(filter(None, names))
-
-    @api.multi
-    @api.constrains('justificative')
-    def _check_justificative(self):
-        if len(self.justificative) < 15:
-            raise UserError(
-                _('Justificativa deve ter tamanho minimo de 15 caracteres.'))
-        return True
diff --git a/l10n_br_fiscal/models/document_fiscal_invoice_mixin.py b/l10n_br_fiscal/models/document_fiscal_invoice_mixin.py
index 739128e7bb76..38929349fab9 100644
--- a/l10n_br_fiscal/models/document_fiscal_invoice_mixin.py
+++ b/l10n_br_fiscal/models/document_fiscal_invoice_mixin.py
@@ -24,7 +24,7 @@ class FiscalDocumentInvoiceMixin(models.AbstractModel):
     )
 
     partner_name = fields.Char(
-        string='Name',
+        string='Partner Name',
         related='partner_id.name',
     )
 
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 50ed0a60544d..1e114242c3ea 100644
--- a/l10n_br_fiscal/models/document_fiscal_line_mixin_methods.py
+++ b/l10n_br_fiscal/models/document_fiscal_line_mixin_methods.py
@@ -348,7 +348,7 @@ def _get_product_price(self):
         self.price_unit = price.get(
             self.fiscal_operation_id.default_price_unit, 0.00)
 
-    def _document_comment_vals(self):
+    def __document_comment_vals(self):
         return {
             'user': self.env.user,
             'ctx': self._context,
@@ -356,11 +356,11 @@ def _document_comment_vals(self):
             'item': self,
         }
 
-    def document_comment(self):
+    def _document_comment(self):
         for d in self.filtered('comment_ids'):
             d.additional_data = d.additional_data or ''
             d.additional_data += d.comment_ids.compute_message(
-                d._document_comment_vals())
+                d.__document_comment_vals())
 
     @api.onchange('fiscal_operation_id')
     def _onchange_fiscal_operation_id(self):
diff --git a/l10n_br_fiscal/models/document_fiscal_mixin_methods.py b/l10n_br_fiscal/models/document_fiscal_mixin_methods.py
index e53513b67698..7a3679eafb97 100644
--- a/l10n_br_fiscal/models/document_fiscal_mixin_methods.py
+++ b/l10n_br_fiscal/models/document_fiscal_mixin_methods.py
@@ -58,21 +58,21 @@ def _compute_amount(self):
 
             doc.update(values)
 
-    def _document_comment_vals(self):
+    def __document_comment_vals(self):
         return {
             'user': self.env.user,
             'ctx': self._context,
             'doc': self,
         }
 
-    def document_comment(self):
+    def _document_comment(self):
         for d in self:
             # Fiscal Comments
             fsc_comments = []
             fsc_comments.append(d.fiscal_additional_data or '')
             fsc_comments.append(d.comment_ids.filtered(
                 lambda c: c.comment_type == COMMENT_TYPE_FISCAL
-                ).compute_message(d._document_comment_vals()) or '')
+                ).compute_message(d.__document_comment_vals()) or '')
             d.fiscal_additional_data = ', '.join(
                 [c for c in fsc_comments if c])
 
@@ -81,10 +81,10 @@ def document_comment(self):
             com_comments.append(d.customer_additional_data or '')
             com_comments.append(d.comment_ids.filtered(
                 lambda c: c.comment_type == COMMENT_TYPE_COMMERCIAL
-                ).compute_message(d._document_comment_vals()) or '')
+                ).compute_message(d.__document_comment_vals()) or '')
             d.customer_additional_data = ', '.join(
                 [c for c in com_comments if c])
-            d.line_ids.document_comment()
+            d.line_ids._document_comment()
 
     @api.onchange('fiscal_operation_id')
     def _onchange_fiscal_operation_id(self):
diff --git a/l10n_br_fiscal/models/document_invalidate_number.py b/l10n_br_fiscal/models/document_invalidate_number.py
deleted file mode 100644
index a488a5187b05..000000000000
--- a/l10n_br_fiscal/models/document_invalidate_number.py
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright (C) 2009 - TODAY Renato Lima - Akretion
-# Copyright (C) 2014  KMEE - www.kmee.com.br
-# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
-
-from odoo import api, fields, models, _
-from odoo.exceptions import UserError, ValidationError
-from ..constants.fiscal import SITUACAO_EDOC_INUTILIZADA
-
-
-class DocumentInvalidateNumber(models.Model):
-    _name = "l10n_br_fiscal.document.invalidate.number"
-    _inherit = "l10n_br_fiscal.event.abstract"
-    _description = "Fiscal Document Invalidate Number Record"
-
-    @api.multi
-    def name_get(self):
-        return [(rec.id,
-                 u"({0}): {1} - {2}".format(
-                     rec.document_serie_id.name,
-                     rec.number_start, rec.number_end)
-                 ) for rec in self]
-
-    company_id = fields.Many2one(
-        readonly=True, related=False,
-        states={'draft': [('readonly', False)]}, required=True,
-        default=lambda self: self.env['res.company']._company_default_get(
-            'l10n_br_fiscal.document.invalidate.number'))
-
-    document_serie_id = fields.Many2one(
-        'l10n_br_fiscal.document.serie', 'Série',
-        domain="[('company_id', '=', company_id)]", readonly=True,
-        states={'draft': [('readonly', False)]}, required=True)
-
-    number_start = fields.Integer(
-        u'Número Inicial', readonly=True,
-        states={'draft': [('readonly', False)]}, required=True)
-
-    number_end = fields.Integer(
-        u'Número Final', readonly=True,
-        states={'draft': [('readonly', False)]}, required=True)
-
-    state = fields.Selection(
-        [('draft', 'Rascunho'), ('cancel', 'Cancelado'),
-         ('done', u'Concluído')], 'Status', required=True, default='draft')
-
-    invalid_number_document_event_ids = fields.One2many(
-        'l10n_br_fiscal.document.event', 'invalid_number_document_event_id',
-        u'Eventos', states={'done': [('readonly', True)]})
-
-    _sql_constraints = [
-        ('number_uniq',
-         'unique(document_serie_id, number_start, number_end, state)',
-         u'Sequência existente!'),
-    ]
-
-    @api.multi
-    @api.constrains('number_start', 'number_end')
-    def _check_range(self):
-        for record in self:
-            if record.company_id:
-                domain = [
-                    ('id', '!=', record.id),
-                    ('state', '=', 'done'),
-                    ('document_serie_id', '=', record.document_serie_id.id),
-                    '|',
-                    ('number_end', '>=', record.number_end),
-                    ('number_end', '=', False),
-                    '|',
-                    ('number_start', '<=', record.number_start),
-                    ('number_start', '=', False)]
-
-                if self.search_count(domain):
-                    raise ValidationError(_(
-                        "Não é permitido faixas sobrepostas!"))
-        return True
-
-    def action_draft_done(self):
-        self.write({'state': 'done'})
-        return True
-
-    @api.multi
-    def unlink(self):
-        unlink_ids = []
-        for invalid_number in self:
-            if invalid_number['state'] in ('draft'):
-                unlink_ids.append(invalid_number['id'])
-            else:
-                raise UserError(_(
-                    u'Você não pode excluir uma sequência concluída.'))
-        return super(DocumentInvalidateNumber, self).unlink()
-
-    @api.multi
-    def action_invalidate(self):
-        for record in self:
-            event_id = self.env['l10n_br_fiscal.document.event'].create({
-                'type': '3',
-                'response': 'Inutilização do número %s ao número %s' % (
-                    record.number_start, record.number_end),
-                'company_id': record.company_id.id,
-                'origin': 'Inutilização de faixa',
-                'create_date': fields.Datetime.now(),
-                'write_date': fields.Datetime.now(),
-                'end_date': fields.Datetime.now(),
-                'state': 'draft',
-                'invalid_number_document_event_id': record.id,
-            })
-
-            record.invalidate(event_id)
-
-    @api.multi
-    def invalidate(self, event_id):
-        for record in self:
-            event_id.state = 'done'
-            record.state = 'done'
-            if record.document_id:
-                record.document_id.state_edoc = SITUACAO_EDOC_INUTILIZADA
-            else:
-                for number in range(record.number_start,
-                                    record.number_end + 1):
-                    record.env['l10n_br_fiscal.document'].create({
-                        'document_serie_id': record.document_serie_id.id,
-                        'document_type_id':
-                            record.document_serie_id.document_type_id.id,
-                        'company_id': record.company_id.id,
-                        'state_edoc': SITUACAO_EDOC_INUTILIZADA,
-                        'issuer': 'company',
-                        'number': str(number),
-                    })
diff --git a/l10n_br_fiscal/models/document_related.py b/l10n_br_fiscal/models/document_related.py
index d5ed42ea19d2..6750e73b0dd8 100644
--- a/l10n_br_fiscal/models/document_related.py
+++ b/l10n_br_fiscal/models/document_related.py
@@ -11,7 +11,7 @@ class DocumentRelated(models.Model):
     _name = 'l10n_br_fiscal.document.related'
     _description = 'Fiscal Document Related'
 
-    fiscal_document_id = fields.Many2one(
+    document_id = fields.Many2one(
         comodel_name='l10n_br_fiscal.document',
         string='Fiscal Document',
         index=True)
@@ -32,11 +32,11 @@ class DocumentRelated(models.Model):
         string='Document Key',
         size=44)
 
-    serie = fields.Char(
+    document_serie = fields.Char(
         string='Serie',
         size=12)
 
-    number = fields.Char(
+    document_number = fields.Char(
         string='Number',
         size=32)
 
@@ -60,7 +60,7 @@ class DocumentRelated(models.Model):
         string='Inscr. Estadual/RG',
         size=16)
 
-    date = fields.Date(
+    document_date = fields.Date(
         string='Data')
 
     @api.multi
@@ -115,19 +115,19 @@ def _onchange_document_related_id(self):
         self.document_type_id = related.document_type_id
 
         if related.document_type_id.electronic:
-            self.document_key = related.key
-            self.serie = False
-            self.number = False
+            self.document_key = related.document_key
+            self.document_serie = False
+            self.document_number = False
             self.state_id = False
             self.cnpj_cpf = False
             self.cpfcnpj_type = False
-            self.date = False
+            self.document_date = False
             self.inscr_est = False
 
         if related.document_type_id.code in ('01', '04'):
             self.access_key = False
-            self.serie = related.document_serie
-            self.number = related.number
+            self.document_serie = related.document_serie
+            self.document_number = related.document_number
             self.state_id = related.partner_id and \
                 related.partner_id.state_id and \
                 related.partner_id.state_id.id or False
@@ -140,7 +140,7 @@ def _onchange_document_related_id(self):
             else:
                 self.cpfcnpj_type = 'cpf'
 
-            self.date = related.date
+            self.document_date = related.document_date
 
         if related.document_type_id.code == '04':
             self.inscr_est = related.partner_id and \
diff --git a/l10n_br_fiscal/models/document_serie.py b/l10n_br_fiscal/models/document_serie.py
index ae345f203186..10420fd96cf5 100644
--- a/l10n_br_fiscal/models/document_serie.py
+++ b/l10n_br_fiscal/models/document_serie.py
@@ -46,7 +46,14 @@ class DocumentSerie(models.Model):
         string='Sequence')
 
     sequence_number_next = fields.Integer(
-        related='internal_sequence_id.number_next')
+        related='internal_sequence_id.number_next',
+    )
+
+    invalidate_number_id = fields.One2many(
+        comodel_name='l10n_br_fiscal.invalidate.number',
+        inverse_name='document_serie_id',
+        string='Invalidate Number Range',
+    )
 
     @api.model
     def _create_sequence(self, values):
@@ -75,26 +82,26 @@ def name_get(self):
         return [(r.id, '{}'.format(r.name)) for r in self]
 
     @api.multi
-    def _is_invalid_number(self, number):
+    def _is_invalid_number(self, document_number):
         self.ensure_one()
         is_invalid_number = True
         # TODO Improve this implementation!
         invalids = self.env[
-            'l10n_br_fiscal.document.invalidate.number'].search([
+            'l10n_br_fiscal.invalidate.number'].search([
                 ('state', '=', 'done'),
                 ('document_serie_id', '=', self.id)])
         invalid_numbers = []
         for invalid in invalids:
             invalid_numbers += range(
                 invalid.number_start, invalid.number_end + 1)
-        if int(number) not in invalid_numbers:
+        if int(document_number) not in invalid_numbers:
             is_invalid_number = False
         return is_invalid_number
 
     @api.multi
     def next_seq_number(self):
         self.ensure_one()
-        number = self.internal_sequence_id._next()
-        if self._is_invalid_number(number):
-            self.next_seq_number()
-        return number
+        document_number = self.internal_sequence_id._next()
+        if self._is_invalid_number(document_number):
+            document_number = self.next_seq_number()
+        return document_number
diff --git a/l10n_br_fiscal/models/document_workflow.py b/l10n_br_fiscal/models/document_workflow.py
index 8aacf04ba633..cc303c1bab35 100644
--- a/l10n_br_fiscal/models/document_workflow.py
+++ b/l10n_br_fiscal/models/document_workflow.py
@@ -7,9 +7,16 @@
 
 from odoo import _, api, fields, models
 from ..constants.fiscal import (
+    DOCUMENT_ISSUER_COMPANY,
+    MODELO_FISCAL_CTE,
+    MODELO_FISCAL_NFCE,
+    MODELO_FISCAL_NFE,
+    MODELO_FISCAL_NFSE,
+    PROCESSADOR,
+    PROCESSADOR_NENHUM,
     SITUACAO_EDOC,
-    SITUACAO_EDOC_A_ENVIAR,
     SITUACAO_EDOC_AUTORIZADA,
+    SITUACAO_EDOC_A_ENVIAR,
     SITUACAO_EDOC_CANCELADA,
     SITUACAO_EDOC_DENEGADA,
     SITUACAO_EDOC_EM_DIGITACAO,
@@ -19,12 +26,6 @@
     SITUACAO_FISCAL_SPED_CONSIDERA_CANCELADO,
     WORKFLOW_DOCUMENTO_NAO_ELETRONICO,
     WORKFLOW_EDOC,
-    PROCESSADOR_NENHUM,
-    PROCESSADOR,
-    DOCUMENT_ISSUER_COMPANY,
-    MODELO_FISCAL_NFE,
-    MODELO_FISCAL_NFCE,
-    MODELO_FISCAL_CTE,
 )
 
 _logger = logging.getLogger(__name__)
@@ -45,6 +46,7 @@ class DocumentWorkflow(models.AbstractModel):
         default=SITUACAO_EDOC_EM_DIGITACAO,
         copy=False,
         required=True,
+        readonly=True,
         track_visibility='onchange',
         index=True,
     )
@@ -96,9 +98,11 @@ def _exec_before_SITUACAO_EDOC_EM_DIGITACAO(self, old_state, new_state):
         return True
 
     def _exec_before_SITUACAO_EDOC_A_ENVIAR(self, old_state, new_state):
-        self.document_date()
-        self.document_number()
-        self.document_check()
+        self._document_date()
+        self._document_number()
+        self._document_comment()
+        self._document_check()
+        self._document_export()
         return True
 
     def _exec_before_SITUACAO_EDOC_ENVIADA(self, old_state, new_state):
@@ -213,6 +217,8 @@ def _after_change_state(self, old_state, new_state):
         elif new_state == SITUACAO_EDOC_INUTILIZADA:
             self._exec_after_SITUACAO_EDOC_INUTILIZADA(old_state, new_state)
 
+        self._generates_subsequent_operations()
+
     @api.multi
     def _change_state(self, new_state):
         """ Método para alterar o estado do documento fiscal, mantendo a
@@ -248,11 +254,11 @@ def _change_state(self, new_state):
 
         return status
 
-    def document_date(self):
-        if not self.date:
-            self.date = self._date_server_format()
+    def _document_date(self):
+        if not self.document_date:
+            self.document_date = self._date_server_format()
 
-    def document_check(self):
+    def _document_check(self):
         return True
 
     def _generate_key(self):
@@ -262,7 +268,7 @@ def _generate_key(self):
                     MODELO_FISCAL_NFCE,
                     MODELO_FISCAL_CTE):
                 chave_edoc = ChaveEdoc(
-                    ano_mes=record.date.strftime("%y%m").zfill(4),
+                    ano_mes=record.document_date.strftime("%y%m").zfill(4),
                     cnpj_emitente=record.company_cnpj_cpf,
                     codigo_uf=(
                         record.company_state_id and
@@ -270,27 +276,33 @@ def _generate_key(self):
                     ),
                     forma_emissao=1,  # TODO: Implementar campo no Odoo
                     modelo_documento=record.document_type_id.code or "",
-                    numero_documento=record.number or "",
+                    numero_documento=record.document_number or "",
                     numero_serie=record.document_serie or "",
                     validar=True,
                 )
                 # TODO: Implementar campos no Odoo
                 # record.key_number = chave_edoc.campos
                 # record.key_formated = ' '.joint(chave_edoc.partes())
-                record.key = chave_edoc.chave
+                record.document_key = chave_edoc.chave
 
-    def document_number(self):
+    def _document_number(self):
         if self.issuer == DOCUMENT_ISSUER_COMPANY:
-            if not self.number and self.document_serie_id:
-                self.number = self.document_serie_id.next_seq_number()
+            if self.document_serie_id:
                 self.document_serie = self.document_serie_id.code
 
+                if self.document_type == MODELO_FISCAL_NFSE and not self.rps_number:
+                    self.rps_number = self.document_serie_id.next_seq_number()
+
+                if (self.document_type != MODELO_FISCAL_NFSE and
+                        not self.document_number):
+                    self.document_number = self.document_serie_id.next_seq_number()
+
             if not self.operation_name:
                 self.operation_name = ', '.join(
                     [l.name for l in self.line_ids.mapped(
                         'fiscal_operation_id')])
 
-            if self.document_electronic and not self.key:
+            if self.document_electronic and not self.document_key:
                 self._generate_key()
 
     def _document_confirm(self):
@@ -303,7 +315,7 @@ def action_document_confirm(self):
         if to_confirm:
             to_confirm._document_confirm()
 
-    def _document_send(self):
+    def _no_eletronic_document_send(self):
         self._change_state(SITUACAO_EDOC_AUTORIZADA)
 
     def _document_export(self):
@@ -330,17 +342,26 @@ def _document_cancel(self, justificative):
 
     @api.multi
     def action_document_cancel(self):
-        result = self.env["ir.actions.act_window"].for_xml_id(
-            "l10n_br_fiscal", "document_cancel_wizard_action"
-        )
-        return result
+        if self.state_edoc == SITUACAO_EDOC_AUTORIZADA:
+            result = self.env["ir.actions.act_window"].for_xml_id(
+                "l10n_br_fiscal", "document_cancel_wizard_action"
+            )
+            return result
 
     @api.multi
     def action_document_invalidate(self):
-        result = self.env["ir.actions.act_window"].for_xml_id(
-            "l10n_br_fiscal", "wizard_document_invalidate_action"
-        )
-        return result
+        if self.document_number and self.document_serie and self.state_edoc in (
+                SITUACAO_EDOC_EM_DIGITACAO,
+                SITUACAO_EDOC_REJEITADA,
+                SITUACAO_EDOC_A_ENVIAR,
+        ) and self.issuer == DOCUMENT_ISSUER_COMPANY:
+            return self.env["ir.actions.act_window"].for_xml_id(
+                "l10n_br_fiscal", "invalidate_number_wizard_action"
+            )
+        else:
+            raise UserError(_(
+                "You cannot invalidate this document"
+            ))
 
     def _document_correction(self, justificative):
         self.correction_reason = justificative
@@ -349,7 +370,13 @@ def _document_correction(self, justificative):
 
     @api.multi
     def action_document_correction(self):
-        result = self.env["ir.actions.act_window"].for_xml_id(
-            "l10n_br_fiscal", "document_correction_wizard_action"
-        )
-        return result
+        if (self.state_edoc in SITUACAO_EDOC_AUTORIZADA and
+                self.issuer == DOCUMENT_ISSUER_COMPANY):
+            return self.env["ir.actions.act_window"].for_xml_id(
+                "l10n_br_fiscal", "document_correction_wizard_action"
+            )
+        else:
+            raise UserError(_(
+                "You cannot create a fiscal correction document if "
+                "this fical document you are not the document issuer"
+            ))
diff --git a/l10n_br_fiscal/models/invalidate_number.py b/l10n_br_fiscal/models/invalidate_number.py
new file mode 100644
index 000000000000..31cb31a422a3
--- /dev/null
+++ b/l10n_br_fiscal/models/invalidate_number.py
@@ -0,0 +1,199 @@
+# Copyright (C) 2009 - TODAY Renato Lima - Akretion
+# Copyright (C) 2014  KMEE - www.kmee.com.br
+# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
+
+from odoo.exceptions import UserError, ValidationError
+
+from odoo import _, api, fields, models
+from ..constants.fiscal import SITUACAO_EDOC_INUTILIZADA
+
+
+class InvalidateNumber(models.Model):
+    _name = 'l10n_br_fiscal.invalidate.number'
+    _description = 'Invalidate Number'
+
+    name = fields.Char(
+        compute="_compute_name",
+        store=True,
+        index=True,
+    )
+
+    date = fields.Date(
+        string='Date',
+        default=fields.Date.today,
+        readonly=True,
+    )
+
+    company_id = fields.Many2one(
+        comodel_name='res.company',
+        readonly=True,
+        default=lambda self: self.env.user.company_id.id,
+        required=True,
+        states={'draft': [('readonly', False)]},
+    )
+
+    document_type_id = fields.Many2one(
+        comodel_name='l10n_br_fiscal.document.type',
+        required=True,
+        readonly=True,
+        states={'draft': [('readonly', False)]},
+    )
+
+    document_electronic = fields.Boolean(
+        related='document_type_id.electronic',
+        string='Electronic?',
+        readonly=True)
+
+    document_serie_id = fields.Many2one(
+        comodel_name='l10n_br_fiscal.document.serie',
+        domain="""[('active', '=', True),
+            ('document_type_id', '=', document_type_id),
+            ('company_id', '=', company_id)]""",
+        required=True,
+        readonly=True,
+        states={'draft': [('readonly', False)]},
+    )
+
+    number_start = fields.Integer(
+        string='Initial Number',
+        required=True,
+        readonly=True,
+        states={'draft': [('readonly', False)]},
+    )
+
+    number_end = fields.Integer(
+        string='End Number',
+        required=True,
+        readonly=True,
+        states={'draft': [('readonly', False)]},
+    )
+
+    justification = fields.Char(
+        string='Justification',
+        size=255,
+        required=True,
+        readonly=True,
+        states={'draft': [('readonly', False)]},
+    )
+
+    state = fields.Selection(
+        selection=[
+            ('draft', _('Draft')),
+            ('done', _('Done')),
+        ],
+        string='Status',
+        readonly=True,
+        default='draft',
+    )
+
+    event_ids = fields.One2many(
+        comodel_name='l10n_br_fiscal.event',
+        inverse_name='invalidate_number_id',
+        string='Events',
+        readonly=True,
+        states={'done': [('readonly', True)]},
+    )
+
+    # Authorization Event Related Fields
+    authorization_event_id = fields.Many2one(
+        comodel_name='l10n_br_fiscal.event',
+        string='Authorization Event',
+        readonly=True,
+        copy=False,
+    )
+
+    authorization_date = fields.Datetime(
+        string='Authorization Date',
+        readonly=True,
+        related='authorization_event_id.protocol_date',
+    )
+
+    authorization_protocol = fields.Char(
+        string='Authorization Protocol',
+        related='authorization_event_id.protocol_number',
+        readonly=True,
+    )
+
+    send_file_id = fields.Many2one(
+        comodel_name='ir.attachment',
+        related='authorization_event_id.file_request_id',
+        string='Send Document File XML',
+        ondelete='restrict',
+        readonly=True,
+    )
+
+    authorization_file_id = fields.Many2one(
+        comodel_name='ir.attachment',
+        related='authorization_event_id.file_response_id',
+        string='Authorization File XML',
+        ondelete='restrict',
+        readonly=True,
+    )
+
+    @api.multi
+    @api.constrains('number_start', 'number_end')
+    def _check_range(self):
+        for record in self:
+            if record.company_id:
+                domain = [
+                    ('id', '!=', record.id),
+                    ('state', '=', 'done'),
+                    ('document_serie_id', '=', record.document_serie_id.id),
+                    '|',
+                    ('number_end', '>=', record.number_end),
+                    ('number_end', '=', False),
+                    '|',
+                    ('number_start', '<=', record.number_start),
+                    ('number_start', '=', False)]
+
+                if self.search_count(domain):
+                    raise ValidationError(
+                        _('Number range overlap is not allowed.'))
+        return True
+
+    @api.depends('document_type_id', 'document_serie_id', 'number_start', 'number_end')
+    def _compute_name(self):
+        for record in self:
+            record.name = '{type}/({serie}): {start} - {end}'.format(
+                type=record.document_type_id.type,
+                serie=record.document_serie_id.name,
+                start=record.number_start,
+                end=record.number_end
+            )
+
+    @api.multi
+    def unlink(self):
+        if self.filtered(lambda n: not n.state == 'draft'):
+            raise UserError(
+                _('You can delete only draft Invalidate Number Range !'))
+        return super().unlink()
+
+    @api.multi
+    def action_invalidate(self):
+        for record in self:
+            record._invalidate()
+
+    def _create_invalidate_document(self, document_number):
+        self.env['l10n_br_fiscal.document'].create({
+            'document_serie_id': self.document_serie_id.id,
+            'document_type_id':
+                self.document_serie_id.document_type_id.id,
+            'company_id': self.company_id.id,
+            'state_edoc': SITUACAO_EDOC_INUTILIZADA,
+            'issuer': 'company',
+            'document_number': str(document_number),
+            'invalidate_event_id': self.authorization_event_id.id,
+        })
+
+    def _update_document_status(self, document_id=None):
+        if document_id:
+            document_id.state_edoc = SITUACAO_EDOC_INUTILIZADA
+            document_id.invalidate_event_id = self.authorization_event_id
+        else:
+            for document_number in range(self.number_start, self.number_end + 1):
+                self._create_invalidate_document(document_number)
+
+    def _invalidate(self, document_id=None):
+        self.ensure_one()
+        self._update_document_status(document_id)
+        self.state = 'done'
diff --git a/l10n_br_fiscal/models/mdfe/mdfe.py b/l10n_br_fiscal/models/mdfe/mdfe.py
index 301729f54034..2bd56f53ddf6 100644
--- a/l10n_br_fiscal/models/mdfe/mdfe.py
+++ b/l10n_br_fiscal/models/mdfe/mdfe.py
@@ -27,14 +27,14 @@ class MDFe(models.Model):
     def name_get(self):
         return [(rec.id,
                  u"NFº: {0} ({1}): {2}".format(
-                     rec.number, rec.cnpj_cpf, rec.company_id.legal_name)
+                     rec.document_number, rec.cnpj_cpf, rec.company_id.legal_name)
                  ) for rec in self]
 
     company_id = fields.Many2one(
         comodel_name="res.company",
         string="Company",
     )
-    key = fields.Char(
+    document_key = fields.Char(
         string="Access Key",
         size=44,
     )
@@ -43,7 +43,7 @@ def name_get(self):
         size=3,
         index=True,
     )
-    number = fields.Float(
+    document_number = fields.Float(
         string="Document Number",
         index=True,
         digits=(18, 0),
diff --git a/l10n_br_fiscal/models/res_company.py b/l10n_br_fiscal/models/res_company.py
index 073efb3765f7..39338f8e2b92 100644
--- a/l10n_br_fiscal/models/res_company.py
+++ b/l10n_br_fiscal/models/res_company.py
@@ -303,6 +303,11 @@ def _compute_simplifed_tax(self):
         inverse_name="company_id",
         string="Email Template Definition")
 
+    document_save_disk = fields.Boolean(
+        string="Save Documents to disk",
+        default=True,
+    )
+
     def _del_tax_definition(self, tax_domain):
         tax_def = self.tax_definition_ids.filtered(
             lambda d: d.tax_group_id.tax_domain != tax_domain
diff --git a/l10n_br_fiscal/security/ir.model.access.csv b/l10n_br_fiscal/security/ir.model.access.csv
index d6eab4aa3a86..f099544e4eb7 100644
--- a/l10n_br_fiscal/security/ir.model.access.csv
+++ b/l10n_br_fiscal/security/ir.model.access.csv
@@ -94,13 +94,9 @@
 "uom_alternative_user","UOM alternative for User","model_uom_uom_alternative","l10n_br_fiscal.group_user",1,0,0,0
 "uom_alternative_manager","UOM alternative for Manager","model_uom_uom_alternative","l10n_br_fiscal.group_manager",1,0,0,0
 "uom_alternative_maintenance","UOM alternative for Maintenance","model_uom_uom_alternative","l10n_br_fiscal.group_data_maintenance",1,1,1,1
-"l10n_br_fiscal_document_event_user","Fiscal Document Event for User","model_l10n_br_fiscal_document_event","l10n_br_fiscal.group_user",1,1,1,0
-"l10n_br_fiscal_document_invalidate_number_user","user_l10n_br_fiscal_document_invalidate_number","model_l10n_br_fiscal_document_invalidate_number","l10n_br_fiscal.group_user",1,0,0,0
-"l10n_br_fiscal_document_invalidate_number_manager","manager_l10n_br_fiscal_document_invalidate_number","model_l10n_br_fiscal_document_invalidate_number","l10n_br_fiscal.group_manager",1,1,1,1
-"l10n_br_fiscal_document_cancel_user","user_l10n_br_fiscal_document_cancel","model_l10n_br_fiscal_document_cancel","l10n_br_fiscal.group_user",1,0,0,0
-"l10n_br_fiscal_document_cancel_manager","manager_l10n_br_fiscal_document_cancel","model_l10n_br_fiscal_document_cancel","l10n_br_fiscal.group_manager",1,1,1,1
-"l10n_br_fiscal_document_correction_user","user_l10n_br_fiscal_document_correction","model_l10n_br_fiscal_document_correction","l10n_br_fiscal.group_user",1,0,0,0
-"l10n_br_fiscal_document_correction_manager","manager_l10n_br_fiscal_document_correction","model_l10n_br_fiscal_document_correction","l10n_br_fiscal.group_manager",1,1,1,1
+"l10n_br_fiscal_event_user","Fiscal Document Event for User","model_l10n_br_fiscal_event","l10n_br_fiscal.group_user",1,1,1,0
+"l10n_br_fiscal_invalidate_number_user","user_l10n_br_fiscal_invalidate_number","model_l10n_br_fiscal_invalidate_number","l10n_br_fiscal.group_user",1,0,0,0
+"l10n_br_fiscal_invalidate_number_manager","manager_l10n_br_fiscal_invalidate_number","model_l10n_br_fiscal_invalidate_number","l10n_br_fiscal.group_manager",1,1,1,1
 "l10n_br_fiscal_closing_user","Fiscal Document Event for User","model_l10n_br_fiscal_closing","l10n_br_fiscal.group_user",1,1,1,0
 "l10n_br_fiscal_closing_manager","Fiscal Document Event for User","model_l10n_br_fiscal_closing","l10n_br_fiscal.group_manager",1,1,1,1
 "l10n_br_fiscal_city_taxation_code_user","Fiscal City Taxation Code for User","model_l10n_br_fiscal_city_taxation_code","l10n_br_fiscal.group_user",1,1,1,0
diff --git a/l10n_br_fiscal/tests/test_fiscal_closing.py b/l10n_br_fiscal/tests/test_fiscal_closing.py
index bbc52c642d55..28928a9994e6 100644
--- a/l10n_br_fiscal/tests/test_fiscal_closing.py
+++ b/l10n_br_fiscal/tests/test_fiscal_closing.py
@@ -2,11 +2,16 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 import base64
+import os
 import tempfile
 import zipfile
-import os
 
 from odoo.tests.common import TransactionCase
+from odoo import fields
+from odoo.addons.l10n_br_fiscal.constants.fiscal import (
+    SITUACAO_EDOC_AUTORIZADA,
+    EVENT_ENV_PROD,
+)
 
 
 class TestFiscalClosing(TransactionCase):
@@ -17,26 +22,39 @@ def setUp(self):
         self.nfe_export = self.env.ref(
             'l10n_br_fiscal.demo_nfe_export'
         )
-
+        self.nfe_export.document_date = fields.Datetime.now()
+        self.nfe_export.date_in_out = fields.Datetime.now()
         self.closing_all = self.env['l10n_br_fiscal.closing'].create({
             'export_type': 'all',
         })
 
         self.closing_period = self.env['l10n_br_fiscal.closing'].create({
             'export_type': 'period',
-            'year': str(self.nfe_export.date.year),
-            'month': str(self.nfe_export.date.month),
+            'year': str(self.nfe_export.document_date.year),
+            'month': str(self.nfe_export.document_date.month),
         })
 
     def test_event_to_fiscal_close(self):
         """ Test Fiscal Close Export """
 
         xml_file = '<?xml version="1.0" encoding="utf-8"?><nfeProc xmlns="http://www.portalfiscal.inf.br/nfe" versao="4.00"><NFe xmlns="http://www.portalfiscal.inf.br/nfe"><infNFe versao="4.00" Id="NFe26180812984794000154550010000016871192213339"><ide><cUF>26</cUF><cNF>19221333</cNF><natOp>Venda</natOp><mod>55</mod><serie>1</serie><nNF>1687</nNF><dhEmi>2018-08-16T16:28:18-03:00</dhEmi><dhSaiEnt>2018-08-16T16:28:18-03:00</dhSaiEnt><tpNF>1</tpNF><idDest>2</idDest><cMunFG>2611606</cMunFG><tpImp>1</tpImp><tpEmis>1</tpEmis><cDV>9</cDV><tpAmb>1</tpAmb><finNFe>1</finNFe><indFinal>0</indFinal><indPres>0</indPres><procEmi>0</procEmi><verProc>Odoo Brasil v8</verProc></ide><emit><CNPJ>75335849000115</CNPJ><xNome>Teste Produtos Médicos Ltda - ME</xNome><xFant>Teste Produtos Médicos Ltda - ME</xFant><enderEmit><xLgr>Avenida Manoel</xLgr><nro>1</nro><xBairro>Boa Vista</xBairro><cMun>2611606</cMun><xMun>Recife</xMun><UF>PE</UF><CEP>50070123</CEP><cPais>1058</cPais><xPais>Brasil</xPais><fone>0123456789</fone></enderEmit><IE>306412330</IE><CRT>3</CRT></emit><dest><CNPJ>37148260000119</CNPJ><xNome>MEDICOS, HOSP, IMP. E EXP. LTDA</xNome><enderDest><xLgr>Av. Doutor Pedro</xLgr><nro>1</nro><xCpl>Sala 4</xCpl><xBairro>Ponta da Praia</xBairro><cMun>3548500</cMun><xMun>Santos</xMun><UF>SP</UF><CEP>11025012</CEP><cPais>1058</cPais><xPais>Brasil</xPais><fone>99999999</fone></enderDest><indIEDest>1</indIEDest><IE>803879214167</IE></dest><det nItem="1"><prod><cProd>880945</cProd><cEAN>SEM GTIN</cEAN><xProd>ESPAÇADOR TEMPORARIO DE ACRILICO PARA QUADRIL COM GENTAMICINA</xProd><NCM>90211010</NCM><CFOP>6102</CFOP><uCom>UN</uCom><qCom>1.0000</qCom><vUnCom>2490.0000000</vUnCom><vProd>2490.00</vProd><cEANTrib>SEM GTIN</cEANTrib><uTrib>UN</uTrib><qTrib>1.0000</qTrib><vUnTrib>2490.0000000</vUnTrib><indTot>1</indTot></prod><imposto><vTotTrib>0.00</vTotTrib><ICMS><ICMS40><orig>1</orig><CST>40</CST></ICMS40></ICMS><IPI><cEnq>999</cEnq><IPINT><CST>51</CST></IPINT></IPI><PIS><PISNT><CST>07</CST></PISNT></PIS><COFINS><COFINSNT><CST>07</CST></COFINSNT></COFINS></imposto></det><det nItem="2"><prod><cProd>880930</cProd><cEAN>SEM GTIN</cEAN><xProd>ESPAÇADOR TEMPORARIO DE ACRILICO PARA QUADRIL COM GENTAMICINA</xProd><NCM>90211010</NCM><CFOP>6102</CFOP><uCom>UN</uCom><qCom>1.0000</qCom><vUnCom>2490.0000000</vUnCom><vProd>2490.00</vProd><cEANTrib>SEM GTIN</cEANTrib><uTrib>UN</uTrib><qTrib>1.0000</qTrib><vUnTrib>2490.0000000</vUnTrib><indTot>1</indTot></prod><imposto><vTotTrib>0.00</vTotTrib><ICMS><ICMS40><orig>1</orig><CST>40</CST></ICMS40></ICMS><IPI><cEnq>999</cEnq><IPINT><CST>51</CST></IPINT></IPI><PIS><PISNT><CST>07</CST></PISNT></PIS><COFINS><COFINSNT><CST>07</CST></COFINSNT></COFINS></imposto></det><det nItem="3"><prod><cProd>880200</cProd><cEAN>SEM GTIN</cEAN><xProd>CIMENTO ACRÍLICO G 40G - APLICAÇÃO MANUAL COM GENTAMICINA</xProd><NCM>30064020</NCM><CFOP>6102</CFOP><uCom>UN</uCom><qCom>4.0000</qCom><vUnCom>200.0000000</vUnCom><vProd>800.00</vProd><cEANTrib>SEM GTIN</cEANTrib><uTrib>UN</uTrib><qTrib>4.0000</qTrib><vUnTrib>200.0000000</vUnTrib><indTot>1</indTot></prod><imposto><vTotTrib>0.00</vTotTrib><ICMS><ICMS40><orig>1</orig><CST>40</CST></ICMS40></ICMS><IPI><cEnq>999</cEnq><IPINT><CST>51</CST></IPINT></IPI><PIS><PISNT><CST>06</CST></PISNT></PIS><COFINS><COFINSNT><CST>06</CST></COFINSNT></COFINS></imposto></det><total><ICMSTot><vBC>0.00</vBC><vICMS>0.00</vICMS><vICMSDeson>0.00</vICMSDeson><vFCP>0.00</vFCP><vBCST>0.00</vBCST><vST>0.00</vST><vFCPST>0.00</vFCPST><vFCPSTRet>0.00</vFCPSTRet><vProd>5780.00</vProd><vFrete>0.00</vFrete><vSeg>0.00</vSeg><vDesc>0.00</vDesc><vII>0.00</vII><vIPI>0.00</vIPI><vIPIDevol>0.00</vIPIDevol><vPIS>0.00</vPIS><vCOFINS>0.00</vCOFINS><vOutro>0.00</vOutro><vNF>5780.00</vNF></ICMSTot></total><transp><modFrete>1</modFrete><transporta><CNPJ>02012862002707</CNPJ><xNome>LATAM LINHAS AEREAS S/A</xNome><IE>024673560</IE><xEnder>PRACA MINISTRO SALGADO FILHO, S/N, IMBIRIBEIRA</xEnder><xMun>Recife</xMun><UF>PE</UF></transporta><vol><qVol>1</qVol><esp>CAIXA DE PAPELÃO</esp><marca>S/ MARCA</marca></vol></transp><cobr><fat><nFat>1687</nFat><vOrig>5780.00</vOrig><vDesc>0.00</vDesc><vLiq>5780.00</vLiq></fat><dup><nDup>001</nDup><dVenc>2018-09-25</dVenc><vDup>2890.00</vDup></dup><dup><nDup>002</nDup><dVenc>2018-11-04</dVenc><vDup>2890.00</vDup></dup></cobr><pag><detPag><tPag>99</tPag><vPag>5780.00</vPag></detPag></pag><infAdic><infCpl>- NCM:9021.10.10 - Alíquotas da COFINS e do PIS Reduzidas a Zero pela Lei pela Lei 10.865/2004 ( Redação da Lei 12.058/2009 ) - Isento de ICMS pelo Convênio 126/2010.NCM:3006.40.20 - Isento de ICMS até 30/09/2019 pelos Convênios 01/99 e 049/2017 - Alíquotas da COFINS e do PIS Reduzidas a Zero pelo Decreto 6426/2008.</infCpl></infAdic></infNFe><Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" /><SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" /><Reference URI="#NFe26180812984794000154550010000016871192213339"><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /><Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" /><DigestValue>x7gyL3XnoxBJdNazenJGuNwqRIQ=</DigestValue></Reference></SignedInfo><SignatureValue>fwCykhp3tX/+E3uomHDLVmZB8qX7X6MBJsPluFn4SgDRXenw5Umxgb9NORDE9j/uhsYE7vwJT+T5mslK88jOCDp0loi5z89jmzK9T+/tdwOTHL5FF0oRWvm4MUP3wxFIClfPHzEYL308uVGC9RH1lVa0RjPUPhSj2ikSWHIJwZx5koIdW2b23iLa3ACSjWHLFUs3C6k0ZVRjz70smR/Dn8WuEZs2b1kW2KYmG81nrK+iIO6IQrETwSX+whX/TuL6Z9c0HwOArteAB5pMLL76MJlwwgyUdO/V7SlM1TErsILSHNUZjkOo+5RsWQfAbdsVi0UFDMgkIFm2uc+TxqcKrA==</SignatureValue><KeyInfo><X509Data><X509Certificate>MIIHejCCBWKgAwIBAgIITKnRnque5/QwDQYJKoZIhvcNAQELBQAwTDELMAkGA1UEBhMCQlIxEzARBgNVBAoMCklDUC1CcmFzaWwxKDAmBgNVBAMMH1NFUkFTQSBDZXJ0aWZpY2Fkb3JhIERpZ2l0YWwgdjUwHhcNMTgwMjE2MTQ1NDAwWhcNMTkwMjE2MTQ1NDAwWjCB8jELMAkGA1UEBhMCQlIxEzARBgNVBAoMCklDUC1CcmFzaWwxFDASBgNVBAsMCyhFTSBCUkFOQ08pMRgwFgYDVQQLDA8wMDAwMDEwMDgyMjE2ODYxFDASBgNVBAsMCyhFTSBCUkFOQ08pMRQwEgYDVQQLDAsoRU0gQlJBTkNPKTEUMBIGA1UECwwLKEVNIEJSQU5DTykxFDASBgNVBAsMCyhFTSBCUkFOQ08pMRQwEgYDVQQLDAsoRU0gQlJBTkNPKTEwMC4GA1UEAwwnU1VCSVRPTiBCUkFTSUwgUFJPRFVUT1MgTUVESUNPUyBMVERBIE1FMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAn5AU9/g869aJ2d3ju2yqDCKE38bI1xJRH2vulmla0Nl9Z7cahJX7YbJ4Fgn2GWFp/RrP0gsPwDJrLScGhwwYRCQ0r68z4s4wwNw6HUUm4ig5vIsX7ZCe/BErhtUoycPAUZPUD5tPw5bQM3qQvLFKbk88u+YOJRnhOlkarzd8UrCkQqphKwH3ggot8A9AHRDJmX1EeXsnqWetvmKM8mhnp02FDlHGBpQ3MZnfs0lYB+kktA0RVTovT94bkbW4bpiQb4/5GoT0LscJICABz+TfXfEa0+aDst10myXqMJP+YGnMFIhEKzSrSA5MQrKiyOC9lx+hNNPyTOehpD33Cop/JQIDAQABo4ICtzCCArMwHwYDVR0jBBgwFoAUVnWvSnOy2AjEfftsKBwR1ffBqMwwgZcGCCsGAQUFBwEBBIGKMIGHMEcGCCsGAQUFBzAChjtodHRwOi8vd3d3LmNlcnRpZmljYWRvZGlnaXRhbC5jb20uYnIvY2FkZWlhcy9zZXJhc2FjZHY1LnA3YjA8BggrBgEFBQcwAYYwaHR0cDovL29jc3AuY2VydGlmaWNhZG9kaWdpdGFsLmNvbS5ici9zZXJhc2FjZHY1MIG1BgNVHREEga0wgaqBFlJPQkVSVEFAU1VCSVRPTi5DT00uQlKgPgYFYEwBAwSgNRMzMDgwMzE5ODkwNzY2MTg1OTQwODAwMDAwMDAwMDAwMDAwMDAwMDA3MzE5NjA0U0RTIFBFoBwGBWBMAQMCoBMTEVJPQkVSVEEgRElBUyBMSU5ToBkGBWBMAQMDoBATDjEyOTg0Nzk0MDAwMTU0oBcGBWBMAQMHoA4TDDAwMDAwMDAwMDAwMDBxBgNVHSAEajBoMGYGBmBMAQIBBjBcMFoGCCsGAQUFBwIBFk5odHRwOi8vcHVibGljYWNhby5jZXJ0aWZpY2Fkb2RpZ2l0YWwuY29tLmJyL3JlcG9zaXRvcmlvL2RwYy9kZWNsYXJhY2FvLXNjZC5wZGYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMEMIGbBgNVHR8EgZMwgZAwSaBHoEWGQ2h0dHA6Ly93d3cuY2VydGlmaWNhZG9kaWdpdGFsLmNvbS5ici9yZXBvc2l0b3Jpby9sY3Ivc2VyYXNhY2R2NS5jcmwwQ6BBoD+GPWh0dHA6Ly9sY3IuY2VydGlmaWNhZG9zLmNvbS5ici9yZXBvc2l0b3Jpby9sY3Ivc2VyYXNhY2R2NS5jcmwwDgYDVR0PAQH/BAQDAgXgMA0GCSqGSIb3DQEBCwUAA4ICAQCPM8ywyofTzKOF1C8dAxljfmePeSliRBNARR9yZJlJTGsUWKHCaqDQJFjS1eoBv4KdV8PvwuS9/wSV83phdzIU/tpykH943TuvizlZynMZABB4ZUyHObcLFkdbaqeyxnTbTioDv2TnjfMGGxaptMWzMopH5xoJ4SddLedXdiA3brus8v8gJTjtcf6ywtk4xQec+wohLXSVUpLw6xC1F4gMBCVX5Zav2k6wi1NfcpeGFSOAIFCSKmw+kv4MRW/vD4YbEiTgay71BSMmyTNKXJl1gRhbm7A4/xLFjfL7kJ8dOki83ms+9teCmnvPcZEpmnxYwv8g31FMC5GxzKUijb0Of2gQU+TB4CHYY5IohsVWBG1T4ZtKpe7//KRT/Mxa1aFOsiSu/h1kVJf3qQwCZZWHdwAf/uLja7nbogZjE+cd75ucyDY+s3kKXSS8VR1KSZP8JH7c2sbxf0hW1YRztfa5SDdicqaxZgldzE0QyHEag5bpaHbzch3BcDLegObn6S6O9xx3NkkAm07aqyfdRWMXbXmSgDgzS2/zuttiA2eh540j4BYGHHYFSzgb/ZEqPVYzvBNGUEw3OA2UQebPYA6TCgtu0kL9MdRfxSuZn+iAM1f9bnGM3VYSO0jLWqpsZ+ai27+LS+FMlGRacuZmdBae5BWSyGD4bKHXy8dVrVIO4g==</X509Certificate></X509Data></KeyInfo></Signature></NFe><protNFe xmlns="http://www.portalfiscal.inf.br/nfe" versao="4.00"><infProt Id="ID26180812984794000154550010000016871192213339"><tpAmb>1</tpAmb><verAplic>NFEPE_P_20.01.01.166</verAplic><chNFe>26180812984794000154550010000016871192213339</chNFe><dhRecbto>2018-08-16T16:45:05-03:00</dhRecbto><nProt>126180042806970</nProt><digVal>x7gyL3XnoxBJdNazenJGuNwqRIQ=</digVal><cStat>100</cStat><xMotivo>Autorizado o uso da NF-e</xMotivo></infProt></protNFe></nfeProc>'  # noqa
-        event_id = self.nfe_export._gerar_evento(arquivo_xml=xml_file, event_type='0')
+        event_id = self.nfe_export.event_ids.create_event_save_xml(
+            company_id=self.nfe_export.company_id,
+            environment=EVENT_ENV_PROD,
+            event_type="0",
+            xml_file=xml_file,
+            document_id=self.nfe_export,
+        )
         self.nfe_export._onchange_company_id()
-        event_id.set_done(xml_file)
-        self.nfe_export.autorizacao_event_id = event_id
-
+        event_id.set_done(
+            status_code='101',
+            response='Teste Autorizado',
+            protocol_date=self.nfe_export.document_date,
+            protocol_number='12345678',
+            file_response_xml=xml_file,
+        )
+        self.nfe_export.authorization_event_id = event_id
+        self.nfe_export.state_edoc = SITUACAO_EDOC_AUTORIZADA
         self.closing_all.action_export()
         self.closing_period.action_export()
 
diff --git a/l10n_br_fiscal/tests/test_subsequent_operation.py b/l10n_br_fiscal/tests/test_subsequent_operation.py
index 3fe83df572f0..72271326d337 100644
--- a/l10n_br_fiscal/tests/test_subsequent_operation.py
+++ b/l10n_br_fiscal/tests/test_subsequent_operation.py
@@ -41,7 +41,6 @@ def test_subsequent_operation_simple_faturamento(self):
             line._onchange_fiscal_taxes()
 
         self.nfe_simples_faturamento.action_document_confirm()
-        self.nfe_simples_faturamento.action_document_send()
 
         subsequent_documents = self.nfe_simples_faturamento.\
             document_subsequent_ids
diff --git a/l10n_br_fiscal/tools/misc.py b/l10n_br_fiscal/tools/misc.py
index 70a58d28214f..80e20b41a681 100644
--- a/l10n_br_fiscal/tools/misc.py
+++ b/l10n_br_fiscal/tools/misc.py
@@ -1,14 +1,23 @@
 # Copyright (C) 2020  Renato Lima - Akretion <renato.lima@akretion.com.br>
+# Copyright (C) 2014  KMEE - www.kmee.com.br
 # License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
 
+import logging
+import os
 from base64 import b64encode
 
 from OpenSSL import crypto
+from erpbrasil.base.misc import punctuation_rm
+from odoo.tools import config
 
 from ..constants.fiscal import (
-    CERTIFICATE_TYPE_NFE
+    CERTIFICATE_TYPE_NFE,
+    EVENT_ENV_PROD,
+    EVENT_ENV_HML,
 )
 
+_logger = logging.getLogger(__name__)
+
 
 def domain_field_codes(field_codes, field_name="code_unmasked",
                        delimiter=",", operator1="=",
@@ -89,3 +98,40 @@ def create_fake_certificate_file(valid, passwd, issuer, country, subject):
     p12.set_certificate(cert)
 
     return b64encode(p12.export(passwd))
+
+
+def path_edoc_company(company_id):
+    db_name = company_id._cr.dbname
+    filestore = config.filestore(db_name)
+    return "/".join([
+        filestore,
+        "edoc",
+        punctuation_rm(company_id.cnpj_cpf)
+    ])
+
+
+def build_edoc_path(
+        company_id, ambiente, tipo_documento, ano, mes, serie=False, numero=False):
+    caminho = path_edoc_company(company_id)
+
+    if ambiente not in (EVENT_ENV_PROD, EVENT_ENV_HML):
+        _logger.error(
+            'Ambiente não informado, salvando na pasta de Homologação!')
+
+    if ambiente == EVENT_ENV_PROD:
+        caminho = os.path.join(caminho, "producao/")
+    else:
+        caminho = os.path.join(caminho, "homologacao/")
+
+    caminho = os.path.join(caminho, tipo_documento)
+    caminho = os.path.join(caminho, str(ano) + "-" + str(mes) + "/")
+
+    if serie and numero:
+        caminho = os.path.join(caminho, str(serie) + "-" + str(numero) + "/")
+    try:
+        os.makedirs(caminho, exist_ok=True)
+    except Exception as e:
+        _logger.error(
+            'Falha de permissão ao acessar diretorio do e-doc {}'.format(e)
+        )
+    return caminho
diff --git a/l10n_br_fiscal/views/closing.xml b/l10n_br_fiscal/views/closing.xml
index 0caf27e7310d..61f29659cc25 100644
--- a/l10n_br_fiscal/views/closing.xml
+++ b/l10n_br_fiscal/views/closing.xml
@@ -30,11 +30,11 @@
                 <sheet>
                 <group>
                     <group string="Period">
-                        <field name="export_type"/>
-                        <field name="month" attrs="{'invisible': [('export_type', '=', 'all')]}"/>
-                        <field name="year" attrs="{'invisible': [('export_type', '=', 'all')]}"/>
-                        <field name="company_id"/>
-                        <field name="group_folder"/>
+                        <field name="export_type" attrs="{'readonly': [('state', '!=', 'draft')]}"/>
+                        <field name="month" attrs="{'invisible': [('export_type', '=', 'all')], 'readonly': [('state', '!=', 'draft')]}"/>
+                        <field name="year" attrs="{'invisible': [('export_type', '=', 'all')], 'readonly': [('state', '!=', 'draft')]}"/>
+                        <field name="company_id" attrs="{'readonly': [('state', '!=', 'draft')]}"/>
+                        <field name="group_folder" attrs="{'readonly': [('state', '!=', 'draft')]}"/>
                     </group>
                     <group states="open">
                         <field name="file_name" invisible="1"/>
diff --git a/l10n_br_fiscal/views/dfe/dfe_views.xml b/l10n_br_fiscal/views/dfe/dfe_views.xml
index 8af67a6d6f95..b07c1991ddb4 100644
--- a/l10n_br_fiscal/views/dfe/dfe_views.xml
+++ b/l10n_br_fiscal/views/dfe/dfe_views.xml
@@ -105,7 +105,7 @@
             <field name="fiscal_operation_id" position="attributes">
                 <attribute name="invisible">True</attribute>
             </field>
-            <field name="number" position="attributes">
+            <field name="document_number" position="attributes">
                 <attribute name="invisible">True</attribute>
             </field>
             <field name='amount_total' position="after">
diff --git a/l10n_br_fiscal/views/document_cancel.xml b/l10n_br_fiscal/views/document_cancel.xml
deleted file mode 100755
index 9a395df3d6a0..000000000000
--- a/l10n_br_fiscal/views/document_cancel.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-  <record id="document_cancel_search" model="ir.ui.view">
-    <field name="name">l10n_br_fiscal.document.cancel.search</field>
-    <field name="model">l10n_br_fiscal.document.cancel</field>
-    <field name="arch" type="xml">
-      <search string="Fiscal Document">
-        <field name="document_id"/>
-        <field name="company_id"/>
-        <field name="partner_id"/>
-      </search>
-    </field>
-  </record>
-
-  <record id="document_cancel_tree" model="ir.ui.view">
-    <field name="name">l10n_br_fiscal.document.cancel.tree</field>
-    <field name="model">l10n_br_fiscal.document.cancel</field>
-    <field name="arch" type="xml">
-      <tree string="Fiscal Document">
-          <field name="company_id"/>
-          <field name="document_id"/>
-          <field name="partner_id"/>
-      </tree>
-    </field>
-  </record>
-
-  <record id="document_cancel_form" model="ir.ui.view">
-    <field name="name">l10n_br_fiscal.document.cancel.form</field>
-    <field name="model">l10n_br_fiscal.document.cancel</field>
-    <field name="arch" type="xml">
-      <form string="Fiscal Document">
-          <group>
-              <field name="company_id"/>
-              <field name="document_id"/>
-              <field name="partner_id"/>
-          </group>
-          <group>
-              <field name="justificative"/>
-          </group>
-          <notebook>
-              <page string="Eventos">
-                  <field name="cancel_document_event_ids"/>
-              </page>
-          </notebook>
-      </form>
-    </field>
-  </record>
-
-</odoo>
diff --git a/l10n_br_fiscal/views/document_correction.xml b/l10n_br_fiscal/views/document_correction.xml
deleted file mode 100755
index 391ad6df771f..000000000000
--- a/l10n_br_fiscal/views/document_correction.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-  <record id="document_correction_search" model="ir.ui.view">
-    <field name="name">l10n_br_fiscal.document.correction.search</field>
-    <field name="model">l10n_br_fiscal.document.correction</field>
-    <field name="arch" type="xml">
-      <search string="Fiscal Document">
-        <field name="document_id"/>
-        <field name="company_id"/>
-        <field name="partner_id"/>
-      </search>
-    </field>
-  </record>
-
-  <record id="document_correction_tree" model="ir.ui.view">
-    <field name="name">l10n_br_fiscal.document.correction.tree</field>
-    <field name="model">l10n_br_fiscal.document.correction</field>
-    <field name="arch" type="xml">
-      <tree string="Fiscal Document">
-          <field name="company_id"/>
-          <field name="document_id"/>
-          <field name="partner_id"/>
-      </tree>
-    </field>
-  </record>
-
-  <record id="document_correction_form" model="ir.ui.view">
-    <field name="name">l10n_br_fiscal.document.correction.form</field>
-    <field name="model">l10n_br_fiscal.document.correction</field>
-    <field name="arch" type="xml">
-      <form string="Fiscal Document">
-          <group>
-              <field name="company_id"/>
-              <field name="document_id"/>
-              <field name="partner_id"/>
-          </group>
-          <group>
-              <field name="justificative"/>
-          </group>
-          <notebook>
-              <page string="Eventos">
-                  <field name="cce_document_event_ids"/>
-              </page>
-          </notebook>
-      </form>
-    </field>
-  </record>
-
-</odoo>
diff --git a/l10n_br_fiscal/views/document_event_view.xml b/l10n_br_fiscal/views/document_event_view.xml
index c29857a908b1..6a68504f39f9 100644
--- a/l10n_br_fiscal/views/document_event_view.xml
+++ b/l10n_br_fiscal/views/document_event_view.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-    <record id="document_event_search" model="ir.ui.view">
-        <field name="name">l10n_br_fiscal.document.event.search</field>
-        <field name="model">l10n_br_fiscal.document.event</field>
+    <record id="event_search" model="ir.ui.view">
+        <field name="name">l10n_br_fiscal.event.search</field>
+        <field name="model">l10n_br_fiscal.event</field>
         <field name="arch" type="xml">
             <search string="Fiscal Document Event">
                 <field name="origin"/>
@@ -11,9 +11,9 @@
         </field>
     </record>
 
-    <record id="document_event_tree" model="ir.ui.view">
-        <field name="name">l10n_br_fiscal.document.event.tree</field>
-        <field name="model">l10n_br_fiscal.document.event</field>
+    <record id="event_tree" model="ir.ui.view">
+        <field name="name">l10n_br_fiscal.event.tree</field>
+        <field name="model">l10n_br_fiscal.event</field>
         <field name="arch" type="xml">
             <tree edit="false" create="false">
                 <field name="type"/>
@@ -21,35 +21,45 @@
                 <field name="response"/>
                 <field name="origin"/>
                 <field name="write_date"/>
-                <field name="end_date"/>
-                <field name="status"/>
+                <field name="protocol_date"/>
+                <field name="status_code"/>
                 <field name="message"/>
                 <field name="state"/>
             </tree>
         </field>
     </record>
 
-    <record id="document_event_form" model="ir.ui.view">
-        <field name="name">l10n_br_fiscal.document.event.form</field>
-        <field name="model">l10n_br_fiscal.document.event</field>
+    <record id="event_form" model="ir.ui.view">
+        <field name="name">l10n_br_fiscal.event.form</field>
+        <field name="model">l10n_br_fiscal.event</field>
         <field name="arch" type="xml">
             <form string="Eventos Eletronicos" edit="false" create="false">
                 <header>
                     <field name="state" widget="statusbar"/>
                 </header>
-                <group>
-                    <field name="type"/>
-                    <field name="company_id"/>
-                    <field name="response"/>
-                    <field name="origin"/>
-                    <field name="write_date"/>
-                    <field name="file_sent"/>
-                    <field name="end_date"/>
-                    <field name="file_returned"/>
-                    <field name="status"/>
-                    <field name="message"/>
-                    <field name="state"/>
-                </group>
+                <sheet>
+                    <group>
+                        <field name="type"/>
+                        <field name="company_id"/>
+                        <field name="document_id"/>
+                        <field name="document_type_id"/>
+                        <field name="invalidate_number_id"/>
+                        <field name="sequence"/>
+                        <field name="justification"/>
+                        <field name="partner_id"/>
+                        <field name="file_request_id"/>
+                        <field name="file_response_id"/>
+                        <field name="protocol_number"/>
+                        <field name="response"/>
+                        <field name="origin"/>
+                        <field name="write_date"/>
+                        <field name="file_path"/>
+                        <field name="protocol_date"/>
+                        <field name="status_code"/>
+                        <field name="message"/>
+                        <field name="state"/>
+                    </group>
+                </sheet>
             </form>
         </field>
     </record>
diff --git a/l10n_br_fiscal/views/document_invalidate_number.xml b/l10n_br_fiscal/views/document_invalidate_number.xml
deleted file mode 100755
index cb36421203f4..000000000000
--- a/l10n_br_fiscal/views/document_invalidate_number.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-  <record id="document_invalidate_number_search" model="ir.ui.view">
-    <field name="name">l10n_br_fiscal.document.invalidate.number.search</field>
-    <field name="model">l10n_br_fiscal.document.invalidate.number</field>
-    <field name="arch" type="xml">
-      <search string="Fiscal Document">
-        <field name="document_id"/>
-        <field name="company_id"/>
-      </search>
-    </field>
-  </record>
-
-  <record id="document_invalidate_number_tree" model="ir.ui.view">
-    <field name="name">l10n_br_fiscal.document.invalidate.number.tree</field>
-    <field name="model">l10n_br_fiscal.document.invalidate.number</field>
-    <field name="arch" type="xml">
-      <tree string="Fiscal Document">
-          <field name="company_id"/>
-          <field name="document_id"/>
-          <field name="number_start"/>
-          <field name="number_end"/>
-          <field name="state"/>
-      </tree>
-    </field>
-  </record>
-
-  <record id="document_invalidate_number_form" model="ir.ui.view">
-    <field name="name">l10n_br_fiscal.document.invalidate.number.form</field>
-    <field name="model">l10n_br_fiscal.document.invalidate.number</field>
-    <field name="arch" type="xml">
-      <form string="Fiscal Document">
-          <header>
-              <field name="state" widget="statusbar"/>
-              <button name="action_invalidate" type="object" string="Confirmar" states="draft" class="oe_highlight"/>
-          </header>
-          <group>
-              <field name="company_id"/>
-              <field name="document_id"/>
-              <field name="document_serie_id"/>
-          </group>
-          <group>
-              <field name="number_start"/>
-              <field name="number_end"/>
-              <field name="justificative"/>
-          </group>
-          <notebook>
-              <page string="Eventos">
-                  <field name="invalid_number_document_event_ids"/>
-              </page>
-          </notebook>
-      </form>
-    </field>
-  </record>
-
-</odoo>
diff --git a/l10n_br_fiscal/views/document_related_view.xml b/l10n_br_fiscal/views/document_related_view.xml
index e57180346961..82c31ac0de8a 100644
--- a/l10n_br_fiscal/views/document_related_view.xml
+++ b/l10n_br_fiscal/views/document_related_view.xml
@@ -8,8 +8,8 @@
       <tree string="Fiscal Document Related">
         <field name="document_type_id"/>
         <field name="document_key"/>
-        <field name="serie"/>
-        <field name="number"/>
+        <field name="document_serie"/>
+        <field name="document_number"/>
       </tree>
     </field>
   </record>
@@ -21,7 +21,7 @@
       <form string="Fiscal Document Related">
         <field name="document_type_code" invisible="1"/>
         <group>
-        <field name="document_related_id"/>
+        <field name="document_related_id" context="{'fiscal_document_complete_name': True}"/>
         </group>
         <group>
             <field name="document_type_id"/>
@@ -30,10 +30,10 @@
             <field name="document_key"/>
         </group>
         <group string="Nota Fiscal/Produtor/Cupom Fiscal" attrs="{'invisible': [('document_type_code', 'not in', ('01', '04'))]}">
-            <field name="serie" attrs="{'required': [('document_type_code', 'in', ('01', '04', '07'))]}"/>
-            <field name="number" attrs="{'required': [('document_type_code', 'in', ('01', '04', '07'))]}"/>
+            <field name="document_serie" attrs="{'required': [('document_type_code', 'in', ('01', '04', '07'))]}"/>
+            <field name="document_number" attrs="{'required': [('document_type_code', 'in', ('01', '04', '07'))]}"/>
             <field name="state_id" attrs="{'required': [('document_type_code', 'in', ('01', '04'))], 'invisible': [('document_type_code', '=', '07')]}"/>
-            <field name="date" attrs="{'required': [('document_type_code', 'in', ('01', '04'))], 'invisible': [('document_type_code', '=', '07')]}"/>
+            <field name="document_date" attrs="{'required': [('document_type_code', 'in', ('01', '04'))], 'invisible': [('document_type_code', '=', '07')]}"/>
             <field name="cpfcnpj_type" attrs="{'required': [('document_type_code', 'in', ('04'))], 'invisible': [('document_type_code', '!=', '04')]}"/>
             <field name="cnpj_cpf" attrs="{'required': [('document_type_code', 'in', ('01', '04'))], 'invisible': [('document_type_code', '=', '07')]}"/>
             <field name="inscr_est" attrs="{'invisible': [('document_type_code', '!=', '04')]}"/>
diff --git a/l10n_br_fiscal/views/document_serie_view.xml b/l10n_br_fiscal/views/document_serie_view.xml
index 7430eb6126c7..d2303bea1fff 100644
--- a/l10n_br_fiscal/views/document_serie_view.xml
+++ b/l10n_br_fiscal/views/document_serie_view.xml
@@ -36,6 +36,9 @@
                         <field name="internal_sequence_id"/>
                         <field name="sequence_number_next"/>
                     </group>
+                    <group name="invalidate_number" string="Invalidate Numbers">
+                        <field name="invalidate_number_id" nolabel="1" context="{'default_document_serie_id': id}"/>
+                    </group>
                 </sheet>
             </form>
         </field>
diff --git a/l10n_br_fiscal/views/document_view.xml b/l10n_br_fiscal/views/document_view.xml
index b19f95bdcc56..7482c3cab720 100644
--- a/l10n_br_fiscal/views/document_view.xml
+++ b/l10n_br_fiscal/views/document_view.xml
@@ -6,7 +6,7 @@
     <field name="model">l10n_br_fiscal.document</field>
     <field name="arch" type="xml">
       <search string="Fiscal Document">
-        <field name="number"/>
+        <field name="document_number"/>
         <field name="partner_id"/>
         <field name="document_type_id"/>
         <group expand='0' string='Group By...'>
@@ -23,15 +23,18 @@
     <field name="model">l10n_br_fiscal.document</field>
     <field name="arch" type="xml">
       <tree>
-        <field name="document_type_id"/>
-        <field name="number"/>
-        <field name="date"/>
+        <field name="company_id" groups="base.group_multi_company"/>
+        <field name="document_type"/>
+        <field name="document_serie"/>
+        <field name="document_number"/>
+        <field name="document_date"/>
         <field name="fiscal_operation_id"/>
         <field name="partner_id"/>
         <field name="amount_untaxed"/>
         <field name="amount_tax"/>
         <field name="amount_total"/>
-        <field name="state"/>
+        <field name="state" invisible="1"/>
+        <field name="state_edoc"/>
         <field name="state_fiscal"/>
       </tree>
     </field>
@@ -43,30 +46,31 @@
     <field name="arch" type="xml">
       <form string="Fiscal Document">
         <field name="id" invisible="1"/>
-        <field name="state_edoc" 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"/>
-        <field name="document_section" invisible="1"/>
+        <field name="document_type" invisible="1"/>
         <header>
-            <button name="action_document_confirm" type="object" string="Confirmar"   groups="l10n_br_fiscal.group_user"    states="em_digitacao"     class="btn-primary"/>
-            <button name="action_document_send"    type="object" string="Enviar"      groups="l10n_br_fiscal.group_user"    states="a_enviar,rejeitada"         class="btn-primary"/>
-            <button name="action_document_back2draft"    type="object" string="Voltar p/ Em Digitação"      groups="l10n_br_fiscal.group_user"    states="a_enviar,rejeitada" class="btn-secondary"/>
-            <button name="view_pdf" type="object" string="Visualizar PDF" groups="l10n_br_fiscal.group_user" states="a_enviar,enviada,autorizada,rejeitada,cancelada" class="btn-primary"/>
-            <button name="view_xml" type="object" string="Visualizar XML" groups="l10n_br_fiscal.group_user" states="a_enviar,enviada,autorizada,rejeitada,cancelada" class="btn-primary"/>
-            <button name="action_document_cancel"  type="object" string="Cancelar"    groups="l10n_br_fiscal.group_user"    states="em_digitacao,a_enviar,enviada,rejeitada,autorizada"/>
-            <button name="action_document_invalidate"  type="object" string="Invalidar"    groups="l10n_br_fiscal.group_user"/>
-            <button name="action_document_correction" type="object" string="Carta de correção" groups="l10n_br_fiscal.group_user" states="autorizada"/>
-            <button name="action_create_return" type="object" string="Devolver" groups="l10n_br_fiscal.group_user" states="autorizada"/>
-            <button name="action_send_email" type="object" string="Send Email" attrs="{'invisible': [('state', 'not in', ('autorizada', 'cancelada', 'denegada'))]}"/>
+            <!-- Please use one state_edoc and attrs to maintain compatibility with invoice -->
+            <button name="action_document_confirm"       type="object"     string="Confirmar"               groups="l10n_br_fiscal.group_user"  class="btn-primary"    attrs="{'invisible': [('state_edoc', '!=', 'em_digitacao')]}" />
+            <button name="action_document_send"          type="object"     string="Enviar"                  groups="l10n_br_fiscal.group_user"  class="btn-primary"    attrs="{'invisible': [('state_edoc', 'not in', ('a_enviar', 'rejeitada'))]}" />
+            <button name="action_document_back2draft"    type="object"     string="Voltar p/ Em Digitação"  groups="l10n_br_fiscal.group_user"  class="btn-secondary"  attrs="{'invisible': ['|', ('state_edoc', 'not in', ('a_enviar', 'rejeitada')), ('document_electronic', '=', False)]}" />
+            <button name="view_pdf"                      type="object"     string="Visualizar PDF"          groups="l10n_br_fiscal.group_user"  class="btn-primary"    attrs="{'invisible': [('state_edoc', '=', 'em_digitacao')]}"  />
+            <button name="view_xml"                      type="object"     string="Visualizar XML"          groups="l10n_br_fiscal.group_user"  class="btn-primary"    attrs="{'invisible': [('state_edoc', '=', 'em_digitacao')]}"  />
+            <button name="action_document_cancel"        type="object"     string="Cancelar"                groups="l10n_br_fiscal.group_user"                         attrs="{'invisible': ['|', ('state_edoc', '!=', 'autorizada'), ('document_electronic', '=', False)]}" />
+            <button name="action_document_invalidate"    type="object"     string="Invalidar Numeração"     groups="l10n_br_fiscal.group_user"                         attrs="{'invisible': [('state_edoc', 'in', ('em_digitacao', 'autorizada', 'cancelada', 'denegada'))]}" />
+            <button name="action_document_correction"    type="object"     string="Carta de correção"       groups="l10n_br_fiscal.group_user"                         attrs="{'invisible': [('state_edoc', '!=', 'autorizada')]}" />
+            <button name="action_create_return"          type="object"     string="Devolver"                groups="l10n_br_fiscal.group_user"                         attrs="{'invisible': [('state_edoc', '!=', 'autorizada')]}" />
+            <button name="action_send_email"             type="object"     string="Send Email"              groups="l10n_br_fiscal.group_user"                         attrs="{'invisible': [('state_edoc', 'not in', ('autorizada', 'cancelada', 'denegada'))]}"/>
 <!--                <button name="action_edoc_check" type="object"-->
 <!--                        string="Consultar no sefaz"-->
 <!--                        groups="base.group_no_one"/>-->
 <!--            -->
-            <field name="state" widget="statusbar" statusbar_visible="em_digitacao,autorizada"/>
+            <field name="state_edoc" widget="statusbar" statusbar_visible="em_digitacao,autorizada"/>
         </header>
         <div class="alert alert-danger" role="alert" attrs="{'invisible': [('state_edoc','not in',('rejeitada', 'denegada'))]}">
-            Fiscal Document: <field name="document_type_id" readonly="1"/> is <strong><field name="state_edoc" readonly="1"/></strong>: <field name="codigo_motivo_situacao" readonly="1"/>
+            Fiscal Document: <field name="document_type_id" readonly="1"/> is <strong><field name="state_edoc" readonly="1"/></strong>: <field name="status_description" readonly="1"/>
         </div>
         <div class="alert alert-success" role="alert" attrs="{'invisible': [('state_edoc','!=','autorizada')]}">
             Fiscal Document: <field name="document_type_id" readonly="1"/> is <strong>Authorized</strong>
@@ -79,7 +83,7 @@
           <div class="oe_title">
             <h1>
                 <field name="document_type_id" readonly="1"/>:
-                <field name="number" readonly="1"/>
+                <field name="document_number" attrs="{'readonly': [('issuer', '=', 'company')], 'required': [('issuer', '=', 'partner')]}"/>
             </h1>
           </div>
           <group name="l10n_br_fiscal" colspan="4">
@@ -91,20 +95,20 @@
           <group>
             <field name="issuer"/>
             <field name="document_type_id" required="1"/>
-            <label for="key" attrs="{'invisible': [('document_electronic', '=', False)]}"/>
+            <label for="document_key" attrs="{'invisible': [('document_electronic', '=', False)]}"/>
             <div class="o_row" attrs="{'readonly': [('issuer', '=', 'company')], 'required': [('issuer', '=', 'partner'), ('document_electronic', '=', True)], 'invisible': [('document_electronic', '=', False)]}">
-              <field name="key" force_save="1" class="oe_inline"/>
+              <field name="document_key" force_save="1" class="oe_inline"/>
               <button name="action_search_key" type="object" class="oe_inline btn-sm btn-link mb4 fa fa-search oe_edit_only" aria-label="Pesquisar Chave" title="Pesquisar Chave"/>
               <button name="action_import_xml" type="object" class="oe_inline btn-sm btn-link mb4 fa fa-upload oe_edit_only" aria-label="Upload" title="Upload"/>
             </div>
           </group>
           <group>
-            <group>
+            <group name="document_header_right">
               <field name="document_serie_id" attrs="{'invisible': [('issuer', '!=', 'company')], 'required': [('issuer', '=', 'company')]}" context="{'default_document_type_id': document_type_id}"/>
               <field name="document_serie" attrs="{'invisible': [('issuer', '!=', 'partner')], 'required': [('issuer', '=', 'partner')]}"/>
             </group>
-            <group>
-              <field name="number" force_save="1" attrs="{'readonly': [('issuer', '=', 'company')], 'required': [('issuer', '=', 'partner')]}"/>
+            <group name="document_header_left">
+              <field name="document_number" force_save="1" attrs="{'readonly': [('issuer', '=', 'company')], 'required': [('issuer', '=', 'partner')]}"/>
               <field name="state_fiscal"/>
             </group>
           </group>
@@ -112,7 +116,7 @@
             <page name="document" string="Document Info">
               <group name="Document">
                 <group>
-                  <field name="date"/>
+                  <field name="document_date"/>
                   <field name="date_in_out"/>
                 </group>
                 <group>
@@ -191,11 +195,11 @@
               </field>
             </page>
             <page name="document_related" string="Document Related">
-              <field name="fiscal_document_related_ids"/>
+              <field name="document_related_ids"/>
               <separator colspan="4" string="Subsequents Documents"/>
               <field name="document_subsequent_ids">
                   <tree editable="bottom">
-                    <field name="subsequent_document_id"/>
+                    <field name="subsequent_document_id" context="{'fiscal_document_complete_name': True}"/>
                     <field name="fiscal_operation_id"/>
                     <field name="operation_performed"/>
                     <field name="subsequent_operation_id"/>
@@ -211,31 +215,45 @@
             <page name="others" string="Others">
                 <group>
                     <field name="operation_name"/>
-                    <field name="codigo_motivo_situacao" attrs="{'invisible': [('document_electronic', '=', '0')]}"/>
+                    <field name="status_description" attrs="{'invisible': [('document_electronic', '=', '0')]}"/>
                 </group>
                 <group>
-                    <group name="autorizacao" string="Autorização" colspan="4">
-                        <field name="data_hora_autorizacao"/>
-                        <field name="protocolo_autorizacao"/>
-                        <field name="file_xml_id"/>
-                        <field name="file_xml_autorizacao_id"/>
-                        <field name="file_pdf_id"/>
+                    <group name="authorization" string="Authorization" colspan="4">
+                        <field name="authorization_event_id"/>
+                        <field name="authorization_date"/>
+                        <field name="authorization_protocol"/>
+                        <field name="send_file_id"/>
+                        <field name="authorization_file_id"/>
+                        <field name="file_report_id"/>
+                    </group>
+                    <group name="cancel" string="Cancelation" colspan="4" attrs="{'invisible': [('state_edoc', '!=', 'cancelada')]}">
+                        <field name="cancel_event_id"/>
+                        <field name="cancel_date"/>
+                        <field name="cancel_protocol_number"/>
+                        <field name="cancel_reason"/>
+                        <field name="cancel_file_id"/>
+                    </group>
+                    <group name="corrections" string="Corrections" colspan="4" attrs="{'invisible': [('correction_event_ids', '=', [])]}">
+                        <field name="correction_event_ids" nolabel="1">
+                            <tree>
+                                <field name="id"/>
+                                <field name="justification"/>
+                                <field name="create_date"/>
+                                <field name="state"/>
+                            </tree>
+                        </field>
                     </group>
-                    <group name="cancelamento" string="Cancelamento" colspan="4" attrs="{'invisible': [('state', '!=', 'cancelada')]}" >
-                        <field name="data_hora_cancelamento"/>
-                        <field name="protocolo_cancelamento"/>
-                        <field name="file_xml_cancelamento_id"/>
-                        <field name="file_xml_autorizacao_cancelamento_id"/>
+                    <group name="events" string="Events" colspan="4">
+                        <field name="event_ids" nolabel="1">
+                            <tree>
+                                <field name="id"/>
+                                <field name="type"/>
+                                <field name="origin"/>
+                                <field name="create_date"/>
+                                <field name="state"/>
+                            </tree>
+                        </field>
                     </group>
-                    <field name="document_event_ids">
-                        <tree>
-                            <field name="id"/>
-                            <field name="type"/>
-                            <field name="origin"/>
-                            <field name="create_date"/>
-                            <field name="state"/>
-                        </tree>
-                    </field>
                 </group>
             </page>
             <page name="amounts" string="Amounts">
diff --git a/l10n_br_fiscal/views/invalidate_number_view.xml b/l10n_br_fiscal/views/invalidate_number_view.xml
new file mode 100755
index 000000000000..0e6e54354c57
--- /dev/null
+++ b/l10n_br_fiscal/views/invalidate_number_view.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+  <record id="invalidate_number_search" model="ir.ui.view">
+    <field name="name">l10n_br_fiscal.invalidate.number.search</field>
+    <field name="model">l10n_br_fiscal.invalidate.number</field>
+    <field name="arch" type="xml">
+      <search string="Invalidate Number">
+        <field name="document_serie_id"/>
+        <field name="company_id"/>
+      </search>
+    </field>
+  </record>
+
+  <record id="invalidate_number_tree" model="ir.ui.view">
+    <field name="name">l10n_br_fiscal.invalidate.number.tree</field>
+    <field name="model">l10n_br_fiscal.invalidate.number</field>
+    <field name="arch" type="xml">
+      <tree string="Invalidate Number">
+          <field name="company_id"/>
+          <field name="document_type_id"/>
+          <field name="document_serie_id"/>
+          <field name="number_start"/>
+          <field name="number_end"/>
+          <field name="state"/>
+      </tree>
+    </field>
+  </record>
+
+  <record id="invalidate_number_form" model="ir.ui.view">
+    <field name="name">l10n_br_fiscal.invalidate.number.form</field>
+    <field name="model">l10n_br_fiscal.invalidate.number</field>
+    <field name="arch" type="xml">
+      <form string="Invalidate Number">
+          <header>
+              <field name="state" widget="statusbar"/>
+              <button name="action_invalidate" type="object" string="Confirmar" states="draft" class="oe_highlight"/>
+          </header>
+          <group>
+              <field name="company_id"/>
+              <field name="document_type_id"/>
+              <field name="document_serie_id"/>
+          </group>
+          <group>
+              <field name="number_start"/>
+              <field name="number_end"/>
+              <field name="justification"/>
+          </group>
+          <notebook>
+              <page string="Events">
+                  <field name="event_ids"/>
+              </page>
+          </notebook>
+      </form>
+    </field>
+  </record>
+
+</odoo>
diff --git a/l10n_br_fiscal/views/l10n_br_fiscal_action.xml b/l10n_br_fiscal/views/l10n_br_fiscal_action.xml
index 6282e2f98bbb..016835620b22 100644
--- a/l10n_br_fiscal/views/l10n_br_fiscal_action.xml
+++ b/l10n_br_fiscal/views/l10n_br_fiscal_action.xml
@@ -594,6 +594,42 @@
         </field>
     </record>
 
+    <!-- NF-e Document -->
+    <record id="nfe_document_action" model="ir.actions.act_window">
+        <field name="name">NF-e</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">l10n_br_fiscal.document</field>
+        <field name="view_mode">tree,form</field>
+        <field name="view_type">form</field>
+        <field name="domain" eval="[('document_type_id', '=', ref('l10n_br_fiscal.document_55'))]"/>
+        <field name="view_id" ref="document_tree"/>
+        <field name="help" type="html">
+            <p class="o_view_nocontent_smiling_face">
+              Add a new NFe
+            </p><p>
+              Here you can create NF-es
+            </p>
+        </field>
+    </record>
+
+    <!-- NFS-e Document -->
+    <record id="nfse_document_action" model="ir.actions.act_window">
+        <field name="name">NFS-e</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">l10n_br_fiscal.document</field>
+        <field name="view_mode">tree,form</field>
+        <field name="view_type">form</field>
+        <field name="domain" eval="[('document_type_id', '=', ref('l10n_br_fiscal.document_SE'))]"/>
+        <field name="view_id" ref="document_tree"/>
+        <field name="help" type="html">
+            <p class="o_view_nocontent_smiling_face">
+              Add a new NFSe
+            </p><p>
+              Here you can create NFS-es
+            </p>
+        </field>
+    </record>
+
     <record id="document_all_action" model="ir.actions.act_window">
         <field name="name">All Documents</field>
         <field name="type">ir.actions.act_window</field>
@@ -655,14 +691,14 @@
     </record>
 
     <!-- Document Event -->
-    <record id="document_event_action" model="ir.actions.act_window">
+    <record id="event_action" model="ir.actions.act_window">
         <field name="name">Fiscal Event</field>
         <field name="type">ir.actions.act_window</field>
-        <field name="res_model">l10n_br_fiscal.document.event</field>
+        <field name="res_model">l10n_br_fiscal.event</field>
         <field name="view_type">form</field>
         <field name="view_mode">kanban,tree,form</field>
-        <field name="search_view_id" ref="document_event_search"/>
-        <field name="view_id" ref="document_event_tree"/>
+        <field name="search_view_id" ref="event_search"/>
+        <field name="view_id" ref="event_tree"/>
         <field name="help" type="html">
           <p class="o_view_nocontent_smiling_face">
             Create a new Document
@@ -674,10 +710,10 @@
     </record>
 
     <!-- Invalidate Number -->
-    <record id="document_invalidate_number_action" model="ir.actions.act_window">
+    <record id="invalidate_number_action" model="ir.actions.act_window">
         <field name="name">Invalidate Number</field>
         <field name="type">ir.actions.act_window</field>
-        <field name="res_model">l10n_br_fiscal.document.invalidate.number</field>
+        <field name="res_model">l10n_br_fiscal.invalidate.number</field>
         <field name="view_mode">tree,form</field>
         <field name="view_type">form</field>
         <field name="help" type="html">
diff --git a/l10n_br_fiscal/views/l10n_br_fiscal_menu.xml b/l10n_br_fiscal/views/l10n_br_fiscal_menu.xml
index 01595115d8cf..a1e5a0d87cce 100644
--- a/l10n_br_fiscal/views/l10n_br_fiscal_menu.xml
+++ b/l10n_br_fiscal/views/l10n_br_fiscal_menu.xml
@@ -5,14 +5,19 @@
     <menuitem id="fiscal_menu" name="Fiscal" groups="l10n_br_fiscal.group_user,l10n_br_fiscal.group_manager" web_icon="l10n_br_fiscal,static/description/icon.png" sequence="30"/>
 
     <!-- Fiscal Overview -->
-    <menuitem id="overview_menu" name="Overview" groups="l10n_br_fiscal.group_user,l10n_br_fiscal.group_manager" parent="fiscal_menu" sequence="0"/>
-
-    <!-- Operation Dashboard -->
-    <menuitem id="operation_dashboard_menu" action="operation_dashboard_action" name="Operation Dashboard" parent="overview_menu" sequence="999"/>
+    <menuitem id="overview_menu" name="Overview" groups="l10n_br_fiscal.group_user,l10n_br_fiscal.group_manager" action="operation_dashboard_action" parent="fiscal_menu" sequence="0"/>
 
     <!-- Fiscal Documents-->
     <menuitem id="document_menu" name="Documents" groups="l10n_br_fiscal.group_user,l10n_br_fiscal.group_manager" parent="fiscal_menu" sequence="10"/>
 
+    <!-- NFe Fiscal Documents-->
+    <menuitem id="document_nfe_menu" action="nfe_document_action" name="NF-e"
+              parent="document_menu" sequence="10"/>
+
+    <!-- NFSe Fiscal Documents-->
+    <menuitem id="document_nfse_menu" action="nfse_document_action" name="NFS-e"
+              parent="document_menu" sequence="11"/>
+
     <!-- Sub Menu for All Documents-->
     <menuitem id="document_sub_menu" name="All Documents" groups="l10n_br_fiscal.group_manager" parent="document_menu" sequence="999"/>
 
@@ -26,10 +31,10 @@
     <menuitem id="document_all_menu" action="document_all_action" name="All Documents" groups="l10n_br_fiscal.group_user,l10n_br_fiscal.group_manager" parent="document_sub_menu" sequence="30"/>
 
     <!-- Invalidate Number -->
-    <menuitem id="document_invalidate_number_menu" action="document_invalidate_number_action" name="Invalidate Number" parent="document_sub_menu" sequence="40"/>
+    <menuitem id="invalidate_number_menu" action="invalidate_number_action" name="Invalidate Number" parent="document_sub_menu" sequence="40"/>
 
     <!-- Fiscal Events -->
-    <menuitem id="event_menu" action="document_event_action" name="Fiscal Event" groups="l10n_br_fiscal.group_user,l10n_br_fiscal.group_manager" parent="document_sub_menu" sequence="50"/>
+    <menuitem id="event_menu" action="event_action" name="Fiscal Event" groups="l10n_br_fiscal.group_user,l10n_br_fiscal.group_manager" parent="document_sub_menu" sequence="50"/>
 
     <!-- Partners -->
     <menuitem id="partners_menu" name="Partners" groups="l10n_br_fiscal.group_user,l10n_br_fiscal.group_manager" parent="fiscal_menu" sequence="20"/>
diff --git a/l10n_br_fiscal/views/mdfe/mdfe_views.xml b/l10n_br_fiscal/views/mdfe/mdfe_views.xml
index a5d72882146e..fd19bb6ae2a0 100644
--- a/l10n_br_fiscal/views/mdfe/mdfe_views.xml
+++ b/l10n_br_fiscal/views/mdfe/mdfe_views.xml
@@ -46,9 +46,9 @@
                 </header>
                 <group>
                     <group>
-                        <field name="key" select="1" required="1"/>
+                        <field name="document_key" select="1" required="1"/>
                         <field name="document_id"/>
-                        <field name="number"/>
+                        <field name="document_number"/>
                         <field name="nsu"/>
                         <field name="ie"/>
                         <field name="company_id" required="1"/>
diff --git a/l10n_br_fiscal/views/operation_dashboard_view.xml b/l10n_br_fiscal/views/operation_dashboard_view.xml
index 45bd4fe5dd7d..9cbeeb7e46de 100644
--- a/l10n_br_fiscal/views/operation_dashboard_view.xml
+++ b/l10n_br_fiscal/views/operation_dashboard_view.xml
@@ -5,7 +5,8 @@
         <field name="name">l10n_br_fiscal.operation.dashboard.kanban</field>
         <field name="model">l10n_br_fiscal.operation</field>
         <field name="arch" type="xml">
-            <kanban class="oe_background_grey o_kanban_dashboard o_emphasize_colors o_stock_kanban">
+            <kanban
+                class="oe_background_grey o_kanban_dashboard o_emphasize_colors o_stock_kanban" create="false">
                 <field name="fiscal_type"/>
                 <field name="kanban_dashboard"/>
                 <field name="color"/>
diff --git a/l10n_br_fiscal/views/res_company_view.xml b/l10n_br_fiscal/views/res_company_view.xml
index 40c05d43707a..7f8d5dee0482 100644
--- a/l10n_br_fiscal/views/res_company_view.xml
+++ b/l10n_br_fiscal/views/res_company_view.xml
@@ -98,6 +98,7 @@
                             <group name="edoc">
                                 <group>
                                     <field name="processador_edoc"/>
+                                    <field name="document_save_disk"/>
                                     <field name="document_type_id"/>
                                 </group>
                                 <group></group>
diff --git a/l10n_br_fiscal/wizards/__init__.py b/l10n_br_fiscal/wizards/__init__.py
index 434397688019..be1cc09aed00 100644
--- a/l10n_br_fiscal/wizards/__init__.py
+++ b/l10n_br_fiscal/wizards/__init__.py
@@ -1,6 +1,7 @@
 # License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
 
-from . import wizard_document_status
-from . import wizard_document_cancel
-from . import wizard_document_correction
-from . import wizard_document_invalidate
+from . import base_wizard_mixin
+from . import document_cancel_wizard
+from . import document_correction_wizard
+from . import document_status_wizard
+from . import invalidate_number_wizard
diff --git a/l10n_br_fiscal/wizards/base_wizard_mixin.py b/l10n_br_fiscal/wizards/base_wizard_mixin.py
new file mode 100644
index 000000000000..70b3047745e7
--- /dev/null
+++ b/l10n_br_fiscal/wizards/base_wizard_mixin.py
@@ -0,0 +1,130 @@
+# Copyright (C) 2020  Renato Lima - Akretion <renato.lima@akretion.com.br>
+# Copyright (C) 2020 Luis Felipe Miléo - KMEE
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import api, fields, models
+
+
+class BaseWizardMixin(models.TransientModel):
+    _name = 'l10n_br_fiscal.base.wizard.mixin'
+    _description = 'Fiscal Base Wizard Mixin'
+
+    document_id = fields.Many2one(
+        comodel_name='l10n_br_fiscal.document',
+        string='Fiscal Document',
+    )
+
+    document_type_id = fields.Many2one(
+        comodel_name='l10n_br_fiscal.document.type',
+        string='Document Type',
+    )
+
+    document_type = fields.Char(
+        related='document_type_id.code',
+    )
+
+    document_key = fields.Char(
+        string='Document Key',
+    )
+
+    partner_id = fields.Many2one(
+        comodel_name='res.partner',
+        string='Partner',
+    )
+
+    rps_number = fields.Char(
+        string='RPS Number',
+    )
+
+    document_number = fields.Char(
+        string='Document Number',
+    )
+
+    document_serie = fields.Char(
+        string='Document Serie',
+    )
+
+    event_id = fields.Many2one(
+        comodel_name='l10n_br_fiscal.event',
+        string='Fiscal Event',
+    )
+
+    justification = fields.Text(
+        string='Justification',
+        size=255,
+    )
+
+    document_status = fields.Text(
+        string="Status", readonly=True
+    )
+
+    state = fields.Selection(
+        selection=[
+            ('init', 'init'),
+            ('confirm', 'confirm'),
+            ('done', 'done')
+        ],
+        string='State',
+        readonly=True,
+        default='init',
+    )
+
+    def _prepare_key_fields(self):
+        return {
+            'l10n_br_fiscal.document': 'document_id',
+            'res.partner': 'partner_id',
+        }
+
+    def _document_fields(self):
+        return [
+            'document_key',
+            'document_number',
+            'document_serie',
+            'document_status',
+            'document_type_id',
+            'partner_id',
+            'rps_number',
+        ]
+
+    @api.model
+    def default_get(self, fields_list):
+        default_values = super().default_get(fields_list)
+        active_model = self.env.context['active_model']
+
+        if self._prepare_key_fields().get(active_model):
+
+            active_id = self.env.context['active_id']
+            active_vals = self.env[active_model].browse(active_id).read(
+                self._document_fields())[0]
+            active_vals = self._convert_to_write(active_vals)
+            active_vals.pop('id')
+            default_values.update(active_vals)
+
+            default_values.update({
+                self._prepare_key_fields()[active_model]: active_id
+            })
+        return default_values
+
+    @api.multi
+    def button_back(self):
+        self.ensure_one()
+        self.state = 'init'
+        return self._reopen()
+
+    @api.multi
+    def _reopen(self):
+        self.ensure_one()
+        return {
+            'type': 'ir.actions.act_window',
+            'res_model': self._name,
+            'view_mode': 'form',
+            'view_type': 'form',
+            'res_id': self.id,
+            'views': [(False, 'form')],
+            'target': 'new',
+            'nodestroy': True
+        }
+
+    @api.multi
+    def _close(self):
+        return {'type': 'ir.actions.act_window_close'}
diff --git a/l10n_br_fiscal/wizards/document_cancel_wizard.py b/l10n_br_fiscal/wizards/document_cancel_wizard.py
new file mode 100644
index 000000000000..dbad043fd0fc
--- /dev/null
+++ b/l10n_br_fiscal/wizards/document_cancel_wizard.py
@@ -0,0 +1,21 @@
+# Copyright 2019 KMEE
+# Copyright (C) 2020  Renato Lima - Akretion <renato.lima@akretion.com.br>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import api, models
+
+
+class DocumentCancelWizard(models.TransientModel):
+    _name = 'l10n_br_fiscal.document.cancel.wizard'
+    _description = 'Fiscal Document Cancel Wizard'
+    _inherit = 'l10n_br_fiscal.base.wizard.mixin'
+
+    def do_cancel(self):
+        self.document_id._document_cancel(self.justification)
+
+    @api.multi
+    def doit(self):
+        for wizard in self:
+            if wizard.document_id:
+                wizard.do_cancel()
+        self._close()
diff --git a/l10n_br_fiscal/wizards/wizard_document_cancel_view.xml b/l10n_br_fiscal/wizards/document_cancel_wizard.xml
similarity index 92%
rename from l10n_br_fiscal/wizards/wizard_document_cancel_view.xml
rename to l10n_br_fiscal/wizards/document_cancel_wizard.xml
index 89f77bf79771..ac12b27dbe4b 100644
--- a/l10n_br_fiscal/wizards/wizard_document_cancel_view.xml
+++ b/l10n_br_fiscal/wizards/document_cancel_wizard.xml
@@ -5,12 +5,12 @@
 <odoo>
 
     <record id="document_cancel_wizard_form" model="ir.ui.view">
-        <field name="name">l10n_br_fiscal.document.cancel.wizard.form (in l10n_br_fiscal)</field>
+        <field name="name">l10n_br_fiscal.document.cancel.wizard</field>
         <field name="model">l10n_br_fiscal.document.cancel.wizard</field>
         <field name="arch" type="xml">
             <form string="Cancelamento de documento fiscal">
                 <group>
-                    <field name="justificative"/>
+                    <field name="justification"/>
                 </group>
                 <footer>
                     <button name="doit"
@@ -25,7 +25,7 @@
         </field>
     </record>
 
-    <record id="document_cancel_wizard_action" model="ir.actions.act_window" >
+    <record id="document_cancel_wizard_action" model="ir.actions.act_window">
         <field name="name">Cancelamento de documento fiscal</field>
         <field name="res_model">l10n_br_fiscal.document.cancel.wizard</field>
         <field name="view_mode">form</field>
diff --git a/l10n_br_fiscal/wizards/document_correction_wizard.py b/l10n_br_fiscal/wizards/document_correction_wizard.py
new file mode 100644
index 000000000000..b6cf3d917851
--- /dev/null
+++ b/l10n_br_fiscal/wizards/document_correction_wizard.py
@@ -0,0 +1,18 @@
+# Copyright 2019 KMEE
+# Copyright (C) 2020  Renato Lima - Akretion <renato.lima@akretion.com.br>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import api, models
+
+
+class DocumentCorrectionWizard(models.TransientModel):
+    _name = 'l10n_br_fiscal.document.correction.wizard'
+    _description = 'Fiscal Document Correction Wizard'
+    _inherit = 'l10n_br_fiscal.base.wizard.mixin'
+
+    @api.multi
+    def doit(self):
+        for wizard in self:
+            if wizard.document_id:
+                wizard.document_id._document_correction(wizard.justification)
+        self._close()
diff --git a/l10n_br_fiscal/wizards/wizard_document_correction_view.xml b/l10n_br_fiscal/wizards/document_correction_wizard.xml
similarity index 93%
rename from l10n_br_fiscal/wizards/wizard_document_correction_view.xml
rename to l10n_br_fiscal/wizards/document_correction_wizard.xml
index b05ceaa14e3f..ce0e325689bb 100644
--- a/l10n_br_fiscal/wizards/wizard_document_correction_view.xml
+++ b/l10n_br_fiscal/wizards/document_correction_wizard.xml
@@ -5,12 +5,12 @@
 <odoo>
 
     <record id="document_correction_wizard_form" model="ir.ui.view">
-        <field name="name">l10n_br_fiscal.document.correction.wizard.form (in l10n_br_fiscal)</field>
+        <field name="name">l10n_br_fiscal.document.correction.wizard.form</field>
         <field name="model">l10n_br_fiscal.document.correction.wizard</field>
         <field name="arch" type="xml">
             <form string="Carta de Correção">
                 <group>
-                    <field name="justificative"/>
+                    <field name="justification"/>
                 </group>
                 <footer>
                     <button name="doit"
diff --git a/l10n_br_fiscal/wizards/document_status_wizard.py b/l10n_br_fiscal/wizards/document_status_wizard.py
new file mode 100644
index 000000000000..f25322f12204
--- /dev/null
+++ b/l10n_br_fiscal/wizards/document_status_wizard.py
@@ -0,0 +1,25 @@
+# Copyright 2019 KMEE
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import api, models
+
+
+class DocumentStatusWizard(models.TransientModel):
+    _name = 'l10n_br_fiscal.document.status.wizard'
+    _description = 'Fiscal Document Status Wizard'
+    _inherit = 'l10n_br_fiscal.base.wizard.mixin'
+
+    @api.multi
+    def get_document_status(self):
+        self.write({
+            "document_status": self.document_id._document_status(),
+            "state": "done",
+        })
+        return self._reopen()
+
+    @api.multi
+    def doit(self):
+        for wizard in self:
+            if wizard.document_id:
+                return wizard.get_document_status()
+        self._close()
diff --git a/l10n_br_fiscal/wizards/document_status_wizard.xml b/l10n_br_fiscal/wizards/document_status_wizard.xml
new file mode 100644
index 000000000000..d802a910d4ce
--- /dev/null
+++ b/l10n_br_fiscal/wizards/document_status_wizard.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2020 KMEE
+     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
+
+<odoo>
+
+    <record model="ir.ui.view" id="wizard_document_status_form">
+        <field name="name">wizard.l10n_br_fiscal.base.wizard.mixin (in l10n_br_fiscal)</field>
+        <field name="model">l10n_br_fiscal.document.status.wizard</field>
+        <field name="arch" type="xml">
+            <form string="Document Status">
+                <field invisible="1" name="state"/>
+                <group name="document_info">
+                    <group name="document_info_right">
+                        <field name="partner_id" readonly="1"/>
+                        <field name="document_id" readonly="1"/>
+                    </group>
+                    <group name="document_info_left">
+                        <field name="document_type" invisible="1"/>
+                        <field name="document_type_id" readonly="1"/>
+                        <field name="document_serie" readonly="1"/>
+                        <field name="document_number" readonly="1"/>
+                        <field name="rps_number" attrs="{'invisible': [('document_type', '!=', 'SE')]}" readonly="1"/>
+                    </group>
+                </group>
+                <group name="document_key_group">
+                    <field name="document_key" readonly="1"/>
+                </group>
+                <group states="done" name="document_status">
+                    <field name="document_status"/>
+                </group>
+                <footer>
+                    <button name="doit"
+                            string="OK"
+                            class="btn-primary"
+                            type="object"/>
+                    <button string="Cancel"
+                            class="btn-default"
+                            special="cancel"/>
+                </footer>
+            </form>
+        </field>
+    </record>
+
+    <record model="ir.actions.act_window" id="wizard_document_status_act_multi">
+        <field name="name">Document Status</field>
+        <field name="res_model">l10n_br_fiscal.document.status.wizard</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">form</field>
+        <field name="binding_model_id" ref="model_l10n_br_fiscal_document" />
+        <field name="target">new</field>
+    </record>
+
+</odoo>
diff --git a/l10n_br_fiscal/wizards/invalidate_number_wizard.py b/l10n_br_fiscal/wizards/invalidate_number_wizard.py
new file mode 100644
index 000000000000..fe8d47eb5b7e
--- /dev/null
+++ b/l10n_br_fiscal/wizards/invalidate_number_wizard.py
@@ -0,0 +1,28 @@
+# Copyright 2019 KMEE
+# Copyright (C) 2020  Renato Lima - Akretion <renato.lima@akretion.com.br>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import api, models
+
+
+class InvalidateNumberWizard(models.TransientModel):
+    _name = 'l10n_br_fiscal.invalidate.number.wizard'
+    _description = 'Invalidate Number Wizard'
+    _inherit = 'l10n_br_fiscal.base.wizard.mixin'
+
+    def do_invalidate(self):
+        invalidate = self.env['l10n_br_fiscal.invalidate.number'].create({
+            'company_id': self.document_id.company_id.id,
+            'document_type_id': self.document_id.document_type_id.id,
+            'document_serie_id': self.document_id.document_serie_id.id,
+            'number_start': self.document_id.document_number,
+            'number_end': self.document_id.document_number,
+            'justification': self.justification,
+        })
+        invalidate._invalidate(self.document_id)
+
+    @api.multi
+    def doit(self):
+        for wizard in self:
+            wizard.do_invalidate()
+        self._close()
diff --git a/l10n_br_fiscal/wizards/wizard_document_invalidate_view.xml b/l10n_br_fiscal/wizards/invalidate_number_wizard.xml
similarity index 66%
rename from l10n_br_fiscal/wizards/wizard_document_invalidate_view.xml
rename to l10n_br_fiscal/wizards/invalidate_number_wizard.xml
index 79c6d8682481..ac684c52d6a5 100644
--- a/l10n_br_fiscal/wizards/wizard_document_invalidate_view.xml
+++ b/l10n_br_fiscal/wizards/invalidate_number_wizard.xml
@@ -4,13 +4,13 @@
 
 <odoo>
 
-    <record model="ir.ui.view" id="wizard_document_invalidate_form">
-        <field name="name">l10n_br_fiscal.wizard_document_invalidate.form (in l10n_br_fiscal)</field>
-        <field name="model">l10n_br_fiscal.wizard_document_invalidate</field>
+    <record id="invalidate_number_wizard" model="ir.ui.view">
+        <field name="name">l10n_br_fiscal.invalidate.number.wizard</field>
+        <field name="model">l10n_br_fiscal.invalidate.number.wizard</field>
         <field name="arch" type="xml">
             <form string="Inutilização de documento fiscal">
                 <group>
-                    <field name="justificative"/>
+                    <field name="justification"/>
                 </group>
                 <footer>
                     <button name="doit"
@@ -25,13 +25,12 @@
         </field>
     </record>
 
-    <record model="ir.actions.act_window" id="wizard_document_invalidate_action">
+    <record id="invalidate_number_wizard_action" model="ir.actions.act_window">
         <field name="name">Inutilização de documento fiscal</field>
-        <field name="res_model">l10n_br_fiscal.wizard_document_invalidate</field>
+        <field name="res_model">l10n_br_fiscal.invalidate.number.wizard</field>
         <field name="view_mode">form</field>
         <field name="context">{}</field>
         <field name="target">new</field>
     </record>
 
-
 </odoo>
diff --git a/l10n_br_fiscal/wizards/wizard_document_cancel.py b/l10n_br_fiscal/wizards/wizard_document_cancel.py
deleted file mode 100644
index f80efacccf05..000000000000
--- a/l10n_br_fiscal/wizards/wizard_document_cancel.py
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2019 KMEE
-# Copyright (C) 2020  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
-from odoo.exceptions import ValidationError
-
-
-class DocumentCancelWizard(models.TransientModel):
-    _name = 'l10n_br_fiscal.document.cancel.wizard'
-    _description = 'Fiscal Document Cancel Wizard'
-
-    justificative = fields.Text(
-        string='Justificativa',
-        size=255,
-        required=True)
-
-    @api.multi
-    @api.constrains('justificative')
-    def _check_justificative(self):
-        for record in self:
-            if len(record.justificative) < 15:
-                raise ValidationError(
-                    _('Justificativa deve ter o tamanho mínimo de 15 '
-                      'caracteres.'))
-
-    @api.multi
-    def doit(self):
-        for wizard in self:
-            document_id = self.env[self.env.context["active_model"]].browse(
-                self.env.context["active_id"]
-            )
-
-            cancel = self.env[
-                'l10n_br_fiscal.document.cancel'].create({
-                    'document_id': document_id.id,
-                    'justificative': wizard.justificative,
-                })
-            event_id = self.env['l10n_br_fiscal.document.event'].create({
-                'type': '2',
-                'response': 'Cancelamento da NFe %s' % document_id.key,
-                'company_id': document_id.company_id.id,
-                'origin': 'NFe-%s' % document_id.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': document_id.id,
-            })
-
-            cancel.cancel_document(event_id)
-        return {"type": "ir.actions.act_window_close"}
diff --git a/l10n_br_fiscal/wizards/wizard_document_correction.py b/l10n_br_fiscal/wizards/wizard_document_correction.py
deleted file mode 100644
index 8236852cbe81..000000000000
--- a/l10n_br_fiscal/wizards/wizard_document_correction.py
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 2019 KMEE
-# Copyright (C) 2020  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
-from odoo.exceptions import ValidationError
-
-
-class DocumentCorrectionWizard(models.TransientModel):
-    _name = 'l10n_br_fiscal.document.correction.wizard'
-    _description = 'Fiscal Document Correction Wizard'
-
-    justificative = fields.Text(
-        string='Justificativa',
-        size=255,
-        required=True)
-
-    @api.multi
-    @api.constrains('justificative')
-    def _check_justificative(self):
-        for record in self:
-            if len(record.justificative) < 15:
-                raise ValidationError(
-                    _('Justificativa deve ter o tamanho mínimo de 15 '
-                      'caracteres.'))
-
-    @api.multi
-    def doit(self):
-        for wizard in self:
-            document_id = self.env[self.env.context['active_model']].browse(
-                self.env.context['active_id'])
-
-            document_id.correction_reason = wizard.justificative
-            msg = "Carta de correção: {}".format(wizard.justificative)
-            document_id.message_post(body=msg)
-
-            numeros = document_id.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': document_id.id,
-                    'justificative': wizard.justificative,
-                    'sequencia': sequencia,
-                })
-            event_id = self.env['l10n_br_fiscal.document.event'].create({
-                'type': '14',
-                'response': 'Correção da NFe %s' % document_id.key,
-                'company_id': document_id.company_id.id,
-                'origin': 'NFe-%s' % document_id.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': document_id.id,
-            })
-
-            carta.correction(event_id)
-        return {'type': 'ir.actions.act_window_close'}
diff --git a/l10n_br_fiscal/wizards/wizard_document_invalidate.py b/l10n_br_fiscal/wizards/wizard_document_invalidate.py
deleted file mode 100644
index 1a4749618aaa..000000000000
--- a/l10n_br_fiscal/wizards/wizard_document_invalidate.py
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2019 KMEE
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-
-from odoo import api, fields, models, _
-from odoo.exceptions import UserError
-
-
-class WizardDocumentInvalidate(models.TransientModel):
-
-    _name = "l10n_br_fiscal.wizard_document_invalidate"
-    _description = "Document fiscal cancel wizard"
-
-    justificative = fields.Text("Justificativa", size=255, required=True)
-
-    @api.constrains("justificative")
-    @api.multi
-    def _check_justificative(self):
-        for record in self:
-            if len(record.justificative) < 15:
-                raise UserError(
-                    _("Justificativa deve ter o tamanho mínimo de 15 " "caracteres.")
-                )
-
-    @api.multi
-    def doit(self):
-        for wizard in self:
-            document_id = self.env[self.env.context["active_model"]].browse(
-                self.env.context["active_id"]
-            )
-
-            inut = self.env[
-                'l10n_br_fiscal.document.invalidate.number'].create({
-                    'company_id': document_id.company_id.id,
-                    'document_id': document_id.id,
-                    'document_serie_id': document_id.document_serie_id.id,
-                    'number_start': document_id.number,
-                    'number_end': document_id.number,
-                    'state': 'draft',
-                    'justificative': wizard.justificative,
-                })
-            event_id = self.env['l10n_br_fiscal.document.event'].create({
-                'type': '3',
-                'response': 'Inutilização do número %s ao número %s' % (
-                    document_id.number, document_id.number),
-                'company_id': document_id.company_id.id,
-                'origin': 'NFe-%s' % document_id.number,
-                'create_date': fields.Datetime.now(),
-                'write_date': fields.Datetime.now(),
-                'end_date': fields.Datetime.now(),
-                'state': 'draft',
-                'invalid_number_document_event_id': inut.id,
-                'fiscal_document_id': document_id.id,
-            })
-
-            inut.invalidate(event_id)
-        return {"type": "ir.actions.act_window_close"}
diff --git a/l10n_br_fiscal/wizards/wizard_document_status.py b/l10n_br_fiscal/wizards/wizard_document_status.py
deleted file mode 100644
index c55c8f2d56a8..000000000000
--- a/l10n_br_fiscal/wizards/wizard_document_status.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (C) 2013 Luis Felipe Miléo - KMEE
-# Copyright (C) 2014 Renato Lima - Akretion
-# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
-
-from odoo import api, fields, models
-
-
-class DocumentStatusWizard(models.TransientModel):
-    _name = "l10n_br_fiscal.document.status.wizard"
-    _description = "Fiscal Document Status"
-
-    state = fields.Selection(
-        selection=[
-            ("init", "Init"),
-            ("error", "Error"),
-            ("done", "Done")],
-        string="State",
-        index=True,
-        readonly=True,
-        default="init")
-
-    document_status = fields.Text(
-        string="Status", readonly=True)
-
-    @api.multi
-    def get_document_status(self):
-        pass
diff --git a/l10n_br_fiscal/wizards/wizard_document_status_view.xml b/l10n_br_fiscal/wizards/wizard_document_status_view.xml
deleted file mode 100644
index 4ab8d20d4fc7..000000000000
--- a/l10n_br_fiscal/wizards/wizard_document_status_view.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-    <record id="document_status_wizard_form" model="ir.ui.view">
-        <field name="name">Consultar Documento</field>
-        <field name="model">l10n_br_fiscal.document.status.wizard</field>
-        <field name="arch" type="xml">
-            <form string="Fiscal Document Inquiry on SEFAZ">
-                <field invisible="1" name="state"/>
-                    <group>
-                        <group states="done">
-                            <field name="document_status"/>
-                        </group>
-                    </group>
-                <footer states="init">
-                    <button name="get_document_status" string="Consultar" type="object" class="oe_highlight"/>
-                    <button special="cancel" string="Cancel" type="object" class="oe_link"/>
-                </footer>
-                <footer states="done">
-                    <button special="cancel" string="Close" type="object"/>
-                </footer>
-            </form>
-        </field>
-    </record>
-
-    <record id="document_status_wizard_action" model="ir.actions.act_window">
-        <field name="name">Fiscal Document Inquiry</field>
-        <field name="res_model">l10n_br_fiscal.document.status.wizard</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">form</field>
-        <field name="target">new</field>
-    </record>
-
-</odoo>
diff --git a/l10n_br_nfe/__manifest__.py b/l10n_br_nfe/__manifest__.py
index fd5317fa9297..aed9c0154104 100644
--- a/l10n_br_nfe/__manifest__.py
+++ b/l10n_br_nfe/__manifest__.py
@@ -24,14 +24,7 @@
         # Views
         "views/res_company_view.xml",
         "views/nfe_document_view.xml",
-        "views/nfe_document_line_view.xml",
         "views/res_config_settings_view.xml",
-
-        # Action
-        "views/nfe_action.xml",
-
-        # Menu
-        "views/nfe_menu.xml",
     ],
     "demo": [
         "demo/res_users_demo.xml",
diff --git a/l10n_br_nfe/demo/fiscal_document_demo.xml b/l10n_br_nfe/demo/fiscal_document_demo.xml
index 09050c9448e0..17a366ceb9f8 100644
--- a/l10n_br_nfe/demo/fiscal_document_demo.xml
+++ b/l10n_br_nfe/demo/fiscal_document_demo.xml
@@ -9,7 +9,6 @@
         <field name="company_id" ref="l10n_br_base.empresa_lucro_presumido"/>
         <field name="company_number">3</field>
         <field name="document_serie">1</field>
-        <field name="document_section">nfe</field>
         <field name="processador_edoc">oca</field>
         <field name="partner_id" ref="l10n_br_base.res_partner_cliente1_sp"/>
         <field name="user_id" ref="base.user_demo"/>
diff --git a/l10n_br_nfe/hooks.py b/l10n_br_nfe/hooks.py
index f07c1a36994a..469af3e6901b 100644
--- a/l10n_br_nfe/hooks.py
+++ b/l10n_br_nfe/hooks.py
@@ -32,9 +32,9 @@ def post_init_hook(cr, registry):
         # nfe_stream = pkg_resources.resource_stream('nfelib',
         # '../tests/nfe/v4_00/leiauteNFe/35180803102452000172550010000474491454651420-nfe.xml')
         nfe_binding = nfe_sub.parse(nfe_stream, silence=True)
-        number = nfe_binding.infNFe.ide.nNF
+        document_number = nfe_binding.infNFe.ide.nNF
         existing_nfes = env["l10n_br_fiscal.document"].search(
-            [('number', '=', number)])
+            [('document_number', '=', document_number)])
 
         try:
             existing_nfes.unlink()
@@ -43,4 +43,4 @@ def post_init_hook(cr, registry):
                 lang='pt_BR').build(nfe_binding.infNFe)
             _logger.info(nfe.nfe40_emit.nfe40_CNPJ)
         except ValidationError:
-            _logger.info("NF-e already %s imported by hooks" % (number,))
+            _logger.info("NF-e already %s imported by hooks" % (document_number,))
diff --git a/l10n_br_nfe/models/__init__.py b/l10n_br_nfe/models/__init__.py
index b802a6bc9193..da50ae23a042 100644
--- a/l10n_br_nfe/models/__init__.py
+++ b/l10n_br_nfe/models/__init__.py
@@ -10,7 +10,5 @@
 from . import res_city
 from . import res_config_settings
 from . import cfop
-from . import document_cancel
-from . import document_correction
-from . import document_invalidate_number
+from . import invalidate_number
 from . import spec_mixin
diff --git a/l10n_br_nfe/models/document.py b/l10n_br_nfe/models/document.py
index 9ee4bcf43dba..fdaaae0a66e1 100644
--- a/l10n_br_nfe/models/document.py
+++ b/l10n_br_nfe/models/document.py
@@ -4,7 +4,8 @@
 
 import base64
 import logging
-import tempfile
+from datetime import datetime
+
 from unicodedata import normalize
 
 from erpbrasil.base.fiscal.edoc import ChaveEdoc
@@ -18,6 +19,11 @@
     AUTORIZADO,
     DENEGADO,
     CANCELADO,
+    CANCELADO_DENTRO_PRAZO,
+    CANCELADO_FORA_PRAZO,
+    EVENTO_RECEBIDO,
+    EVENT_ENV_HML,
+    EVENT_ENV_PROD,
     LOTE_PROCESSADO,
     MODELO_FISCAL_NFE,
     MODELO_FISCAL_NFCE,
@@ -80,6 +86,7 @@ def _compute_emit(self):
     nfe40_emit = fields.Many2one('res.company', compute='_compute_emit',
                                  readonly=True, string="Emit")
 
+    @api.depends('partner_id')
     def _compute_dest(self):
         for doc in self:  # TODO if out
             doc.nfe40_dest = doc.partner_id
@@ -87,13 +94,6 @@ def _compute_dest(self):
     nfe40_dest = fields.Many2one('res.partner', compute='_compute_dest',
                                  readonly=True, string="Dest")
 
-    fiscal_document_event_ids = fields.One2many(
-        comodel_name='l10n_br_fiscal.document.event',
-        inverse_name='fiscal_document_id',
-        string='Fiscal Events',
-        copy=False,
-    )
-
     nfe_version = fields.Selection(
         selection=NFE_VERSIONS,
         string='NFe Version',
@@ -115,11 +115,11 @@ def _compute_dest(self):
     )
 
     nfe40_nNF = fields.Char(
-        related='number',
+        related='document_number',
     )
 
     nfe40_Id = fields.Char(
-        related='key',
+        related='document_key',
     )
 
     # TODO should be done by framework?
@@ -130,13 +130,12 @@ def _compute_dest(self):
     )
 
     nfe40_NFref = fields.One2many(
-        related='fiscal_document_related_ids',
-        comodel_name='l10n_br_fiscal.document.related',
-        inverse_name='fiscal_document_id',
+        related='document_related_ids',
+        inverse_name='document_id',
     )
 
     nfe40_dhEmi = fields.Datetime(
-        related='date',
+        related='document_date',
     )
 
     nfe40_dhSaiEnt = fields.Datetime(
@@ -255,6 +254,10 @@ def _compute_dest(self):
         compute='_compute_nfe40_additional_data',
     )
 
+    nfe40_transporta = fields.Many2one(
+        comodel_name='res.partner'
+    )
+
     nfe40_infRespTec = fields.Many2one(
         comodel_name='res.partner',
         related='company_id.technical_support_id'
@@ -295,12 +298,15 @@ def _inverse_nfe40_tpNF(self):
                 rec.fiscal_operation_type = tpNF_2_operation[rec.nfe40_tpNF]
 
     @api.multi
-    def document_number(self):
-        super().document_number()
-        if self.key:
-            chave = ChaveEdoc(self.key)
-            self.nfe40_cNF = chave.codigo_aleatorio
-            self.nfe40_cDV = chave.digito_verificador
+    def _document_number(self):
+        # TODO: Criar campos no fiscal para codigo aleatorio e digito verificador,
+        # pois outros modelos também precisam dessescampos: CT-e, MDF-e etc
+        super()._document_number()
+        for record in self.filtered(filter_processador_edoc_nfe):
+            if record.document_key:
+                chave = ChaveEdoc(record.document_key)
+                record.nfe40_cNF = chave.codigo_aleatorio
+                record.nfe40_cDV = chave.digito_verificador
 
     def _serialize(self, edocs):
         edocs = super()._serialize(edocs)
@@ -344,31 +350,50 @@ def _document_export(self, pretty_print=True):
             xml_file = processador.\
                 _generateds_to_string_etree(edoc, pretty_print=pretty_print)[0]
             _logger.debug(xml_file)
-            event_id = self._gerar_evento(xml_file, event_type="0")
-            record.autorizacao_event_id = event_id
+            event_id = self.event_ids.create_event_save_xml(
+                company_id=self.company_id,
+                environment=(
+                    EVENT_ENV_PROD if self.nfe_environment == '1' else EVENT_ENV_HML),
+                event_type="0",
+                xml_file=xml_file,
+                document_id=self,
+            )
+            record.authorization_event_id = event_id
 
-    def atualiza_status_nfe(self, infProt):
+    def atualiza_status_nfe(self, infProt, xml_file):
         self.ensure_one()
+        # TODO: Verificar a consulta de notas
         # if not infProt.chNFe == self.key:
         #     self = self.search([
         #         ('key', '=', infProt.chNFe)
         #     ])
-
         if infProt.cStat in AUTORIZADO:
             state = SITUACAO_EDOC_AUTORIZADA
         elif infProt.cStat in DENEGADO:
             state = SITUACAO_EDOC_DENEGADA
         else:
             state = SITUACAO_EDOC_REJEITADA
-
-        self._change_state(state)
-
+        if self.authorization_event_id and infProt.nProt:
+            if type(infProt.dhRecbto) == datetime:
+                protocol_date = fields.Datetime.to_string(
+                    infProt.dhRecbto
+                )
+            else:
+                protocol_date = fields.Datetime.to_string(
+                    datetime.fromisoformat(infProt.dhRecbto))
+
+            self.authorization_event_id.set_done(
+                status_code=infProt.cStat,
+                response=infProt.xMotivo,
+                protocol_date=protocol_date,
+                protocol_number=infProt.nProt,
+                file_response_xml=xml_file,
+            )
         self.write({
-            'codigo_situacao': infProt.cStat,
-            'motivo_situacao': infProt.xMotivo,
-            'data_hora_autorizacao': infProt.dhRecbto,
-            'protocolo_autorizacao': infProt.nProt,
+            'status_code': infProt.cStat,
+            'status_name': infProt.xMotivo,
         })
+        self._change_state(state)
 
     def _prepare_amount_financial(self, ind_pag, t_pag, v_pag):
         return {
@@ -396,35 +421,26 @@ def _eletronic_document_send(self):
                 for p in processador.processar_documento(edoc):
                     processo = p
                     if processo.webservice == 'nfeAutorizacaoLote':
-                        self.autorizacao_event_id._grava_anexo(
+                        record.authorization_event_id._save_event_file(
                             processo.envio_xml.decode('utf-8'), "xml"
                         )
 
             if processo.resposta.cStat in LOTE_PROCESSADO + ['100']:
-                protocolos = processo.resposta.protNFe
-                if type(protocolos) != list:
-                    protocolos = [protocolos]
-                for protocolo in protocolos:
-                    nfe_proc = leiauteNFe.TNfeProc(
-                        NFe=edoc,
-                        protNFe=protocolo,
-                    )
-                    nfe_proc.original_tagname_ = 'nfeProc'
-                    xml_file = \
-                        processador._generateds_to_string_etree(nfe_proc)[0]
-                    record.autorizacao_event_id.set_done(xml_file)
-                    record.atualiza_status_nfe(protocolo.infProt)
-                    if protocolo.infProt.cStat in AUTORIZADO:
-                        try:
-                            record.gera_pdf()
-                        except Exception as e:
-                            # Não devemos interromper o fluxo
-                            # E dar rollback em um documento
-                            # autorizado, podendo perder dados.
-
-                            # Se der problema que apareça quando
-                            # o usuário clicar no gera PDF novamente.
-                            _logger.error('DANFE Error \n {}'.format(e))
+                record.atualiza_status_nfe(
+                    processo.protocolo.infProt,
+                    processo.processo_xml.decode('utf-8')
+                )
+                if processo.protocolo.infProt.cStat in AUTORIZADO:
+                    try:
+                        record.make_pdf()
+                    except Exception as e:
+                        # Não devemos interromper o fluxo
+                        # E dar rollback em um documento
+                        # autorizado, podendo perder dados.
+
+                        # Se der problema que apareça quando
+                        # o usuário clicar no gera PDF novamente.
+                        _logger.error('DANFE Error \n {}'.format(e))
 
             elif processo.resposta.cStat == '225':
                 state = SITUACAO_EDOC_REJEITADA
@@ -432,76 +448,17 @@ def _eletronic_document_send(self):
                 self._change_state(state)
 
                 self.write({
-                    'codigo_situacao': processo.resposta.cStat,
-                    'motivo_situacao': processo.resposta.xMotivo,
+                    'status_code': processo.resposta.cStat,
+                    'status_name': processo.resposta.xMotivo,
                 })
         return
 
     @api.multi
-    def cancel_invoice_online(self, justificative):
-        super(NFe, self).cancel_invoice_online(justificative)
+    def _document_date(self):
+        super()._document_date()
         for record in self.filtered(filter_processador_edoc_nfe):
-            if record.state in ('open', 'paid'):
-                processador = record._processador()
-
-                evento = processador.cancela_documento(
-                    chave=record.edoc_access_key,
-                    protocolo_autorizacao=record.edoc_protocol_number,
-                    justificativa=justificative
-                )
-                processo = processador.enviar_lote_evento(
-                    lista_eventos=[evento]
-                )
-
-                for retevento in processo.resposta.retEvento:
-                    if not retevento.infEvento.chNFe == record.edoc_access_key:
-                        continue
-
-                    if retevento.infEvento.cStat not in CANCELADO:
-                        mensagem = 'Erro no cancelamento'
-                        mensagem += '\nCódigo: ' + \
-                                    retevento.infEvento.cStat
-                        mensagem += '\nMotivo: ' + \
-                                    retevento.infEvento.xMotivo
-                        raise UserError(mensagem)
-
-                    if retevento.infEvento.cStat == '155':
-                        record.state_fiscal = SITUACAO_FISCAL_CANCELADO_EXTEMPORANEO
-                        record.state_edoc = SITUACAO_EDOC_CANCELADA
-                    elif retevento.infEvento.cStat == '135':
-                        record.state_fiscal = SITUACAO_FISCAL_CANCELADO
-                        record.state_edoc = SITUACAO_EDOC_CANCELADA
-
-    # def cce_invoice_online(self, justificative):
-    #     super(NFe, self).cce_invoice_online(justificative)
-    #     for record in self.filtered(filter_processador_edoc_nfe):
-    #         if record.state in ('open', 'paid'):
-    #             processador = record._processador()
-    #
-    #             evento = processador.carta_correcao(
-    #                 chave=record.edoc_access_key,
-    #                 sequencia='1',
-    #                 justificativa=justificative
-    #             )
-    #             processo = processador.enviar_lote_evento(
-    #                 lista_eventos=[evento]
-    #             )
-    #             pass
-
-    @api.multi
-    def action_document_confirm(self):
-        for record in self:
             if not record.date_in_out:
                 record.date_in_out = fields.Datetime.now()
-        super(NFe, self).action_document_confirm()
-
-        for record in self.filtered(filter_processador_edoc_nfe):
-            processador = record._processador()
-            record.autorizacao_event_id = record._gerar_evento(
-                processador._generateds_to_string_etree(
-                    record.serialize()[0]
-                )[0], event_type="0"
-            )
 
     def _export_fields(self, xsd_fields, class_obj, export_dict):
         if self.company_id.partner_id.state_id.ibge_code:
@@ -589,7 +546,6 @@ def _build_attr(self, node, fields, vals, path, attr):
         value = getattr(node, attr.get_name())
 
         if key == 'nfe40_mod':
-            vals['document_section'] = 'nfe' if value == '55' else False
             vals['document_type_id'] = \
                 self.env['l10n_br_fiscal.document.type'].search([
                     ('code', '=', value)], limit=1).id
@@ -620,50 +576,51 @@ def _build_many2one(self, comodel, vals, new_value, key, value, path):
             super(NFe, self)._build_many2one(comodel, vals, new_value,
                                              key, value, path)
 
-    def gera_pdf(self):
-        file_pdf = self.file_pdf_id
-        self.file_pdf_id = False
+    def view_pdf(self):
+        if not self.filtered(filter_processador_edoc_nfe):
+            return super().view_pdf()
+        if not self.authorization_file_id or not self.file_report_id:
+            self.make_pdf()
+        return self._target_new_tab(self.file_report_id)
+
+    def make_pdf(self):
+        if not self.filtered(filter_processador_edoc_nfe):
+            return super().make_pdf()
+
+        file_pdf = self.file_report_id
+        self.file_report_id = False
         file_pdf.unlink()
-        output = self.autorizacao_event_id.monta_caminho(
-            ambiente=self.nfe40_tpAmb,
-            company_id=self.company_id,
-            chave=self.key,
-        )
 
-        if self.file_xml_autorizacao_id:
-            arquivo = output + self.file_xml_autorizacao_id.datas_fname
+        if self.authorization_file_id:
+            arquivo = self.authorization_file_id
+            xml_string = base64.b64decode(arquivo.datas).decode()
         else:
-            tmp_xml = tempfile.NamedTemporaryFile()
-            self.temp_xml_autorizacao(tmp_xml)
-            arquivo = tmp_xml.name
+            arquivo = self.send_file_id
+            xml_string = base64.b64decode(arquivo.datas).decode()
+            xml_string = self.temp_xml_autorizacao(xml_string)
 
-        base.ImprimirXml.imprimir(caminho_xml=arquivo, output_dir=output)
-        file_name = 'danfe.pdf'
-        with open(output + file_name, 'rb') as f:
-            arquivo_data = f.read()
+        pdf = base.ImprimirXml.imprimir(
+            string_xml=xml_string,
+            # output_dir=self.authorization_event_id.file_path
+        )
+        # TODO: Alterar a opção output_dir para devolter também o arquivo do XML
+        # no retorno, evitando a releitura do arquivo.
 
-        self.file_pdf_id = self.env['ir.attachment'].create(
+        self.file_report_id = self.env['ir.attachment'].create(
             {
-                "name": file_name,
-                "datas_fname": file_name,
+                "name": self.document_key + '.pdf',
+                "datas_fname": self.document_key + '.pdf',
                 "res_model": self._name,
                 "res_id": self.id,
-                "datas": base64.b64encode(arquivo_data),
+                "datas": base64.b64encode(pdf),
                 "mimetype": "application/pdf",
                 "type": "binary",
             }
         )
 
-    def view_pdf(self):
-        if not self.file_pdf_id:
-            self.gera_pdf()
-        return super(NFe, self).view_pdf()
-
-    def temp_xml_autorizacao(self, tmp_xml):
+    def temp_xml_autorizacao(self, xml_string):
         """ TODO: Migrate-me to erpbrasil.edoc.pdf ASAP"""
-        xml_string = base64.b64decode(self.file_xml_id.datas).decode()
         root = etree.fromstring(xml_string)
-
         ns = {None: 'http://www.portalfiscal.inf.br/nfe'}
         new_root = etree.Element('nfeProc', nsmap=ns)
 
@@ -679,6 +636,118 @@ def temp_xml_autorizacao(self, tmp_xml):
 
         new_root.append(root)
         new_root.append(protNFe_node)
+        return etree.tostring(new_root)
+
+    @api.multi
+    def _document_cancel(self, justificative):
+        super(NFe, self)._document_cancel(justificative)
+        online_event = self.filtered(filter_processador_edoc_nfe)
+        if online_event:
+            online_event._nfe_cancel()
+
+    def _nfe_cancel(self):
+        self.ensure_one()
+        processador = self._processador()
+
+        if not self.authorization_protocol:
+            raise UserError(_('Authorization Protocol Not Found!'))
+
+        evento = processador.cancela_documento(
+            chave=self.document_key[3:],
+            protocolo_autorizacao=self.authorization_protocol,
+            justificativa=self.cancel_reason.replace('\n', '\\n')
+        )
+        processo = processador.enviar_lote_evento(
+            lista_eventos=[evento]
+        )
+        # Gravamos o arquivo no disco e no filestore ASAP.
+
+        self.cancel_event_id = self.event_ids.create_event_save_xml(
+            company_id=self.company_id,
+            environment=(
+                EVENT_ENV_PROD if self.nfe_environment == '1' else EVENT_ENV_HML),
+            event_type='2',
+            xml_file=processo.envio_xml.decode('utf-8'),
+            document_id=self,
+        )
+
+        for retevento in processo.resposta.retEvento:
+            if not retevento.infEvento.chNFe == self.document_key[3:]:
+                continue
+
+            if retevento.infEvento.cStat not in CANCELADO:
+                mensagem = 'Erro no cancelamento'
+                mensagem += '\nCódigo: ' + retevento.infEvento.cStat
+                mensagem += '\nMotivo: ' + retevento.infEvento.xMotivo
+                raise UserError(mensagem)
+
+            if retevento.infEvento.cStat == CANCELADO_FORA_PRAZO:
+                self.state_fiscal = SITUACAO_FISCAL_CANCELADO_EXTEMPORANEO
+            elif retevento.infEvento.cStat == CANCELADO_DENTRO_PRAZO:
+                self.state_fiscal = SITUACAO_FISCAL_CANCELADO
+
+            self.state_edoc = SITUACAO_EDOC_CANCELADA
+            self.cancel_event_id.set_done(
+                status_code=retevento.infEvento.cStat,
+                response=retevento.infEvento.xMotivo,
+                protocol_date=fields.Datetime.to_string(
+                    datetime.fromisoformat(retevento.infEvento.dhRegEvento)),
+                protocol_number=retevento.infEvento.nProt,
+                file_response_xml=processo.retorno.content.decode('utf-8'),
+            )
+
+    @api.multi
+    def _document_correction(self, justificative):
+        super(NFe, self)._document_correction(justificative)
+        online_event = self.filtered(filter_processador_edoc_nfe)
+        if online_event:
+            online_event._nfe_correction(justificative)
+
+    @api.multi
+    def _nfe_correction(self, justificative):
+        self.ensure_one()
+        processador = self._processador()
 
-        tmp_xml.write(etree.tostring(new_root))
-        tmp_xml.seek(0)
+        numeros = self.event_ids.filtered(
+            lambda e: e.type == '14' and e.state == 'done'
+        ).mapped('sequence')
+
+        sequence = str(int(max(numeros)) + 1) if numeros else '1'
+
+        evento = processador.carta_correcao(
+            chave=self.document_key[3:],
+            sequencia=sequence,
+            justificativa=justificative.replace('\n', '\\n')
+        )
+        processo = processador.enviar_lote_evento(
+            lista_eventos=[evento]
+        )
+        # Gravamos o arquivo no disco e no filestore ASAP.
+        event_id = self.event_ids.create_event_save_xml(
+            company_id=self.company_id,
+            environment=(
+                EVENT_ENV_PROD if self.nfe_environment == '1' else EVENT_ENV_HML),
+            event_type='14',
+            xml_file=processo.envio_xml.decode('utf-8'),
+            document_id=self,
+            sequence=sequence,
+            justification=justificative,
+        )
+        for retevento in processo.resposta.retEvento:
+            if not retevento.infEvento.chNFe == self.document_key[3:]:
+                continue
+
+            if retevento.infEvento.cStat not in EVENTO_RECEBIDO:
+                mensagem = 'Erro na carta de correção'
+                mensagem += '\nCódigo: ' + retevento.infEvento.cStat
+                mensagem += '\nMotivo: ' + retevento.infEvento.xMotivo
+                raise UserError(mensagem)
+
+            event_id.set_done(
+                status_code=retevento.infEvento.cStat,
+                response=retevento.infEvento.xMotivo,
+                protocol_date=fields.Datetime.to_string(
+                    datetime.fromisoformat(retevento.infEvento.dhRegEvento)),
+                protocol_number=retevento.infEvento.nProt,
+                file_response_xml=processo.retorno.content.decode('utf-8'),
+            )
diff --git a/l10n_br_nfe/models/document_cancel.py b/l10n_br_nfe/models/document_cancel.py
deleted file mode 100644
index 424ea33847e5..000000000000
--- a/l10n_br_nfe/models/document_cancel.py
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright (C) 2020  KMEE - www.kmee.com.br
-# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
-
-from odoo import api, models
-from odoo.exceptions import UserError
-from odoo.addons.l10n_br_fiscal.constants.fiscal import (
-    SITUACAO_EDOC_CANCELADA,
-    SITUACAO_FISCAL_CANCELADO,
-    CANCELADO,
-    SITUACAO_FISCAL_CANCELADO_EXTEMPORANEO,
-)
-
-
-class DocumentCancel(models.Model):
-    _inherit = 'l10n_br_fiscal.document.cancel'
-
-    @api.multi
-    def cancel_document(self, event_id):
-        for record in self:
-            if not record.document_id or not record.justificative:
-                return super().cancel_document(event_id)
-
-            processador = record.document_id._processador()
-
-            evento = processador.cancela_documento(
-                chave=record.document_id.key[3:],
-                protocolo_autorizacao=record.document_id.protocolo_autorizacao,
-                justificativa=record.justificative
-            )
-            processo = processador.enviar_lote_evento(
-                lista_eventos=[evento]
-            )
-
-            for retevento in processo.resposta.retEvento:
-                if not retevento.infEvento.chNFe == record.document_id.key[3:]:
-                    continue
-
-                if retevento.infEvento.cStat not in CANCELADO:
-                    mensagem = 'Erro no cancelamento'
-                    mensagem += '\nCódigo: ' + retevento.infEvento.cStat
-                    mensagem += '\nMotivo: ' + retevento.infEvento.xMotivo
-                    raise UserError(mensagem)
-
-                if retevento.infEvento.cStat == '155':
-                    record.document_id.state_fiscal = \
-                        SITUACAO_FISCAL_CANCELADO_EXTEMPORANEO
-                    record.document_id.state_edoc = SITUACAO_EDOC_CANCELADA
-                elif retevento.infEvento.cStat == '135':
-                    record.document_id.state_fiscal = \
-                        SITUACAO_FISCAL_CANCELADO
-                    record.document_id.state_edoc = SITUACAO_EDOC_CANCELADA
-
-                event_id.write({
-                    'file_sent': processo.envio_xml,
-                    'file_returned': processo.retorno.content,
-                    'status': retevento.infEvento.cStat,
-                    'message': retevento.infEvento.xMotivo,
-                    'state': 'done',
-                })
-
-            record.document_id.state_fiscal = SITUACAO_FISCAL_CANCELADO
-            record.document_id.state_edoc = SITUACAO_EDOC_CANCELADA
-
-            event_id.write({
-                'state': 'done',
-            })
diff --git a/l10n_br_nfe/models/document_correction.py b/l10n_br_nfe/models/document_correction.py
deleted file mode 100644
index d309b52347a6..000000000000
--- a/l10n_br_nfe/models/document_correction.py
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright (C) 2020  KMEE - www.kmee.com.br
-# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
-
-from odoo import api, models
-from odoo.exceptions import UserError
-
-
-class DocumentCorrection(models.Model):
-    _inherit = 'l10n_br_fiscal.document.correction'
-
-    @api.multi
-    def correction(self, event_id):
-        for record in self:
-            if not record.document_id or not record.justificative:
-                return super().correction(event_id)
-
-            processador = record.document_id._processador()
-
-            evento = processador.carta_correcao(
-                chave=record.document_id.key[3:],
-                sequencia=record.sequencia,
-                justificativa=record.justificative.replace('\n', '\\n')
-            )
-            processo = processador.enviar_lote_evento(
-                lista_eventos=[evento]
-            )
-
-            for retevento in processo.resposta.retEvento:
-                if not retevento.infEvento.chNFe == record.document_id.key[3:]:
-                    continue
-
-                if retevento.infEvento.cStat not in ('135', '136'):
-                    mensagem = 'Erro na carta de correção'
-                    mensagem += '\nCódigo: ' + retevento.infEvento.cStat
-                    mensagem += '\nMotivo: ' + retevento.infEvento.xMotivo
-                    raise UserError(mensagem)
-
-                event_id.write({
-                    'file_sent': processo.envio_xml,
-                    'file_returned': processo.retorno.content,
-                    'status': retevento.infEvento.cStat,
-                    'message': retevento.infEvento.xMotivo,
-                    'state': 'done',
-                })
diff --git a/l10n_br_nfe/models/document_invalidate_number.py b/l10n_br_nfe/models/document_invalidate_number.py
deleted file mode 100644
index 2f1f85ac1d5b..000000000000
--- a/l10n_br_nfe/models/document_invalidate_number.py
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright (C) 2020  KMEE - www.kmee.com.br
-# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
-
-from requests import Session
-
-from erpbrasil.assinatura import certificado as cert
-from erpbrasil.edoc.nfe import NFe as edoc_nfe
-from erpbrasil.transmissao import TransmissaoSOAP
-
-from odoo import _, api, models
-from odoo.exceptions import UserError
-from odoo.addons.l10n_br_fiscal.constants.fiscal import (
-    SITUACAO_EDOC_INUTILIZADA,
-)
-
-
-class DocumentInvalidateNumber(models.Model):
-    _inherit = 'l10n_br_fiscal.document.invalidate.number'
-
-    def _processador(self):
-        if not self.company_id.certificate_nfe_id:
-            raise UserError(_("Certificado não encontrado"))
-
-        certificado = cert.Certificado(
-            arquivo=self.company_id.certificate_nfe_id.file,
-            senha=self.company_id.certificate_nfe_id.password,
-        )
-        session = Session()
-        session.verify = False
-        transmissao = TransmissaoSOAP(certificado, session)
-        return edoc_nfe(
-            transmissao, self.company_id.state_id.ibge_code,
-            versao='4.00', ambiente=self.company_id.nfe_environment
-        )
-
-    @api.multi
-    def invalidate(self, event_id):
-        for record in self:
-            processador = record._processador()
-
-            evento = processador.inutilizacao(
-                cnpj=record.company_id.cnpj_cpf.replace('.', '').replace(
-                    '/', '').replace('-', ''),
-                mod=record.document_serie_id.document_type_id.code,
-                serie=record.document_serie_id.code,
-                num_ini=record.number_start,
-                num_fin=record.number_end,
-                justificativa=record.justificative
-            )
-
-            processo = processador.envia_inutilizacao(
-                evento=evento
-            )
-
-            event_id.write({
-                'file_sent': processo.envio_xml,
-                'file_returned': processo.retorno.content,
-                'status': processo.resposta.infInut.cStat,
-                'message': processo.resposta.infInut.xMotivo,
-            })
-
-            if processo.resposta.infInut.cStat == '102':
-                event_id.state = 'done'
-                record.state = 'done'
-                if record.document_id:
-                    record.document_id.state_edoc = SITUACAO_EDOC_INUTILIZADA
-                else:
-                    for number in range(record.number_start,
-                                        record.number_end + 1):
-                        record.env['l10n_br_fiscal.document'].create({
-                            'document_serie_id': record.document_serie_id.id,
-                            'document_type_id':
-                                record.document_serie_id.document_type_id.id,
-                            'company_id': record.company_id.id,
-                            'state_edoc': SITUACAO_EDOC_INUTILIZADA,
-                            'issuer': 'company',
-                            'number': str(number),
-                        })
diff --git a/l10n_br_nfe/models/document_related.py b/l10n_br_nfe/models/document_related.py
index 8a65c935dba9..3f8505096588 100644
--- a/l10n_br_nfe/models/document_related.py
+++ b/l10n_br_nfe/models/document_related.py
@@ -71,7 +71,7 @@ def _compute_nfe_data(self):
         """Set schema data which are not just related fields"""
         for rec in self:
             document = rec.document_related_id
-            document_key = document.key[3:] if document.key else ''
+            document_key = document.document_key[3:] if document.document_key else ''
             if rec.document_type_id:
                 if rec.document_type_id.code in (
                     MODELO_FISCAL_NFE,
@@ -94,8 +94,8 @@ def _compute_nfe_data(self):
                         rec.nfe40_choice4 = 'nfe40_refNF'
                     rec.nfe40_cUF = document.partner_id.state_id.ibge_code
                     rec.nfe40_AAMM = fields.Datetime.from_string(
-                        document.data_hora_autorizacao).strftime("%y%m") \
-                        if document.data_hora_autorizacao else ''
+                        document.authorization_date).strftime("%y%m") \
+                        if document.authorization_date else ''
                     if rec.cpfcnpj_type == 'cpf':
                         rec.nfe40_CPF = rec.cnjp_cpf
                     else:
@@ -103,7 +103,7 @@ def _compute_nfe_data(self):
                     rec.nfe40_IE = rec.inscr_est
                     rec.nfe40_mod = rec.document_type_id.code
                     rec.nfe40_serie = document.document_serie
-                    rec.nfe40_nNF = document.number
+                    rec.nfe40_nNF = document.document_number
 
     def _inverse_nfe40_choice4(self):
         for rec in self:
diff --git a/l10n_br_nfe/models/invalidate_number.py b/l10n_br_nfe/models/invalidate_number.py
new file mode 100644
index 000000000000..851bd7122a20
--- /dev/null
+++ b/l10n_br_nfe/models/invalidate_number.py
@@ -0,0 +1,93 @@
+# Copyright (C) 2020  KMEE - www.kmee.com.br
+# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
+
+import logging
+from datetime import datetime
+
+from erpbrasil.assinatura import certificado as cert
+from erpbrasil.edoc.nfe import NFe as edoc_nfe
+from erpbrasil.transmissao import TransmissaoSOAP
+from odoo.exceptions import UserError
+from requests import Session
+
+from odoo import _, api, fields, models
+
+from odoo.addons.l10n_br_fiscal.constants.fiscal import (
+    EVENT_ENV_HML,
+    EVENT_ENV_PROD,
+)
+
+_logger = logging.getLogger(__name__)
+
+try:
+    from erpbrasil.base.misc import punctuation_rm
+except ImportError:
+    _logger.error("Biblioteca erpbrasil.base não instalada")
+
+
+class InvalidateNumber(models.Model):
+    _inherit = 'l10n_br_fiscal.invalidate.number'
+
+    def _processador(self):
+        if not self.company_id.certificate_nfe_id:
+            raise UserError(_("Certificado não encontrado"))
+
+        certificado = cert.Certificado(
+            arquivo=self.company_id.certificate_nfe_id.file,
+            senha=self.company_id.certificate_nfe_id.password,
+        )
+        session = Session()
+        session.verify = False
+        transmissao = TransmissaoSOAP(certificado, session)
+        return edoc_nfe(
+            transmissao, self.company_id.state_id.ibge_code,
+            versao='4.00', ambiente=self.company_id.nfe_environment
+        )
+
+    @api.multi
+    def _invalidate(self, document_id=False):
+        processador = self._processador()
+        evento = processador.inutilizacao(
+            cnpj=punctuation_rm(self.company_id.cnpj_cpf),
+            mod=self.document_type_id.code,
+            serie=self.document_serie_id.code,
+            num_ini=self.number_start,
+            num_fin=self.number_end,
+            justificativa=self.justification.replace('\n', '\\n'),
+        )
+
+        processo = processador.envia_inutilizacao(
+            evento=evento
+        )
+
+        event_id = self.event_ids.create_event_save_xml(
+            company_id=self.company_id,
+            environment=(
+                EVENT_ENV_PROD if self.nfe_environment == '1' else EVENT_ENV_HML),
+            event_type='3',
+            xml_file=processo.envio_xml.decode('utf-8'),
+            invalidate_number_id=self,
+        )
+
+        if document_id:
+            event_id.document_id = document_id
+        self.event_ids |= event_id
+        self.authorization_event_id = event_id
+
+        if hasattr(processo.resposta.infInut, 'dhRegEvento'):
+            date_response = processo.resposta.infInut.dhRegEvento
+        elif hasattr(processo.resposta.infInut, 'dhRecbto'):
+            date_response = processo.resposta.infInut.dhRecbto
+
+        event_id.set_done(
+            status_code=processo.resposta.infInut.cStat,
+            response=processo.resposta.infInut.xMotivo,
+            protocol_date=fields.Datetime.to_string(
+                datetime.fromisoformat(date_response)
+            ),
+            protocol_number=processo.resposta.infInut.nProt,
+            file_response_xml=processo.retorno.content.decode('utf-8'),
+        )
+
+        if processo.resposta.infInut.cStat == '102':
+            super(InvalidateNumber, self)._invalidate(document_id)
diff --git a/l10n_br_nfe/models/res_partner.py b/l10n_br_nfe/models/res_partner.py
index c0f9cfa4dd0e..65da394dd8db 100644
--- a/l10n_br_nfe/models/res_partner.py
+++ b/l10n_br_nfe/models/res_partner.py
@@ -1,10 +1,18 @@
 # Copyright 2019 Akretion (Raphaël Valyi <raphael.valyi@akretion.com>)
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 
-from odoo import api, fields
+import logging
 
+from odoo import api, fields
 from odoo.addons.spec_driven_model.models import spec_models
 
+_logger = logging.getLogger(__name__)
+
+try:
+    from erpbrasil.base.misc import punctuation_rm
+except ImportError:
+    _logger.error("Biblioteca erpbrasil.base não instalada")
+
 
 class ResPartner(spec_models.SpecModel):
     # NOTE TODO
@@ -58,6 +66,7 @@ def _prepare_import_dict(self, values, model=None):
     nfe40_IE = fields.Char(related='inscr_est')
     nfe40_ISUF = fields.Char(related='suframa')
     nfe40_email = fields.Char(related='email')
+    nfe40_xEnder = fields.Char(compute='_compute_nfe40_xEnder')
 
     # nfe.40.infresptec
     nfe40_xContato = fields.Char(related='legal_name')
@@ -67,6 +76,13 @@ def _prepare_import_dict(self, values, model=None):
         ('nfe40_CPF', 'CPF')],
         "CNPJ/CPF do Parceiro")
 
+    @api.multi
+    def _compute_nfe40_xEnder(self):
+        for rec in self:
+            rec.nfe40_xEnder = rec.street + ', ' + rec.street_number
+            if rec.street2:
+                rec.nfe40_xEnder = rec.nfe40_xEnder + ' - ' + rec.street2
+
     @api.multi
     def _compute_nfe40_enderDest(self):
         for rec in self:
@@ -78,9 +94,11 @@ def _compute_nfe_data(self):
         for rec in self:
             if rec.cnpj_cpf:
                 if rec.is_company:
-                    rec.nfe40_CNPJ = rec.cnpj_cpf
+                    rec.nfe40_CNPJ = punctuation_rm(
+                        rec.cnpj_cpf)
                 else:
-                    rec.nfe40_CPF = rec.cnpj_cpf
+                    rec.nfe40_CPF = punctuation_rm(
+                        rec.cnpj_cpf)
             rec.nfe40_cMun = "%s%s" % (rec.state_id.ibge_code,
                                        rec.city_id.ibge_code)
 
diff --git a/l10n_br_nfe/tests/test_nfe_import.py b/l10n_br_nfe/tests/test_nfe_import.py
index eb9e4ae55994..1d5f199b7b8f 100644
--- a/l10n_br_nfe/tests/test_nfe_import.py
+++ b/l10n_br_nfe/tests/test_nfe_import.py
@@ -22,7 +22,6 @@ def test_import_in_nfe_dry_run(self):
                                                    resource_path)
 
         nfe_binding = nfe_sub.parse(nfe_stream, silence=True)
-        # number = nfe_binding.infNFe.ide.nNF
         nfe = self.env["nfe.40.infnfe"].with_context(
             tracking_disable=True,
             edoc_type='in', lang='pt_BR').build(nfe_binding.infNFe, dry_run=True)
@@ -42,7 +41,6 @@ def test_import_in_nfe(self):
                                                    resource_path)
 
         nfe_binding = nfe_sub.parse(nfe_stream, silence=True)
-        # number = nfe_binding.infNFe.ide.nNF
         nfe = self.env["nfe.40.infnfe"].with_context(
             tracking_disable=True,
             edoc_type='in', lang='pt_BR').build(nfe_binding.infNFe)
diff --git a/l10n_br_nfe/tests/test_nfe_serialize.py b/l10n_br_nfe/tests/test_nfe_serialize.py
index 74fe985deeaf..41948c68b2aa 100644
--- a/l10n_br_nfe/tests/test_nfe_serialize.py
+++ b/l10n_br_nfe/tests/test_nfe_serialize.py
@@ -45,7 +45,7 @@ def test_serialize_xml(self):
         xml_path = os.path.join(
             l10n_br_nfe.__path__[0], 'tests', 'nfe', 'v4_00', 'leiauteNFe',
             'NFe35200697231608000169550010000000111855451724-nf-e.xml')
-        self.nfe.date = datetime.strptime(
+        self.nfe.document_date = datetime.strptime(
             '2020-06-04T11:58:46', '%Y-%m-%dT%H:%M:%S')
         self.nfe.date_in_out = datetime.strptime(
             '2020-06-04T11:58:46', '%Y-%m-%dT%H:%M:%S')
@@ -57,7 +57,7 @@ def test_serialize_xml(self):
         self.nfe.nfe40_detPag = [(5, 0, 0), (0, 0, financial_vals)]
         self.nfe.with_context(lang='pt_BR').action_document_confirm()
         output = os.path.join(config['data_dir'], 'filestore',
-                              self.cr.dbname, self.nfe.file_xml_id.store_fname)
+                              self.cr.dbname, self.nfe.send_file_id.store_fname)
         _logger.info("XML file saved at %s" % (output,))
         self.nfe.company_id.country_id.name = 'Brazil'  # clean mess
         diff = main.diff_files(
diff --git a/l10n_br_nfe/views/nfe_action.xml b/l10n_br_nfe/views/nfe_action.xml
index 3be05e8c953c..e359c71604cc 100644
--- a/l10n_br_nfe/views/nfe_action.xml
+++ b/l10n_br_nfe/views/nfe_action.xml
@@ -9,7 +9,7 @@
         <field name="view_mode">tree,form</field>
         <field name="view_type">form</field>
         <field name="domain" eval="[('document_type_id', '=', ref('l10n_br_fiscal.document_55'))]"/>
-        <field name="view_id" ref="nfe_document_tree"/>
+<!--        <field name="view_id" ref="nfe_document_tree"/>-->
         <field name="help" type="html">
             <p class="o_view_nocontent_smiling_face">
               Add a new NFe
diff --git a/l10n_br_nfe/views/nfe_document_line_view.xml b/l10n_br_nfe/views/nfe_document_line_view.xml
deleted file mode 100644
index 1d77a6b31998..000000000000
--- a/l10n_br_nfe/views/nfe_document_line_view.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-</odoo>
diff --git a/l10n_br_nfe/views/nfe_document_view.xml b/l10n_br_nfe/views/nfe_document_view.xml
index fa710f61cafd..a0e3c899c48e 100644
--- a/l10n_br_nfe/views/nfe_document_view.xml
+++ b/l10n_br_nfe/views/nfe_document_view.xml
@@ -1,61 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-  <record id="nfe_document_search" model="ir.ui.view">
-    <field name="name">l10n_br_nfe.document.search</field>
-    <field name="model">l10n_br_fiscal.document</field>
-    <field name="arch" type="xml">
-      <search string="NF-e">
-        <field name="number"/>
-        <group expand='0' string='Group By...'>
-          <filter string='Document Type' name="document_type_id" domain="[]" context="{'group_by' : 'document_type_id'}"/>
-        </group>
-      </search>
-    </field>
-  </record>
-
-  <record id="nfe_document_tree" model="ir.ui.view">
-    <field name="name">l10n_br_nfe.document.tree</field>
-    <field name="model">l10n_br_fiscal.document</field>
-    <field name="arch" type="xml">
-      <tree string="NF-e">
-        <field name="number"/>
-        <field name="date"/>
-        <field name="fiscal_operation_id"/>
-        <field name="partner_id"/>
-        <field name="amount_untaxed"/>
-        <field name="amount_tax"/>
-        <field name="amount_total"/>
-      </tree>
-    </field>
-  </record>
-
   <record id="nfe_document_form_inherit" model="ir.ui.view">
       <field name="name">l10n_br_nfe.document.form.inherit</field>
       <field name="model">l10n_br_fiscal.document</field>
       <field name="priority">5</field>
       <field name="inherit_id" ref="l10n_br_fiscal.document_form"/>
       <field name="arch" type="xml">
-          <button name="view_pdf" position="replace">
-              <button name="view_pdf" type="object" string="Visualizar PDF" groups="l10n_br_fiscal.group_user" states="autorizada,a_enviar" class="btn-primary"/>
-              <button name="gera_pdf" type="object" string="Gerar PDF" groups="l10n_br_fiscal.group_user" states="autorizada,a_enviar" class="btn-primary"/>
-          </button>
           <page name="delivery" position="inside">
-              <group>
+              <group name="nfe_transport" attrs="{'invisible': [('document_type', 'not in', ['55', '65'])]}">
                   <field name="nfe40_modFrete"/>
                   <field name="nfe40_transporta"/>
               </group>
-              <group>
+              <group name="nfe_vol" attrs="{'invisible': [('document_type', 'not in', ['55', '65'])]}">
                   <field name="nfe40_vol"/>
               </group>
           </page>
           <page name="finance" position="inside">
-              <group>
+              <group name="nfe_finance" attrs="{'invisible': [('document_type', 'not in', ['55', '65'])]}">
                   <field name="nfe40_detPag"/>
               </group>
           </page>
-          <field name="state_fiscal" position="after">
-              <field name="nfe40_infAdic"/>
+          <field name="customer_additional_data" position="after">
+              <field name="nfe40_infAdic" attrs="{'invisible': [('document_type', 'not in', ['55', '65'])]}"/>
           </field>
       </field>
   </record>
@@ -72,19 +39,6 @@
       </field>
   </record>
 
-  <record id="nfe_40_detpag_form" model="ir.ui.view">
-      <field name="name">nfe.40.detpag.form</field>
-      <field name="model">nfe.40.detpag</field>
-      <field name="arch" type="xml">
-          <form>
-              <group>
-                  <field name="nfe40_tPag"/>
-                  <field name="nfe40_vPag"/>
-              </group>
-          </form>
-      </field>
-  </record>
-
   <record id="nfe_40_vol_form" model="ir.ui.view">
       <field name="name">nfe.40.vol.form</field>
       <field name="model">nfe.40.vol</field>
@@ -99,133 +53,4 @@
       </field>
   </record>
 
-  <record id="nfe_40_transporta_form" model="ir.ui.view">
-      <field name="name">nfe.40.transporta.form</field>
-      <field name="model">nfe.40.transporta</field>
-      <field name="arch" type="xml">
-          <form>
-              <group>
-                  <field name="nfe40_CNPJ"/>
-                  <field name="nfe40_xNome"/>
-                  <field name="nfe40_IE"/>
-                  <field name="nfe40_xEnder"/>
-                  <field name="nfe40_xMun"/>
-                  <field name="nfe40_UF"/>
-              </group>
-          </form>
-      </field>
-  </record>
-
-  <record id="nfe_document_form" model="ir.ui.view">
-    <field name="name">l10n_br_nfe.document.form</field>
-    <field name="model">l10n_br_fiscal.document</field>
-    <field name="arch" type="xml">
-      <form string="NF-e">
-        <field name="id" invisible="1"/>
-        <field name="currency_id" invisible="1"/>
-        <field name="document_electronic" invisible="1"/>
-        <field name="fiscal_operation_type" invisible="1"/>
-        <header>
-            <button name="action_confirm" type="object" states="draft" string="Confirm" class="oe_highlight" groups="l10n_br_fiscal.group_user"/>
-            <field name="state" widget="statusbar"/>
-        </header>
-        <sheet string="Fiscal Document">
-          <div class="oe_title">
-            <h1>
-                <field name="document_type_id" readonly="1"/>:
-                <field name="number" readonly="1"/>
-            </h1>
-          </div>
-          <group>
-            <field name="fiscal_operation_id"/>
-            <field name="issuer"/>
-            <field name="document_type_id"/>
-            <label for="key" attrs="{'readonly': [('issuer', '=', 'company')], 'required': [('document_electronic', '=', True)], 'invisible': [('document_electronic', '=', False)]}"/>
-            <div class="o_row" attrs="{'readonly': [('issuer', '=', 'company')], 'required': [('document_electronic', '=', True)], 'invisible': [('document_electronic', '=', False)]}">
-              <field name="key" force_save="1" class="oe_inline"/>
-              <button name="action_search_key" type="object" class="oe_inline btn-sm btn-link mb4 fa fa-search oe_edit_only" aria-label="Pesquisar Chave" title="Pesquisar Chave"/>
-            </div>
-          </group>
-          <group>
-            <group>
-              <field name="document_serie_id" context="{'default_document_type_id': document_type_id}"/>
-            </group>
-            <group>
-              <field name="number" force_save="1" attrs="{'readonly': [('issuer', '=', 'company')]}"/>
-            </group>
-          </group>
-          <notebook>
-            <page name="document" string="Document Info">
-              <group name="Document">
-                <field name="date"/>
-              </group>
-              <group name="company_info" string="Company">
-                <field name="company_id" groups="base.group_multi_company"/>
-              </group>
-              <group>
-                <group name="company_left">
-                  <field name="company_legal_name"/>
-                  <field name="company_name"/>
-                  <field name="company_cnpj_cpf"/>
-                  <field name="company_inscr_est"/>
-                </group>
-                <group name="company_right">
-                  <field name="company_inscr_mun"/>
-                  <field name="company_suframa"/>
-                  <field name="company_cnae_main_id"/>
-                  <field name="company_tax_framework"/>
-                </group>
-              </group>
-            </page>
-            <page name="recipient" string="Recipient">
-              <group name="partner">
-                <field name="partner_id"/>
-              </group>
-              <group>
-                <group name="partner_left">
-                  <field name="partner_legal_name" force_save="1" attrs="{'readonly': [('partner_id', '!=', False)]}"/>
-                  <field name="partner_name" force_save="1" attrs="{'readonly': [('partner_id', '!=', False)]}"/>
-                  <field name="partner_cnpj_cpf" force_save="1" attrs="{'readonly': [('partner_id', '!=', False)]}"/>
-                  <field name="partner_inscr_est" force_save="1" attrs="{'readonly': [('partner_id', '!=', False)]}"/>
-                </group>
-                <group name="partner_right">
-                  <field name="partner_inscr_mun" force_save="1" attrs="{'readonly': [('partner_id', '!=', False)]}"/>
-                  <field name="partner_suframa" force_save="1" attrs="{'readonly': [('partner_id', '!=', False)]}"/>
-                  <field name="partner_cnae_main_id" force_save="1" attrs="{'readonly': [('partner_id', '!=', False)]}"/>
-                  <field name="partner_tax_framework" force_save="1" attrs="{'readonly': [('partner_id', '!=', False)]}"/>
-                </group>
-              </group>
-              <group>
-                <field name="partner_shipping_id"/>
-              </group>
-            </page>
-            <page name="products" string="Products and Services">
-              <field name="line_ids" context="{'form_view_ref': 'l10n_br_fiscal.document_line_form', 'default_document_id': id, 'default_fiscal_operation_id': fiscal_operation_id, 'default_company_id': company_id, 'default_fiscal_operation_type': fiscal_operation_type}">
-                <tree>
-                  <field name="product_id"/>
-                  <field name="uom_id"/>
-                  <field name="fiscal_price"/>
-                  <field name="quantity"/>
-                  <field name="amount_total"/>
-                </tree>
-              </field>
-            </page>
-            <page name="amounts" string="Amounts">
-              <group>
-                <field name="amount_untaxed"/>
-                <field name="amount_tax"/>
-                <field name="amount_total"/>
-              </group>
-            </page>
-          </notebook>
-        </sheet>
-        <div class="oe_chatter">
-            <field name="message_follower_ids" widget="mail_followers"/>
-            <field name="activity_ids" widget="mail_activity"/>
-            <field name="message_ids" widget="mail_thread"/>
-        </div>
-      </form>
-    </field>
-  </record>
-
 </odoo>
diff --git a/l10n_br_nfse/__init__.py b/l10n_br_nfse/__init__.py
index aee8895e7a31..0650744f6bc6 100644
--- a/l10n_br_nfse/__init__.py
+++ b/l10n_br_nfse/__init__.py
@@ -1,2 +1 @@
 from . import models
-from . import wizards
diff --git a/l10n_br_nfse/__manifest__.py b/l10n_br_nfse/__manifest__.py
index f059aa495288..147a3df97bbd 100644
--- a/l10n_br_nfse/__manifest__.py
+++ b/l10n_br_nfse/__manifest__.py
@@ -30,8 +30,6 @@
         'views/document_line_view.xml',
         'views/res_company_view.xml',
 
-        'wizards/wizard_document_status.xml',
-
         'report/danfse.xml',
     ],
     'demo': [
diff --git a/l10n_br_nfse/models/document.py b/l10n_br_nfse/models/document.py
index 336f62d79de4..2f91031a5e69 100644
--- a/l10n_br_nfse/models/document.py
+++ b/l10n_br_nfse/models/document.py
@@ -1,6 +1,7 @@
 # Copyright 2019 KMEE INFORMATICA LTDA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
+import base64
 from requests import Session
 import logging
 
@@ -11,10 +12,11 @@
 
 from odoo import api, fields, models
 from odoo.addons.l10n_br_fiscal.constants.fiscal import (
+    EVENT_ENV_HML,
+    EVENT_ENV_PROD,
     MODELO_FISCAL_NFSE,
-    TAX_FRAMEWORK_SIMPLES_ALL,
-    DOCUMENT_ISSUER_COMPANY,
     PROCESSADOR_OCA,
+    TAX_FRAMEWORK_SIMPLES_ALL,
 )
 from ..constants.nfse import (
     NFSE_ENVIRONMENTS,
@@ -50,11 +52,6 @@ class Document(models.Model):
         copy=False,
     )
 
-    rps_number = fields.Char(
-        string='RPS Number',
-        copy=False,
-        index=True,
-    )
     rps_type = fields.Selection(
         string='RPS Type',
         selection=RPS_TYPE,
@@ -81,17 +78,36 @@ class Document(models.Model):
         default=lambda self: self.env.user.company_id.nfse_environment,
     )
 
-    def document_number(self):
+    @api.multi
+    def _document_date(self):
+        super()._document_date()
         for record in self.filtered(filter_processador_edoc_nfse):
-            if record.issuer == DOCUMENT_ISSUER_COMPANY:
-                if record.document_serie_id:
-                    record.document_serie = record.document_serie_id.code
-                    if not record.rps_number and record.date:
-                        record.rps_number = record.document_serie_id.\
-                            next_seq_number()
-                        record.number = record.rps_number
-        super(Document, self - self.filtered(filter_processador_edoc_nfse)
-              ).document_number()
+            if not record.date_in_out:
+                record.date_in_out = fields.Datetime.now()
+
+    def make_pdf(self):
+        if not self.filtered(filter_processador_edoc_nfse):
+            return super().make_pdf()
+        pdf = self.env.ref(
+            'l10n_br_nfse.report_br_nfse_danfe').render_qweb_pdf(self.ids)[0]
+        self.file_report_id.unlink()
+
+        if self.document_number:
+            filename = 'NFS-e-' + self.document_number + '.pdf'
+        else:
+            filename = 'RPS-' + self.rps_number + '.pdf'
+
+        self.file_report_id = self.env['ir.attachment'].create(
+            {
+                "name": filename,
+                "datas_fname": filename,
+                "res_model": self._name,
+                "res_id": self.id,
+                "datas": base64.b64encode(pdf),
+                "mimetype": "application/pdf",
+                "type": "binary",
+            }
+        )
 
     def _processador_erpbrasil_nfse(self):
         certificado = cert.Certificado(
@@ -122,9 +138,16 @@ def _document_export(self, pretty_print=True):
             processador = record._processador_erpbrasil_nfse()
             xml_file = processador.\
                 _generateds_to_string_etree(edoc, pretty_print=pretty_print)[0]
-            event_id = self._gerar_evento(xml_file, event_type="0")
+            event_id = self.event_ids.create_event_save_xml(
+                company_id=self.company_id,
+                environment=(
+                    EVENT_ENV_PROD if self.nfe_environment == '1' else EVENT_ENV_HML),
+                event_type="0",
+                xml_file=xml_file,
+                document_id=self,
+            )
             _logger.debug(xml_file)
-            record.autorizacao_event_id = event_id
+            record.authorization_event_id = event_id
 
     def _prepare_dados_servico(self):
         self.line_ids.ensure_one()
@@ -147,10 +170,6 @@ def _prepare_dados_tomador(self):
 
     def _prepare_lote_rps(self):
         num_rps = self.rps_number
-
-        dh_emi = fields.Datetime.context_timestamp(
-            self, fields.Datetime.from_string(self.date)
-        ).strftime('%Y-%m-%dT%H:%M:%S')
         return {
             'cnpj': misc.punctuation_rm(self.company_id.partner_id.cnpj_cpf),
             'inscricao_municipal': misc.punctuation_rm(
@@ -159,7 +178,11 @@ def _prepare_lote_rps(self):
             'numero': num_rps,
             'serie': self.document_serie_id.code or '',
             'tipo': self.rps_type,
-            'data_emissao': dh_emi,
+            'data_emissao': fields.Datetime.context_timestamp(
+                self, fields.Datetime.from_string(self.document_date)
+            ).strftime('%Y-%m-%dT%H:%M:%S'),
+            'date_in_out': fields.Datetime.context_timestamp(
+                self, self.date_in_out).strftime('%Y-%m-%dT%H:%M:%S'),
             'natureza_operacao': self.operation_nature,
             'regime_especial_tributacao': self.taxation_special_regime,
             'optante_simples_nacional': '1'
@@ -174,3 +197,23 @@ def _prepare_lote_rps(self):
             'carga_tributaria': self.amount_tax,
             'total_recebido': self.amount_total,
         }
+
+    def convert_type_nfselib(self, class_object, object_filed, value):
+        if value is None:
+            return value
+
+        value_type = ''
+        for field in class_object().member_data_items_:
+            if field.name == object_filed:
+                value_type = field.child_attrs.get('type', '').\
+                    replace('xsd:', '')
+                break
+
+        if value_type in ('int', 'byte', 'nonNegativeInteger'):
+            return int(value)
+        elif value_type == 'decimal':
+            return float(value)
+        elif value_type == 'string':
+            return str(value)
+        else:
+            return value
diff --git a/l10n_br_nfse/report/danfse.xml b/l10n_br_nfse/report/danfse.xml
index ca7c1337dae4..e71533e4329f 100644
--- a/l10n_br_nfse/report/danfse.xml
+++ b/l10n_br_nfse/report/danfse.xml
@@ -24,7 +24,7 @@
     <record id="report_br_nfse_danfe" model="ir.actions.report">
         <field name="paperformat_id" ref="paperformat_br_nfse_danfse"/>
         <field name="name">Nota de Serviço</field>
-        <field name="print_report_name">'%s - NF - %s' % (object.number, object.partner_id.name)</field>
+        <field name="print_report_name">'%s - NF - %s' % (object.document_number, object.partner_id.name)</field>
     </record>
 
     <template id="danfse_report_template">
@@ -97,7 +97,7 @@
                 <div class="col-3">
                     <div style="padding: 3px; text-align: center;">
                         <span>Número da NFS-e</span><br />
-                        <strong t-field="doc.number"></strong>
+                        <strong t-field="doc.document_number"></strong>
                     </div>
                 </div>
             </div>
@@ -107,13 +107,13 @@
                     Data e Hora da Emissão
                 </div>
                 <div class="col-2 linha centro br">
-                    <span t-field="doc.date" />
+                    <span t-field="doc.document_date" />
                 </div>
                  <div class="col-2 rotulo br">
                     Competência
                 </div>
                 <div class="col-2 linha centro br">
-                    <span t-field="doc.date" t-options='{"format": "MM/yyyy"}' />
+                    <span t-field="doc.document_date" t-options='{"format": "MM/yyyy"}' />
                 </div>
                  <div class="col-2 rotulo br">
                     Código de Verificação
diff --git a/l10n_br_nfse/security/ir.model.access.csv b/l10n_br_nfse/security/ir.model.access.csv
index 595c771b9e2d..71378628c046 100644
--- a/l10n_br_nfse/security/ir.model.access.csv
+++ b/l10n_br_nfse/security/ir.model.access.csv
@@ -1,2 +1,2 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"l10n_br_nfse_res_partner_user","Partner for User","model_res_partner","base.group_user",1,0,0,0
\ No newline at end of file
+"l10n_br_nfse_res_partner_user","Partner for User","model_res_partner","base.group_user",1,0,0,0
diff --git a/l10n_br_nfse/views/document_line_view.xml b/l10n_br_nfse/views/document_line_view.xml
index 4c4b03e1da8c..7c7759e48484 100644
--- a/l10n_br_nfse/views/document_line_view.xml
+++ b/l10n_br_nfse/views/document_line_view.xml
@@ -4,15 +4,20 @@
 
 <odoo>
 
-  <record id="document_line_form" model="ir.ui.view">
-    <field name="name">l10n_br_fiscal.document.line.form</field>
-    <field name="model">l10n_br_fiscal.document.line</field>
-    <field name="inherit_id" ref="l10n_br_fiscal.document_line_form"/>
-    <field name="arch" type="xml">
-        <field name="fiscal_price" position="after">
-            <field name="fiscal_deductions_value"/>
+    <record id="document_line_form" model="ir.ui.view">
+        <field name="name">l10n_br_fiscal.document.line.form</field>
+        <field name="model">l10n_br_fiscal.document.line</field>
+        <field name="inherit_id" ref="l10n_br_fiscal.document_line_form"/>
+        <field name="arch" type="xml">
+            <field name="fiscal_price" position="after">
+                <field name="fiscal_deductions_value"/>
+            </field>
+            <field name="city_taxation_code_id" position="after">
+                <field name="cnae_main_id" invisible="1"/>
+                <field name="cnae_secondary_ids" invisible="1"/>
+                <field name="cnae_id"/>
+            </field>
         </field>
-    </field>
-  </record>
+    </record>
 
 </odoo>
diff --git a/l10n_br_nfse/views/document_view.xml b/l10n_br_nfse/views/document_view.xml
index a883b553f226..0c7a6abebade 100644
--- a/l10n_br_nfse/views/document_view.xml
+++ b/l10n_br_nfse/views/document_view.xml
@@ -9,19 +9,21 @@
         <field name="model">l10n_br_fiscal.document</field>
         <field name="inherit_id" ref="l10n_br_fiscal.document_form"/>
         <field name="arch" type="xml">
-            <field name="codigo_motivo_situacao" position="after">
-<!--                Comentei temporariamente este trecho porque document_section não está sendo preenchido no caso da NFSe-->
-<!--                <field name="edoc_error_message" attrs="{'invisible': [('document_section', '!=', 'nfse_recibos')]}"/>-->
+            <field name="status_description" position="after">
                 <field name="edoc_error_message"/>
             </field>
-            <field name="state_fiscal" position="before">
-                <field name="rps_number" force_save="1" readonly="1"/>
-                <field name="rps_type"/>
-                <field name="operation_nature"/>
-                <field name="taxation_special_regime"/>
-            </field>
-            <field name="protocolo_autorizacao" position="after">
-                <field name="verify_code"/>
+            <group  name="document_header_right" position="before">
+                <group name="nfse_operation" attrs="{'invisible': [('document_type', '!=', 'SE')]}">
+                    <field name="operation_nature"/>
+                    <field name="taxation_special_regime"/>
+                </group>
+                <group name="nfse_info" attrs="{'invisible': [('document_type', '!=', 'SE')]}">
+                    <field name="rps_number" force_save="1" readonly="1"/>
+                    <field name="rps_type"/>
+                </group>
+            </group>
+            <field name="authorization_protocol" position="after">
+                <field name="verify_code"  attrs="{'invisible': [('document_type', '!=', 'SE')]}"/>
             </field>
         </field>
     </record>
diff --git a/l10n_br_nfse/wizards/__init__.py b/l10n_br_nfse/wizards/__init__.py
deleted file mode 100644
index 18ad30b59bc3..000000000000
--- a/l10n_br_nfse/wizards/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from . import wizard_document_status
diff --git a/l10n_br_nfse/wizards/wizard_document_status.py b/l10n_br_nfse/wizards/wizard_document_status.py
deleted file mode 100644
index 7d0e91d71265..000000000000
--- a/l10n_br_nfse/wizards/wizard_document_status.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2020 KMEE
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-from odoo import api, fields, models
-
-
-class WizardDocumentStatus(models.TransientModel):
-
-    _inherit = 'l10n_br_fiscal.document.status.wizard'
-
-    rps_number = fields.Char(
-        string='RPS Number',
-        default=lambda self: self.env['l10n_br_fiscal.document'].browse(
-            self._context.get('active_ids', [])).rps_number
-    )
-
-    @api.multi
-    def get_document_status(self):
-        for data in self:
-            document_id = self.env['l10n_br_fiscal.document'].browse(
-                self._context.get('active_ids', []))[0]
-            call_result = {
-                "document_status": document_id.action_consultar_nfse_rps(),
-                "rps_number": data.rps_number,
-                "state": "done",
-            }
-            data.write(call_result)
-
-            return {
-                "name": "Fiscal Document Inquiry",
-                "view_type": "form",
-                "view_mode": "form",
-                "res_model": "l10n_br_fiscal.document.status.wizard",
-                "res_id": data.id,
-                "type": "ir.actions.act_window",
-                "target": "new",
-                "context": data.env.context,
-            }
diff --git a/l10n_br_nfse/wizards/wizard_document_status.xml b/l10n_br_nfse/wizards/wizard_document_status.xml
deleted file mode 100644
index 6c4721b5976b..000000000000
--- a/l10n_br_nfse/wizards/wizard_document_status.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2020 KMEE
-     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
-
-<odoo>
-
-    <record model="ir.ui.view" id="wizard_document_status_form_view">
-        <field name="name">wizard.document.status.form (in l10n_br_nfse)</field>
-        <field name="model">l10n_br_fiscal.document.status.wizard</field>
-        <field name="inherit_id" ref="l10n_br_fiscal.document_status_wizard_form"/>
-        <field name="arch" type="xml">
-            <group states="done" position="before">
-                <group  colspan="2" col='2'>
-                  <field name="rps_number" readonly="1"/>
-                </group>
-            </group>
-        </field>
-    </record>
-
-
-    <record model="ir.actions.act_window" id="wizard_document_status_act_multi">
-        <field name="name">Fiscal Document Inquiry</field>
-        <field name="res_model">l10n_br_fiscal.document.status.wizard</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">form</field>
-        <field name="binding_model_id" ref="model_l10n_br_fiscal_document" />
-        <field name="target">new</field>
-    </record>
-
-</odoo>
diff --git a/l10n_br_nfse_ginfes/__manifest__.py b/l10n_br_nfse_ginfes/__manifest__.py
index e1cd08cb5695..be2ff9343bec 100644
--- a/l10n_br_nfse_ginfes/__manifest__.py
+++ b/l10n_br_nfse_ginfes/__manifest__.py
@@ -10,7 +10,7 @@
     'author': 'KMEE, Odoo Community Association (OCA)',
     'maintainers': ['gabrielcardoso21', 'mileo', 'luismalta'],
     'website': 'https://github.com/OCA/l10n-brazil',
-    "development_status": "Alpha",
+    "development_status": "Beta",
     'external_dependencies': {
         'python': [
             'erpbrasil.edoc',
diff --git a/l10n_br_nfse_ginfes/models/document.py b/l10n_br_nfse_ginfes/models/document.py
index 12bdde0b5555..bf7499a6f831 100644
--- a/l10n_br_nfse_ginfes/models/document.py
+++ b/l10n_br_nfse_ginfes/models/document.py
@@ -19,10 +19,14 @@
 )
 
 from odoo import models, api, _
+from odoo.exceptions import UserError
 from odoo.addons.l10n_br_fiscal.constants.fiscal import (
+    EVENT_ENV_HML,
+    EVENT_ENV_PROD,
     MODELO_FISCAL_NFSE,
+    PROCESSADOR_OCA,
     SITUACAO_EDOC_AUTORIZADA,
-    PROCESSADOR_OCA
+    SITUACAO_EDOC_REJEITADA,
 )
 
 from ..constants.ginfes import (
@@ -31,7 +35,7 @@
 )
 
 
-def filter_processador_edoc_nfse_ginfes(record):
+def filter_oca_nfse(record):
     if (record.processador_edoc == PROCESSADOR_OCA and
             record.document_type_id.code in [
                 MODELO_FISCAL_NFSE,
@@ -40,7 +44,7 @@ def filter_processador_edoc_nfse_ginfes(record):
     return False
 
 
-def fiter_provedor_ginfes(record):
+def filter_ginfes(record):
     if record.company_id.provedor_nfse == 'ginfes':
         return True
     return False
@@ -50,35 +54,13 @@ class Document(models.Model):
 
     _inherit = 'l10n_br_fiscal.document'
 
-    def convert_type_nfselib(self, class_object, object_filed, value):
-        if value is None:
-            return value
-
-        value_type = ''
-        for field in class_object().member_data_items_:
-            if field.name == object_filed:
-                value_type = field.child_attrs.get('type', '').\
-                    replace('xsd:', '')
-                break
-
-        if value_type in ('int', 'byte', 'nonNegativeInteger'):
-            return int(value)
-        elif value_type == 'decimal':
-            return float(value)
-        elif value_type == 'string':
-            return str(value)
-        else:
-            return value
-
     def _serialize(self, edocs):
-        edocs = super(Document, self)._serialize(edocs)
-        for record in self.filtered(
-                filter_processador_edoc_nfse_ginfes).filtered(
-                    fiter_provedor_ginfes):
+        edocs = super()._serialize(edocs)
+        for record in self.filtered(filter_oca_nfse).filtered(filter_ginfes):
             edocs.append(record.serialize_nfse_ginfes())
         return edocs
 
-    def _serialize_dados_servico(self):
+    def _serialize_ginfes_dados_servico(self):
         self.line_ids.ensure_one()
         dados = self._prepare_dados_servico()
         return tcDadosServico(
@@ -127,7 +109,7 @@ def _serialize_dados_servico(self):
                 tcDadosServico, 'CodigoMunicipio', dados['codigo_municipio']),
         )
 
-    def _serialize_dados_tomador(self):
+    def _serialize_ginfes_dados_tomador(self):
         dados = self._prepare_dados_tomador()
         return tcDadosTomador(
             IdentificacaoTomador=tcIdentificacaoTomador(
@@ -159,7 +141,7 @@ def _serialize_dados_tomador(self):
             ) or None,
         )
 
-    def _serialize_rps(self, dados):
+    def _serialize_ginfes_rps(self, dados):
 
         return tcRps(
             InfRps=tcInfRps(
@@ -173,7 +155,7 @@ def _serialize_rps(self, dados):
                         tcIdentificacaoRps, 'Tipo', dados['tipo']),
                 ),
                 DataEmissao=self.convert_type_nfselib(
-                    tcInfRps, 'DataEmissao', dados['data_emissao']),
+                    tcInfRps, 'DataEmissao', dados['date_in_out']),
                 NaturezaOperacao=self.convert_type_nfselib(
                     tcInfRps, 'NaturezaOperacao', dados['natureza_operacao']),
                 RegimeEspecialTributacao=self.convert_type_nfselib(
@@ -189,7 +171,7 @@ def _serialize_rps(self, dados):
                     tcInfRps, 'Status', dados['status']),
                 RpsSubstituido=self.convert_type_nfselib(
                     tcInfRps, 'RpsSubstituido', dados['rps_substitiuido']),
-                Servico=self._serialize_dados_servico(),
+                Servico=self._serialize_ginfes_dados_servico(),
                 Prestador=tcIdentificacaoPrestador(
                     Cnpj=self.convert_type_nfselib(
                         tcIdentificacaoPrestador, 'InscricaoMunicipal',
@@ -198,7 +180,7 @@ def _serialize_rps(self, dados):
                         tcIdentificacaoPrestador, 'InscricaoMunicipal',
                         dados['inscricao_municipal']),
                 ),
-                Tomador=self._serialize_dados_tomador(),
+                Tomador=self._serialize_ginfes_dados_tomador(),
                 IntermediarioServico=self.convert_type_nfselib(
                     tcInfRps, 'IntermediarioServico',
                     dados['intermediario_servico']),
@@ -207,7 +189,7 @@ def _serialize_rps(self, dados):
             )
         )
 
-    def _serialize_lote_rps(self):
+    def _serialize_ginfes_lote_rps(self):
         dados = self._prepare_lote_rps()
         return tcLoteRps(
             Cnpj=self.convert_type_nfselib(tcLoteRps, 'Cnpj', dados['cnpj']),
@@ -215,139 +197,158 @@ def _serialize_lote_rps(self):
                 tcLoteRps, 'InscricaoMunicipal', dados['inscricao_municipal']),
             QuantidadeRps=1,
             ListaRps=ListaRpsType(
-                Rps=[self._serialize_rps(dados)]
+                Rps=[self._serialize_ginfes_rps(dados)]
             )
         )
 
     def serialize_nfse_ginfes(self):
-        # numero_lote = 14
         lote_rps = EnviarLoteRpsEnvio(
-            LoteRps=self._serialize_lote_rps()
+            LoteRps=self._serialize_ginfes_lote_rps()
         )
         return lote_rps
 
     def cancel_document_ginfes(self):
-        for record in self.filtered(filter_processador_edoc_nfse_ginfes):
+        for record in self.filtered(filter_oca_nfse).filtered(filter_ginfes):
             processador = record._processador_erpbrasil_nfse()
-            processo = processador.cancela_documento(doc_numero=int(self.number))
+            processo = processador.cancela_documento(doc_numero=int(
+                record.document_number))
 
             status, message = \
                 processador.analisa_retorno_cancelamento(processo)
 
+            if not status:
+                raise UserError(_(message))
+
+            record.cancel_event_id = record.event_ids.create_event_save_xml(
+                company_id=record.company_id,
+                environment=(
+                    EVENT_ENV_PROD if self.nfe_environment == '1' else EVENT_ENV_HML),
+                event_type='2',
+                xml_file=processo.envio_xml.decode('utf-8'),
+                document_id=record,
+            )
+
             return status
 
-    def action_consultar_nfse_rps(self):
-        for record in self.filtered(filter_processador_edoc_nfse_ginfes):
+    def _document_status(self):
+        for record in self.filtered(filter_oca_nfse):
             processador = record._processador_erpbrasil_nfse()
             processo = processador.consulta_nfse_rps(
-                rps_number=int(self.rps_number),
-                rps_serie=self.document_serie,
-                rps_type=int(self.rps_type)
+                rps_number=int(record.rps_number),
+                rps_serie=record.document_serie,
+                rps_type=int(record.rps_type)
             )
 
             return _(
                 processador.analisa_retorno_consulta(
                     processo,
-                    self.number,
-                    self.company_cnpj_cpf,
-                    self.company_legal_name)
+                    record.document_number,
+                    record.company_cnpj_cpf,
+                    record.company_legal_name)
             )
 
     @api.multi
     def _eletronic_document_send(self):
-        super(Document, self)._eletronic_document_send()
-        for record in self.filtered(filter_processador_edoc_nfse_ginfes):
-            for record in self.filtered(fiter_provedor_ginfes):
-                processador = record._processador_erpbrasil_nfse()
-
-                protocolo = record.protocolo_autorizacao
-                vals = dict()
-
-                if not protocolo:
-                    for edoc in record.serialize():
-                        processo = None
-                        for p in processador.processar_documento(edoc):
-                            processo = p
-
-                            if processo.webservice in RECEPCIONAR_LOTE_RPS:
-                                if processo.resposta.Protocolo is None:
-                                    mensagem_completa = ''
-                                    if processo.resposta.ListaMensagemRetorno:
-                                        lista_msgs = processo.resposta.\
-                                            ListaMensagemRetorno
-                                        for mr in lista_msgs.MensagemRetorno:
-
-                                            correcao = ''
-                                            if mr.Correcao:
-                                                correcao = mr.Correcao
-
-                                            mensagem_completa += (
-                                                mr.Codigo + ' - ' +
-                                                mr.Mensagem +
-                                                ' - Correção: ' +
-                                                correcao + '\n'
-                                            )
-                                    vals['edoc_error_message'] = \
-                                        mensagem_completa
-                                    record.write(vals)
-                                    return
-                                protocolo = processo.resposta.Protocolo
-
-                        if processo.webservice in CONSULTAR_SITUACAO_LOTE_RPS:
-                            vals['codigo_situacao'] = \
-                                processo.resposta.Situacao
-                else:
-                    vals['codigo_situacao'] = 4
-
-                if vals.get('codigo_situacao') == 1:
-                    vals['motivo_situacao'] = _('Não Recebido')
-
-                elif vals.get('codigo_situacao') == 2:
-                    vals['motivo_situacao'] = _('Lote ainda não processado')
-
-                elif vals.get('codigo_situacao') == 3:
-                    vals['motivo_situacao'] = _('Procesado com Erro')
-
-                elif vals.get('codigo_situacao') == 4:
-                    vals['motivo_situacao'] = _('Procesado com Sucesso')
-                    vals['protocolo_autorizacao'] = protocolo
-
-                if vals.get('codigo_situacao') in (3, 4):
-                    processo = processador.consultar_lote_rps(protocolo)
-
-                    if processo.resposta:
-                        mensagem_completa = ''
-                        if processo.resposta.ListaMensagemRetorno:
-                            lista_msgs = processo.resposta.ListaMensagemRetorno
-                            for mr in lista_msgs.MensagemRetorno:
-
-                                correcao = ''
-                                if mr.Correcao:
-                                    correcao = mr.Correcao
-
-                                mensagem_completa += (
-                                    mr.Codigo + ' - ' +
-                                    mr.Mensagem +
-                                    ' - Correção: ' +
-                                    correcao + '\n'
-                                )
-                        vals['edoc_error_message'] = mensagem_completa
-
-                    if processo.resposta.ListaNfse:
-                        xml_file = processo.retorno
-                        record.autorizacao_event_id.set_done(xml_file)
-                        for comp in processo.resposta.ListaNfse.CompNfse:
-                            vals['number'] = comp.Nfse.InfNfse.Numero
-                            vals['data_hora_autorizacao'] = \
-                                comp.Nfse.InfNfse.DataEmissao
-                            vals['verify_code'] = \
-                                comp.Nfse.InfNfse.CodigoVerificacao
-                        record._change_state(SITUACAO_EDOC_AUTORIZADA)
-
-                record.write(vals)
+        super()._eletronic_document_send()
+        for record in self.filtered(filter_oca_nfse).filtered(filter_ginfes):
+            processador = record._processador_erpbrasil_nfse()
+
+            protocolo = record.authorization_protocol
+            vals = dict()
+
+            if not protocolo:
+                for edoc in record.serialize():
+                    processo = None
+                    for p in processador.processar_documento(edoc):
+                        processo = p
+
+                        if processo.webservice in RECEPCIONAR_LOTE_RPS:
+                            if processo.resposta.Protocolo is None:
+                                mensagem_completa = ''
+                                if processo.resposta.ListaMensagemRetorno:
+                                    lista_msgs = processo.resposta.\
+                                        ListaMensagemRetorno
+                                    for mr in lista_msgs.MensagemRetorno:
+
+                                        correcao = ''
+                                        if mr.Correcao:
+                                            correcao = mr.Correcao
+
+                                        mensagem_completa += (
+                                            mr.Codigo + ' - ' +
+                                            mr.Mensagem +
+                                            ' - Correção: ' +
+                                            correcao + '\n'
+                                        )
+                                vals['edoc_error_message'] = \
+                                    mensagem_completa
+                                record._change_state(SITUACAO_EDOC_REJEITADA)
+                                record.write(vals)
+                                return
+                            protocolo = processo.resposta.Protocolo
+
+                    if processo.webservice in CONSULTAR_SITUACAO_LOTE_RPS:
+                        vals['status_code'] = \
+                            processo.resposta.Situacao
+            else:
+                vals['status_code'] = 4
+
+            if vals.get('status_code') == 1:
+                vals['status_name'] = _('Not received')
+
+            elif vals.get('status_code') == 2:
+                vals['status_name'] = _('Batch not yet processed')
+
+            elif vals.get('status_code') == 3:
+                vals['status_name'] = _('Processed with Error')
+
+            elif vals.get('status_code') == 4:
+                vals['status_name'] = _('Successfully Processed')
+                vals['authorization_protocol'] = protocolo
+
+            if vals.get('status_code') in (3, 4):
+                processo = processador.consultar_lote_rps(protocolo)
+
+                if processo.resposta:
+                    mensagem_completa = ''
+                    if processo.resposta.ListaMensagemRetorno:
+                        lista_msgs = processo.resposta.ListaMensagemRetorno
+                        for mr in lista_msgs.MensagemRetorno:
+
+                            correcao = ''
+                            if mr.Correcao:
+                                correcao = mr.Correcao
+
+                            mensagem_completa += (
+                                mr.Codigo + ' - ' +
+                                mr.Mensagem +
+                                ' - Correção: ' +
+                                correcao + '\n'
+                            )
+                    vals['edoc_error_message'] = mensagem_completa
+                    if vals.get('status_code') == 3:
+                        record._change_state(SITUACAO_EDOC_REJEITADA)
+
+                if processo.resposta.ListaNfse:
+                    xml_file = processo.retorno
+                    for comp in processo.resposta.ListaNfse.CompNfse:
+                        vals['document_number'] = comp.Nfse.InfNfse.Numero
+                        vals['authorization_date'] = \
+                            comp.Nfse.InfNfse.DataEmissao
+                        vals['verify_code'] = \
+                            comp.Nfse.InfNfse.CodigoVerificacao
+                    record.authorization_event_id.set_done(
+                        status_code=vals['status_code'],
+                        response=vals['status_name'],
+                        protocol_date=vals['authorization_date'],
+                        protocol_number=protocolo,
+                        file_response_xml=xml_file,
+                    )
+                    record._change_state(SITUACAO_EDOC_AUTORIZADA)
+
+            record.write(vals)
         return
 
     def _exec_before_SITUACAO_EDOC_CANCELADA(self, old_state, new_state):
-        super(Document, self)._exec_before_SITUACAO_EDOC_CANCELADA(
-            old_state, new_state)
+        super()._exec_before_SITUACAO_EDOC_CANCELADA(old_state, new_state)
         return self.cancel_document_ginfes()
diff --git a/l10n_br_nfse_ginfes/tests/test_fiscal_document_nfse_ginfes.py b/l10n_br_nfse_ginfes/tests/test_fiscal_document_nfse_ginfes.py
index d68707406447..b1d5136054fb 100644
--- a/l10n_br_nfse_ginfes/tests/test_fiscal_document_nfse_ginfes.py
+++ b/l10n_br_nfse_ginfes/tests/test_fiscal_document_nfse_ginfes.py
@@ -35,7 +35,7 @@ def test_nfse_ginfes(self):
         self.nfse_same_state._onchange_fiscal_operation_id()
         self.nfse_same_state._onchange_company_id()
         self.nfse_same_state.rps_number = '50'
-        self.nfse_same_state.number = '50'
+        self.nfse_same_state.document_number = '50'
 
         for line in self.nfse_same_state.line_ids:
             line._onchange_product_id_fiscal()
@@ -47,7 +47,7 @@ def test_nfse_ginfes(self):
 
         self.nfse_same_state.action_document_confirm()
 
-        self.nfse_same_state.date = datetime.strptime(
+        self.nfse_same_state.document_date = datetime.strptime(
             '2020-06-04T11:58:46', '%Y-%m-%dT%H:%M:%S')
         self.nfse_same_state.date_in_out = datetime.strptime(
             '2020-06-04T11:58:46', '%Y-%m-%dT%H:%M:%S')
@@ -55,7 +55,7 @@ def test_nfse_ginfes(self):
         self.nfse_same_state.with_context(lang='pt_BR')._document_export()
 
         output = os.path.join(config['data_dir'], 'filestore', self.cr.dbname,
-                              self.nfse_same_state.file_xml_id.store_fname)
+                              self.nfse_same_state.send_file_id.store_fname)
         _logger.info("XML file saved at %s" % (output,))
 
         diff = main.diff_files(xml_path, output)
diff --git a/l10n_br_nfse_issnet/models/l10n_br_fiscal_document.py b/l10n_br_nfse_issnet/models/l10n_br_fiscal_document.py
index 92447c42dc0a..d89034df0161 100644
--- a/l10n_br_nfse_issnet/models/l10n_br_fiscal_document.py
+++ b/l10n_br_nfse_issnet/models/l10n_br_fiscal_document.py
@@ -19,10 +19,14 @@
 )
 
 from odoo import models, api, _
+from odoo.exceptions import UserError
 from odoo.addons.l10n_br_fiscal.constants.fiscal import (
+    EVENT_ENV_HML,
+    EVENT_ENV_PROD,
     MODELO_FISCAL_NFSE,
-    SITUACAO_EDOC_AUTORIZADA,
     PROCESSADOR_OCA,
+    SITUACAO_EDOC_AUTORIZADA,
+    SITUACAO_EDOC_REJEITADA,
 )
 
 from ..constants.issnet import (
@@ -31,7 +35,7 @@
 )
 
 
-def filter_processador_edoc_nfse_issnet(record):
+def filter_processador_edoc_nfse(record):
     if (record.processador_edoc == PROCESSADOR_OCA and
             record.document_type_id.code in [
                 MODELO_FISCAL_NFSE,
@@ -50,35 +54,15 @@ class Document(models.Model):
 
     _inherit = 'l10n_br_fiscal.document'
 
-    def convert_type_nfselib(self, class_object, object_filed, value):
-        if value is None:
-            return value
-
-        value_type = ''
-        for field in class_object().member_data_items_:
-            if field.name == object_filed:
-                value_type = field.child_attrs.get('type', '').\
-                    replace('xsd:', '')
-                break
-
-        if value_type in ('int', 'byte', 'nonNegativeInteger'):
-            return int(value)
-        elif value_type == 'decimal':
-            return float(value)
-        elif value_type == 'string':
-            return str(value)
-        else:
-            return value
-
     def _serialize(self, edocs):
         edocs = super(Document, self)._serialize(edocs)
         for record in self.filtered(
-                filter_processador_edoc_nfse_issnet).filtered(
+                filter_processador_edoc_nfse).filtered(
                     fiter_provedor_issnet):
             edocs.append(record.serialize_nfse_issnet())
         return edocs
 
-    def _serialize_dados_servico(self):
+    def _serialize_issnet_dados_servico(self):
         self.line_ids.ensure_one()
         dados = self._prepare_dados_servico()
         return tcDadosServico(
@@ -131,7 +115,7 @@ def _serialize_dados_servico(self):
             else 999,
         )
 
-    def _serialize_dados_tomador(self):
+    def _serialize_issnet_dados_tomador(self):
         dados = self._prepare_dados_tomador()
         return tcDadosTomador(
             IdentificacaoTomador=tcIdentificacaoTomador(
@@ -167,7 +151,7 @@ def _serialize_dados_tomador(self):
             ) or None,
         )
 
-    def _serialize_rps(self, dados):
+    def _serialize_issnet_rps(self, dados):
 
         return tcRps(
             InfRps=tcInfRps(
@@ -197,7 +181,7 @@ def _serialize_rps(self, dados):
                     tcInfRps, 'Status', dados['status']),
                 RpsSubstituido=self.convert_type_nfselib(
                     tcInfRps, 'RpsSubstituido', dados['rps_substitiuido']),
-                Servico=self._serialize_dados_servico(),
+                Servico=self._serialize_issnet_dados_servico(),
                 Prestador=tcIdentificacaoPrestador(
                     CpfCnpj=tcCpfCnpj(
                         Cnpj=self.convert_type_nfselib(
@@ -207,7 +191,7 @@ def _serialize_rps(self, dados):
                         tcIdentificacaoPrestador, 'InscricaoMunicipal',
                         dados['inscricao_municipal']),
                 ),
-                Tomador=self._serialize_dados_tomador(),
+                Tomador=self._serialize_issnet_dados_tomador(),
                 IntermediarioServico=self.convert_type_nfselib(
                     tcInfRps, 'IntermediarioServico',
                     dados['intermediario_servico']),
@@ -216,7 +200,7 @@ def _serialize_rps(self, dados):
             )
         )
 
-    def _serialize_lote_rps(self):
+    def _serialize_issnet_lote_rps(self):
         dados = self._prepare_lote_rps()
         return tcLoteRps(
             CpfCnpj=tcCpfCnpj(
@@ -227,88 +211,77 @@ def _serialize_lote_rps(self):
                 tcLoteRps, 'InscricaoMunicipal', dados['inscricao_municipal']),
             QuantidadeRps=1,
             ListaRps=ListaRpsType(
-                Rps=[self._serialize_rps(dados)]
+                Rps=[self._serialize_issnet_rps(dados)]
             )
         )
 
     def serialize_nfse_issnet(self):
         lote_rps = EnviarLoteRpsEnvio(
-            LoteRps=self._serialize_lote_rps()
+            LoteRps=self._serialize_issnet_lote_rps()
         )
         return lote_rps
 
     def cancel_document_issnet(self):
-        for record in self.filtered(filter_processador_edoc_nfse_issnet):
+        for record in self.filtered(filter_processador_edoc_nfse):
             processador = record._processador_erpbrasil_nfse()
-            processo = processador.cancela_documento(doc_numero=int(self.number))
+            processo = processador.cancela_documento(doc_numero=int(
+                record.document_number))
 
             status, message = \
                 processador.analisa_retorno_cancelamento(processo)
 
+            if not status:
+                raise UserError(_(message))
+
+            record.cancel_event_id = record.event_ids.create_event_save_xml(
+                company_id=record.company_id,
+                environment=(
+                    EVENT_ENV_PROD if self.nfe_environment == '1' else EVENT_ENV_HML),
+                event_type='2',
+                xml_file=processo.envio_xml,
+                document_id=record,
+            )
+
             return status
 
-    def action_consultar_nfse_rps(self):
-        for record in self.filtered(filter_processador_edoc_nfse_issnet):
+    def _document_status(self):
+        for record in self.filtered(filter_processador_edoc_nfse):
             processador = record._processador_erpbrasil_nfse()
             processo = processador.consulta_nfse_rps(
-                rps_number=int(self.rps_number),
-                document_serie=self.document_serie,
-                rps_type=int(self.rps_type)
+                rps_number=int(record.rps_number),
+                document_serie=record.document_serie,
+                rps_type=int(record.rps_type)
             )
 
             return _(
                 processador.analisa_retorno_consulta(
                     processo,
-                    self.number,
-                    self.company_cnpj_cpf,
-                    self.company_legal_name)
+                    record.document_number,
+                    record.company_cnpj_cpf,
+                    record.company_legal_name)
             )
 
     @api.multi
     def _eletronic_document_send(self):
         super(Document, self)._eletronic_document_send()
-        for record in self.filtered(filter_processador_edoc_nfse_issnet):
-            for record in self.filtered(fiter_provedor_issnet):
-                processador = record._processador_erpbrasil_nfse()
-
-                protocolo = record.protocolo_autorizacao
-                vals = dict()
-
-                if not protocolo:
-                    for edoc in record.serialize():
-                        processo = None
-                        for p in processador.processar_documento(edoc):
-                            processo = p
-
-                            if processo.webservice in RECEPCIONAR_LOTE_RPS:
-                                if processo.resposta.Protocolo is None:
-                                    mensagem_completa = ''
-                                    if processo.resposta.ListaMensagemRetorno:
-                                        lista_msgs = processo.resposta.\
-                                            ListaMensagemRetorno
-                                        for mr in lista_msgs.MensagemRetorno:
-
-                                            correcao = ''
-                                            if mr.Correcao:
-                                                correcao = mr.Correcao
-
-                                            mensagem_completa += (
-                                                mr.Codigo + ' - ' +
-                                                mr.Mensagem +
-                                                ' - Correção: ' +
-                                                correcao + '\n'
-                                            )
-                                    vals['edoc_error_message'] = \
-                                        mensagem_completa
-                                    record.write(vals)
-                                    return
-                                protocolo = processo.resposta.Protocolo
-
-                        if processo.webservice in CONSULTAR_SITUACAO_LOTE_RPS:
-                            if processo.resposta.Situacao is None:
+        edoc_nfse = self.filtered(filter_processador_edoc_nfse)
+        for record in edoc_nfse.filtered(fiter_provedor_issnet):
+            processador = record._processador_erpbrasil_nfse()
+
+            protocolo = record.authorization_protocol
+            vals = dict()
+
+            if not protocolo:
+                for edoc in record.serialize():
+                    processo = None
+                    for p in processador.processar_documento(edoc):
+                        processo = p
+
+                        if processo.webservice in RECEPCIONAR_LOTE_RPS:
+                            if processo.resposta.Protocolo is None:
                                 mensagem_completa = ''
                                 if processo.resposta.ListaMensagemRetorno:
-                                    lista_msgs = processo.resposta. \
+                                    lista_msgs = processo.resposta.\
                                         ListaMensagemRetorno
                                     for mr in lista_msgs.MensagemRetorno:
 
@@ -324,60 +297,94 @@ def _eletronic_document_send(self):
                                         )
                                 vals['edoc_error_message'] = \
                                     mensagem_completa
+                                record._change_state(SITUACAO_EDOC_REJEITADA)
                                 record.write(vals)
                                 return
-                            else:
-                                vals['codigo_situacao'] = \
-                                    processo.resposta.Situacao
-                else:
-                    vals['codigo_situacao'] = 4
-
-                if vals.get('codigo_situacao') == 1:
-                    vals['motivo_situacao'] = _('Not received')
-
-                elif vals.get('codigo_situacao') == 2:
-                    vals['motivo_situacao'] = _('Batch not yet processed')
-
-                elif vals.get('codigo_situacao') == 3:
-                    vals['motivo_situacao'] = _('Processed with Error')
-
-                elif vals.get('codigo_situacao') == 4:
-                    vals['motivo_situacao'] = _('Successfully Processed')
-                    vals['protocolo_autorizacao'] = protocolo
-
-                if vals.get('codigo_situacao') in (3, 4):
-                    processo = processador.consultar_lote_rps(protocolo)
-
-                    if processo.resposta:
-                        mensagem_completa = ''
-                        if processo.resposta.ListaMensagemRetorno:
-                            lista_msgs = processo.resposta.ListaMensagemRetorno
-                            for mr in lista_msgs.MensagemRetorno:
-
-                                correcao = ''
-                                if mr.Correcao:
-                                    correcao = mr.Correcao
-
-                                mensagem_completa += (
-                                    mr.Codigo + ' - ' +
-                                    mr.Mensagem +
-                                    ' - Correção: ' +
-                                    correcao + '\n'
-                                )
-                        vals['edoc_error_message'] = mensagem_completa
-
-                    if processo.resposta.ListaNfse:
-                        xml_file = processo.retorno
-                        record.autorizacao_event_id.set_done(xml_file)
-                        for comp in processo.resposta.ListaNfse.CompNfse:
-                            vals['number'] = comp.Nfse.InfNfse.Numero
-                            vals['data_hora_autorizacao'] = \
-                                comp.Nfse.InfNfse.DataEmissao
-                            vals['verify_code'] = \
-                                comp.Nfse.InfNfse.CodigoVerificacao
-                        record._change_state(SITUACAO_EDOC_AUTORIZADA)
-
-                record.write(vals)
+                            protocolo = processo.resposta.Protocolo
+
+                    if processo.webservice in CONSULTAR_SITUACAO_LOTE_RPS:
+                        if processo.resposta.Situacao is None:
+                            mensagem_completa = ''
+                            if processo.resposta.ListaMensagemRetorno:
+                                lista_msgs = processo.resposta. \
+                                    ListaMensagemRetorno
+                                for mr in lista_msgs.MensagemRetorno:
+
+                                    correcao = ''
+                                    if mr.Correcao:
+                                        correcao = mr.Correcao
+
+                                    mensagem_completa += (
+                                        mr.Codigo + ' - ' +
+                                        mr.Mensagem +
+                                        ' - Correção: ' +
+                                        correcao + '\n'
+                                    )
+                            vals['edoc_error_message'] = \
+                                mensagem_completa
+                            record._change_state(SITUACAO_EDOC_REJEITADA)
+                            record.write(vals)
+                            return
+                        else:
+                            vals['status_code'] = \
+                                processo.resposta.Situacao
+            else:
+                vals['status_code'] = 4
+
+            if vals.get('status_code') == 1:
+                vals['status_name'] = _('Not received')
+
+            elif vals.get('status_code') == 2:
+                vals['status_name'] = _('Batch not yet processed')
+
+            elif vals.get('status_code') == 3:
+                vals['status_name'] = _('Processed with Error')
+
+            elif vals.get('status_code') == 4:
+                vals['status_name'] = _('Successfully Processed')
+                vals['authorization_protocol'] = protocolo
+
+            if vals.get('status_code') in (3, 4):
+                processo = processador.consultar_lote_rps(protocolo)
+
+                if processo.resposta:
+                    mensagem_completa = ''
+                    if processo.resposta.ListaMensagemRetorno:
+                        lista_msgs = processo.resposta.ListaMensagemRetorno
+                        for mr in lista_msgs.MensagemRetorno:
+
+                            correcao = ''
+                            if mr.Correcao:
+                                correcao = mr.Correcao
+
+                            mensagem_completa += (
+                                mr.Codigo + ' - ' +
+                                mr.Mensagem +
+                                ' - Correção: ' +
+                                correcao + '\n'
+                            )
+                    vals['edoc_error_message'] = mensagem_completa
+                    if vals.get('status_code') == 3:
+                        record._change_state(SITUACAO_EDOC_REJEITADA)
+
+                if processo.resposta.ListaNfse:
+                    xml_file = processo.retorno
+                    for comp in processo.resposta.ListaNfse.CompNfse:
+                        vals['document_number'] = comp.Nfse.InfNfse.Numero
+                        vals['authorization_date'] = \
+                            comp.Nfse.InfNfse.DataEmissao
+                        vals['verify_code'] = \
+                            comp.Nfse.InfNfse.CodigoVerificacao
+                    record.authorization_event_id.set_done(
+                        status_code=vals['status_code'],
+                        response=vals['status_name'],
+                        protocol_date=vals['authorization_date'],
+                        protocol_number=protocolo,
+                        file_response_xml=xml_file,
+                    )
+                    record._change_state(SITUACAO_EDOC_AUTORIZADA)
+
+            record.write(vals)
         return
 
     def _exec_before_SITUACAO_EDOC_CANCELADA(self, old_state, new_state):
diff --git a/l10n_br_nfse_issnet/tests/test_fiscal_document_nfse_issnet.py b/l10n_br_nfse_issnet/tests/test_fiscal_document_nfse_issnet.py
index 3c61ef9a9c43..e801118e655c 100644
--- a/l10n_br_nfse_issnet/tests/test_fiscal_document_nfse_issnet.py
+++ b/l10n_br_nfse_issnet/tests/test_fiscal_document_nfse_issnet.py
@@ -34,7 +34,7 @@ def test_nfse_issnet(self):
         self.nfse_same_state._onchange_fiscal_operation_id()
         self.nfse_same_state._onchange_company_id()
         self.nfse_same_state.rps_number = '50'
-        self.nfse_same_state.number = '50'
+        self.nfse_same_state.document_number = '50'
 
         for line in self.nfse_same_state.line_ids:
             line._onchange_product_id_fiscal()
@@ -46,7 +46,7 @@ def test_nfse_issnet(self):
 
         self.nfse_same_state.action_document_confirm()
 
-        self.nfse_same_state.date = datetime.strptime(
+        self.nfse_same_state.document_date = datetime.strptime(
             '2020-06-04T11:58:46', '%Y-%m-%dT%H:%M:%S')
         self.nfse_same_state.date_in_out = datetime.strptime(
             '2020-06-04T11:58:46', '%Y-%m-%dT%H:%M:%S')
@@ -54,7 +54,7 @@ def test_nfse_issnet(self):
         self.nfse_same_state.with_context(lang='pt_BR')._document_export()
 
         output = os.path.join(config['data_dir'], 'filestore', self.cr.dbname,
-                              self.nfse_same_state.file_xml_id.store_fname)
+                              self.nfse_same_state.send_file_id.store_fname)
         _logger.info("XML file saved at %s" % (output,))
 
         diff = main.diff_files(xml_path, output)
diff --git a/requirements.txt b/requirements.txt
index 96016ff3cdf4..420bd84e0d2d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,8 +4,8 @@ workalendar==7.1.1
 erpbrasil.base==2.1.0
 erpbrasil.assinatura==1.1.0
 erpbrasil.transmissao==1.0.0
-erpbrasil.edoc==2.0.0
-erpbrasil.edoc.pdf==0.1.2
+erpbrasil.edoc==2.0.2
+erpbrasil.edoc.pdf==1.0.1
 nfselib.ginfes==0.2.0
 nfselib.issnet==0.2.0
 xmldiff==2.4