From 949325589cbdc488afff7bce781eda501f30e1a9 Mon Sep 17 00:00:00 2001
From: nvi-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 4 Nov 2010 09:48:22 +0100
Subject: [PATCH] [IMP] Merged new version of l10n_br

bzr revid: nicolas.vanhoren@openerp.com-20101104084822-cw0tkndeor5lhy58
---
 addons/l10n_br/__openerp__.py                 |  5 +-
 addons/l10n_br/data/account_tax_template.xml  | 80 +++++++++----------
 ...xml => l10n_br_account_chart_template.xml} |  2 +-
 3 files changed, 44 insertions(+), 43 deletions(-)
 rename addons/l10n_br/data/{l10n_br_chart_template.xml => l10n_br_account_chart_template.xml} (95%)

diff --git a/addons/l10n_br/__openerp__.py b/addons/l10n_br/__openerp__.py
index 8a5fd7f87a6..9eb52a40fab 100644
--- a/addons/l10n_br/__openerp__.py
+++ b/addons/l10n_br/__openerp__.py
@@ -25,7 +25,8 @@
     'website' : 'http://openerpbrasil.org',
     'version' : '0.6',
     'depends' : [
-		'account_chart',
+		'account', 
+		'account_chart', 
 		],
     'init_xml': [
 		],
@@ -33,7 +34,7 @@
         'data/account.account.type.csv',
         'data/account.tax.code.template.csv',
         'data/account.account.template.csv',
-        'data/l10n_br_chart_template.xml',
+        'data/l10n_br_account_chart_template.xml',
         'data/account_tax_template.xml',
     ],
     'installable': True
diff --git a/addons/l10n_br/data/account_tax_template.xml b/addons/l10n_br/data/account_tax_template.xml
index 910680eaf9d..1aa0ab88afa 100644
--- a/addons/l10n_br/data/account_tax_template.xml
+++ b/addons/l10n_br/data/account_tax_template.xml
@@ -8,7 +8,7 @@
             		<field name="tax_group">vat</field>
 			<field name="amount">0.00</field>
 			<!-- <field name="price_include">False</field> -->
-			<field ref="l10n_br_chart_template" name="chart_template_id"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
 			<field ref="tax_code_4" name="base_code_id"/>
 			<field ref="tax_code_4" name="tax_code_id"/>
 			<field ref="tax_code_4" name="ref_base_code_id"/>
@@ -21,7 +21,7 @@
             		<field name="tax_group">vat</field>
 			<field name="amount">0.02</field>
 			<!-- <field name="price_include">False</field> -->
-			<field ref="l10n_br_chart_template" name="chart_template_id"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
 			<field ref="tax_code_4" name="base_code_id"/>
 			<field ref="tax_code_4" name="tax_code_id"/>
 			<field ref="tax_code_4" name="ref_base_code_id"/>
@@ -34,7 +34,7 @@
             		<field name="tax_group">vat</field>
 			<field name="amount">0.03</field>
 			<!-- <field name="price_include">False</field> -->
-			<field ref="l10n_br_chart_template" name="chart_template_id"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
 			<field ref="tax_code_4" name="base_code_id"/>
 			<field ref="tax_code_4" name="tax_code_id"/>
 			<field ref="tax_code_4" name="ref_base_code_id"/>
@@ -47,7 +47,7 @@
             		<field name="tax_group">vat</field>
 			<field name="amount">0.04</field>
 			<!-- <field name="price_include">False</field> -->
-			<field ref="l10n_br_chart_template" name="chart_template_id"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
 			<field ref="tax_code_4" name="base_code_id"/>
 			<field ref="tax_code_4" name="tax_code_id"/>
 			<field ref="tax_code_4" name="ref_base_code_id"/>
@@ -60,7 +60,7 @@
             		<field name="tax_group">vat</field>
 			<field name="amount">0.05</field>
 			<!-- <field name="price_include">False</field> -->
-			<field ref="l10n_br_chart_template" name="chart_template_id"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
 			<field ref="tax_code_4" name="base_code_id"/>
 			<field ref="tax_code_4" name="tax_code_id"/>
 			<field ref="tax_code_4" name="ref_base_code_id"/>
