From 0eee772093f070edad1158792d17cd9bc9aeb203 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <maxime.chambreuil@savoirfairelinux.com>
Date: Sat, 9 Jun 2012 10:41:32 -0400
Subject: [PATCH] [IMP] Use account.data_account_type. Remove notax. Improve
 chart of taxes.

bzr revid: maxime.chambreuil@savoirfairelinux.com-20120609144132-gdmwqfdc2vbq1qv6
---
 addons/l10n_ca/__openerp__.py          |   2 -
 addons/l10n_ca/account_chart_en.xml    | 154 +++++++++++------------
 addons/l10n_ca/account_chart_fr.xml    | 162 ++++++++++++-------------
 addons/l10n_ca/account_tax_code_en.xml |  18 +--
 addons/l10n_ca/account_tax_en.xml      | 104 ++++++++--------
 addons/l10n_ca/account_tax_fr.xml      |   8 --
 addons/l10n_ca/account_types_en.xml    |  75 ------------
 addons/l10n_ca/account_types_fr.xml    |  75 ------------
 addons/l10n_ca/fiscal_templates_en.xml |  16 ---
 addons/l10n_ca/fiscal_templates_fr.xml |  16 ---
 10 files changed, 215 insertions(+), 415 deletions(-)
 delete mode 100644 addons/l10n_ca/account_types_en.xml
 delete mode 100644 addons/l10n_ca/account_types_fr.xml

