Skip to content

Commit

Permalink
Merge branch '14.0' into 13.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@danimaribeiro
danimaribeiro authored Oct 31, 2020
2 parents 4540d67 + 1c004ac commit ea8b687
Show file tree
Hide file tree
Showing 20 changed files with 98 additions and 61 deletions.
2 changes: 1 addition & 1 deletion br_coa_me_epp/__manifest__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
'name': 'Plano de Contas para Microempresa e Empresa de Pequeno Porte',
'summary': "Plano de Contas para Microempresa e Empresa de Pequeno Porte",
'description': """Plano de Contas para Microempresa e EPP""",
'version': '13.0.1.0.0',
'version': '14.0.1.0.0',
'category': 'Localization',
'author': 'Trustcode',
'license': 'AGPL-3',
Expand Down
108 changes: 72 additions & 36 deletions br_coa_me_epp/data/account_group.xml
View file
Original file line number Diff line number Diff line change
@@ -1,216 +1,252 @@
<odoo>

<record id="account_group_1" model="account.group">
<field name="code_prefix">1</field>
<field name="code_prefix_start">1</field>
<field name="name">Ativo</field>
<field name="company_id" ref="base.main_company"></field>
</record>

<record id="account_group_1_1" model="account.group">
<field name="code_prefix">1.1</field>
<field name="code_prefix_start">1.1</field>
<field name="name">Ativo Circulante</field>
<field name="parent_id" ref="account_group_1"/>
<field name="company_id" ref="base.main_company"></field>
</record>

<record id="account_group_1_1_1" model="account.group">
<field name="code_prefix">1.1.1</field>
<field name="code_prefix_start">1.1.1</field>
<field name="name">Caixa e Equivalentes de Caixa</field>
<field name="parent_id" ref="account_group_1_1"/>
<field name="company_id" ref="base.main_company"></field>
</record>

<record id="account_group_1_1_2" model="account.group">
<field name="code_prefix">1.1.2</field>
<field name="code_prefix_start">1.1.2</field>
<field name="name">Contas a Receber</field>
<field name="parent_id" ref="account_group_1_1"/>
<field name="company_id" ref="base.main_company"></field>
</record>

<record id="account_group_1_1_3" model="account.group">
<field name="code_prefix">1.1.3</field>
<field name="code_prefix_start">1.1.3</field>
<field name="name">Estoque</field>
<field name="parent_id" ref="account_group_1_1"/>
<field name="company_id" ref="base.main_company"></field>
</record>

<record id="account_group_1_1_4" model="account.group">
<field name="code_prefix">1.1.4</field>
<field name="code_prefix_start">1.1.4</field>
<field name="name">Outros Créditos</field>
<field name="parent_id" ref="account_group_1_1"/>
<field name="company_id" ref="base.main_company"></field>
</record>

<record id="account_group_1_3" model="account.group">
<field name="code_prefix">1.3</field>
<field name="code_prefix_start">1.3</field>
<field name="name">Ativo Não Circulante</field>
<field name="parent_id" ref="account_group_1"/>
<field name="company_id" ref="base.main_company"></field>
</record>

<record id="account_group_1_3_1" model="account.group">
<field name="code_prefix">1.3.1</field>
<field name="code_prefix_start">1.3.1</field>
<field name="name">Realizável a Longo Prazo</field>
<field name="parent_id" ref="account_group_1_3"/>
<field name="company_id" ref="base.main_company"></field>
</record>

<record id="account_group_1_3_2" model="account.group">
<field name="code_prefix">1.3.2</field>
<field name="code_prefix_start">1.3.2</field>
<field name="name">Investimentos</field>
<field name="parent_id" ref="account_group_1_3"/>
<field name="company_id" ref="base.main_company"></field>
</record>

<record id="account_group_1_3_3" model="account.group">
<field name="code_prefix">1.3.3</field>
<field name="code_prefix_start">1.3.3</field>
<field name="name">Imobilizado</field>
<field name="parent_id" ref="account_group_1_3"/>
<field name="company_id" ref="base.main_company"></field>
</record>