@@ -73,7 +73,7 @@
             		<field name="tax_group">vat</field>
 			<field name="amount">0.07</field>
 			<!-- <field name="price_include">False</field> -->
-			<field ref="l10n_br_chart_template" name="chart_template_id"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
 			<field ref="tax_code_4" name="base_code_id"/>
 			<field ref="tax_code_4" name="tax_code_id"/>
 			<field ref="tax_code_4" name="ref_base_code_id"/>
@@ -86,7 +86,7 @@
             		<field name="tax_group">vat</field>
 			<field name="amount">0.08</field>
 			<field name="price_include">False</field>
-			<field ref="l10n_br_chart_template" name="chart_template_id"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
 			<field ref="tax_code_4" name="base_code_id"/>
 			<field ref="tax_code_4" name="tax_code_id"/>
 			<field ref="tax_code_4" name="ref_base_code_id"/>
@@ -99,7 +99,7 @@
             		<field name="tax_group">vat</field>
 			<field name="amount">0.10</field>
 			<!-- <field name="price_include">False</field> -->
-			<field ref="l10n_br_chart_template" name="chart_template_id"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
 			<field ref="tax_code_4" name="base_code_id"/>
 			<field ref="tax_code_4" name="tax_code_id"/>
 			<field ref="tax_code_4" name="ref_base_code_id"/>
@@ -112,7 +112,7 @@
             		<field name="tax_group">vat</field>
 			<field name="amount">0.12</field>
 			<!-- <field name="price_include">False</field> -->
-			<field ref="l10n_br_chart_template" name="chart_template_id"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
 			<field ref="tax_code_4" name="base_code_id"/>
 			<field ref="tax_code_4" name="tax_code_id"/>
 			<field ref="tax_code_4" name="ref_base_code_id"/>
@@ -125,7 +125,7 @@
             		<field name="tax_group">vat</field>
 			<field name="amount">0.13</field>
 			<!-- <field name="price_include">False</field> -->
-			<field ref="l10n_br_chart_template" name="chart_template_id"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
 			<field ref="tax_code_4" name="base_code_id"/>
 			<field ref="tax_code_4" name="tax_code_id"/>
 			<field ref="tax_code_4" name="ref_base_code_id"/>
@@ -138,7 +138,7 @@
             		<field name="tax_group">vat</field>
 			<field name="amount">0.15</field>
 			<!-- <field name="price_include">False</field> -->
-			<field ref="l10n_br_chart_template" name="chart_template_id"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
 			<field ref="tax_code_4" name="base_code_id"/>
 			<field ref="tax_code_4" name="tax_code_id"/>
 			<field ref="tax_code_4" name="ref_base_code_id"/>
@@ -151,7 +151,7 @@
             		<field name="tax_group">vat</field>
 			<field name="amount">0.16</field>
 			<!-- <field name="price_include">False</field> -->
-			<field ref="l10n_br_chart_template" name="chart_template_id"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
 			<field ref="tax_code_4" name="base_code_id"/>
 			<field ref="tax_code_4" name="tax_code_id"/>
 			<field ref="tax_code_4" name="ref_base_code_id"/>
@@ -164,7 +164,7 @@
             		<field name="tax_group">vat</field>
 			<field name="amount">0.18</field>
 			<!-- <field name="price_include">False</field> -->
-			<field ref="l10n_br_chart_template" name="chart_template_id"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
 			<field ref="tax_code_4" name="base_code_id"/>
 			<field ref="tax_code_4" name="tax_code_id"/>
 			<field ref="tax_code_4" name="ref_base_code_id"/>
@@ -177,7 +177,7 @@
             		<field name="tax_group">vat</field>
 			<field name="amount">0.20</field>
 			<!-- <field name="price_include">False</field> -->
-			<field ref="l10n_br_chart_template" name="chart_template_id"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
 			<field ref="tax_code_4" name="base_code_id"/>
 			<field ref="tax_code_4" name="tax_code_id"/>
 			<field ref="tax_code_4" name="ref_base_code_id"/>
@@ -190,7 +190,7 @@
             		<field name="tax_group">vat</field>
 			<field name="amount">0.22</field>
 			<!-- <field name="price_include">False</field> -->