diff --git a/addons/l10n_ca/__openerp__.py b/addons/l10n_ca/__openerp__.py
index 800ca7937eb..bd5fe4e6ea0 100644
--- a/addons/l10n_ca/__openerp__.py
+++ b/addons/l10n_ca/__openerp__.py
@@ -33,13 +33,11 @@ Canadian accounting charts and localizations.
     "depends" : ['base', 'account', 'base_iban', 'base_vat', 'account_chart'],
     "init_xml" : [],
     "update_xml" : [
-        'account_types_en.xml',
         'account_chart_en.xml',
         'account_tax_code_en.xml',
         'account_chart_template_en.xml',
         'account_tax_en.xml',
         'fiscal_templates_en.xml',
-        'account_types_fr.xml',
         'account_chart_fr.xml',
         'account_tax_code_fr.xml',
         'account_chart_template_fr.xml',
diff --git a/addons/l10n_ca/account_chart_en.xml b/addons/l10n_ca/account_chart_en.xml
index 47e76ec3148..14cbc993b2b 100644
--- a/addons/l10n_ca/account_chart_en.xml
+++ b/addons/l10n_ca/account_chart_en.xml
@@ -8,7 +8,7 @@
             <field name="name">Account Chart CA EN</field>
             <field eval="0" name="parent_id"/>
             <field name="type">view</field>
-            <field name="user_type" ref="user_type_view_en"/>
+            <field name="user_type" ref="account.data_account_type_view"/>
         </record>
 
 	<!-- ASSET -->
@@ -17,7 +17,7 @@
 		<field name="code">1</field>
 		<field name="parent_id" ref="chart0_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">ASSETS</field>
 	</record>
 	
@@ -25,7 +25,7 @@
 		<field name="code">11</field>
 		<field name="parent_id" ref="chart1_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">CURRENT ASSETS</field>
 	</record>
 	
@@ -33,7 +33,7 @@
 		<field name="code">111</field>
 		<field name="parent_id" ref="chart11_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">CASH</field>
 	</record>
 
@@ -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_bank_en"/>
+		<field name="user_type" ref="account.data_account_type_bank"/>
 		<field name="name">Checking Account</field>
 	</record>
 
@@ -49,7 +49,7 @@
 		<field name="code">112</field>
 		<field name="parent_id" ref="chart11_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">TREASURY OR TREASURY EQUIVALENTS</field>
 	</record>
 
@@ -57,7 +57,7 @@
 		<field name="code">113</field>
 		<field name="parent_id" ref="chart11_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">CERTIFICATES OF DEPOSITS</field>
 	</record>
 
@@ -65,7 +65,7 @@
 		<field name="code">114</field>
 		<field name="parent_id" ref="chart11_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">STOCKS</field>
 	</record>
 
@@ -73,7 +73,7 @@
 		<field name="code">115</field>
 		<field name="parent_id" ref="chart11_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">ACCOUNTS RECEIVABLES</field>
 	</record>
 
@@ -81,7 +81,7 @@
 		<field name="code">1151</field>
 		<field name="parent_id" ref="chart115_en"/>
 		<field name="type">receivable</field>
-		<field name="user_type" ref="user_type_receivable_en"/>
+		<field name="user_type" ref="account.data_account_type_receivable"/>
 		<field name="reconcile" eval="True"/>
 		<field name="name">Customers Account</field>
 	</record>
@@ -90,7 +90,7 @@
 		<field name="code">1152</field>
 		<field name="parent_id" ref="chart115_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">ALLOWANCE FOR DOUBTFUL ACCOUNTS</field>
 	</record>
 
@@ -98,7 +98,7 @@
 		<field name="code">116</field>
 		<field name="parent_id" ref="chart11_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">PREPAID EXPENSES</field>
 	</record>
 
@@ -106,7 +106,7 @@
 		<field name="code">117</field>
 		<field name="parent_id" ref="chart11_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">INVESTMENTS HELD FOR TRADING</field>
 	</record>
 
@@ -114,7 +114,7 @@
 		<field name="code">118</field>
 		<field name="parent_id" ref="chart11_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">TAXES RECEIVABLES</field>
 	</record>
 
@@ -122,7 +122,7 @@
 		<field name="code">1181</field>
 		<field name="parent_id" ref="chart118_en"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_receivable_en"/>
+		<field name="user_type" ref="account.data_account_type_receivable"/>
 		<field name="reconcile" eval="True"/>
 		<field name="name">GST receivable</field>
 	</record>
@@ -131,7 +131,7 @@
 		<field name="code">1182</field>
 		<field name="parent_id" ref="chart118_en"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_receivable_en"/>
+		<field name="user_type" ref="account.data_account_type_receivable"/>
 		<field name="reconcile" eval="True"/>
 		<field name="name">PST/QST receivable</field>
 	</record>
@@ -140,7 +140,7 @@
 		<field name="code">1183</field>
 		<field name="parent_id" ref="chart118_en"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_receivable_en"/>
+		<field name="user_type" ref="account.data_account_type_receivable"/>
 		<field name="reconcile" eval="True"/>
 		<field name="name">HST receivable</field>
 	</record>
@@ -149,7 +149,7 @@
 		<field name="code">15</field>
 		<field name="parent_id" ref="chart1_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">NON-CURRENT ASSETS</field>
 	</record>
 
@@ -157,7 +157,7 @@
 		<field name="code">151</field>
 		<field name="parent_id" ref="chart15_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">INVESTMENTS AVAILABLE FOR SALE</field>
 	</record>
 
@@ -165,7 +165,7 @@
 		<field name="code">152</field>
 		<field name="parent_id" ref="chart15_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">TANGIBLE ASSETS</field>
 	</record>
 
@@ -173,7 +173,7 @@
 		<field name="code">1527</field>
 		<field name="parent_id" ref="chart152_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">ACCUMULATED DEPRECIATIONS</field>
 	</record>
 
@@ -181,7 +181,7 @@
 		<field name="code">153</field>
 		<field name="parent_id" ref="chart15_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">INTANGIBLE ASSETS</field>
 	</record>
 
@@ -189,7 +189,7 @@
 		<field name="code">1531</field>
 		<field name="parent_id" ref="chart153_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">PATENTS, TRADEMARKS AND COPYRIGHTS</field>
 	</record>
 
@@ -199,7 +199,7 @@
 		<field name="code">2</field>
 		<field name="parent_id" ref="chart0_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">LIABILITIES</field>
 	</record>
 
@@ -207,7 +207,7 @@
 		<field name="code">21</field>
 		<field name="parent_id" ref="chart2_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">CURRENT LIABILITIES</field>
 	</record>
 
@@ -215,7 +215,7 @@
 		<field name="code">211</field>
 		<field name="parent_id" ref="chart21_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">ACCOUNTS PAYABLES</field>
 	</record>
 
@@ -223,7 +223,7 @@
 		<field name="code">2111</field>
 		<field name="parent_id" ref="chart211_en"/>
 		<field name="type">payable</field>
-		<field name="user_type" ref="user_type_payable_en"/>
+		<field name="user_type" ref="account.data_account_type_payable"/>
 		<field name="reconcile" eval="True"/>
 		<field name="name">Suppliers Account</field>
 	</record>
@@ -232,7 +232,7 @@
 		<field name="code">212</field>
 		<field name="parent_id" ref="chart21_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">TAXES PAYABLES</field>
 	</record>
 
@@ -240,7 +240,7 @@
 		<field name="code">2121</field>
 		<field name="parent_id" ref="chart212_en"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_payable_en"/>
+		<field name="user_type" ref="account.data_account_type_payable"/>
 		<field name="reconcile" eval="True"/>
 		<field name="name">GST to pay</field>
 	</record>
@@ -249,7 +249,7 @@
 		<field name="code">2122</field>
 		<field name="parent_id" ref="chart212_en"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_payable_en"/>
+		<field name="user_type" ref="account.data_account_type_payable"/>
 		<field name="reconcile" eval="True"/>
 		<field name="name">PST/QST to pay</field>
 	</record>
@@ -258,7 +258,7 @@
 		<field name="code">2123</field>
 		<field name="parent_id" ref="chart212_en"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_payable_en"/>
+		<field name="user_type" ref="account.data_account_type_payable"/>
 		<field name="reconcile" eval="True"/>
 		<field name="name">HST to pay</field>
 	</record>
@@ -267,7 +267,7 @@
 		<field name="code">213</field>
 		<field name="parent_id" ref="chart21_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">CURRENT FINANCIAL DEBTS</field>
 	</record>
 
@@ -275,7 +275,7 @@
 		<field name="code">25</field>
 		<field name="parent_id" ref="chart2_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">NON-CURRENT LIABILITIES</field>
 	</record>
 
@@ -283,7 +283,7 @@
 		<field name="code">251</field>
 		<field name="parent_id" ref="chart25_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">NON-CURRENT FINANCIAL DEBTS</field>
 	</record>
 
@@ -291,7 +291,7 @@
 		<field name="code">252</field>
 		<field name="parent_id" ref="chart25_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">PROVISIONS FOR PENSIONS AND OTHER POST-EMPLOYMENT ADVANTAGES</field>
 	</record>
 
@@ -299,7 +299,7 @@
 		<field name="code">253</field>
 		<field name="parent_id" ref="chart25_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">DEFERRED TAXES</field>
 	</record>
 
@@ -307,7 +307,7 @@
 		<field name="code">259</field>
 		<field name="parent_id" ref="chart25_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">OTHER NON-CURRENT LIABILITIES</field>
 	</record>
 
@@ -317,7 +317,7 @@
 		<field name="code">3</field>
 		<field name="parent_id" ref="chart0_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">EQUITY</field>
 	</record>
 
@@ -325,7 +325,7 @@
 		<field name="code">31</field>
 		<field name="parent_id" ref="chart3_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">SHARE CAPITAL</field>
 	</record>
 
@@ -333,7 +333,7 @@
 		<field name="code">32</field>
 		<field name="parent_id" ref="chart3_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">PREMIUMS</field>
 	</record>
 
@@ -341,7 +341,7 @@
 		<field name="code">33</field>
 		<field name="parent_id" ref="chart3_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">RETAINED EARNINGS</field>
 	</record>
 
@@ -349,7 +349,7 @@
 		<field name="code">34</field>
 		<field name="parent_id" ref="chart3_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">DIVIDENDS</field>
 	</record>
 
@@ -357,7 +357,7 @@
 		<field name="code">35</field>
 		<field name="parent_id" ref="chart3_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">TRANSLATION ADJUSTMENTS</field>
 	</record>
 
@@ -365,7 +365,7 @@
 		<field name="code">36</field>
 		<field name="parent_id" ref="chart3_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">CONTRIBUTED SURPLUS</field>
 	</record>
 
@@ -375,7 +375,7 @@
 		<field name="code">4</field>
 		<field name="parent_id" ref="chart0_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">INCOMES</field>
 	</record>
 
@@ -383,7 +383,7 @@
 		<field name="code">41</field>
 		<field name="parent_id" ref="chart4_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">OPERATING INCOMES</field>
 	</record>
 
@@ -391,7 +391,7 @@
 		<field name="code">411</field>
 		<field name="parent_id" ref="chart41_en"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_income_en"/>
+		<field name="user_type" ref="account.data_account_type_income"/>
 		<field name="name">Inside Sales</field>
 	</record>
 
@@ -399,7 +399,7 @@
                 <field name="code">412</field>
                 <field name="parent_id" ref="chart41_en"/>
                 <field name="type">other</field>
-                <field name="user_type" ref="user_type_income_en"/>
+                <field name="user_type" ref="account.data_account_type_income"/>
                 <field name="name">Harmonized Provinces Sales</field>
         </record>
 
@@ -407,7 +407,7 @@
                 <field name="code">413</field>
                 <field name="parent_id" ref="chart41_en"/>
                 <field name="type">other</field>
-                <field name="user_type" ref="user_type_income_en"/>
+                <field name="user_type" ref="account.data_account_type_income"/>
                 <field name="name">Non-Harmonized Provinces Sales</field>
         </record>
 
@@ -415,7 +415,7 @@
                 <field name="code">414</field>
                 <field name="parent_id" ref="chart41_en"/>
                 <field name="type">other</field>
-                <field name="user_type" ref="user_type_income_en"/>
+                <field name="user_type" ref="account.data_account_type_income"/>
                 <field name="name">International Sales</field>
         </record>
 
@@ -423,7 +423,7 @@
 		<field name="code">419</field>
 		<field name="parent_id" ref="chart41_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">OTHER OPERATING INCOMES</field>
 	</record>
 
@@ -431,7 +431,7 @@
 		<field name="code">42</field>
 		<field name="parent_id" ref="chart4_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">NON-OPERATING INCOMES</field>
 	</record>
 
@@ -439,7 +439,7 @@
 		<field name="code">421</field>
 		<field name="parent_id" ref="chart42_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">INTERESTS</field>
 	</record>
 
@@ -447,7 +447,7 @@
 		<field name="code">429</field>
 		<field name="parent_id" ref="chart42_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">OTHER NON-OPERATING INCOMES</field>
 	</record>
 
@@ -457,7 +457,7 @@
 		<field name="code">5</field>
 		<field name="parent_id" ref="chart0_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">EXPENSES</field>
 	</record>
 
@@ -465,7 +465,7 @@
 		<field name="code">51</field>
 		<field name="parent_id" ref="chart5_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">OPERATING EXPENSES</field>
 	</record>
 
@@ -473,7 +473,7 @@
 		<field name="code">511</field>
 		<field name="parent_id" ref="chart51_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">COST OF GOODS SOLD</field>
 	</record>
 
@@ -481,7 +481,7 @@
 		<field name="code">5111</field>
 		<field name="parent_id" ref="chart511_en"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_expense_en"/>
+		<field name="user_type" ref="account.data_account_type_expense"/>
 		<field name="name">Inside Purchases</field>
 	</record>
 
@@ -489,7 +489,7 @@
 		<field name="code">5112</field>
 		<field name="parent_id" ref="chart511_en"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_expense_en"/>
+		<field name="user_type" ref="account.data_account_type_expense"/>
 		<field name="name">Purchases in harmonized provinces</field>
 	</record>
 
@@ -497,7 +497,7 @@
 		<field name="code">5113</field>
 		<field name="parent_id" ref="chart511_en"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_expense_en"/>
+		<field name="user_type" ref="account.data_account_type_expense"/>
 		<field name="name">Purchases in non-harmonized provinces</field>
 	</record>
 
@@ -505,7 +505,7 @@
 		<field name="code">5114</field>
 		<field name="parent_id" ref="chart511_en"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_expense_en"/>
+		<field name="user_type" ref="account.data_account_type_expense"/>
 		<field name="name">International Purchases</field>
 	</record>
 
@@ -513,7 +513,7 @@
 		<field name="code">512</field>
 		<field name="parent_id" ref="chart51_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">LABOUR EXPENSES</field>
 	</record>
 
@@ -521,7 +521,7 @@
 		<field name="code">5121</field>
 		<field name="parent_id" ref="chart512_en"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_expense_en"/>
+		<field name="user_type" ref="account.data_account_type_expense"/>
 		<field name="name">Salaries, wages and commissions</field>
 	</record>
 
@@ -529,7 +529,7 @@
 		<field name="code">5122</field>
 		<field name="parent_id" ref="chart512_en"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_expense_en"/>
+		<field name="user_type" ref="account.data_account_type_expense"/>
 		<field name="name">Holidays</field>
 	</record>
 
@@ -537,7 +537,7 @@
 		<field name="code">5123</field>
 		<field name="parent_id" ref="chart512_en"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_expense_en"/>
+		<field name="user_type" ref="account.data_account_type_expense"/>
 		<field name="name">Employment Insurance</field>
 	</record>
 
@@ -545,7 +545,7 @@
 		<field name="code">5124</field>
 		<field name="parent_id" ref="chart512_en"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_expense_en"/>
+		<field name="user_type" ref="account.data_account_type_expense"/>
 		<field name="name">Health Services Fund</field>
 	</record>
 
@@ -553,7 +553,7 @@
 		<field name="code">5125</field>
 		<field name="parent_id" ref="chart512_en"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_expense_en"/>
+		<field name="user_type" ref="account.data_account_type_expense"/>
 		<field name="name">Annuities</field>
 	</record>
 
@@ -561,7 +561,7 @@
 		<field name="code">5126</field>
 		<field name="parent_id" ref="chart512_en"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_expense_en"/>
+		<field name="user_type" ref="account.data_account_type_expense"/>
 		<field name="name">Parental Insurance</field>
 	</record>
 
@@ -569,7 +569,7 @@
 		<field name="code">5127</field>
 		<field name="parent_id" ref="chart512_en"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_expense_en"/>
+		<field name="user_type" ref="account.data_account_type_expense"/>
 		<field name="name">Labour Health and Safety</field>
 	</record>
 
@@ -577,7 +577,7 @@
 		<field name="code">5128</field>
 		<field name="parent_id" ref="chart512_en"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_expense_en"/>
+		<field name="user_type" ref="account.data_account_type_expense"/>
 		<field name="name">Labour Standards</field>
 	</record>
 
@@ -585,7 +585,7 @@
 		<field name="code">513</field>
 		<field name="parent_id" ref="chart51_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">SALES EXPENSES</field>
 	</record>
 
@@ -593,7 +593,7 @@
 		<field name="code">514</field>
 		<field name="parent_id" ref="chart51_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">GENERAL EXPENSES</field>
 	</record>
 
@@ -601,7 +601,7 @@
 		<field name="code">515</field>
 		<field name="parent_id" ref="chart51_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">RESEARCH AND DEVELOPMENT EXPENSES</field>
 	</record>
 
@@ -609,7 +609,7 @@
 		<field name="code">519</field>
 		<field name="parent_id" ref="chart51_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">OTHER OPERATING EXPENSES</field>
 	</record>
 
@@ -617,7 +617,7 @@
 		<field name="code">55</field>
 		<field name="parent_id" ref="chart5_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">NON-OPERATING EXPENSES</field>
 	</record>
 
@@ -625,7 +625,7 @@
 		<field name="code">551</field>
 		<field name="parent_id" ref="chart55_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">INTEREST EXPENSES</field>
 	</record>
 
@@ -633,7 +633,7 @@
 		<field name="code">559</field>
 		<field name="parent_id" ref="chart55_en"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_en"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">OTHER NON-OPERATING EXPENSES</field>
 	</record>
 
diff --git a/addons/l10n_ca/account_chart_fr.xml b/addons/l10n_ca/account_chart_fr.xml
index 18258315416..e50ac7ff4dc 100644
--- a/addons/l10n_ca/account_chart_fr.xml
+++ b/addons/l10n_ca/account_chart_fr.xml
@@ -6,7 +6,7 @@
         <record id="chart0_fr" model="account.account.template">
             <field name="code">0</field>
             <field name="type">view</field>
-            <field name="user_type" ref="user_type_view_fr"/>
+            <field name="user_type" ref="account.data_account_type_view"/>
             <field name="name">Account Chart CA FR</field>
         </record>
 
@@ -16,7 +16,7 @@
 		<field name="code">1</field>
 		<field name="parent_id" ref="chart0_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">ACTIF</field>
 	</record>
 	
@@ -24,7 +24,7 @@
 		<field name="code">11</field>
 		<field name="parent_id" ref="chart1_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">ACTIFS COURANTS</field>
 	</record>
 	
@@ -32,7 +32,7 @@
 		<field name="code">111</field>
 		<field name="parent_id" ref="chart11_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">ENCAISSE</field>
 	</record>
 
@@ -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_bank_fr"/>
+		<field name="user_type" ref="account.data_account_type_bank"/>
 		<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_cash_fr"/>
+		<field name="user_type" ref="account.data_account_type_cash"/>
 		<field name="name">Petite caisse</field>
 	</record>
 
@@ -56,7 +56,7 @@
 		<field name="code">112</field>
 		<field name="parent_id" ref="chart11_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">TRÉSORERIE OU ÉQUIVALENTS DE TRÉSORERIE</field>
 	</record>
 
@@ -64,7 +64,7 @@
 		<field name="code">113</field>
 		<field name="parent_id" ref="chart11_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">CERTIFICATS DE DÉPÔTS</field>
 	</record>
 
@@ -72,7 +72,7 @@
 		<field name="code">114</field>
 		<field name="parent_id" ref="chart11_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">STOCKS</field>
 	</record>
 
@@ -80,7 +80,7 @@
 		<field name="code">115</field>
 		<field name="parent_id" ref="chart11_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">COMPTES CLIENTS</field>
 	</record>
 
@@ -88,7 +88,7 @@
 		<field name="code">1151</field>
 		<field name="parent_id" ref="chart115_fr"/>
 		<field name="type">receivable</field>
-		<field name="user_type" ref="user_type_tiers_receiv_fr"/>
+		<field name="user_type" ref="account.data_account_type_receivable"/>
 		<field name="reconcile" eval="True"/>
 		<field name="name">Comptes clients</field>
 	</record>
@@ -97,7 +97,7 @@
 		<field name="code">1152</field>
 		<field name="parent_id" ref="chart115_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">PROVISION POUR CRÉANCES DOUTEUSES</field>
 	</record>
 
@@ -105,7 +105,7 @@
 		<field name="code">116</field>
 		<field name="parent_id" ref="chart11_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">FRAIS PAYÉS D'AVANCE</field>
 	</record>
 
@@ -113,7 +113,7 @@
 		<field name="code">117</field>
 		<field name="parent_id" ref="chart11_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">PLACEMENTS DÉTENUS À DES FINS DE TRANSACTION</field>
 	</record>
 
@@ -121,7 +121,7 @@
 		<field name="code">118</field>
 		<field name="parent_id" ref="chart11_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">IMPÔTS À RECEVOIR</field>
 	</record>
 
@@ -129,7 +129,7 @@
 		<field name="code">1181</field>
 		<field name="parent_id" ref="chart118_fr"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_asset_fr"/>
+		<field name="user_type" ref="account.data_account_type_asset"/>
 		<field name="reconcile" eval="True"/>
 		<field name="name">TPS à recevoir</field>
 	</record>
@@ -138,7 +138,7 @@
 		<field name="code">1182</field>
 		<field name="parent_id" ref="chart118_fr"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_asset_fr"/>
+		<field name="user_type" ref="account.data_account_type_asset"/>
 		<field name="reconcile" eval="True"/>
 		<field name="name">TVP/TVQ à recevoir</field>
 	</record>
@@ -147,7 +147,7 @@
 		<field name="code">1183</field>
 		<field name="parent_id" ref="chart118_fr"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_asset_fr"/>
+		<field name="user_type" ref="account.data_account_type_asset"/>
 		<field name="reconcile" eval="True"/>
 		<field name="name">TVH à recevoir</field>
 	</record>
@@ -156,7 +156,7 @@
 		<field name="code">15</field>
 		<field name="parent_id" ref="chart1_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">ACTIFS NON-COURANTS</field>
 	</record>
 
@@ -164,7 +164,7 @@
 		<field name="code">151</field>
 		<field name="parent_id" ref="chart15_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">PLACEMENTS DISPONIBLES À LA VENTE</field>
 	</record>
 
@@ -172,7 +172,7 @@
 		<field name="code">152</field>
 		<field name="parent_id" ref="chart15_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">IMMOBILISATIONS CORPORELLES</field>
 	</record>
 
@@ -180,7 +180,7 @@
 		<field name="code">1527</field>
 		<field name="parent_id" ref="chart152_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">AMORTISSEMENTS CUMULÉS</field>
 	</record>
 
@@ -188,7 +188,7 @@
 		<field name="code">153</field>
 		<field name="parent_id" ref="chart15_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">IMMOBILISATIONS INCORPORELLES</field>
 	</record>
 
@@ -196,7 +196,7 @@
 		<field name="code">1531</field>
 		<field name="parent_id" ref="chart153_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">BREVETS, MARQUES DE COMMERCE ET DROITS D'AUTEURS</field>
 	</record>
 
@@ -206,7 +206,7 @@
 		<field name="code">2</field>
 		<field name="parent_id" ref="chart0_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">PASSIF</field>
 	</record>
 
@@ -214,7 +214,7 @@
 		<field name="code">21</field>
 		<field name="parent_id" ref="chart2_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">PASSIFS COURANTS</field>
 	</record>
 
@@ -222,7 +222,7 @@
 		<field name="code">211</field>
 		<field name="parent_id" ref="chart21_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">FOURNISSEURS ET COMPTES RATTACHÉS</field>
 	</record>
 
@@ -230,7 +230,7 @@
 		<field name="code">2111</field>
 		<field name="parent_id" ref="chart211_fr"/>
 		<field name="type">payable</field>
-		<field name="user_type" ref="user_type_tiers_payable_fr"/>
+		<field name="user_type" ref="account.data_account_type_payable"/>
 		<field name="reconcile" eval="True"/>
 		<field name="name">Comptes fournisseurs</field>
 	</record>
@@ -239,7 +239,7 @@
 		<field name="code">212</field>
 		<field name="parent_id" ref="chart21_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">AUTRES COMPTES CRÉDITEURS</field>
 	</record>
 
@@ -247,7 +247,7 @@
 		<field name="code">213</field>
 		<field name="parent_id" ref="chart21_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">IMPÔTS À PAYER</field>
 	</record>
 
@@ -255,7 +255,7 @@
 		<field name="code">2131</field>
 		<field name="parent_id" ref="chart213_fr"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_liability_fr"/>
+		<field name="user_type" ref="account.data_account_type_liability"/>
 		<field name="reconcile" eval="True"/>
 		<field name="name">TPS à payer</field>
 	</record>
@@ -264,7 +264,7 @@
 		<field name="code">2132</field>
 		<field name="parent_id" ref="chart213_fr"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_liability_fr"/>
+		<field name="user_type" ref="account.data_account_type_liability"/>
 		<field name="reconcile" eval="True"/>
 		<field name="name">TVP/TVQ à payer</field>
 	</record>
@@ -273,7 +273,7 @@
 		<field name="code">2133</field>
 		<field name="parent_id" ref="chart213_fr"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_liability_fr"/>
+		<field name="user_type" ref="account.data_account_type_liability"/>
 		<field name="reconcile" eval="True"/>
 		<field name="name">TVH à payer</field>
 	</record>
@@ -282,7 +282,7 @@
 		<field name="code">214</field>
 		<field name="parent_id" ref="chart21_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">DETTES FINANCIÈRES COURANTES</field>
 	</record>
 
@@ -290,7 +290,7 @@
 		<field name="code">215</field>
 		<field name="parent_id" ref="chart21_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">PASSIFS LIÉS AUX ACTIFS DÉTENUS EN VUE DE LEUR CESSION</field>
 	</record>
 
@@ -298,7 +298,7 @@
 		<field name="code">25</field>
 		<field name="parent_id" ref="chart2_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">PASSIFS NON-COURANTS</field>
 	</record>
 
@@ -306,7 +306,7 @@
 		<field name="code">251</field>
 		<field name="parent_id" ref="chart25_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">DETTES FINANCIÈRES NON-COURANTES</field>
 	</record>
 
@@ -314,7 +314,7 @@
 		<field name="code">252</field>
 		<field name="parent_id" ref="chart25_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">PROVISIONS POUR RETRAITES ET AUTRES AVANTAGES POSTÉRIEURS À L'EMPLOI</field>
 	</record>
 
@@ -322,7 +322,7 @@
 		<field name="code">253</field>
 		<field name="parent_id" ref="chart25_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">IMPÔTS DIFFÉRÉS</field>
 	</record>
 
@@ -330,7 +330,7 @@
 		<field name="code">254</field>
 		<field name="parent_id" ref="chart25_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">AUTRES PASSIFS NON-COURANTS</field>
 	</record>
 
@@ -340,7 +340,7 @@
 		<field name="code">3</field>
 		<field name="parent_id" ref="chart0_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">CAPITAUX PROPRES</field>
 	</record>
 
@@ -348,7 +348,7 @@
 		<field name="code">31</field>
 		<field name="parent_id" ref="chart3_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">CAPITAL-ACTIONS</field>
 	</record>
 
@@ -356,7 +356,7 @@
 		<field name="code">32</field>
 		<field name="parent_id" ref="chart3_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">PRIMES</field>
 	</record>
 
@@ -364,7 +364,7 @@
 		<field name="code">33</field>
 		<field name="parent_id" ref="chart3_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">BÉNÉFICES NON RÉPARTIS</field>
 	</record>
 
@@ -372,7 +372,7 @@
 		<field name="code">34</field>
 		<field name="parent_id" ref="chart3_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">DIVIDENDES</field>
 	</record>
 
@@ -380,7 +380,7 @@
 		<field name="code">35</field>
 		<field name="parent_id" ref="chart3_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">ÉCARTS DE CONVERSION</field>
 	</record>
 
@@ -388,7 +388,7 @@
 		<field name="code">36</field>
 		<field name="parent_id" ref="chart3_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">SURPLUS D'APPORT</field>
 	</record>
 
@@ -396,7 +396,7 @@
 		<field name="code">39</field>
 		<field name="parent_id" ref="chart3_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">AUTRES ÉLÉMENTS DU RÉSULTAT GLOBAL</field>
 	</record>
 
@@ -406,7 +406,7 @@
 		<field name="code">4</field>
 		<field name="parent_id" ref="chart0_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">PRODUITS</field>
 	</record>
 
@@ -414,7 +414,7 @@
 		<field name="code">41</field>
 		<field name="parent_id" ref="chart4_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">PRODUITS D'EXPLOITATION</field>
 	</record>
 
@@ -422,7 +422,7 @@
 		<field name="code">411</field>
 		<field name="parent_id" ref="chart41_fr"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_produit_fr"/>
+		<field name="user_type" ref="account.data_account_type_income"/>
 		<field name="name">Ventes</field>
 	</record>
 
@@ -430,7 +430,7 @@
 		<field name="code">412</field>
 		<field name="parent_id" ref="chart41_fr"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_produit_fr"/>
+		<field name="user_type" ref="account.data_account_type_income"/>
 		<field name="name">Ventes avec des provinces harmonisées</field>
 	</record>
 	
@@ -438,7 +438,7 @@
 		<field name="code">413</field>
 		<field name="parent_id" ref="chart41_fr"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_produit_fr"/>
+		<field name="user_type" ref="account.data_account_type_income"/>
 		<field name="name">Ventes avec des provinces non-harmonisées</field>
 	</record>
 
@@ -446,7 +446,7 @@
 		<field name="code">414</field>
 		<field name="parent_id" ref="chart41_fr"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_produit_fr"/>
+		<field name="user_type" ref="account.data_account_type_income"/>
 		<field name="name">Ventes à l'étranger</field>
 	</record>
 
@@ -454,7 +454,7 @@
 		<field name="code">419</field>
 		<field name="parent_id" ref="chart41_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">AUTRES PRODUITS D'EXPLOITATION</field>
 	</record>
 
@@ -462,7 +462,7 @@
 		<field name="code">42</field>
 		<field name="parent_id" ref="chart4_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">PRODUITS NON LIÉS À L'EXPLOITATION</field>
 	</record>
 
@@ -470,7 +470,7 @@
 		<field name="code">425</field>
 		<field name="parent_id" ref="chart42_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">INTÉRÊTS</field>
 	</record>
 
@@ -478,7 +478,7 @@
 		<field name="code">429</field>
 		<field name="parent_id" ref="chart42_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">AUTRES PRODUITS NON LIÉS À L'EXPLOITATION</field>
 	</record>
 
@@ -488,7 +488,7 @@
 		<field name="code">5</field>
 		<field name="parent_id" ref="chart0_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">CHARGES</field>
 	</record>
 
@@ -496,7 +496,7 @@
 		<field name="code">51</field>
 		<field name="parent_id" ref="chart5_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">CHARGES D'EXPLOITATION</field>
 	</record>
 
@@ -504,7 +504,7 @@
 		<field name="code">511</field>
 		<field name="parent_id" ref="chart51_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">COÛT DES PRODUITS VENDUS</field>
 	</record>
 	
@@ -512,7 +512,7 @@
 		<field name="code">5111</field>
 		<field name="parent_id" ref="chart511_fr"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_charge_fr"/>
+		<field name="user_type" ref="account.data_account_type_expense"/>
 		<field name="name">Achats</field>
 	</record>
 
@@ -520,7 +520,7 @@
 		<field name="code">5112</field>
 		<field name="parent_id" ref="chart511_fr"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_produit_fr"/>
+		<field name="user_type" ref="account.data_account_type_income"/>
 		<field name="name">Achats dans des provinces harmonisées</field>
 	</record>
 	
@@ -528,7 +528,7 @@
 		<field name="code">5113</field>
 		<field name="parent_id" ref="chart511_fr"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_produit_fr"/>
+		<field name="user_type" ref="account.data_account_type_income"/>
 		<field name="name">Achats dans des provinces non-harmonisées</field>
 	</record>
 
@@ -536,7 +536,7 @@
 		<field name="code">5114</field>
 		<field name="parent_id" ref="chart511_fr"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_produit_fr"/>
+		<field name="user_type" ref="account.data_account_type_income"/>
 		<field name="name">Achats à l'étranger</field>
 	</record>
 
@@ -544,7 +544,7 @@
 		<field name="code">512</field>
 		<field name="parent_id" ref="chart51_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">SALAIRES ET CHARGES SOCIALES</field>
 	</record>
 
@@ -552,7 +552,7 @@
 		<field name="code">51201</field>
 		<field name="parent_id" ref="chart512_fr"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_charge_fr"/>
+		<field name="user_type" ref="account.data_account_type_expense"/>
 		<field name="name">Salaires</field>
 	</record>
 
@@ -560,7 +560,7 @@
 		<field name="code">51202</field>
 		<field name="parent_id" ref="chart512_fr"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_charge_fr"/>
+		<field name="user_type" ref="account.data_account_type_expense"/>
 		<field name="name">Vacances</field>
 	</record>
 
@@ -568,7 +568,7 @@
 		<field name="code">51203</field>
 		<field name="parent_id" ref="chart512_fr"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_charge_fr"/>
+		<field name="user_type" ref="account.data_account_type_expense"/>
 		<field name="name">Assurance Emploi</field>
 	</record>
 
@@ -576,7 +576,7 @@
 		<field name="code">51204</field>
 		<field name="parent_id" ref="chart512_fr"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_charge_fr"/>
+		<field name="user_type" ref="account.data_account_type_expense"/>
 		<field name="name">Fonds des services de santé</field>
 	</record>
 
@@ -584,7 +584,7 @@
 		<field name="code">51205</field>
 		<field name="parent_id" ref="chart512_fr"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_charge_fr"/>
+		<field name="user_type" ref="account.data_account_type_expense"/>
 		<field name="name">Rentes</field>
 	</record>
 
@@ -592,7 +592,7 @@
 		<field name="code">51206</field>
 		<field name="parent_id" ref="chart512_fr"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_charge_fr"/>
+		<field name="user_type" ref="account.data_account_type_expense"/>
 		<field name="name">Assurance parental</field>
 	</record>
 
@@ -600,7 +600,7 @@
 		<field name="code">51207</field>
 		<field name="parent_id" ref="chart512_fr"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_charge_fr"/>
+		<field name="user_type" ref="account.data_account_type_expense"/>
 		<field name="name">Santé et sécurité au travail</field>
 	</record>
 
@@ -608,7 +608,7 @@
 		<field name="code">51208</field>
 		<field name="parent_id" ref="chart512_fr"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="user_type_charge_fr"/>
+		<field name="user_type" ref="account.data_account_type_expense"/>
 		<field name="name">Normes du travail</field>
 	</record>
 
@@ -616,7 +616,7 @@
 		<field name="code">513</field>
 		<field name="parent_id" ref="chart51_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">FRAIS SUR VENTE</field>
 	</record>
 
@@ -624,7 +624,7 @@
 		<field name="code">514</field>
 		<field name="parent_id" ref="chart51_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">FRAIS GÉNÉRAUX</field>
 	</record>
 
@@ -632,7 +632,7 @@
 		<field name="code">515</field>
 		<field name="parent_id" ref="chart51_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">FRAIS DE RECHERCHE ET DÉVELOPPEMENT</field>
 	</record>
 
@@ -640,7 +640,7 @@
 		<field name="code">519</field>
 		<field name="parent_id" ref="chart51_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">AUTRES FRAIS D'EXPLOITATION</field>
 	</record>
 
@@ -648,7 +648,7 @@
 		<field name="code">52</field>
 		<field name="parent_id" ref="chart5_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">FRAIS NON LIÉS À L'EXPLOITATION</field>
 	</record>
 
@@ -656,7 +656,7 @@
 		<field name="code">521</field>
 		<field name="parent_id" ref="chart52_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">INTÉRÊTS DÉBITEURS</field>
 	</record>
 
@@ -664,7 +664,7 @@
 		<field name="code">529</field>
 		<field name="parent_id" ref="chart52_fr"/>
 		<field name="type">view</field>
-		<field name="user_type" ref="user_type_view_fr"/>
+		<field name="user_type" ref="account.data_account_type_view"/>
 		<field name="name">AUTRES FRAIS NON LIÉS À L'EXPLOITATION</field>
 	</record>
 
diff --git a/addons/l10n_ca/account_tax_code_en.xml b/addons/l10n_ca/account_tax_code_en.xml
index 2fe144d6086..bb628a39f15 100644
--- a/addons/l10n_ca/account_tax_code_en.xml
+++ b/addons/l10n_ca/account_tax_code_en.xml
@@ -7,47 +7,47 @@
 	</record>
 	
 	<record model="account.tax.code.template" id="vat_code_balance_net_en">
-		<field name="name">Tax Balance to Pay</field>
+		<field name="name">Tax Balance</field>
 		<field name="parent_id" ref="vat_code_tax_en"/>
 	</record>
 
 	<record model="account.tax.code.template" id="vat_code_receivable_tva_en">
-		<field name="name">Receivable Taxes</field>
+		<field name="name">Taxes paid</field>
 		<field name="parent_id" ref="vat_code_balance_net_en"/>
 	</record>
 
 	<record model="account.tax.code.template" id="vat_code_receivable_gst_en">
-		<field name="name">GST to Receive</field>
+		<field name="name">GST paid</field>
 		<field name="parent_id" ref="vat_code_receivable_tva_en"/>
 	</record>
 
 	<record model="account.tax.code.template" id="vat_code_receivable_pst_en">
-		<field name="name">PST to Receive</field>
+		<field name="name">PST paid</field>
 		<field name="parent_id" ref="vat_code_receivable_tva_en"/>
 	</record>
 
 	<record model="account.tax.code.template" id="vat_code_receivable_hst_en">
-		<field name="name">HST to Receive</field>
+		<field name="name">HST paid</field>
 		<field name="parent_id" ref="vat_code_receivable_tva_en"/>
 	</record>
 
 	<record model="account.tax.code.template" id="vat_code_payable_en">
-		<field name="name">Payable Taxes</field>
+		<field name="name">Taxes received</field>
 		<field name="parent_id" ref="vat_code_balance_net_en"/>
 	</record>
 
 	<record model="account.tax.code.template" id="vat_code_payable_gst_en">
-		<field name="name">GST to Pay</field>
+		<field name="name">GST received</field>
 		<field name="parent_id" ref="vat_code_payable_en"/>
 	</record>
 
 	<record model="account.tax.code.template" id="vat_code_payable_pst_en">
-		<field name="name">PST to Pay</field>
+		<field name="name">PST received</field>
 		<field name="parent_id" ref="vat_code_payable_en"/>
 	</record>
 
 	<record model="account.tax.code.template" id="vat_code_payable_hst_en">
-		<field name="name">HST to Pay</field>
+		<field name="name">HST received</field>
 		<field name="parent_id" ref="vat_code_payable_en"/>
 	</record>
 
diff --git a/addons/l10n_ca/account_tax_en.xml b/addons/l10n_ca/account_tax_en.xml
index 5c2392786c4..f185f7f9198 100644
--- a/addons/l10n_ca/account_tax_en.xml
+++ b/addons/l10n_ca/account_tax_en.xml
@@ -8,8 +8,8 @@
 
     <record id="gstpst_mb_sale_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">TPS + TVP for sales (MB)</field>
-        <field name="description">TPSTVP_MB_SALE</field>
+        <field name="name">GST + PST for sales (MB)</field>
+        <field name="description">GSTPST_MB_SALE</field>
         <field name="type_tax_use">sale</field>
         <field name="amount">1</field>
         <field name="child_depend">1</field>
@@ -18,8 +18,8 @@
 
     <record id="gstpst_sale_mb_gst_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">TPS for sales - 5% (MB)</field>
-        <field name="description">TPS</field>
+        <field name="name">GST for sales - 5% (MB)</field>
+        <field name="description">GST</field>
         <field name="type_tax_use">sale</field>
         <field name="amount">0.050000</field>
         <field name="type">percent</field>
@@ -36,8 +36,8 @@
 
     <record id="pst_mb_sale_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">TVP for sales - 7%</field>
-        <field name="description">TVP</field>
+        <field name="name">PST for sales - 7%</field>
+        <field name="description">PST</field>
         <field name="type_tax_use">sale</field>
         <field name="amount">0.700000</field>
         <field name="type">percent</field>
@@ -55,8 +55,8 @@
 
     <record id="gstpst_pe_sale_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">TPS + TVP for sales (PE)</field>
-        <field name="description">TPSTVP_PE_SALE</field>
+        <field name="name">GST + PST for sales (PE)</field>
+        <field name="description">GSTPST_PE_SALE</field>
         <field name="type_tax_use">sale</field>
         <field name="amount">1</field>
         <field name="child_depend">1</field>
@@ -65,8 +65,8 @@
 
     <record id="gstpst_sale_pe_gst_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">TPS for sales - 5% (PE)</field>
-        <field name="description">TPS</field>
+        <field name="name">GST for sales - 5% (PE)</field>
+        <field name="description">GST</field>
         <field name="type_tax_use">sale</field>
         <field name="amount">0.050000</field>
         <field name="type">percent</field>
@@ -83,8 +83,8 @@
 
     <record id="pst_pe_sale_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">TVP for sale - 10%</field>
-        <field name="description">TVP</field>
+        <field name="name">PST for sale - 10%</field>
+        <field name="description">PST</field>
         <field name="type_tax_use">sale</field>
         <field name="amount">0.100000</field>
         <field name="type">percent</field>
@@ -102,8 +102,8 @@
 
     <record id="gsttvq_sale_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">TPS + TVQ for sales</field>
-        <field name="description">TPSTVQ_SALE</field>
+        <field name="name">GST + TVQ for sales</field>
+        <field name="description">GSTTVQ_SALE</field>
         <field name="type_tax_use">sale</field>
         <field name="amount">1</field>
         <field name="child_depend">1</field>
@@ -112,8 +112,8 @@
 
     <record id="gsttvq_sale_gst_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">TPS for sales - 5% (QC)</field>
-        <field name="description">TPS</field>
+        <field name="name">GST for sales - 5% (QC)</field>
+        <field name="description">GST</field>
         <field name="type_tax_use">sale</field>
         <field name="amount">0.050000</field>
         <field name="type">percent</field>
@@ -149,8 +149,8 @@
 
     <record id="gstpst_sk_sale_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">TPS + TVP for sales (SK)</field>
-        <field name="description">TPSTVP_SK_SALE</field>
+        <field name="name">GST + PST for sales (SK)</field>
+        <field name="description">GSTPST_SK_SALE</field>
         <field name="type_tax_use">sale</field>
         <field name="amount">1</field>
         <field name="child_depend">1</field>
@@ -159,8 +159,8 @@
 
     <record id="gstpst_sale_sk_gst_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">TPS for sales - 5% (SK)</field>
-        <field name="description">TPS</field>
+        <field name="name">GST for sales - 5% (SK)</field>
+        <field name="description">GST</field>
         <field name="type_tax_use">sale</field>
         <field name="amount">0.050000</field>
         <field name="type">percent</field>
@@ -177,8 +177,8 @@
 
     <record id="pst_sk_sale_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">TVP for sales - 5% (SK)</field>
-        <field name="description">TVP</field>
+        <field name="name">PST for sales - 5% (SK)</field>
+        <field name="description">PST</field>
         <field name="type_tax_use">sale</field>
         <field name="amount">0.050000</field>
         <field name="type">percent</field>
@@ -258,8 +258,8 @@
 
     <record id="gst_sale_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">TPS for sales - 5%</field>
-        <field name="description">TPS_SALE</field>
+        <field name="name">GST for sales - 5%</field>
+        <field name="description">GST_SALE</field>
         <field name="type_tax_use">sale</field>
         <field name="amount">0.050000</field>
         <field name="type">percent</field>
@@ -278,8 +278,8 @@
 
     <record id="gstpst_mb_purc_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">TPS + TVP for purchases (MB)</field>
-        <field name="description">TPSTVP_MB_PURC</field>
+        <field name="name">GST + PST for purchases (MB)</field>
+        <field name="description">GSTPST_MB_PURC</field>
         <field name="type_tax_use">purchase</field>
         <field name="amount">1</field>
         <field name="child_depend">1</field>
@@ -288,8 +288,8 @@
 
     <record id="gstpst_purc_mb_gst_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">TPS for purchases - 5% (MB)</field>
-        <field name="description">TPS</field>
+        <field name="name">GST for purchases - 5% (MB)</field>
+        <field name="description">GST</field>
         <field name="type_tax_use">purchase</field>
         <field name="amount">0.050000</field>
         <field name="type">percent</field>
@@ -306,8 +306,8 @@
 
     <record id="pst_mb_purc_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">TVP for purchases - 7%</field>
-        <field name="description">TVP</field>
+        <field name="name">PST for purchases - 7%</field>
+        <field name="description">PST</field>
         <field name="type_tax_use">purchase</field>
         <field name="amount">0.700000</field>
         <field name="type">percent</field>
@@ -325,8 +325,8 @@
 
     <record id="gstpst_pe_purc_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">TPS + TVP for purchases (PE)</field>
-        <field name="description">TPSTVP_PE_PURC</field>
+        <field name="name">GST + PST for purchases (PE)</field>
+        <field name="description">GSTPST_PE_PURC</field>
         <field name="type_tax_use">purchase</field>
         <field name="amount">1</field>
         <field name="child_depend">1</field>
@@ -335,8 +335,8 @@
 
     <record id="gstpst_purc_pe_gst_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">TPS for purchases - 5% (PE)</field>
-        <field name="description">TPS</field>
+        <field name="name">GST for purchases - 5% (PE)</field>
+        <field name="description">GST</field>
         <field name="type_tax_use">purchase</field>
         <field name="amount">0.050000</field>
         <field name="type">percent</field>
@@ -353,8 +353,8 @@
 
     <record id="pst_pe_purc_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">TVP for purchases - 10%</field>
-        <field name="description">TVP</field>
+        <field name="name">PST for purchases - 10%</field>
+        <field name="description">PST</field>
         <field name="type_tax_use">purchase</field>
         <field name="amount">0.100000</field>
         <field name="type">percent</field>
@@ -372,8 +372,8 @@
 
     <record id="gsttvq_purc_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">TPS + TVQ for purchases</field>
-        <field name="description">TPSTVQ_PURC</field>
+        <field name="name">GST + TVQ for purchases</field>
+        <field name="description">GSTTVQ_PURC</field>
         <field name="type_tax_use">purchase</field>
         <field name="amount">1</field>
         <field name="child_depend">1</field>
@@ -382,8 +382,8 @@
 
     <record id="gsttvq_purc_gst_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">TPS for purchases - 5% (QC)</field>
-        <field name="description">TPS</field>
+        <field name="name">GST for purchases - 5% (QC)</field>
+        <field name="description">GST</field>
         <field name="type_tax_use">purchase</field>
         <field name="amount">0.050000</field>
         <field name="type">percent</field>
@@ -419,8 +419,8 @@
 
     <record id="gstpst_sk_purc_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">TPS + TVP for purchases (SK)</field>
-        <field name="description">TPSTVP_SK_PURC</field>
+        <field name="name">GST + PST for purchases (SK)</field>
+        <field name="description">GSTPST_SK_PURC</field>
         <field name="type_tax_use">purchase</field>
         <field name="amount">1</field>
         <field name="child_depend">1</field>
@@ -429,8 +429,8 @@
 
     <record id="gstpst_purc_sk_gst_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">TPS for purchases - 5% (SK)</field>
-        <field name="description">TPS</field>
+        <field name="name">GST for purchases - 5% (SK)</field>
+        <field name="description">GST</field>
         <field name="type_tax_use">purchase</field>
         <field name="amount">0.050000</field>
         <field name="type">percent</field>
@@ -447,8 +447,8 @@
 
     <record id="pst_sk_purc_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">TVP for purchases - 5% (SK)</field>
-        <field name="description">TVP</field>
+        <field name="name">PST for purchases - 5% (SK)</field>
+        <field name="description">PST</field>
         <field name="type_tax_use">purchase</field>
         <field name="amount">0.050000</field>
         <field name="type">percent</field>
@@ -528,8 +528,8 @@
 
     <record id="gst_purc_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">TPS for purchases - 5%</field>
-        <field name="description">TPS_PURC</field>
+        <field name="name">GST for purchases - 5%</field>
+        <field name="description">GST_PURC</field>
         <field name="type_tax_use">purchase</field>
         <field name="amount">0.050000</field>
         <field name="type">percent</field>
@@ -541,13 +541,5 @@
         <field name="ref_tax_code_id" ref="vat_code_receivable_gst_en"/>
     </record>
 
-    <record id="notax_en" model="account.tax.template">
-        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">Pas de taxes</field>
-        <field name="description">Pas de taxes</field>
-        <field name="amount">0.00</field>
-        <field name="type">percent</field>
-    </record>
-
     </data>
 </openerp>
diff --git a/addons/l10n_ca/account_tax_fr.xml b/addons/l10n_ca/account_tax_fr.xml
index 98544207135..169bfe4f20b 100644
--- a/addons/l10n_ca/account_tax_fr.xml
+++ b/addons/l10n_ca/account_tax_fr.xml
@@ -541,13 +541,5 @@
         <field name="ref_tax_code_id" ref="vat_code_receivable_tps_fr"/>
     </record>
 
-    <record id="notax_fr" model="account.tax.template">
-        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">Pas de taxes</field>
-        <field name="description">Pas de taxes</field>
-        <field name="amount">0.00</field>
-        <field name="type">percent</field>
-    </record>
-
     </data>
 </openerp>
diff --git a/addons/l10n_ca/account_types_en.xml b/addons/l10n_ca/account_types_en.xml
deleted file mode 100644
index 5cd891f3231..00000000000
--- a/addons/l10n_ca/account_types_en.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-	<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_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>
-		<field name="report_type">income</field>
-	</record>
-
-	<record model="account.account.type" id="user_type_expense_en">
-		<field name="name">Expense</field>
-		<field name="code">expense</field>
-		<field name="close_method">none</field>
-		<field name="report_type">expense</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">
-		<field name="name">Asset</field>
-		<field name="code">asset</field>
-		<field name="close_method">balance</field>
-		<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>
-		<field name="report_type">liability</field>
-		<field name="close_method">balance</field>
-	</record>
-
-    </data>
-</openerp>
diff --git a/addons/l10n_ca/account_types_fr.xml b/addons/l10n_ca/account_types_fr.xml
deleted file mode 100644
index 1ce0d89a7ea..00000000000
--- a/addons/l10n_ca/account_types_fr.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-	<record id="user_type_view_fr" model="account.account.type">
-		<field name="name">Vue</field>
-		<field name="code">view</field>
-		<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">Capitaux propres</field>
-		<field name="code">capital</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">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">Payable</field>
-		<field name="code">payable</field>
-		<field name="report_type">liability</field>
-		<field name="close_method">unreconciled</field>
-	</record>
-
-	<record id="user_type_charge_fr" model="account.account.type">
-		<field name="name">Charge</field>
-		<field name="code">charge</field>
-		<field name="report_type">expense</field>
-		<field name="close_method">none</field>
-	</record>
-
-	<record id="user_type_produit_fr" model="account.account.type">
-		<field name="name">Produit</field>
-		<field name="code">produit</field>
-		<field name="report_type">income</field>
-		<field name="close_method">none</field>
-	</record>        
-
-    </data>
-</openerp>
diff --git a/addons/l10n_ca/fiscal_templates_en.xml b/addons/l10n_ca/fiscal_templates_en.xml
index 4c16ae24c92..54f9c21b5e1 100644
--- a/addons/l10n_ca/fiscal_templates_en.xml
+++ b/addons/l10n_ca/fiscal_templates_en.xml
@@ -70,7 +70,6 @@
 	<record id="fiscal_position_tax_template_4_ab_purc_en" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_4_en"  />
 		<field name="tax_src_id" ref="gst_purc_en" />
-		<field name="tax_dest_id" ref="notax_en" />
 	</record>
 
 	<!--  British Columbia Fiscal Position Tax Templates (default is hst12) -->
@@ -102,7 +101,6 @@
 	<record id="fiscal_position_tax_template_4_12_purc_en" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_4_en"  />
 		<field name="tax_src_id" ref="hst12_purc_en" />
-		<field name="tax_dest_id" ref="notax_en" />
 	</record>
 
 	<!--  Manitoba Fiscal Position Tax Templates (default is gstpst_mb) -->
@@ -140,7 +138,6 @@
 	<record id="fiscal_position_tax_template_4_mb_purc_en" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_4_en"  />
 		<field name="tax_src_id" ref="gstpst_mb_purc_en" />
-		<field name="tax_dest_id" ref="notax_en" />
 	</record>
 
 	<!--  New Brunswick, Newfoundland and Labrador and Ontario Fiscal Position Tax Templates (default is hst13) -->
@@ -172,7 +169,6 @@
 	<record id="fiscal_position_tax_template_4_13_purc_en" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_4_en"  />
 		<field name="tax_src_id" ref="hst13_purc_en" />
-		<field name="tax_dest_id" ref="notax_en" />
 	</record>
 
 	<!--  Nova Scotia Fiscal Position Tax Templates (default is hst15) -->
@@ -204,7 +200,6 @@
 	<record id="fiscal_position_tax_template_4_15_purc_en" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_4_en"  />
 		<field name="tax_src_id" ref="hst15_purc_en" />
-		<field name="tax_dest_id" ref="notax_en" />
 	</record>
 
 	<!--  Prince Edward Island Fiscal Position Tax Templates (default is gstpst_pe)-->
@@ -242,7 +237,6 @@
 	<record id="fiscal_position_tax_template_4_qc_purc_en" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_4_en"  />
 		<field name="tax_src_id" ref="gstpst_pe_purc_en" />
-		<field name="tax_dest_id" ref="notax_en" />
 	</record>
 
 	<!--  Quebec Fiscal Position Tax Templates (default is gsttvq)-->
@@ -274,7 +268,6 @@
 	<record id="fiscal_position_tax_template_4_qc_purc_en" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_4_en"  />
 		<field name="tax_src_id" ref="gsttvq_purc_en" />
-		<field name="tax_dest_id" ref="notax_en" />
 	</record>
 
 	<!--  Saskatchewan Fiscal Position Tax Templates (default is gstpst_sk)-->
@@ -312,7 +305,6 @@
 	<record id="fiscal_position_tax_template_4_sk_purc_en" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_4_en"  />
 		<field name="tax_src_id" ref="gstpst_sk_purc_en" />
-		<field name="tax_dest_id" ref="notax_en" />
 	</record>
 
 
@@ -348,7 +340,6 @@
 	<record id="fiscal_position_tax_template_4_ab_sale_en" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_4_en"  />
 		<field name="tax_src_id" ref="gst_sale_en" />
-		<field name="tax_dest_id" ref="notax_en" />
 	</record>
 
 	<!--  British Columbia Fiscal Position Tax Templates (default is hst12) -->
@@ -380,7 +371,6 @@
 	<record id="fiscal_position_tax_template_4_12_sale_en" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_4_en"  />
 		<field name="tax_src_id" ref="hst12_sale_en" />
-		<field name="tax_dest_id" ref="notax_en" />
 	</record>
 
 	<!--  Manitoba Fiscal Position Tax Templates (default is gstpst_mb) -->
@@ -418,7 +408,6 @@
 	<record id="fiscal_position_tax_template_4_mb_sale_en" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_4_en"  />
 		<field name="tax_src_id" ref="gstpst_mb_sale_en" />
-		<field name="tax_dest_id" ref="notax_en" />
 	</record>
 
 	<!--  New Brunswick, Newfoundland and Labrador and Ontario Fiscal Position Tax Templates (default is hst13) -->
@@ -450,7 +439,6 @@
 	<record id="fiscal_position_tax_template_4_13_sale_en" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_4_en"  />
 		<field name="tax_src_id" ref="hst13_sale_en" />
-		<field name="tax_dest_id" ref="notax_en" />
 	</record>
 
 	<!--  Nova Scotia Fiscal Position Tax Templates (default is hst15) -->
@@ -482,7 +470,6 @@
 	<record id="fiscal_position_tax_template_4_15_sale_en" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_4_en"  />
 		<field name="tax_src_id" ref="hst15_sale_en" />
-		<field name="tax_dest_id" ref="notax_en" />
 	</record>
 
 	<!--  Prince Edward Island Fiscal Position Tax Templates (default is gstpst_pe)-->
@@ -520,7 +507,6 @@
 	<record id="fiscal_position_tax_template_4_qc_sale_en" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_4_en"  />
 		<field name="tax_src_id" ref="gstpst_pe_sale_en" />
-		<field name="tax_dest_id" ref="notax_en" />
 	</record>
 
 	<!--  Quebec Fiscal Position Tax Templates (default is gsttvq)-->
@@ -552,7 +538,6 @@
 	<record id="fiscal_position_tax_template_4_qc_sale_en" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_4_en"  />
 		<field name="tax_src_id" ref="gsttvq_sale_en" />
-		<field name="tax_dest_id" ref="notax_en" />
 	</record>
 
 	<!--  Saskatchewan Fiscal Position Tax Templates (default is gstpst_sk)-->
@@ -590,7 +575,6 @@
 	<record id="fiscal_position_tax_template_4_sk_sale_en" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_4_en"  />
 		<field name="tax_src_id" ref="gstpst_sk_sale_en" />
-		<field name="tax_dest_id" ref="notax_en" />
 	</record>
 
 	<!-- Fiscal Position Account Templates - Products -->
diff --git a/addons/l10n_ca/fiscal_templates_fr.xml b/addons/l10n_ca/fiscal_templates_fr.xml
index 9215622bb6a..0acd7388a52 100644
--- a/addons/l10n_ca/fiscal_templates_fr.xml
+++ b/addons/l10n_ca/fiscal_templates_fr.xml
@@ -70,7 +70,6 @@
 	<record id="fiscal_position_tax_template_4_ab_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_4_fr"  />
 		<field name="tax_src_id" ref="tps_purc_fr" />
-		<field name="tax_dest_id" ref="notax_fr" />
 	</record>
 
 	<!--  British Columbia Fiscal Position Tax Templates (default is hst12) -->
@@ -102,7 +101,6 @@
 	<record id="fiscal_position_tax_template_4_12_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_4_fr"  />
 		<field name="tax_src_id" ref="tvh12_purc_fr" />
-		<field name="tax_dest_id" ref="notax_fr" />
 	</record>
 
 	<!--  Manitoba Fiscal Position Tax Templates (default is tpstvp_mb) -->
@@ -140,7 +138,6 @@
 	<record id="fiscal_position_tax_template_4_mb_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_4_fr"  />
 		<field name="tax_src_id" ref="tpstvp_mb_purc_fr" />
-		<field name="tax_dest_id" ref="notax_fr" />
 	</record>
 
 	<!--  New Brunswick, Newfoundland and Labrador and Ontario Fiscal Position Tax Templates (default is hst13) -->
@@ -172,7 +169,6 @@
 	<record id="fiscal_position_tax_template_4_13_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_4_fr"  />
 		<field name="tax_src_id" ref="tvh13_purc_fr" />
-		<field name="tax_dest_id" ref="notax_fr" />
 	</record>
 
 	<!--  Nova Scotia Fiscal Position Tax Templates (default is hst15) -->
@@ -204,7 +200,6 @@
 	<record id="fiscal_position_tax_template_4_15_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_4_fr"  />
 		<field name="tax_src_id" ref="tvh15_purc_fr" />
-		<field name="tax_dest_id" ref="notax_fr" />
 	</record>
 
 	<!--  Prince Edward Island Fiscal Position Tax Templates (default is tpstvp_pe)-->
@@ -242,7 +237,6 @@
 	<record id="fiscal_position_tax_template_4_qc_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_4_fr"  />
 		<field name="tax_src_id" ref="tpstvp_pe_purc_fr" />
-		<field name="tax_dest_id" ref="notax_fr" />
 	</record>
 
 	<!--  Quebec Fiscal Position Tax Templates (default is tpstvq)-->
@@ -274,7 +268,6 @@
 	<record id="fiscal_position_tax_template_4_qc_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_4_fr"  />
 		<field name="tax_src_id" ref="tpstvq_purc_fr" />
-		<field name="tax_dest_id" ref="notax_fr" />
 	</record>
 
 	<!--  Saskatchewan Fiscal Position Tax Templates (default is tpstvp_sk)-->
@@ -312,7 +305,6 @@
 	<record id="fiscal_position_tax_template_4_sk_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_4_fr"  />
 		<field name="tax_src_id" ref="tpstvp_sk_purc_fr" />
-		<field name="tax_dest_id" ref="notax_fr" />
 	</record>
 
 
@@ -348,7 +340,6 @@
 	<record id="fiscal_position_tax_template_4_ab_sale_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_4_fr"  />
 		<field name="tax_src_id" ref="tps_sale_fr" />
-		<field name="tax_dest_id" ref="notax_fr" />
 	</record>
 
 	<!--  British Columbia Fiscal Position Tax Templates (default is hst12) -->
@@ -380,7 +371,6 @@
 	<record id="fiscal_position_tax_template_4_12_sale_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_4_fr"  />
 		<field name="tax_src_id" ref="tvh12_sale_fr" />
-		<field name="tax_dest_id" ref="notax_fr" />
 	</record>
 
 	<!--  Manitoba Fiscal Position Tax Templates (default is tpstvp_mb) -->
@@ -418,7 +408,6 @@
 	<record id="fiscal_position_tax_template_4_mb_sale_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_4_fr"  />
 		<field name="tax_src_id" ref="tpstvp_mb_sale_fr" />
-		<field name="tax_dest_id" ref="notax_fr" />
 	</record>
 
 	<!--  New Brunswick, Newfoundland and Labrador and Ontario Fiscal Position Tax Templates (default is hst13) -->
@@ -450,7 +439,6 @@
 	<record id="fiscal_position_tax_template_4_13_sale_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_4_fr"  />
 		<field name="tax_src_id" ref="tvh13_sale_fr" />
-		<field name="tax_dest_id" ref="notax_fr" />
 	</record>
 
 	<!--  Nova Scotia Fiscal Position Tax Templates (default is hst15) -->
@@ -482,7 +470,6 @@
 	<record id="fiscal_position_tax_template_4_15_sale_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_4_fr"  />
 		<field name="tax_src_id" ref="tvh15_sale_fr" />
-		<field name="tax_dest_id" ref="notax_fr" />
 	</record>
 
 	<!--  Prince Edward Island Fiscal Position Tax Templates (default is tpstvp_pe)-->
@@ -520,7 +507,6 @@
 	<record id="fiscal_position_tax_template_4_qc_sale_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_4_fr"  />
 		<field name="tax_src_id" ref="tpstvp_pe_sale_fr" />
-		<field name="tax_dest_id" ref="notax_fr" />
 	</record>
 
 	<!--  Quebec Fiscal Position Tax Templates (default is tpstvq)-->
@@ -552,7 +538,6 @@
 	<record id="fiscal_position_tax_template_4_qc_sale_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_4_fr"  />
 		<field name="tax_src_id" ref="tpstvq_sale_fr" />
-		<field name="tax_dest_id" ref="notax_fr" />
 	</record>
 
 	<!--  Saskatchewan Fiscal Position Tax Templates (default is tpstvp_sk)-->
@@ -590,7 +575,6 @@
 	<record id="fiscal_position_tax_template_4_sk_sale_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_4_fr"  />
 		<field name="tax_src_id" ref="tpstvp_sk_sale_fr" />
-		<field name="tax_dest_id" ref="notax_fr" />
 	</record>
 
 	<!-- Fiscal Position Account Templates - Products -->