<record id="account_group_1_3_4" model="account.group">
<field name="code_prefix">1.3.4</field>
<field name="code_prefix_start">1.3.4</field>
<field name="name">Intangível</field>
<field name="parent_id" ref="account_group_1_3"/>
<field name="company_id" ref="base.main_company"></field>
</record>

<record id="account_group_2" model="account.group">
<field name="code_prefix">2</field>
<field name="code_prefix_start">2</field>
<field name="name">Passivo e Patrimônio Líquido</field>
<field name="company_id" ref="base.main_company"></field>
</record>

<record id="account_group_2_1" model="account.group">
<field name="code_prefix">2.1</field>
<field name="code_prefix_start">2.1</field>
<field name="name">Passivo Circulante</field>
<field name="parent_id" ref="account_group_2"/>
<field name="company_id" ref="base.main_company"></field>
</record>

<record id="account_group_2_1_1" model="account.group">
<field name="code_prefix">2.1.1</field>
<field name="code_prefix_start">2.1.1</field>
<field name="name">Fornecedores Nacionais</field>
<field name="parent_id" ref="account_group_2_1"/>
<field name="company_id" ref="base.main_company"></field>
</record>

<record id="account_group_2_1_2" model="account.group">
<field name="code_prefix">2.1.2</field>
<field name="code_prefix_start">2.1.2</field>
<field name="name">Empréstimos e Financiamentos</field>
<field name="parent_id" ref="account_group_2_1"/>
<field name="company_id" ref="base.main_company"></field>
</record>

<record id="account_group_2_1_3" model="account.group">
<field name="code_prefix">2.1.3</field>
<field name="code_prefix_start">2.1.3</field>
<field name="name">Obrigações Fiscais</field>
<field name="parent_id" ref="account_group_2_1"/>
<field name="company_id" ref="base.main_company"></field>
</record>

<record id="account_group_2_1_4" model="account.group">
<field name="code_prefix">2.1.4</field>
<field name="code_prefix_start">2.1.4</field>
<field name="name">Obrigações Trabalhistas e Sociais</field>
<field name="parent_id" ref="account_group_2_1"/>
<field name="company_id" ref="base.main_company"></field>
</record>

<record id="account_group_2_1_5" model="account.group">
<field name="code_prefix">2.1.5</field>
<field name="code_prefix_start">2.1.5</field>
<field name="name">Contas a Pagar</field>
<field name="parent_id" ref="account_group_2_1"/>
<field name="company_id" ref="base.main_company"></field>
</record>

<record id="account_group_2_1_6" model="account.group">
<field name="code_prefix">2.1.6</field>
<field name="code_prefix_start">2.1.6</field>
<field name="name">Provisões</field>
<field name="parent_id" ref="account_group_2_1"/>
<field name="company_id" ref="base.main_company"></field>
</record>

<record id="account_group_2_2" model="account.group">
<field name="code_prefix">2.2</field>
<field name="code_prefix_start">2.2</field>
<field name="name">Passivo Não Circulante</field>
<field name="parent_id" ref="account_group_2"/>
<field name="company_id" ref="base.main_company"></field>
</record>

<record id="account_group_2_2_1" model="account.group">
<field name="code_prefix">2.2.1</field>
<field name="code_prefix_start">2.2.1</field>
<field name="name">Financiamentos</field>
<field name="parent_id" ref="account_group_2_2"/>
<field name="company_id" ref="base.main_company"></field>
</record>

<record id="account_group_2_2_2" model="account.group">
<field name="code_prefix">2.2.2</field>
<field name="code_prefix_start">2.2.2</field>
<field name="name">Outras Contas a Pagar</field>
<field name="parent_id" ref="account_group_2_2"/>
<field name="company_id" ref="base.main_company"></field>
</record>

<record id="account_group_2_3" model="account.group">
<field name="code_prefix">2.3</field>
<field name="code_prefix_start">2.3</field>
<field name="name">Patrimônio Líquido</field>
<field name="parent_id" ref="account_group_2"/>
<field name="company_id" ref="base.main_company"></field>
</record>