-			<field ref="l10n_br_chart_template" name="chart_template_id"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
 			<field ref="tax_code_4" name="base_code_id"/>
 			<field ref="tax_code_4" name="tax_code_id"/>
 			<field ref="tax_code_4" name="ref_base_code_id"/>
@@ -203,7 +203,7 @@
             		<field name="tax_group">vat</field>
 			<field name="amount">0.25</field>
 			<!-- <field name="price_include">False</field> -->
-			<field ref="l10n_br_chart_template" name="chart_template_id"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
 			<field ref="tax_code_4" name="base_code_id"/>
 			<field ref="tax_code_4" name="tax_code_id"/>
 			<field ref="tax_code_4" name="ref_base_code_id"/>
@@ -216,7 +216,7 @@
             		<field name="tax_group">vat</field>
 			<field name="amount">0.27</field>
 			<!-- <field name="price_include">False</field> -->
-			<field ref="l10n_br_chart_template" name="chart_template_id"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
 			<field ref="tax_code_4" name="base_code_id"/>
 			<field ref="tax_code_4" name="tax_code_id"/>
 			<field ref="tax_code_4" name="ref_base_code_id"/>
@@ -229,7 +229,7 @@
             		<field name="tax_group">vat</field>
 			<field name="amount">0.30</field>
 			<!-- <field name="price_include">False</field> -->
-			<field ref="l10n_br_chart_template" name="chart_template_id"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
 			<field ref="tax_code_4" name="base_code_id"/>
 			<field ref="tax_code_4" name="tax_code_id"/>
 			<field ref="tax_code_4" name="ref_base_code_id"/>
@@ -242,7 +242,7 @@
             		<field name="tax_group">vat</field>
 			<field name="amount">0.35</field>
 			<!-- <field name="price_include">False</field> -->
-			<field ref="l10n_br_chart_template" name="chart_template_id"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
 			<field ref="tax_code_4" name="base_code_id"/>
 			<field ref="tax_code_4" name="tax_code_id"/>
 			<field ref="tax_code_4" name="ref_base_code_id"/>
@@ -255,7 +255,7 @@
             		<field name="tax_group">vat</field>
 			<field name="amount">0.40</field>
 			<!-- <field name="price_include">False</field> -->
-			<field ref="l10n_br_chart_template" name="chart_template_id"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
 			<field ref="tax_code_4" name="base_code_id"/>
 			<field ref="tax_code_4" name="tax_code_id"/>
 			<field ref="tax_code_4" name="ref_base_code_id"/>
@@ -268,7 +268,7 @@
             		<field name="tax_group">vat</field>
 			<field name="amount">0.42</field>
 			<!-- <field name="price_include">False</field> -->
-			<field ref="l10n_br_chart_template" name="chart_template_id"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
 			<field ref="tax_code_4" name="base_code_id"/>
 			<field ref="tax_code_4" name="tax_code_id"/>
 			<field ref="tax_code_4" name="ref_base_code_id"/>
@@ -281,7 +281,7 @@
             		<field name="tax_group">vat</field>
 			<field name="amount">0.45</field>
 			<!-- <field name="price_include">False</field> -->
-			<field ref="l10n_br_chart_template" name="chart_template_id"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
 			<field ref="tax_code_4" name="base_code_id"/>
 			<field ref="tax_code_4" name="tax_code_id"/>
 			<field ref="tax_code_4" name="ref_base_code_id"/>
@@ -294,7 +294,7 @@
             		<field name="tax_group">vat</field>
 			<field name="amount">0.50</field>
 			<!-- <field name="price_include">False</field> -->
-			<field ref="l10n_br_chart_template" name="chart_template_id"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
 			<field ref="tax_code_4" name="base_code_id"/>
 			<field ref="tax_code_4" name="tax_code_id"/>
 			<field ref="tax_code_4" name="ref_base_code_id"/>
@@ -307,7 +307,7 @@
             		<field name="tax_group">vat</field>
 			<field name="amount">0.60</field>
 			<!-- <field name="price_include">False</field> -->
-			<field ref="l10n_br_chart_template" name="chart_template_id"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
 			<field ref="tax_code_4" name="base_code_id"/>
 			<field ref="tax_code_4" name="tax_code_id"/>
 			<field ref="tax_code_4" name="ref_base_code_id"/>
