Skip to content

Commit

Permalink
[REF] WARNING moved default 'Venda' fiscal category to l10n_br_accoun…
Browse files Browse the repository at this point in the history 
…t so it can be shared bewteen products and services. You need to change the ir_model_data id of this fiscal category by SQL to update your database
  • Loading branch information
@rvalyi
rvalyi committed Feb 10, 2014
1 parent 1316a7e commit 5296355
Show file tree
Hide file tree
Showing 9 changed files with 86 additions and 96 deletions.
23 changes: 14 additions & 9 deletions l10n_br_account/data/l10n_br_account_data.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,6 @@
<field name="fiscal_type">service</field>
</record>

<!-- res.company -->
<record id="base.main_company" model="res.company">
<field name="service_invoice_id" ref="fiscal_document_service"/>
<field name="document_serie_service_id" ref="l10n_br_document_serie_1_service" />
<field name="currency_id" ref="base.BRL"/>
<field name="fiscal_type">3</field>
</record>

<!-- l10n_br_account.partner.fiscal.type -->
<record id="partner_fiscal_type_1" model="l10n_br_account.partner.fiscal.type">
<field name="code">Contribuinte</field>
Expand Down Expand Up @@ -53,8 +45,21 @@
<field name="icms" eval="False"/>
</record>

<!-- l10n_br_account.fiscal.category -->
<record id="fc_78df616ab31e95ee46c6a519a2ce9e12" model="l10n_br_account.fiscal.category">
<field name="code">Venda</field>
<field name="name">Venda</field>
<field name="type">output</field>
<field name="journal_type">sale</field>
<field name="state">approved</field>
</record>

<!-- res.company -->
<record id="base.main_company" model="res.company">
<field name="service_invoice_id" ref="fiscal_document_service"/>
<field name="document_serie_service_id" ref="l10n_br_document_serie_1_service" />
<field name="currency_id" ref="base.BRL"/>
<field name="fiscal_type">3</field>
<field name="currency_id" ref="base.BRL"/>
<field name="fiscal_type">3</field>
</record>
Expand Down Expand Up @@ -361,4 +366,4 @@
</record>

</data>
</openerp>
</openerp>
9 changes: 2 additions & 7 deletions l10n_br_account_product/data/l10n_br_account_product_data.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,8 @@
</record>

<!-- l10n_br_account.fiscal.category -->
<record id="fc_78df616ab31e95ee46c6a519a2ce9e12" model="l10n_br_account.fiscal.category">
<field name="code">Venda</field>
<field name="name">Venda</field>
<field name="type">output</field>
<record id="l10n_br_account.fc_78df616ab31e95ee46c6a519a2ce9e12" model="l10n_br_account.fiscal.category">
<field name="fiscal_type">product</field>
<field name="journal_type">sale</field>
<field name="state">approved</field>
</record>

<record id="fc_c333f0a13695741d07c872b54016c093" model="l10n_br_account.fiscal.category">
Expand Down Expand Up @@ -100,7 +95,7 @@

<record id="base.main_company" model="res.company">
<field name="in_invoice_fiscal_category_id" ref="l10n_br_account_product.fc_b7aafa9c3056c3f020ceae63d7312504" />
<field name="out_invoice_fiscal_category_id" ref="l10n_br_account_product.fc_78df616ab31e95ee46c6a519a2ce9e12" />
<field name="out_invoice_fiscal_category_id" ref="l10n_br_account.fc_78df616ab31e95ee46c6a519a2ce9e12" />
<field name="in_refund_fiscal_category_id" ref="l10n_br_account_product.fc_f20c37a9e1e1c870af37efe62a786fbf" />
<field name="out_refund_fiscal_category_id" ref="l10n_br_account_product.fc_7817d015cb9832d137d7939a224a79a5" />
<field name="product_invoice_id" ref="l10n_br_account_product.fiscal_document_55"/>
Expand Down
54 changes: 27 additions & 27 deletions l10n_br_account_product/demo/account_fiscal_position_rule_demo.xml
View file

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions l10n_br_account_product/demo/l10n_br_account_product_demo.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</record>

<!-- l10n_br_account.fiscal.category -->
<record id="fc_78df616ab31e95ee46c6a519a2ce9e12" model="l10n_br_account.fiscal.category">
<record id="l10n_br_account.fc_78df616ab31e95ee46c6a519a2ce9e12" model="l10n_br_account.fiscal.category">
<field name="property_journal" ref="account.sales_journal" />
</record>