<record id="account_group_2_3_1" model="account.group">
<field name="code_prefix">2.3.1</field>
<field name="code_prefix_start">2.3.1</field>
<field name="name">Capital Social</field>
<field name="parent_id" ref="account_group_2_3"/>
<field name="company_id" ref="base.main_company"></field>
</record>

<record id="account_group_2_3_2" model="account.group">
<field name="code_prefix">2.3.2</field>
<field name="code_prefix_start">2.3.2</field>
<field name="name">Reservas</field>
<field name="parent_id" ref="account_group_2_3"/>
<field name="company_id" ref="base.main_company"></field>
</record>

<record id="account_group_2_3_3" model="account.group">
<field name="code_prefix">2.3.3</field>
<field name="code_prefix_start">2.3.3</field>
<field name="name">Passivo Circulante</field>
<field name="parent_id" ref="account_group_2_3"/>
<field name="company_id" ref="base.main_company"></field>
</record>

<record id="account_group_3" model="account.group">
<field name="code_prefix">3</field>
<field name="code_prefix_start">3</field>
<field name="name">Receitas, Custos e Despesas (Contas de Resultado)</field>
<field name="company_id" ref="base.main_company"></field>
</record>

<record id="account_group_3_1" model="account.group">
<field name="code_prefix">3.1</field>
<field name="code_prefix_start">3.1</field>
<field name="name">Receita</field>
<field name="parent_id" ref="account_group_3"/>
<field name="company_id" ref="base.main_company"></field>
</record>

<record id="account_group_3_1_1" model="account.group">
<field name="code_prefix">3.1.1</field>
<field name="code_prefix_start">3.1.1</field>
<field name="name">Receitas de Venda</field>
<field name="parent_id" ref="account_group_3_1"/>
<field name="company_id" ref="base.main_company"></field>
</record>

<record id="account_group_3_1_2" model="account.group">
<field name="code_prefix">3.1.2</field>
<field name="code_prefix_start">3.1.2</field>
<field name="name">Receitas Financeiras</field>
<field name="parent_id" ref="account_group_3_1"/>
<field name="company_id" ref="base.main_company"></field>
</record>

<record id="account_group_3_1_3" model="account.group">
<field name="code_prefix">3.1.3</field>
<field name="code_prefix_start">3.1.3</field>
<field name="name">Outras Receitas Operacionais</field>
<field name="parent_id" ref="account_group_3_1"/>
<field name="company_id" ref="base.main_company"></field>
</record>

<record id="account_group_3_2" model="account.group">
<field name="code_prefix">3.2</field>
<field name="code_prefix_start">3.2</field>
<field name="name">Custos e Despesas</field>
<field name="parent_id" ref="account_group_3"/>
<field name="company_id" ref="base.main_company"></field>
</record>

<record id="account_group_3_2_1" model="account.group">
<field name="code_prefix">3.2.1</field>
<field name="code_prefix_start">3.2.1</field>
<field name="name">Custos dos Produtos, Mercadorias e Serviços Vendidos</field>
<field name="parent_id" ref="account_group_3_2"/>
<field name="company_id" ref="base.main_company"></field>
</record>

<record id="account_group_3_2_2" model="account.group">
<field name="code_prefix">3.2.2</field>
<field name="code_prefix_start">3.2.2</field>
<field name="name">Despesas Operacionais</field>
<field name="parent_id" ref="account_group_3_2"/>
<field name="company_id" ref="base.main_company"></field>
</record>

<record id="account_group_3_2_3" model="account.group">
<field name="code_prefix">3.2.3</field>
<field name="code_prefix_start">3.2.3</field>
<field name="name">Despesas Financeiras</field>
<field name="parent_id" ref="account_group_3_2"/>
<field name="company_id" ref="base.main_company"></field>
</record>

<record id="account_group_3_2_4" model="account.group">
<field name="code_prefix">3.2.4</field>
<field name="code_prefix_start">3.2.4</field>
<field name="name">Outras Despesas Operacionais</field>
<field name="parent_id" ref="account_group_3_2"/>
<field name="company_id" ref="base.main_company"></field>
</record>

