Merge

.travis.yml

@@ -13,6 +13,7 @@ addons:
       - libxml2-dev
       - libxmlsec1-dev
       - libxslt-dev
+      - python-libxml2
 
 env:
   - VERSION="11.0" LINT_CHECK="1"

br_account/models/account.py

@@ -5,6 +5,14 @@
 from odoo import fields, models
 
 
+class AccountAccountTemplate(models.Model):
+    _inherit = 'account.account.template'
+
+    account_type = fields.Selection(
+        [('tax', 'Imposto'), ('income', 'Receita'), ('expense', 'Despesa')],
+        string="Tipo de conta")
+
+
 class AccountAccount(models.Model):
     _inherit = 'account.account'
 

br_account/models/account_invoice.py

@@ -35,6 +35,7 @@ def _compute_amount(self):
         self.pis_value = sum(abs(l.pis_valor) for l in lines)
         self.cofins_base = sum(l.cofins_base_calculo for l in lines)
         self.cofins_value = sum(abs(l.cofins_valor) for l in lines)
+        self.ii_base = sum(l.ii_base_calculo for l in lines)
         self.ii_value = sum(l.ii_valor for l in lines)
         self.csll_base = sum(l.csll_base_calculo for l in lines)
         self.csll_value = sum(abs(l.csll_valor) for l in lines)
@@ -208,6 +209,9 @@ def _compute_payables(self):
         string='COFINS Retido', store=True,
         digits=dp.get_precision('Account'), compute='_compute_amount',
         readonly=True)
+    ii_base = fields.Float(
+        string='Base II', store=True,
+        digits=dp.get_precision('Account'), compute='_compute_amount')
     ii_value = fields.Float(
         string='Valor II', store=True,
         digits=dp.get_precision('Account'), compute='_compute_amount')
@@ -398,7 +402,7 @@ def _prepare_refund(self, invoice, date_invoice=None, date=None,
             invoice, date_invoice=date_invoice, date=date,
             description=description, journal_id=journal_id)
 
-        res['product_document_id'] = invoice.produc5_document_id.id
+        res['product_document_id'] = invoice.product_document_id.id
         res['product_serie_id'] = invoice.product_serie_id.id
         res['service_document_id'] = invoice.service_document_id.id
         res['service_serie_id'] = invoice.service_serie_id.id

br_account_einvoice/models/res_config_settings.py

@@ -12,10 +12,13 @@ class ResConfigSettings(models.TransientModel):
         'mail.template', string="Template de Email para NFe",
         domain=[('model_id.model', '=', 'account.invoice')])
 
-    def get_default_nfe_email_template(self, fields):
-        return {'nfe_email_template':
-                self.env.user.company_id.nfe_email_template.id}
+    def get_values(self):
+        res = super(ResConfigSettings, self).get_values()
+        res['nfe_email_template'] = self.env.user.company_id\
+            .nfe_email_template.id
+        return res
 
     @api.multi
-    def set_default_nfe_email_template(self):
+    def set_values(self):
+        super(ResConfigSettings, self).set_values()
         self.env.user.company_id.nfe_email_template = self.nfe_email_template

br_account_payment/models/account_move_line.py

@@ -35,6 +35,5 @@ def action_register_payment(self):
             'default_move_line_id': self.id,
         }
         if self.invoice_id:
-            vals['context']['default_invoice_ids'] = [
-                (4, self.invoice_id.id, None)],
+            vals['context']['default_invoice_ids'] = [self.invoice_id.id]
         return vals

br_boleto/models/res_config_settings.py

@@ -12,10 +12,13 @@ class ResConfigSettings(models.TransientModel):
         'mail.template', string="Template de Email para Envio de Boleto",
         domain=[('model_id.model', '=', 'account.invoice')])
 
-    def get_default_boleto_email_tmpl(self, fields):
-        return {'boleto_email_tmpl':
-                self.env.user.company_id.boleto_email_tmpl.id}
+    def get_values(self):
+        res = super(ResConfigSettings, self).get_values()
+        res['boleto_email_tmpl'] = self.env.user.company_id\
+            .boleto_email_tmpl.id
+        return res
 
     @api.multi