@@ -320,7 +320,7 @@
             		<field name="tax_group">vat</field>
 			<field name="amount">3.30</field>
 			<!-- <field name="price_include">False</field> -->
-			<field ref="l10n_br_chart_template" name="chart_template_id"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
 			<field ref="tax_code_4" name="base_code_id"/>
 			<field ref="tax_code_4" name="tax_code_id"/>
 			<field ref="tax_code_4" name="ref_base_code_id"/>
@@ -333,7 +333,7 @@
             		<field name="tax_group">vat</field>
 			<field name="amount">0.00</field>
 			<!-- <field name="price_include">True</field> -->
-			<field ref="l10n_br_chart_template" name="chart_template_id"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
 			<field ref="tax_code_1" name="base_code_id"/>
 			<field ref="tax_code_1" name="tax_code_id"/>
 			<field ref="tax_code_1" name="ref_base_code_id"/>
@@ -346,7 +346,7 @@
             		<field name="tax_group">vat</field>
 			<field name="amount">0.00</field>
 			<!-- <field name="price_include">True</field> -->
-			<field ref="l10n_br_chart_template" name="chart_template_id"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
 			<field ref="tax_code_2" name="base_code_id"/>
 			<field ref="tax_code_2" name="tax_code_id"/>
 			<field ref="tax_code_2" name="ref_base_code_id"/>
@@ -359,7 +359,7 @@
             		<field name="tax_group">vat</field>
 			<field name="amount">0.00</field>
 			<!-- <field name="price_include">True</field> -->
-			<field ref="l10n_br_chart_template" name="chart_template_id"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
 			<field ref="tax_code_3" name="base_code_id"/>
 			<field ref="tax_code_3" name="tax_code_id"/>
 			<field ref="tax_code_3" name="ref_base_code_id"/>
@@ -374,7 +374,7 @@
 			<field ref="account_template_241" name="account_collected_id"/>
 			<field ref="account_template_42" name="account_paid_id"/>
 			<!-- <field name="price_include">True</field> -->
-			<field ref="l10n_br_chart_template" name="chart_template_id"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
 			<field ref="tax_code_2" name="base_code_id"/>
 			<field ref="tax_code_2" name="tax_code_id"/>
 			<field ref="tax_code_2" name="ref_base_code_id"/>
@@ -390,7 +390,7 @@
 			<field ref="account_template_241" name="account_collected_id"/>
 			<field ref="account_template_42" name="account_paid_id"/>
 			<!-- <field name="price_include">True</field> -->
-			<field ref="l10n_br_chart_template" name="chart_template_id"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
 			<field ref="tax_code_2" name="base_code_id"/>
 			<field ref="tax_code_2" name="tax_code_id"/>
 			<field ref="tax_code_2" name="ref_base_code_id"/>
@@ -405,7 +405,7 @@
 			<field ref="account_template_241" name="account_collected_id"/>
 			<field ref="account_template_42" name="account_paid_id"/>
 			<!-- <field name="price_include">True</field> -->
-			<field ref="l10n_br_chart_template" name="chart_template_id"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
 			<field ref="tax_code_1" name="base_code_id"/>
 			<field ref="tax_code_1" name="tax_code_id"/>
 			<field ref="tax_code_1" name="ref_base_code_id"/>
@@ -420,7 +420,7 @@
 			<field ref="account_template_241" name="account_collected_id"/>
 			<field ref="account_template_42" name="account_paid_id"/>
 			<!-- <field name="price_include">True</field> -->
-			<field ref="l10n_br_chart_template" name="chart_template_id"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
 			<field ref="tax_code_1" name="base_code_id"/>
 			<field ref="tax_code_1" name="tax_code_id"/>
 			<field ref="tax_code_1" name="ref_base_code_id"/>
@@ -433,7 +433,7 @@
             		<field name="tax_group">vat</field>
 			<field name="amount">0.00</field>
 			<!-- <field name="price_include">True</field> -->
-			<field ref="l10n_br_chart_template" name="chart_template_id"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
 			<field ref="tax_code_5" name="base_code_id"/>
 			<field ref="tax_code_5" name="tax_code_id"/>
 			<field ref="tax_code_5" name="ref_base_code_id"/>