</odoo>
2 changes: 1 addition & 1 deletion l10n_br_account/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ def post_init(cr, registry):

filename = 'data/account.ncm.csv'
convert_file(cr, 'l10n_br_account', filename, None,
mode='init', noupdate=False, kind='init', report=None)
mode='init', noupdate=False, kind='init')
2 changes: 1 addition & 1 deletion l10n_br_account/__manifest__.py
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ # pylint: disable=C8101,C8103
'name': 'Odoo Next - Enable tax calculations',
'description': 'Enable Tax Calculations',
'version': '13.0.1.0.0',
'version': '14.0.1.0.0',
'category': 'Localization',
'author': 'Trustcode',
'license': 'OEEL-1',
Expand Down
2 changes: 1 addition & 1 deletion l10n_br_account_reports/__manifest__.py
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
'name': 'Account Reports',
'version': '13.0.1.0.0',
'version': '14.0.1.0.0',
'category': 'Account',
'author': 'Trustcode',
'license': 'OPL-1',
Expand Down
2 changes: 1 addition & 1 deletion l10n_br_automated_payment/__manifest__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

{
'name': 'Integração Iugu',
'version': '13.0.1.0.0',
'version': '14.0.1.0.0',
'category': 'Finance',
'sequence': 5,
'author': 'Trustcode',
Expand Down
2 changes: 1 addition & 1 deletion l10n_br_base/__manifest__.py
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ # pylint: disable=C8101,C8103
'name': 'Odoo Next - Brazilian Base',
'description': 'Create a base for brazilian modules',
'version': '13.0.1.0.0',
'version': '14.0.1.0.0',
'category': 'Localization',
'author': 'Trustcode',
'license': 'Other OSI approved licence',
Expand Down
2 changes: 1 addition & 1 deletion l10n_br_base_address/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ def post_init(cr, registry):
from odoo.tools import convert_file
filename = 'data/res.city.csv'
convert_file(cr, 'l10n_br_base_address', filename, None, mode='init',
noupdate=True, kind='init', report=None)
noupdate=True, kind='init')
2 changes: 1 addition & 1 deletion l10n_br_base_address/__manifest__.py
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ # pylint: disable=C8101,C8103
'name': 'Odoo Next - Address Extension',
'description': 'Modifies address forms',
'version': '13.0.1.0.0',
'version': '14.0.1.0.0',
'category': 'Localization',
'author': 'Trustcode',
'license': 'OEEL-1',
Expand Down
2 changes: 1 addition & 1 deletion l10n_br_eletronic_document/__manifest__.py
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ # pylint: disable=C8101,C8103
'name': 'Odoo Next - Eletronic documents',
'description': 'Enable Eletronic Documents',
'version': '13.0.1.0.0',
'version': '14.0.1.0.0',
'category': 'Localization',
'author': 'Trustcode',
'license': 'OEEL-1',
Expand Down
2 changes: 1 addition & 1 deletion l10n_br_eletronic_document/models/account_move.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ def _create_product_eletronic_document(self, move, products):
self.env['eletronic.document'].create(vals)

def action_post(self):
moves = self.filtered(lambda x: x.l10n_br_edoc_policy == 'directly' and x.type != 'entry')
moves = self.filtered(lambda x: x.l10n_br_edoc_policy == 'directly' and x.move_type != 'entry')
moves._validate_for_eletronic_document()
res = super(AccountMove, self).action_post()
moves.action_create_eletronic_document()
Expand Down
2 changes: 1 addition & 1 deletion l10n_br_eletronic_document/views/account_move.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<field name="total_edocs" /> <span> NFEs</span>
</button>
</div>
<button name="action_invoice_register_payment" position="before">
<button name="action_register_payment" position="before">
<button name="action_create_eletronic_document" type="object" string="Criar nota fiscal" attrs="{'invisible':['|', ('state', '!=', 'posted'), ('l10n_br_edoc_policy', '=', 'directly')]}" class="oe_highlight" groups="base.group_user"/>
</button>
<field name="fiscal_position_id" position="after">
Expand Down
Loading

0 comments on commit ea8b687

Please sign in to comment.