Expand All @@ -41,7 +41,7 @@
<record id="fp_78df616ab31e95ee46c6a519a2ce9e12_internal_demo" model="account.fiscal.position">
<field name="name">Venda para Dentro do Estado</field>
<field name="cfop_id" ref="cfop_5101" />
<field name="fiscal_category_id" ref="l10n_br_account_product.fc_78df616ab31e95ee46c6a519a2ce9e12" />
<field name="fiscal_category_id" ref="l10n_br_account.fc_78df616ab31e95ee46c6a519a2ce9e12" />
<field name="company_id" ref="base.main_company"/>
<field name="type">output</field>
<field name="type_tax_use">sale</field>
Expand All @@ -50,7 +50,7 @@
<record id="fp_78df616ab31e95ee46c6a519a2ce9e12_external_icms7_demo" model="account.fiscal.position">
<field name="name">Venda Fora do Estado ICMS 7%</field>
<field name="cfop_id" ref="cfop_6101" />
<field name="fiscal_category_id" ref="l10n_br_account_product.fc_78df616ab31e95ee46c6a519a2ce9e12" />
<field name="fiscal_category_id" ref="l10n_br_account.fc_78df616ab31e95ee46c6a519a2ce9e12" />
<field name="company_id" ref="base.main_company"/>
<field name="type">output</field>
<field name="type_tax_use">sale</field>
Expand All @@ -59,7 +59,7 @@
<record id="fp_78df616ab31e95ee46c6a519a2ce9e12_external_icms12_demo" model="account.fiscal.position">
<field name="name">Venda Fora do Estado ICMS 12%</field>
<field name="cfop_id" ref="cfop_6101" />
<field name="fiscal_category_id" ref="l10n_br_account_product.fc_78df616ab31e95ee46c6a519a2ce9e12" />
<field name="fiscal_category_id" ref="l10n_br_account.fc_78df616ab31e95ee46c6a519a2ce9e12" />
<field name="company_id" ref="base.main_company"/>
<field name="type">output</field>
<field name="type_tax_use">sale</field>
Expand All @@ -68,7 +68,7 @@
<record id="fp_78df616ab31e95ee46c6a519a2ce9e12_exportation_demo" model="account.fiscal.position">
<field name="name">Venda Fora do Estado Ex</field>
<field name="cfop_id" ref="cfop_7101" />
<field name="fiscal_category_id" ref="l10n_br_account_product.fc_78df616ab31e95ee46c6a519a2ce9e12" />
<field name="fiscal_category_id" ref="l10n_br_account.fc_78df616ab31e95ee46c6a519a2ce9e12" />
<field name="company_id" ref="base.main_company"/>
<field name="type">output</field>
<field name="type_tax_use">sale</field>
Expand Down
4 changes: 1 addition & 3 deletions l10n_br_sale/l10n_br_sale_data.xml
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data noupdate="1">

<record id="sale.sale_shop_1" model="sale.shop">
<field name="default_fc_id" ref="l10n_br_account_product.fc_78df616ab31e95ee46c6a519a2ce9e12"/>
<field name="default_fc_id" ref="l10n_br_account.fc_78df616ab31e95ee46c6a519a2ce9e12"/>
</record>

