Skip to content

Commit

Permalink
[WIP] Cria tela para cadastro das DI e posterior vinculo com item da …
Browse files Browse the repository at this point in the history
…nota.
  • Loading branch information
fabioluna committed Feb 7, 2018
1 parent f077cf0 commit c33b938
Show file tree
Hide file tree
Showing 4 changed files with 64 additions and 39 deletions.
1 change: 1 addition & 0 deletions br_account/models/account_fiscal_position.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ class AccountFiscalPosition(models.Model):
fiscal_type = fields.Selection([('saida', 'Saída'),
('entrada', 'Entrada')],
string=u"Tipo da posição")
is_import = fields.Boolean(string="Importação")

def _filter_rules(self, fpos_id, type_tax, partner, product, state):
rule_obj = self.env['account.fiscal.position.tax.rule']
Expand Down
3 changes: 3 additions & 0 deletions br_account/models/br_account.py
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,9 @@ class ImportDeclarationLine(models.Model):
amount_discount = fields.Float(
string=u'Valor', digits=dp.get_precision('Account'), default=0.00)
drawback_number = fields.Char(u'Número Drawback', size=11)
invoice_line_id = fields.Many2one(
'account.invoice.line', u'Linha de Documento Fiscal',
ondelete='cascade', index=True)


class AccountDocumentRelated(models.Model):
Expand Down
4 changes: 3 additions & 1 deletion br_account/views/account_fiscal_position_view.xml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,9 @@
<field name="fiscal_observation_ids" nolabel="1" />
</group>
</page>
<page name="other_information" string="Outras Informações"></page>
<page name="other_information" string="Outras Informações">
<field name="is_import" />
</page>
</xpath>
<field name="vat_required" position="attributes">
<attribute name="invisible">1</attribute>
Expand Down
95 changes: 57 additions & 38 deletions br_account/views/br_account_view.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,50 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>

<menuitem id="menu_br_account" name="Brasil" parent="account.menu_finance_configuration" sequence="0"/>

<record id="view_br_account_import_declaration_form" model="ir.ui.view">
<field name="name">br_account.import.declaration.form</field>
<field name="model">br_account.import.declaration</field>
<field name="arch" type="xml">
<form>
<sheet>
<group>
<group>
<field name="name"/>
<field name="date_registration"/>
<field name="state_id" options="{'no_create': True, 'no_create_edit': True}"/>
<field name="location"/>
<field name="date_release"/>
<field name="type_transportation" />
</group>
<group>
<field name="afrmm_value" />
<field name="type_import" />
<field name="thirdparty_cnpj" />
<field name="thirdparty_state_id" options="{'no_create': True, 'no_create_edit': True}"/>
<field name="exporting_code"/>
</group>
<group string="Adições" colspan="4">
<field name="line_ids" nolabel="1"></field>
</group>
</group>
</sheet>
</form>
</field>
</record>
<record id="view_br_account_import_declaration_tree" model="ir.ui.view">
<field name="name">br_account.import.declaration.tree</field>
<field name="model">br_account.import.declaration</field>
<field name="arch" type="xml">
<tree>
<field name="name"/>
<field name="date_registration"/>
<field name="date_release"/>
<field name="type_transportation" />
<field name="afrmm_value" />
<field name="type_import" />
</tree>
</field>
</record>
<record id="view_br_account_import_declaration_line_form" model="ir.ui.view">
<field name="name">br_account.import.declaration.line.form</field>
<field name="model">br_account.import.declaration.line</field>
Expand All @@ -14,11 +56,11 @@
<field name="manufacturer_code"/>
<field name="amount_discount"/>
<field name="drawback_number"/>
<field name="invoice_line_id" widget="many2many_checkboxes" domain="[('invoice_id.state', '=', 'draft'), ('invoice_id.fiscal_position_id.is_import', '=', 'True')]"/>
</group>
</form>
</field>
</record>

<record id="view_br_account_import_declaration_line_tree" model="ir.ui.view">
<field name="name">br_account.import.declaration.line.tree</field>
<field name="model">br_account.import.declaration.line</field>
Expand All @@ -29,10 +71,10 @@
<field name="manufacturer_code"/>
<field name="amount_discount"/>
<field name="drawback_number" />
<field name="invoice_line_id"/>
</tree>
</field>
</record>

<record id="view_br_account_fiscal_document_form" model="ir.ui.view">
<field name="name">br_account.fiscal.document</field>
<field name="model">br_account.fiscal.document</field>
Expand All @@ -48,7 +90,6 @@
</form>
</field>
</record>