-    def set_default_boleto_email_tmpl(self):
+    def set_values(self):
+        super(ResConfigSettings, self).set_values()
         self.env.user.company_id.boleto_email_tmpl = self.boleto_email_tmpl

br_boleto/tests/test_common.py

@@ -50,7 +50,7 @@ def setUp(self):
         })
         self.partner_fisica = self.env['res.partner'].create(dict(
             name='Parceiro',
-            company_type='company',
+            company_type='person',
             is_company=False,
             street='Donicia',
             number=45,

br_boleto/views/res_config_settings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <odoo>
-    <record id="account_config_settings_email_boleto" model="ir.ui.view">
-        <field name="name">account_config_settings.email.boleto</field>
+    <record id="res_config_settings_email_boleto" model="ir.ui.view">
+        <field name="name">res_config_settings.email.boleto</field>
         <field name="model">res.config.settings</field>
         <field name="inherit_id" ref="br_account.account_config_settings_email_templates"/>
         <field name="arch" type="xml">

br_boleto_nfe/views/res_config_settings.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <odoo>
-    <record id="account_config_settings_email_boleto" model="ir.ui.view">
-        <field name="name">account_config_settings.email.boleto</field>
+    <record id="res_config_settings_email_boleto" model="ir.ui.view">
+        <field name="name">res_config_settings.email.boleto</field>
         <field name="model">res.config.settings</field>
-        <field name="inherit_id" ref="br_boleto.account_config_settings_email_boleto"/>
+        <field name="inherit_id" ref="br_boleto.res_config_settings_email_boleto"/>
         <field name="arch" type="xml">
             <div id="mail_template_boleto" position="attributes" >
                 <attribute name="invisible">1</attribute>

br_cnab/tests/test_cnab_common.py

@@ -60,7 +60,7 @@ def setUp(self):
         })
         self.partner_fisica = self.env['res.partner'].create(dict(
             name='Parceiro',
-            company_type='company',
+            company_type='person',
             is_company=False,
             street='Donicia',
             zip='88032-050',

br_coa/__manifest__.py

@@ -4,9 +4,9 @@
 
 
 {  # pylint: disable=C8101,C8103
-    'name': 'Plano de Contas Simplificado Brasil',
-    'summary': """Plano de contas simplificado""",
-    'description': """Plano de contas simplificado""",
+    'name': 'Plano de Contas Brasil',
+    'summary': """Plano de contas Brasileiro""",
+    'description': """Plano de contas Brasileiro""",
     'version': '11.0.1.0.0',
     'category': 'Localization',
     'author': 'Trustcode',
@@ -25,5 +25,5 @@
         # TODO Achar uma forma de carregar o template
         # 'data/account_chart_template_data.yml',
     ],
-    'active': False,
+    'active': True,
 }

br_coa/data/br_chart_data.xml

@@ -10,7 +10,7 @@
     </record>
 
     <record id="br_account_chart_template" model="account.chart.template">
-        <field name="name">Plano de Contas Simplificado Brasil</field>
+        <field name="name">Plano de Contas Brasil</field>
         <field name="code_digits">1</field>
         <field name="bank_account_code_prefix">1.1.1.02</field>
         <field name="cash_account_code_prefix">1.1.1.01</field>

br_coa_simple/__init__.py

@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+# © 2017 Danimar Ribeiro <danimaribeiro@gmail.com>, Trustcode
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).

br_coa_simple/__manifest__.py

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+# © 2017 Danimar Ribeiro <danimaribeiro@gmail.com>, Trustcode
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+
+{  # pylint: disable=C8101,C8103
+    'name': 'Plano de Contas Simplificado Brasil',
+    'summary': """Plano de contas simplificado""",
+    'description': """Plano de contas simplificado""",
+    'version': '11.0.1.0.0',
+    'category': 'Localization',
+    'author': 'Trustcode',
+    'license': 'AGPL-3',
+    'website': 'http://www.trustcode.com.br',
+    'contributors': [
+        'Danimar Ribeiro <danimaribeiro@gmail.com>',
+    ],
+    'depends': [
+        'account', 'br_account'
+    ],
+    'data': [
+        'data/br_chart_data.xml',
+        'data/account.account.template.csv',
+        'data/account_tax_template_data.xml',
+    ],
+    'active': True,
+}