@@ -446,7 +446,7 @@
             		<field name="tax_group">vat</field>
 			<field name="amount">0.0065</field>
 			<!-- <field name="price_include">True</field> -->
-			<field ref="l10n_br_chart_template" name="chart_template_id"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
 			<field ref="tax_code_5" name="base_code_id"/>
 			<field ref="tax_code_5" name="tax_code_id"/>
 			<field ref="tax_code_5" name="ref_base_code_id"/>
@@ -460,7 +460,7 @@
             		<field name="tax_group">vat</field>
 			<field name="amount">0.00</field>
 			<!-- <field name="price_include">True</field> -->
-			<field ref="l10n_br_chart_template" name="chart_template_id"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
 			<field ref="tax_code_6" name="base_code_id"/>
 			<field ref="tax_code_6" name="tax_code_id"/>
 			<field ref="tax_code_6" name="ref_base_code_id"/>
@@ -474,7 +474,7 @@
             		<field name="tax_group">vat</field>
 			<field name="amount">0.03</field>
 			<!-- <field name="price_include">True</field> -->
-			<field ref="l10n_br_chart_template" name="chart_template_id"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
 			<field ref="tax_code_6" name="base_code_id"/>
 			<field ref="tax_code_6" name="tax_code_id"/>
 			<field ref="tax_code_6" name="ref_base_code_id"/>
@@ -487,7 +487,7 @@
             		<field name="tax_group">vat</field>
 			<field name="amount">0.00</field>
 			<!-- <field name="price_include">True</field> -->
-			<field ref="l10n_br_chart_template" name="chart_template_id"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
 			<field ref="tax_code_7" name="base_code_id"/>
 			<field ref="tax_code_7" name="tax_code_id"/>
 			<field ref="tax_code_7" name="ref_base_code_id"/>
@@ -500,7 +500,7 @@
             		<field name="tax_group">vat</field>
 			<field name="amount">0.00</field>
 			<!-- <field name="price_include">True</field> -->
-			<field ref="l10n_br_chart_template" name="chart_template_id"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
 			<field ref="tax_code_8" name="base_code_id"/>
 			<field ref="tax_code_8" name="tax_code_id"/>
 			<field ref="tax_code_8" name="ref_base_code_id"/>
@@ -513,7 +513,7 @@
             		<field name="tax_group">vat</field>
 			<field name="amount">0.00</field>
 			<!-- <field name="price_include">True</field> -->
-			<field ref="l10n_br_chart_template" name="chart_template_id"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
 			<field ref="tax_code_9" name="base_code_id"/>
 			<field ref="tax_code_9" name="tax_code_id"/>
 			<field ref="tax_code_9" name="ref_base_code_id"/>
@@ -526,7 +526,7 @@
             		<field name="tax_group">vat</field>
 			<field name="amount">0.00</field>
 			<!-- <field name="price_include">True</field> -->
-			<field ref="l10n_br_chart_template" name="chart_template_id"/>
+			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
 			<field ref="tax_code_10" name="base_code_id"/>
 			<field ref="tax_code_10" name="tax_code_id"/>
 			<field ref="tax_code_10" name="ref_base_code_id"/>
diff --git a/addons/l10n_br/data/l10n_br_chart_template.xml b/addons/l10n_br/data/l10n_br_account_chart_template.xml
similarity index 95%
rename from addons/l10n_br/data/l10n_br_chart_template.xml
rename to addons/l10n_br/data/l10n_br_account_chart_template.xml
index 7a1dc5eb23e..dd714bacab8 100644
--- a/addons/l10n_br/data/l10n_br_chart_template.xml
+++ b/addons/l10n_br/data/l10n_br_account_chart_template.xml
@@ -2,7 +2,7 @@
 <openerp>
 	<data>
 
-		<record id="l10n_br_chart_template" model="account.chart.template">
+		<record id="l10n_br_account_chart_template" model="account.chart.template">
 			<field name="name">Planilha de Contas Brasileira</field>
 			<field name="account_root_id" ref="account_template_1" />
 			<field name="tax_code_root_id" ref="tax_code_chart_root"/>