<record id="view_br_account_fiscal_document_tree" model="ir.ui.view">
<field name="name">br_account.fiscal.document</field>
<field name="model">br_account.fiscal.document</field>
Expand All @@ -60,7 +101,6 @@
</tree>
</field>
</record>

<record id="view_br_account_document_serie_form" model="ir.ui.view">
<field name="name">br_account.document.serie</field>
<field name="model">br_account.document.serie</field>
Expand All @@ -80,7 +120,6 @@
</form>
</field>
</record>

<record id="view_br_account_document_serie_tree" model="ir.ui.view">
<field name="name">br_account.document.serie</field>
<field name="model">br_account.document.serie</field>
Expand All @@ -94,7 +133,6 @@
</tree>
</field>
</record>

<record id="view_br_account_cnae_form" model="ir.ui.view">
<field name="name">br_account.cnae.form</field>
<field name="model">br_account.cnae</field>
Expand All @@ -112,7 +150,6 @@
</form>
</field>
</record>

<record id="view_br_account_cnae_tree" model="ir.ui.view">
<field name="name">br_account.cnae.tree</field>
<field name="model">br_account.cnae</field>
Expand All @@ -125,7 +162,6 @@
</tree>
</field>
</record>

<record id="view_br_account_cnae_structure" model="ir.ui.view">
<field name="name">br_account.cnae.structure</field>
<field name="model">br_account.cnae</field>
Expand All @@ -139,7 +175,6 @@
</tree>
</field>
</record>

<record id="view_br_account_service_type_form" model="ir.ui.view">
<field name="name">br_account.service.type.form</field>
<field name="model">br_account.service.type</field>
Expand All @@ -160,7 +195,6 @@
</form>
</field>
</record>

<record id="view_br_account_service_type_tree" model="ir.ui.view">
<field name="name">br_account.service.type.tree</field>
<field name="model">br_account.service.type</field>
Expand All @@ -172,7 +206,6 @@
</tree>
</field>
</record>

<record id="view_br_account_service_type_structure" model="ir.ui.view">
<field name="name">br_account.service.type.structure</field>
<field name="model">br_account.service.type</field>
Expand All @@ -185,7 +218,6 @@
</tree>
</field>
</record>

<record id="br_account_cfop_form" model="ir.ui.view">
<field name="name">br_account.cfop.name</field>
<field name="model">br_account.cfop</field>
Expand All @@ -207,7 +239,6 @@
</form>
</field>
</record>

<record id="br_account_cfop_search" model="ir.ui.view">
<field name="name">br_account.cfop.search</field>
<field name="model">br_account.cfop</field>
Expand All @@ -220,13 +251,12 @@
<field name="name"/>
<field name="small_name"/>
<newline/>
<group expand='0' string='Agrupar Por...' groups="base.group_extended">
<group expand='0' string='Agrupar Por...' groups="base.group_extended">
<filter string='Tipo' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'type'}" />
</group>
</search>
</field>
</record>

<record id="br_account_cfop_tree" model="ir.ui.view">
<field name="name">br_account.cfop.tree</field>
<field name="model">br_account.cfop</field>
Expand All @@ -238,7 +268,6 @@
</tree>
</field>
</record>

<record id="br_account_cfop_structure" model="ir.ui.view">
<field name="name">br_account.cfop.structure</field>
<field name="model">br_account.cfop</field>
Expand All @@ -251,7 +280,6 @@
</tree>
</field>
</record>

<record id="br_account_fiscal_observation_form" model="ir.ui.view">
<field name="name">br_account.fiscal.observation.form</field>
<field name="model">br_account.fiscal.observation</field>
Expand All @@ -268,7 +296,6 @@
</form>
</field>
</record>

<record id="br_account_fiscal_observation_tree" model="ir.ui.view">
<field name="name">br_account.fiscal.observation.tree</field>
<field name="model">br_account.fiscal.observation</field>
Expand All @@ -280,7 +307,6 @@
</tree>
</field>
</record>

<record id="br_account_cfop_action" model="ir.actions.act_window">
<field name="name">CFOP</field>
<field name="type">ir.actions.act_window</field>
Expand All @@ -289,7 +315,6 @@
<field name="view_type">form</field>
<field name="view_id" ref="br_account_cfop_tree"/>
</record>

