Skip to content

Commit

Permalink
Merge c35f074 into 7a0f3f4
Browse files Browse the repository at this point in the history
  • Loading branch information
renatonlima committed Nov 20, 2015
2 parents 7a0f3f4 + c35f074 commit 2eaeb87
Show file tree
Hide file tree
Showing 37 changed files with 2,067 additions and 840 deletions.
3 changes: 2 additions & 1 deletion README.md
Expand Up @@ -85,6 +85,8 @@ addon | version | summary
[l10n_br_data_account_product](l10n_br_data_account_product/) | 8.0.1.0.0 | Brazilian Localisation Data Extension for Product
[l10n_br_data_base](l10n_br_data_base/) | 8.0.1.0.0 | Brazilian Localisation Data Extension for Base
[l10n_br_sale](l10n_br_sale/) | 8.0.1.0.0 | Brazilian Localization Sale
[l10n_br_stock](l10n_br_stock/) | 8.0.1.0.0 | Brazilian Localization Warehouse
[l10n_br_stock_account](l10n_br_stock_account/) | 8.0.1.0.0 | Brazilian Localization Warehouse
[l10n_br_zip](l10n_br_zip/) | 8.0.1.0.0 | Brazilian Localisation ZIP Codes

Unported addons
Expand All @@ -103,6 +105,5 @@ addon | version | summary
[l10n_br_sale_product](l10n_br_sale_product/) | 7.0 (unported) | Brazilian Localization Sale Product
[l10n_br_sale_service](l10n_br_sale_service/) | 7.0 (unported) | Brazilian Localization Sale Service
[l10n_br_sale_stock](l10n_br_sale_stock/) | 7.0 (unported) | Brazilian Localization Sales and Warehouse
[l10n_br_stock](l10n_br_stock/) | 7.0 (unported) | Brazilian Localization Warehouse