br_coa_simple/data/account.account.template.csv

@@ -0,0 +1,33 @@
+id,code,name,reconcile,account_type,user_type_id:id,chart_template_id:id
+account_account_1000,1000,Clientes (a receber),True,,account.data_account_type_receivable,br_account_chart_template
+account_account_1010,1010,Adiantamento a Fornecedores,True,,account.data_account_type_payable,br_account_chart_template
+account_account_1011,1011,Adiantamento a Funcionários,True,,account.data_account_type_payable,br_account_chart_template
+account_account_1020,1020,Caixa Geral,False,,account.data_account_type_liquidity,br_account_chart_template
+account_account_1030,1030,Banco (Cadastro Automático),False,,account.data_account_type_liquidity,br_account_chart_template
+account_account_1040,1040,Banco Aplicação,False,,account.data_account_type_liquidity,br_account_chart_template
+account_account_1100,1100,Produtos em Estoque,False,,account.data_account_type_current_assets,br_account_chart_template
+account_account_1101,1101,Matéria Prima em Estoque,False,,account.data_account_type_current_assets,br_account_chart_template
+account_account_1102,1102,Materiais de Uso e Consumo em Estoque,False,,account.data_account_type_current_assets,br_account_chart_template
+account_account_1200,1200,Imobilizados,False,,account.data_account_type_fixed_assets,br_account_chart_template
+account_account_1300,1300,Intangíveis,False,,account.data_account_type_fixed_assets,br_account_chart_template
+account_account_2000,2000,Fornecedores (a Pagar),True,,account.data_account_type_payable,br_account_chart_template
+account_account_2010,2010,Adiantamento de Clientes,True,,account.data_account_type_receivable,br_account_chart_template
+account_account_2020,2020,Bancos Empréstimos,True,,account.data_account_type_payable,br_account_chart_template
+account_account_2100,2100,Salários a Pagar,True,,account.data_account_type_payable,br_account_chart_template
+account_account_2101,2101,Provisão para 13º c/ Encargos,False,,account.data_account_type_current_liabilities,br_account_chart_template
+account_account_2102,2102,Provisão para Férias c/ Encargos,False,,account.data_account_type_current_liabilities,br_account_chart_template
+account_account_3000,3000,Receita com Produtos Vendidos,False,income,account.data_account_type_revenue,br_account_chart_template
+account_account_3001,3001,Receita com Serviços Vendidos,False,income,account.data_account_type_revenue,br_account_chart_template
+account_account_3100,3100,Juros Recebidos,False,income,account.data_account_type_revenue,br_account_chart_template
+account_account_3101,3101,Resultado da Venda de Bens,False,income,account.data_account_type_revenue,br_account_chart_template
+account_account_4000,4000,Despesas Administrativas,False,expense,account.data_account_type_expenses,br_account_chart_template
+account_account_4050,4050,Despesas Comerciais,False,expense,account.data_account_type_expenses,br_account_chart_template
+account_account_4100,4100,Despesas Financeiras,False,expense,account.data_account_type_expenses,br_account_chart_template
+account_account_4150,4150,Despesas com Recursos Humanos,False,expense,account.data_account_type_expenses,br_account_chart_template
+account_account_4200,4200,Despesas Outras,False,expense,account.data_account_type_expenses,br_account_chart_template
+account_account_4300,4300,Custo dos Produtos Vendidos,False,expense,account.data_account_type_direct_costs,br_account_chart_template
+account_account_4301,4301,Custo com Matéria Prima,False,expense,account.data_account_type_direct_costs,br_account_chart_template
+account_account_4302,4302,Custo com Mão de Obra,False,expense,account.data_account_type_direct_costs,br_account_chart_template
+account_account_4303,4303,Custo com Salário,False,expense,account.data_account_type_direct_costs,br_account_chart_template
+account_account_4320,4320,Custo dos Serviços,False,expense,account.data_account_type_direct_costs,br_account_chart_template
+account_account_5000,5000,Resultado do Exercício,False,,account.data_unaffected_earnings,br_account_chart_template