<record id="br_account_cfop_structure_action" model="ir.actions.act_window">
<field name="name">Estrutura do CFOP</field>
<field name="type">ir.actions.act_window</field>
Expand All @@ -298,7 +323,6 @@
<field name="domain">[('parent_id','=',False)]</field>
<field name="view_id" ref="br_account_cfop_structure"/>
</record>

<record id="action_br_account_fiscal_document_form" model="ir.actions.act_window">
<field name="name">Documento Fiscal</field>
<field name="type">ir.actions.act_window</field>
Expand All @@ -307,7 +331,6 @@
<field name="view_type">form</field>
<field name="view_id" ref="view_br_account_fiscal_document_tree"/>
</record>

<record id="action_br_account_document_serie_form" model="ir.actions.act_window">
<field name="name">Document Serie</field>
<field name="type">ir.actions.act_window</field>
Expand All @@ -316,7 +339,6 @@
<field name="view_type">form</field>
<field name="view_id" ref="view_br_account_document_serie_tree"/>
</record>

<record id="action_br_account_cnae_form" model="ir.actions.act_window">
<field name="name">CNAE</field>
<field name="type">ir.actions.act_window</field>
Expand All @@ -325,7 +347,6 @@
<field name="view_type">form</field>
<field name="view_id" ref="view_br_account_cnae_tree"/>
</record>

<record id="action_br_account_cnae_structure" model="ir.actions.act_window">
<field name="name">Estrutura do CNAE</field>
<field name="type">ir.actions.act_window</field>
Expand All @@ -334,7 +355,6 @@
<field name="domain">[('parent_id','=',False)]</field>
<field name="view_id" ref="view_br_account_cnae_structure"/>
</record>

<record id="action_br_account_service_type_form" model="ir.actions.act_window">
<field name="name">Tipo de Serviço</field>
<field name="type">ir.actions.act_window</field>
Expand All @@ -343,7 +363,6 @@
<field name="view_type">form</field>
<field name="view_id" ref="view_br_account_service_type_tree"/>
</record>

<record id="action_br_account_service_type_structure" model="ir.actions.act_window">
<field name="name">Estrutura de Tipo de Serviço</field>
<field name="type">ir.actions.act_window</field>
Expand All @@ -352,22 +371,22 @@
<field name="domain">[('parent_id','=',False)]</field>
<field name="view_id" ref="view_br_account_service_type_structure"/>
</record>

<record id="action_br_account_import_declaration_form" model="ir.actions.act_window">
<field name="name">Import Declaration</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">br_account.import.declaration</field>
<field name="view_mode">tree,form</field>
<field name="view_type">form</field>
<field name="view_id" ref="view_br_account_import_declaration_tree"/>
</record>
<menuitem id="menu_br_account_fiscal_manager" name="Cadastros" parent="menu_br_account" sequence="0"/>

<menuitem id="br_account_cfop_menu" name="CFOP" parent="br_account.menu_br_account_fiscal_manager" action="br_account_cfop_action" sequence="10" />
<menuitem id="br_account_cfop_structure_menu" name="Estrutura do CFOP" parent="br_account.menu_br_account_fiscal_manager" action="br_account_cfop_structure_action" sequence="20" />

<menuitem id="menu_action_cnae_form" name="CNAE" parent="menu_br_account_fiscal_manager" action="action_br_account_cnae_form" sequence="30" />

<menuitem id="menu_action_cnae_structure" name="Estrutura do CNAE" parent="menu_br_account_fiscal_manager" action="action_br_account_cnae_structure" sequence="40" />

<menuitem id="menu_action_service_type_form" name="Tipo de Serviço" parent="menu_br_account_fiscal_manager" action="action_br_account_service_type_form" sequence="50" />

<menuitem id="menu_action_service_type_structure" name="Estrutura de Tipo de Serviço" parent="menu_br_account_fiscal_manager" action="action_br_account_service_type_structure" sequence="60" />

<menuitem id="menu_action_br_account_fiscal_document_form" name="Documento Fiscal" parent="menu_br_account" action="action_br_account_fiscal_document_form"/>

<menuitem id="menu_action_document_serie_form" name="Serie de Documento Fiscal" parent="menu_br_account" action="action_br_account_document_serie_form"/>

</odoo>
<menuitem id="menu_action_br_account_import_declaration_form" name="Declaração de Importação" parent="menu_br_account" action="action_br_account_import_declaration_form"/>
</odoo>

0 comments on commit c33b938

Please sign in to comment.