[//]: # (end addons)
5 changes: 0 additions & 5 deletions l10n_br_account/test/account_customer_invoice.yml
Expand Up @@ -15,11 +15,6 @@
type: output
company_id: base.main_company
fiscal_category_id: fiscal_category_sale
-
I configure automatically if the country is set on the company, mainly for online offers.
-
!python {model: account.installer}: |
print "passou!"
-
Create Fiscal Position Rule
-
Expand Down
10 changes: 10 additions & 0 deletions l10n_br_account_product/data/l10n_br_account_product_data.xml
Expand Up @@ -83,10 +83,20 @@
<field name="state">approved</field>
</record>

<record id="fc_d9132a81edff5374f33560f58666b792" model="l10n_br_account.fiscal.category">
<field name="code">Entrada de Remessa</field>
<field name="name">Entrada de Remessa</field>
<field name="type">input</field>
<field name="fiscal_type">product</field>
<field name="journal_type">sale</field>
<field name="state">approved</field>
</record>

<record id="fc_86d8c770fc2fb9d9fa242a3bdddd507a" model="l10n_br_account.fiscal.category">
<field name="code">SimplesRemessa</field>
<field name="name">Simples Remessa</field>
<field name="type">output</field>
<field name="refund_fiscal_category_id" ref="fc_d9132a81edff5374f33560f58666b792"/>
<field name="fiscal_type">product</field>
<field name="journal_type">sale</field>
<field name="state">approved</field>
Expand Down
923 changes: 923 additions & 0 deletions l10n_br_account_product/demo/account_fiscal_position_rule_demo.xml

Large diffs are not rendered by default.

196 changes: 193 additions & 3 deletions l10n_br_account_product/demo/l10n_br_account_product_demo.xml
Expand Up @@ -13,6 +13,7 @@
<field name="analytic_journal_id" ref="account.cose_journal_sale"/>
<field name="user_id" ref="base.user_root"/>
<field eval="1" name="revenue_expense"/>
<field name="company_id" ref="base.main_company"/>
</record>

<record id="aj_b7aafa9c3056c3f020ceae63d7312504" model="account.journal">
Expand All @@ -24,20 +25,57 @@
<!-- <field name="default_credit_account_id" ref="account_demo_602"/>
<field name="default_debit_account_id" ref="account_demo_602"/> -->
<field name="user_id" ref="base.user_root"/>
<field eval="1" name="revenue_expense"/>
<field name="company_id" ref="base.main_company"/>
</record>

<record id="aj_86d8c770fc2fb9d9fa242a3bdddd507a" model="account.journal">
<field name="name">Simples Remessa</field>
<field name="code">SMPR</field>
<field name="type">sale</field>
<field name="update_posted" eval="1" />
<field name="group_invoice_lines" eval="0" />
<!-- <field name="default_credit_account_id" ref="account_demo_602"/>
<field name="default_debit_account_id" ref="account_demo_602"/> -->
<field eval="0" name="revenue_expense"/>
<field name="user_id" ref="base.user_root"/>
<field name="company_id" ref="base.main_company"/>
</record>

<record id="aj_d9132a81edff5374f33560f58666b792" model="account.journal">
<field name="name">Entrada de Remessa</field>
<field name="code">ESMR</field>
<field name="type">sale_refund</field>
<field name="update_posted" eval="1" />
<field name="group_invoice_lines" eval="0" />
<!-- <field name="default_credit_account_id" ref="account_demo_602"/>
<field name="default_debit_account_id" ref="account_demo_602"/> -->
<field eval="0" name="revenue_expense"/>
<field name="user_id" ref="base.user_root"/>
<field name="company_id" ref="base.main_company"/>
</record>

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

<!-- Devolução de Venda -->
<record id="fc_7817d015cb9832d137d7939a224a79a5" model="l10n_br_account.fiscal.category">
<field name="property_journal" ref="account.refund_sales_journal" />
</record>

<!-- Simples Remessa -->
<record id="fc_86d8c770fc2fb9d9fa242a3bdddd507a" model="l10n_br_account.fiscal.category">
<field name="property_journal" ref="aj_86d8c770fc2fb9d9fa242a3bdddd507a" />
</record>

<!-- Entrada de Remessa -->
<record id="fc_d9132a81edff5374f33560f58666b792" model="l10n_br_account.fiscal.category">
<field name="property_journal" ref="aj_d9132a81edff5374f33560f58666b792" />
</record>

<record id="fc_b7aafa9c3056c3f020ceae63d7312504" model="l10n_br_account.fiscal.category">
<field name="property_journal" ref="aj_b7aafa9c3056c3f020ceae63d7312504" />
</record>
Expand Down Expand Up @@ -157,6 +195,158 @@
<field name="type">output</field>
<field name="type_tax_use">sale</field>
</record>

<!-- Simples Remessa -->
<record id="fp_86d8c770fc2fb9d9fa242a3bdddd507a_internal_demo" model="account.fiscal.position">
<field name="name">Simples Remessa</field>
<field name="cfop_id" ref="l10n_br_account_product.cfop_5949" />
<field name="fiscal_category_id" ref="l10n_br_account_product.fc_86d8c770fc2fb9d9fa242a3bdddd507a" />
<field name="company_id" ref="base.main_company"/>
<field name="type">output</field>
<field name="type_tax_use">sale</field>
</record>

<record id="fp_86d8c770fc2fb9d9fa242a3bdddd507a_internal_demo_pis" model="account.fiscal.position.tax">
<field name="position_id" ref="fp_86d8c770fc2fb9d9fa242a3bdddd507a_internal_demo"/>
<field name="tax_code_src_id" ref="l10n_br_account_product.tax_code_demo_pis"/>
<field name="tax_dest_id" ref="l10n_br_account_product.demo_tax_out_pis"/>
<field name="tax_code_dest_id" ref="l10n_br_account_product.tax_code_demo_pis_07"/>
<field name="tax_src_domain">pis</field>
</record>

<record id="fp_86d8c770fc2fb9d9fa242a3bdddd507a_internal_demo_cofins" model="account.fiscal.position.tax">
<field name="position_id" ref="fp_86d8c770fc2fb9d9fa242a3bdddd507a_internal_demo"/>
<field name="tax_code_src_id" ref="l10n_br_account_product.tax_code_demo_cofins"/>
<field name="tax_dest_id" ref="l10n_br_account_product.demo_tax_out_cofins"/>
<field name="tax_code_dest_id" ref="l10n_br_account_product.tax_code_demo_cofins_07"/>
<field name="tax_src_domain">cofins</field>
</record>

<record id="fp_86d8c770fc2fb9d9fa242a3bdddd507a_external_icms7_demo" model="account.fiscal.position">
<field name="name">Simples Remessa Fora do Estado ICMS 7%</field>
<field name="cfop_id" ref="l10n_br_account_product.cfop_6949" />
<field name="fiscal_category_id" ref="l10n_br_account_product.fc_86d8c770fc2fb9d9fa242a3bdddd507a" />
<field name="company_id" ref="base.main_company"/>
<field name="type">output</field>
<field name="type_tax_use">sale</field>
</record>

<record id="fp_86d8c770fc2fb9d9fa242a3bdddd507a_external_icms7_demo_pis" model="account.fiscal.position.tax">
<field name="position_id" ref="fp_86d8c770fc2fb9d9fa242a3bdddd507a_external_icms7_demo"/>
<field name="tax_code_src_id" ref="l10n_br_account_product.tax_code_demo_pis"/>
<field name="tax_dest_id" ref="l10n_br_account_product.demo_tax_out_pis"/>
<field name="tax_code_dest_id" ref="l10n_br_account_product.tax_code_demo_pis_07"/>
<field name="tax_src_domain">pis</field>
</record>

<record id="fp_86d8c770fc2fb9d9fa242a3bdddd507a_external_icms7_demo_cofins" model="account.fiscal.position.tax">
<field name="position_id" ref="fp_86d8c770fc2fb9d9fa242a3bdddd507a_external_icms7_demo"/>
<field name="tax_code_src_id" ref="l10n_br_account_product.tax_code_demo_cofins"/>
<field name="tax_dest_id" ref="l10n_br_account_product.demo_tax_out_cofins"/>
<field name="tax_code_dest_id" ref="l10n_br_account_product.tax_code_demo_cofins_07"/>
<field name="tax_src_domain">cofins</field>
</record>

<record id="fp_86d8c770fc2fb9d9fa242a3bdddd507a_external_icms12_demo" model="account.fiscal.position">
<field name="name">Simples Remessa Fora do Estado ICMS 12%</field>
<field name="cfop_id" ref="l10n_br_account_product.cfop_6949" />
<field name="fiscal_category_id" ref="l10n_br_account_product.fc_86d8c770fc2fb9d9fa242a3bdddd507a"/>
<field name="company_id" ref="base.main_company"/>
<field name="type">input</field>
<field name="type_tax_use">sale</field>
</record>

<record id="fp_86d8c770fc2fb9d9fa242a3bdddd507a_external_icms12_demo_pis" model="account.fiscal.position.tax">
<field name="position_id" ref="fp_86d8c770fc2fb9d9fa242a3bdddd507a_external_icms12_demo"/>
<field name="tax_code_src_id" ref="l10n_br_account_product.tax_code_demo_pis"/>
<field name="tax_dest_id" ref="l10n_br_account_product.demo_tax_out_pis"/>
<field name="tax_code_dest_id" ref="l10n_br_account_product.tax_code_demo_pis_07"/>
<field name="tax_src_domain">pis</field>
</record>

<record id="fp_86d8c770fc2fb9d9fa242a3bdddd507a_external_icms12_demo_cofins" model="account.fiscal.position.tax">
<field name="position_id" ref="fp_86d8c770fc2fb9d9fa242a3bdddd507a_external_icms12_demo"/>
<field name="tax_code_src_id" ref="l10n_br_account_product.tax_code_demo_cofins"/>
<field name="tax_dest_id" ref="l10n_br_account_product.demo_tax_out_cofins"/>
<field name="tax_code_dest_id" ref="l10n_br_account_product.tax_code_demo_cofins_07"/>
<field name="tax_src_domain">cofins</field>
</record>

<!-- Entrada de Remessa -->
<record id="fp_d9132a81edff5374f33560f58666b792_internal_demo" model="account.fiscal.position">
<field name="name">Entrada de Remessa</field>
<field name="cfop_id" ref="l10n_br_account_product.cfop_1949" />
<field name="fiscal_category_id" ref="l10n_br_account_product.fc_d9132a81edff5374f33560f58666b792" />
<field name="company_id" ref="base.main_company"/>
<field name="type">input</field>
<field name="type_tax_use">sale</field>
</record>

<record id="fp_d9132a81edff5374f33560f58666b792_internal_demo_pis" model="account.fiscal.position.tax">
<field name="position_id" ref="fp_d9132a81edff5374f33560f58666b792_internal_demo"/>
<field name="tax_code_src_id" ref="l10n_br_account_product.tax_code_demo_pis"/>
<field name="tax_dest_id" ref="l10n_br_account_product.demo_tax_out_pis"/>
<field name="tax_code_dest_id" ref="l10n_br_account_product.tax_code_demo_pis_07"/>
<field name="tax_src_domain">pis</field>
</record>

<record id="fp_d9132a81edff5374f33560f58666b792_internal_demo_cofins" model="account.fiscal.position.tax">
<field name="position_id" ref="fp_d9132a81edff5374f33560f58666b792_internal_demo"/>
<field name="tax_code_src_id" ref="l10n_br_account_product.tax_code_demo_cofins"/>
<field name="tax_dest_id" ref="l10n_br_account_product.demo_tax_out_cofins"/>
<field name="tax_code_dest_id" ref="l10n_br_account_product.tax_code_demo_cofins_07"/>
<field name="tax_src_domain">cofins</field>
</record>

<record id="fp_d9132a81edff5374f33560f58666b792_external_icms7_demo" model="account.fiscal.position">
<field name="name">Entrada de Remessa Fora do Estado ICMS 7%</field>
<field name="cfop_id" ref="l10n_br_account_product.cfop_6949" />
<field name="fiscal_category_id" ref="l10n_br_account_product.fc_d9132a81edff5374f33560f58666b792" />
<field name="company_id" ref="base.main_company"/>
<field name="type">input</field>
<field name="type_tax_use">sale</field>
</record>

<record id="fp_d9132a81edff5374f33560f58666b792_external_icms7_demo_pis" model="account.fiscal.position.tax">
<field name="position_id" ref="fp_d9132a81edff5374f33560f58666b792_external_icms7_demo"/>
<field name="tax_code_src_id" ref="l10n_br_account_product.tax_code_demo_pis"/>
<field name="tax_dest_id" ref="l10n_br_account_product.demo_tax_out_pis"/>
<field name="tax_code_dest_id" ref="l10n_br_account_product.tax_code_demo_pis_07"/>
<field name="tax_src_domain">pis</field>
</record>

<record id="fp_d9132a81edff5374f33560f58666b792_external_icms7_demo_cofins" model="account.fiscal.position.tax">
<field name="position_id" ref="fp_d9132a81edff5374f33560f58666b792_external_icms7_demo"/>
<field name="tax_code_src_id" ref="l10n_br_account_product.tax_code_demo_cofins"/>
<field name="tax_dest_id" ref="l10n_br_account_product.demo_tax_out_cofins"/>
<field name="tax_code_dest_id" ref="l10n_br_account_product.tax_code_demo_cofins_07"/>
<field name="tax_src_domain">cofins</field>
</record>

<record id="fp_d9132a81edff5374f33560f58666b792_external_icms12_demo" model="account.fiscal.position">
<field name="name">Entrada de Remessa Fora do Estado ICMS 12%</field>
<field name="cfop_id" ref="l10n_br_account_product.cfop_2949" />
<field name="fiscal_category_id" ref="l10n_br_account_product.fc_d9132a81edff5374f33560f58666b792"/>
<field name="company_id" ref="base.main_company"/>
<field name="type">input</field>
<field name="type_tax_use">sale</field>
</record>

<record id="fp_d9132a81edff5374f33560f58666b792_external_icms12_demo_pis" model="account.fiscal.position.tax">
<field name="position_id" ref="fp_d9132a81edff5374f33560f58666b792_external_icms12_demo"/>
<field name="tax_code_src_id" ref="l10n_br_account_product.tax_code_demo_pis"/>
<field name="tax_dest_id" ref="l10n_br_account_product.demo_tax_out_pis"/>
<field name="tax_code_dest_id" ref="l10n_br_account_product.tax_code_demo_pis_07"/>
<field name="tax_src_domain">pis</field>
</record>

<record id="fp_d9132a81edff5374f33560f58666b792_external_icms12_demo_cofins" model="account.fiscal.position.tax">
<field name="position_id" ref="fp_d9132a81edff5374f33560f58666b792_external_icms12_demo"/>
<field name="tax_code_src_id" ref="l10n_br_account_product.tax_code_demo_cofins"/>
<field name="tax_dest_id" ref="l10n_br_account_product.demo_tax_out_cofins"/>
<field name="tax_code_dest_id" ref="l10n_br_account_product.tax_code_demo_cofins_07"/>
<field name="tax_src_domain">cofins</field>
</record>

<!-- Devolução de Venda -->
<record id="fp_7817d015cb9832d137d7939a224a79a5_internal_demo" model="account.fiscal.position">
Expand All @@ -167,7 +357,7 @@
<field name="type">input</field>
<field name="type_tax_use">sale</field>
</record>

<record id="fp_7817d015cb9832d137d7939a224a79a5_external_icms7_demo" model="account.fiscal.position">
<field name="name">Devolução de Venda Fora do Estado ICMS 7%</field>
<field name="cfop_id" ref="cfop_2201" />
Expand All @@ -187,7 +377,7 @@
</record>

<record id="fp_7817d015cb9832d137d7939a224a79a5_exportation_demo" model="account.fiscal.position">
<field name="name">input de Venda Ex</field>
<field name="name">Devolução de Venda Ex</field>
<field name="cfop_id" ref="cfop_3201" />
<field name="fiscal_category_id" ref="l10n_br_account_product.fc_7817d015cb9832d137d7939a224a79a5" />
<field name="company_id" ref="base.main_company"/>
Expand Down
2 changes: 0 additions & 2 deletions l10n_br_stock/README.md

This file was deleted.

78 changes: 78 additions & 0 deletions l10n_br_stock/README.rst
@@ -0,0 +1,78 @@
.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
:alt: License: AGPL-3

==========================================
Módulo Stock
==========================================

* do this ...

Installation
============

To install this module, you need to:

* do this ...

Configuration
=============

To configure this module, you need to:

* go to ...

Usage
=====

To use this module, you need to:

* go to ...

.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
:alt: Try me on Runbot
:target: https://runbot.odoo-community.org/runbot/{repo_id}/{branch}


.. repo_id is available in https://github.com/OCA/maintainer-tools/blob/master/tools/repos_with_ids.txt
.. branch is "8.0" for example
Known issues / Roadmap
======================

TODO

Bug Tracker
===========

Bugs are tracked on `GitHub Issues <https://github.com/OCA/l10n-brazil/issues>`_.
In case of trouble, please check there if your issue has already been reported.
If you spotted it first, help us smashing it by providing a detailed and welcomed feedback `here <https://github.com/OCA/
l10n-brazil/issues/new?body=module:%20
l10n_br_stock%0Aversion:%20
8.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.


Credits
=======

Contributors
------------

* Renato Lima <renato.lima@akretion.com>
* Raphaël Valyi <rvalyi@akretion.com>

Maintainer
----------

.. image:: https://odoo-community.org/logo.png
:alt: Odoo Community Association
:target: https://odoo-community.org

This module is maintained by the OCA.

OCA, or the Odoo Community Association, is a nonprofit organization whose
mission is to support the collaborative development of Odoo features and
promote its widespread use.

To contribute to this module, please visit http://odoo-community.org.

0 comments on commit 2eaeb87

Please sign in to comment.