</data>
</openerp>
1 change: 0 additions & 1 deletion l10n_br_sale_stock/__openerp__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
'l10n_br_account_product',
],
'data': [
'l10n_br_sale_stock_data.xml',
'sale_stock_view.xml',
],
'demo': [
Expand Down
7 changes: 0 additions & 7 deletions l10n_br_sale_stock/l10n_br_sale_stock_data.xml
View file

This file was deleted.

58 changes: 29 additions & 29 deletions l10n_br_sale_stock/l10n_br_sale_stock_demo.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,147 +3,147 @@
<data noupdate="1">

<record id="sale.sale_order_1" model="sale.order">
<field name="fiscal_category_id" ref="l10n_br_account_product.fc_78df616ab31e95ee46c6a519a2ce9e12"/>
<field name="fiscal_category_id" ref="l10n_br_account.fc_78df616ab31e95ee46c6a519a2ce9e12"/>
<field name="fiscal_position" ref="l10n_br_account_product.fp_78df616ab31e95ee46c6a519a2ce9e12_internal_demo"/>
</record>

<record id="sale.sale_order_line_1" model="sale.order.line">
<field name="fiscal_category_id" ref="l10n_br_account_product.fc_78df616ab31e95ee46c6a519a2ce9e12"/>
<field name="fiscal_category_id" ref="l10n_br_account.fc_78df616ab31e95ee46c6a519a2ce9e12"/>
<field name="fiscal_position" ref="l10n_br_account_product.fp_78df616ab31e95ee46c6a519a2ce9e12_internal_demo"/>
</record>

<record id="sale.sale_order_line_2" model="sale.order.line">
<field name="fiscal_category_id" ref="l10n_br_account_product.fc_78df616ab31e95ee46c6a519a2ce9e12"/>
<field name="fiscal_category_id" ref="l10n_br_account.fc_78df616ab31e95ee46c6a519a2ce9e12"/>
<field name="fiscal_position" ref="l10n_br_account_product.fp_78df616ab31e95ee46c6a519a2ce9e12_internal_demo"/>
</record>

<record id="sale.sale_order_line_3" model="sale.order.line">
<field name="fiscal_category_id" ref="l10n_br_account_product.fc_78df616ab31e95ee46c6a519a2ce9e12"/>
<field name="fiscal_category_id" ref="l10n_br_account.fc_78df616ab31e95ee46c6a519a2ce9e12"/>
<field name="fiscal_position" ref="l10n_br_account_product.fp_78df616ab31e95ee46c6a519a2ce9e12_internal_demo"/>
</record>

<record id="sale.sale_order_2" model="sale.order">
<field name="fiscal_category_id" ref="l10n_br_account_product.fc_78df616ab31e95ee46c6a519a2ce9e12"/>
<field name="fiscal_category_id" ref="l10n_br_account.fc_78df616ab31e95ee46c6a519a2ce9e12"/>
<field name="fiscal_position" ref="l10n_br_account_product.fp_78df616ab31e95ee46c6a519a2ce9e12_internal_demo"/>
</record>

<record id="sale.sale_order_line_4" model="sale.order.line">
<field name="fiscal_category_id" ref="l10n_br_account_product.fc_78df616ab31e95ee46c6a519a2ce9e12"/>
<field name="fiscal_category_id" ref="l10n_br_account.fc_78df616ab31e95ee46c6a519a2ce9e12"/>
<field name="fiscal_position" ref="l10n_br_account_product.fp_78df616ab31e95ee46c6a519a2ce9e12_internal_demo"/>
</record>

<record id="sale.sale_order_line_5" model="sale.order.line">
<field name="fiscal_category_id" ref="l10n_br_account_product.fc_78df616ab31e95ee46c6a519a2ce9e12"/>
<field name="fiscal_category_id" ref="l10n_br_account.fc_78df616ab31e95ee46c6a519a2ce9e12"/>
<field name="fiscal_position" ref="l10n_br_account_product.fp_78df616ab31e95ee46c6a519a2ce9e12_internal_demo"/>
</record>

<record id="sale.sale_order_3" model="sale.order">
<field name="fiscal_category_id" ref="l10n_br_account_product.fc_78df616ab31e95ee46c6a519a2ce9e12"/>
<field name="fiscal_category_id" ref="l10n_br_account.fc_78df616ab31e95ee46c6a519a2ce9e12"/>
<field name="fiscal_position" ref="l10n_br_account_product.fp_78df616ab31e95ee46c6a519a2ce9e12_internal_demo"/>
</record>

<record id="sale.sale_order_line_6" model="sale.order.line">
<field name="fiscal_category_id" ref="l10n_br_account_product.fc_78df616ab31e95ee46c6a519a2ce9e12"/>
<field name="fiscal_category_id" ref="l10n_br_account.fc_78df616ab31e95ee46c6a519a2ce9e12"/>
<field name="fiscal_position" ref="l10n_br_account_product.fp_78df616ab31e95ee46c6a519a2ce9e12_internal_demo"/>
</record>

<record id="sale.sale_order_line_7" model="sale.order.line">
<field name="fiscal_category_id" ref="l10n_br_account_product.fc_78df616ab31e95ee46c6a519a2ce9e12"/>
<field name="fiscal_category_id" ref="l10n_br_account.fc_78df616ab31e95ee46c6a519a2ce9e12"/>
<field name="fiscal_position" ref="l10n_br_account_product.fp_78df616ab31e95ee46c6a519a2ce9e12_internal_demo"/>
</record>

<record id="sale.sale_order_4" model="sale.order">
<field name="fiscal_category_id" ref="l10n_br_account_product.fc_78df616ab31e95ee46c6a519a2ce9e12"/>
<field name="fiscal_category_id" ref="l10n_br_account.fc_78df616ab31e95ee46c6a519a2ce9e12"/>
<field name="fiscal_position" ref="l10n_br_account_product.fp_78df616ab31e95ee46c6a519a2ce9e12_internal_demo"/>
</record>

<record id="sale.sale_order_line_8" model="sale.order.line">
<field name="fiscal_category_id" ref="l10n_br_account_product.fc_78df616ab31e95ee46c6a519a2ce9e12"/>
<field name="fiscal_category_id" ref="l10n_br_account.fc_78df616ab31e95ee46c6a519a2ce9e12"/>
<field name="fiscal_position" ref="l10n_br_account_product.fp_78df616ab31e95ee46c6a519a2ce9e12_internal_demo"/>
</record>

<record id="sale.sale_order_line_9" model="sale.order.line">
<field name="fiscal_category_id" ref="l10n_br_account_product.fc_78df616ab31e95ee46c6a519a2ce9e12"/>
<field name="fiscal_category_id" ref="l10n_br_account.fc_78df616ab31e95ee46c6a519a2ce9e12"/>
<field name="fiscal_position" ref="l10n_br_account_product.fp_78df616ab31e95ee46c6a519a2ce9e12_internal_demo"/>
</record>

<record id="sale.sale_order_line_10" model="sale.order.line">
<field name="fiscal_category_id" ref="l10n_br_account_product.fc_78df616ab31e95ee46c6a519a2ce9e12"/>
<field name="fiscal_category_id" ref="l10n_br_account.fc_78df616ab31e95ee46c6a519a2ce9e12"/>
<field name="fiscal_position" ref="l10n_br_account_product.fp_78df616ab31e95ee46c6a519a2ce9e12_internal_demo"/>
</record>

<record id="sale.sale_order_line_11" model="sale.order.line">
<field name="fiscal_category_id" ref="l10n_br_account_product.fc_78df616ab31e95ee46c6a519a2ce9e12"/>
<field name="fiscal_category_id" ref="l10n_br_account.fc_78df616ab31e95ee46c6a519a2ce9e12"/>
<field name="fiscal_position" ref="l10n_br_account_product.fp_78df616ab31e95ee46c6a519a2ce9e12_internal_demo"/>
</record>

<record id="sale.sale_order_5" model="sale.order">
<field name="fiscal_category_id" ref="l10n_br_account_product.fc_78df616ab31e95ee46c6a519a2ce9e12"/>
<field name="fiscal_category_id" ref="l10n_br_account.fc_78df616ab31e95ee46c6a519a2ce9e12"/>
<field name="fiscal_position" ref="l10n_br_account_product.fp_78df616ab31e95ee46c6a519a2ce9e12_internal_demo"/>
</record>

<record id="sale.sale_order_line_12" model="sale.order.line">
<field name="fiscal_category_id" ref="l10n_br_account_product.fc_78df616ab31e95ee46c6a519a2ce9e12"/>
<field name="fiscal_category_id" ref="l10n_br_account.fc_78df616ab31e95ee46c6a519a2ce9e12"/>
<field name="fiscal_position" ref="l10n_br_account_product.fp_78df616ab31e95ee46c6a519a2ce9e12_internal_demo"/>
</record>

<record id="sale.sale_order_line_13" model="sale.order.line">
<field name="fiscal_category_id" ref="l10n_br_account_product.fc_78df616ab31e95ee46c6a519a2ce9e12"/>
<field name="fiscal_category_id" ref="l10n_br_account.fc_78df616ab31e95ee46c6a519a2ce9e12"/>
<field name="fiscal_position" ref="l10n_br_account_product.fp_78df616ab31e95ee46c6a519a2ce9e12_internal_demo"/>
</record>

<record id="sale.sale_order_line_14" model="sale.order.line">
<field name="fiscal_category_id" ref="l10n_br_account_product.fc_78df616ab31e95ee46c6a519a2ce9e12"/>
<field name="fiscal_category_id" ref="l10n_br_account.fc_78df616ab31e95ee46c6a519a2ce9e12"/>
<field name="fiscal_position" ref="l10n_br_account_product.fp_78df616ab31e95ee46c6a519a2ce9e12_internal_demo"/>
</record>

<record id="sale.sale_order_6" model="sale.order">
<field name="fiscal_category_id" ref="l10n_br_account_product.fc_78df616ab31e95ee46c6a519a2ce9e12"/>
<field name="fiscal_category_id" ref="l10n_br_account.fc_78df616ab31e95ee46c6a519a2ce9e12"/>
<field name="fiscal_position" ref="l10n_br_account_product.fp_78df616ab31e95ee46c6a519a2ce9e12_internal_demo"/>
</record>

<record id="sale.sale_order_line_15" model="sale.order.line">
<field name="fiscal_category_id" ref="l10n_br_account_product.fc_78df616ab31e95ee46c6a519a2ce9e12"/>
<field name="fiscal_category_id" ref="l10n_br_account.fc_78df616ab31e95ee46c6a519a2ce9e12"/>
<field name="fiscal_position" ref="l10n_br_account_product.fp_78df616ab31e95ee46c6a519a2ce9e12_internal_demo"/>
</record>

<record id="sale.sale_order_7" model="sale.order">
<field name="fiscal_category_id" ref="l10n_br_account_product.fc_78df616ab31e95ee46c6a519a2ce9e12"/>
<field name="fiscal_category_id" ref="l10n_br_account.fc_78df616ab31e95ee46c6a519a2ce9e12"/>
<field name="fiscal_position" ref="l10n_br_account_product.fp_78df616ab31e95ee46c6a519a2ce9e12_internal_demo"/>
</record>

<record id="sale.sale_order_line_16" model="sale.order.line">
<field name="fiscal_category_id" ref="l10n_br_account_product.fc_78df616ab31e95ee46c6a519a2ce9e12"/>
<field name="fiscal_category_id" ref="l10n_br_account.fc_78df616ab31e95ee46c6a519a2ce9e12"/>
<field name="fiscal_position" ref="l10n_br_account_product.fp_78df616ab31e95ee46c6a519a2ce9e12_internal_demo"/>
</record>

<record id="sale.sale_order_line_17" model="sale.order.line">
<field name="fiscal_category_id" ref="l10n_br_account_product.fc_78df616ab31e95ee46c6a519a2ce9e12"/>
<field name="fiscal_category_id" ref="l10n_br_account.fc_78df616ab31e95ee46c6a519a2ce9e12"/>
<field name="fiscal_position" ref="l10n_br_account_product.fp_78df616ab31e95ee46c6a519a2ce9e12_internal_demo"/>
</record>

<record id="sale.sale_order_line_18" model="sale.order.line">
<field name="fiscal_category_id" ref="l10n_br_account_product.fc_78df616ab31e95ee46c6a519a2ce9e12"/>
<field name="fiscal_category_id" ref="l10n_br_account.fc_78df616ab31e95ee46c6a519a2ce9e12"/>
<field name="fiscal_position" ref="l10n_br_account_product.fp_78df616ab31e95ee46c6a519a2ce9e12_internal_demo"/>
</record>

<record id="sale.sale_order_line_19" model="sale.order.line">
<field name="fiscal_category_id" ref="l10n_br_account_product.fc_78df616ab31e95ee46c6a519a2ce9e12"/>
<field name="fiscal_category_id" ref="l10n_br_account.fc_78df616ab31e95ee46c6a519a2ce9e12"/>
<field name="fiscal_position" ref="l10n_br_account_product.fp_78df616ab31e95ee46c6a519a2ce9e12_internal_demo"/>
</record>

<record id="sale.sale_order_8" model="sale.order">
<field name="fiscal_category_id" ref="l10n_br_account_product.fc_78df616ab31e95ee46c6a519a2ce9e12"/>
<field name="fiscal_category_id" ref="l10n_br_account.fc_78df616ab31e95ee46c6a519a2ce9e12"/>
<field name="fiscal_position" ref="l10n_br_account_product.fp_78df616ab31e95ee46c6a519a2ce9e12_internal_demo"/>
</record>

<record id="sale.sale_order_line_20" model="sale.order.line">
<field name="fiscal_category_id" ref="l10n_br_account_product.fc_78df616ab31e95ee46c6a519a2ce9e12"/>
<field name="fiscal_category_id" ref="l10n_br_account.fc_78df616ab31e95ee46c6a519a2ce9e12"/>
<field name="fiscal_position" ref="l10n_br_account_product.fp_78df616ab31e95ee46c6a519a2ce9e12_internal_demo"/>
</record>

<record id="sale.sale_order_line_21" model="sale.order.line">
<field name="fiscal_category_id" ref="l10n_br_account_product.fc_78df616ab31e95ee46c6a519a2ce9e12"/>
<field name="fiscal_category_id" ref="l10n_br_account.fc_78df616ab31e95ee46c6a519a2ce9e12"/>
<field name="fiscal_position" ref="l10n_br_account_product.fp_78df616ab31e95ee46c6a519a2ce9e12_internal_demo"/>
</record>

Expand Down
Loading

0 comments on commit 5296355

Please sign in to comment.