From 081b314ab1f59d1b6226f574bc075ba635a34754 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <maxime.chambreuil@savoirfairelinux.com>
Date: Tue, 6 Mar 2012 17:01:02 -0500
Subject: [PATCH] [IMP] Cleanup

bzr revid: maxime.chambreuil@savoirfairelinux.com-20120306220102-eif6vpx5g4154hkh
---
 addons/l10n_ca/account_chart_en.xml |  2 +-
 addons/l10n_ca/account_chart_fr.xml |  4 +-
 addons/l10n_ca/account_types_en.xml | 49 ++++++++++++--------
 addons/l10n_ca/account_types_fr.xml | 72 ++++++++++++++---------------
 4 files changed, 67 insertions(+), 60 deletions(-)

diff --git a/addons/l10n_ca/account_chart_en.xml b/addons/l10n_ca/account_chart_en.xml
index 26db0bcef95..0359052daab 100644
--- a/addons/l10n_ca/account_chart_en.xml
+++ b/addons/l10n_ca/account_chart_en.xml
@@ -41,7 +41,7 @@
 		<field name="code">1111</field>
 		<field name="parent_id" ref="chart111_en"/>
 		<field name="type">liquidity</field>
-		<field name="user_type" ref="user_type_asset_en"/>
+		<field name="user_type" ref="user_type_bank_en"/>
 		<field name="name">Checking Account</field>
 	</record>
 
diff --git a/addons/l10n_ca/account_chart_fr.xml b/addons/l10n_ca/account_chart_fr.xml
index b66dd5f02ba..b1ef87d566d 100644
--- a/addons/l10n_ca/account_chart_fr.xml
+++ b/addons/l10n_ca/account_chart_fr.xml
@@ -40,7 +40,7 @@
 		<field name="code">1111</field>
 		<field name="parent_id" ref="chart111_fr"/>
 		<field name="type">liquidity</field>
-		<field name="user_type" ref="user_type_immo_fr" />
+		<field name="user_type" ref="user_type_bank_fr" />
 		<field name="name">Compte chèque</field>
 	</record>
 
@@ -48,7 +48,7 @@
 		<field name="code">1112</field>
 		<field name="parent_id" ref="chart111_fr"/>
 		<field name="type">liquidity</field>
-		<field name="user_type" ref="user_type_immo_fr" />
+		<field name="user_type" ref="user_type_cash_fr" />
 		<field name="name">Petite caisse</field>
 	</record>
 
diff --git a/addons/l10n_ca/account_types_en.xml b/addons/l10n_ca/account_types_en.xml
index 1af3fd92205..5cd891f3231 100644
--- a/addons/l10n_ca/account_types_en.xml
+++ b/addons/l10n_ca/account_types_en.xml
@@ -2,25 +2,27 @@
 <openerp>
     <data>
 
-	<record model="account.account.type" id="user_type_receivable_en" >
-		<field name="name">Receivable</field>
-		<field name="code">receivable</field>
-		<field name="close_method">unreconciled</field>
-	</record>
-
-	<record model="account.account.type" id="user_type_payable_en" >
-		<field name="name">Payable</field>
-		<field name="code">payable</field>
-		<field name="close_method">unreconciled</field>
-	</record>
-
 	<record model="account.account.type" id="user_type_view_en">
 		<field name="name">View</field>
 		<field name="code">view</field>
 		<field name="close_method">none</field>
 	</record>
 
-	<record model="account.account.type" id="user_type_income_en" >
+	<record model="account.account.type" id="user_type_receivable_en">
+		<field name="name">Receivable</field>
+		<field name="code">receivable</field>
+		<field name="close_method">unreconciled</field>
+		<field name="report_type">asset</field>
+	</record>
+
+	<record model="account.account.type" id="user_type_payable_en">
+		<field name="name">Payable</field>
+		<field name="code">payable</field>
+		<field name="close_method">unreconciled</field>
+		<field name="report_type">liability</field>
+	</record>
+
+	<record model="account.account.type" id="user_type_income_en">
 		<field name="name">Income</field>
 		<field name="code">income</field>
 		<field name="close_method">none</field>
@@ -34,16 +36,18 @@
 		<field name="report_type">expense</field>
 	</record>
 
-	<record model="account.account.type" id="user_type_tax_en">
-		<field name="name">Tax</field>
-		<field name="code">tax</field>
-		<field name="close_method">unreconciled</field>
-	</record>
-
 	<record model="account.account.type" id="user_type_cash_en">
 		<field name="name">Cash</field>
 		<field name="code">cash</field>
 		<field name="close_method">balance</field>
+		<field name="report_type">asset</field>
+	</record>
+
+	<record model="account.account.type" id="user_type_bank_en">
+		<field name="name">Bank</field>
+		<field name="code">bank</field>
+		<field name="close_method">balance</field>
+		<field name="report_type">asset</field>
 	</record>
 
 	<record model="account.account.type" id="user_type_asset_en">
@@ -53,6 +57,13 @@
 		<field name="report_type">asset</field>
 	</record>
 
+	<record model="account.account.type" id="user_type_liability_en">
+		<field name="name">Liability</field>
+		<field name="code">liability</field>
+		<field name="report_type">liability</field>
+		<field name="close_method">balance</field>
+	</record>
+
 	<record model="account.account.type" id="user_type_equity_en">
 		<field name="name">Equity</field>
 		<field name="code">equity</field>
diff --git a/addons/l10n_ca/account_types_fr.xml b/addons/l10n_ca/account_types_fr.xml
index cff6c01e6f2..1ce0d89a7ea 100644
--- a/addons/l10n_ca/account_types_fr.xml
+++ b/addons/l10n_ca/account_types_fr.xml
@@ -8,59 +8,55 @@
 		<field name="close_method">none</field>
 	</record>
 
+	<record id="user_type_asset_fr" model="account.account.type">
+		<field name="name">Actif</field>
+		<field name="code">asset</field>
+		<field name="report_type">asset</field>
+		<field name="close_method">balance</field>
+	</record>
+
+	<record id="user_type_bank_fr" model="account.account.type">
+		<field name="name">Banque</field>
+		<field name="code">bank</field>
+		<field name="report_type">asset</field>
+		<field name="close_method">balance</field>
+	</record>
+
+	<record id="user_type_cash_fr" model="account.account.type">
+		<field name="name">Caisse</field>
+		<field name="code">cash</field>
+		<field name="report_type">asset</field>
+		<field name="close_method">balance</field>
+	</record>
+
+	<record id="user_type_liability_fr" model="account.account.type">
+		<field name="name">Passif</field>
+		<field name="code">liab</field>
+		<field name="report_type">liability</field>
+		<field name="close_method">balance</field>
+	</record>
+
 	<record id="user_type_capitaux_fr" model="account.account.type">
-		<field name="name">Capital</field>
+		<field name="name">Capitaux propres</field>
 		<field name="code">capital</field>
-		<field name="report_type">asset</field>
-		<field name="close_method">balance</field>
-	</record>
-
-	<record id="user_type_immo_fr" model="account.account.type">
-		<field name="name">Immobilisation</field>
-		<field name="code">immo</field>
-		<field name="report_type">asset</field>
-		<field name="close_method">balance</field>
-	</record>
-
-	<record id="user_type_stock_fr" model="account.account.type">
-		<field name="name">Stock et Encours</field>
-		<field name="code">stock</field>
-		<field name="report_type">asset</field>
-		<field name="close_method">balance</field>
-	</record>
-
-	<record id="user_type_tiers_fr" model="account.account.type">
-		<field name="name">Tiers</field>
-		<field name="code">tiers</field>
+		<field name="report_type">liability</field>
 		<field name="close_method">balance</field>
 	</record>
 
 	<record id="user_type_tiers_receiv_fr" model="account.account.type">
-		<field name="name">Tiers - Recevable</field>
-		<field name="code">tiers -rec</field>
+		<field name="name">Recevable</field>
+		<field name="code">receivable</field>
 		<field name="report_type">asset</field>
 		<field name="close_method">unreconciled</field>
 	</record>
 
 	<record id="user_type_tiers_payable_fr" model="account.account.type">
-		<field name="name">Tiers - Payable</field>
-		<field name="code">tiers - pay</field>
+		<field name="name">Payable</field>
+		<field name="code">payable</field>
 		<field name="report_type">liability</field>
 		<field name="close_method">unreconciled</field>
 	</record>
 
-	<record id="user_type_tax_fr" model="account.account.type">
-		<field name="name">Tax</field>
-		<field name="code">tax</field>
-		<field name="close_method">unreconciled</field>
-	</record>
-
-	<record id="user_type_financiers_fr" model="account.account.type">
-		<field name="name">Financier</field>
-		<field name="code">financier</field>
-		<field name="close_method">balance</field>
-	</record>
-
 	<record id="user_type_charge_fr" model="account.account.type">
 		<field name="name">Charge</field>
 		<field name="code">charge</field>