From 156da2b3503a4449106fa78a2883431e1f6663aa Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <maxime.chambreuil@savoirfairelinux.com>
Date: Sat, 9 Jun 2012 11:45:22 -0400
Subject: [PATCH 1/6] [IMP] Use account.data_account_type. Remove notax.
 Improve chart of taxes.

bzr revid: maxime.chambreuil@savoirfairelinux.com-20120609154522-htduc8596i18pj93
---
 addons/l10n_ca/__openerp__.py          |   2 -
 addons/l10n_ca/account_chart_en.xml    | 166 +++---
 addons/l10n_ca/account_chart_fr.xml    | 174 +++---
 addons/l10n_ca/account_tax_code_en.xml |  18 +-
 addons/l10n_ca/account_tax_code_fr.xml |  16 +-
 addons/l10n_ca/account_tax_en.xml      | 481 +++++++++++++----
 addons/l10n_ca/account_tax_fr.xml      | 477 +++++++++++++----
 addons/l10n_ca/account_types_en.xml    |  64 ---
 addons/l10n_ca/account_types_fr.xml    |  79 ---
 addons/l10n_ca/fiscal_templates_en.xml | 712 +++++++++++++++++--------
 addons/l10n_ca/fiscal_templates_fr.xml | 522 +++++++++++++-----
 11 files changed, 1828 insertions(+), 883 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 26db0bcef95..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_asset_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,15 +114,15 @@
 		<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>
 
 	<record id="chart1181_en" model="account.account.template">
 		<field name="code">1181</field>
 		<field name="parent_id" ref="chart118_en"/>
-		<field name="type">receivable</field>
-		<field name="user_type" ref="user_type_receivable_en"/>
+		<field name="type">other</field>
+		<field name="user_type" ref="account.data_account_type_receivable"/>
 		<field name="reconcile" eval="True"/>
 		<field name="name">GST receivable</field>
 	</record>
@@ -130,8 +130,8 @@
 	<record id="chart1182_en" model="account.account.template">
 		<field name="code">1182</field>
 		<field name="parent_id" ref="chart118_en"/>
-		<field name="type">receivable</field>
-		<field name="user_type" ref="user_type_receivable_en"/>
+		<field name="type">other</field>
+		<field name="user_type" ref="account.data_account_type_receivable"/>
 		<field name="reconcile" eval="True"/>
 		<field name="name">PST/QST receivable</field>
 	</record>
@@ -139,8 +139,8 @@
 	<record id="chart1183_en" model="account.account.template">
 		<field name="code">1183</field>
 		<field name="parent_id" ref="chart118_en"/>
-		<field name="type">receivable</field>
-		<field name="user_type" ref="user_type_receivable_en"/>
+		<field name="type">other</field>
+		<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,15 +232,15 @@
 		<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>
 
 	<record id="chart2121_en" model="account.account.template">
 		<field name="code">2121</field>
 		<field name="parent_id" ref="chart212_en"/>
-		<field name="type">payable</field>
-		<field name="user_type" ref="user_type_payable_en"/>
+		<field name="type">other</field>
+		<field name="user_type" ref="account.data_account_type_payable"/>
 		<field name="reconcile" eval="True"/>
 		<field name="name">GST to pay</field>
 	</record>
@@ -248,8 +248,8 @@
 	<record id="chart2122_en" model="account.account.template">
 		<field name="code">2122</field>
 		<field name="parent_id" ref="chart212_en"/>
-		<field name="type">payable</field>
-		<field name="user_type" ref="user_type_payable_en"/>
+		<field name="type">other</field>
+		<field name="user_type" ref="account.data_account_type_payable"/>
 		<field name="reconcile" eval="True"/>
 		<field name="name">PST/QST to pay</field>
 	</record>
@@ -257,8 +257,8 @@
 	<record id="chart2123_en" model="account.account.template">
 		<field name="code">2123</field>
 		<field name="parent_id" ref="chart212_en"/>
-		<field name="type">payable</field>
-		<field name="user_type" ref="user_type_payable_en"/>
+		<field name="type">other</field>
+		<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 b66dd5f02ba..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_immo_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_immo_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,15 +121,15 @@
 		<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>
 
 	<record id="chart1181_fr" model="account.account.template">
 		<field name="code">1181</field>
 		<field name="parent_id" ref="chart118_fr"/>
-		<field name="type">receivable</field>
-		<field name="user_type" ref="user_type_tiers_receiv_fr" />
+		<field name="type">other</field>
+		<field name="user_type" ref="account.data_account_type_asset"/>
 		<field name="reconcile" eval="True"/>
 		<field name="name">TPS à recevoir</field>
 	</record>
@@ -137,8 +137,8 @@
 	<record id="chart1182_fr" model="account.account.template">
 		<field name="code">1182</field>
 		<field name="parent_id" ref="chart118_fr"/>
-		<field name="type">receivable</field>
-		<field name="user_type" ref="user_type_tiers_receiv_fr" />
+		<field name="type">other</field>
+		<field name="user_type" ref="account.data_account_type_asset"/>
 		<field name="reconcile" eval="True"/>
 		<field name="name">TVP/TVQ à recevoir</field>
 	</record>
@@ -146,8 +146,8 @@
 	<record id="chart1183_fr" model="account.account.template">
 		<field name="code">1183</field>
 		<field name="parent_id" ref="chart118_fr"/>
-		<field name="type">receivable</field>
-		<field name="user_type" ref="user_type_tiers_receiv_fr" />
+		<field name="type">other</field>
+		<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,15 +247,15 @@
 		<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>
 
 	<record id="chart2131_fr" model="account.account.template">
 		<field name="code">2131</field>
 		<field name="parent_id" ref="chart213_fr"/>
-		<field name="type">payable</field>
-		<field name="user_type" ref="user_type_tiers_payable_fr" />
+		<field name="type">other</field>
+		<field name="user_type" ref="account.data_account_type_liability"/>
 		<field name="reconcile" eval="True"/>
 		<field name="name">TPS à payer</field>
 	</record>
@@ -263,8 +263,8 @@
 	<record id="chart2132_fr" model="account.account.template">
 		<field name="code">2132</field>
 		<field name="parent_id" ref="chart213_fr"/>
-		<field name="type">payable</field>
-		<field name="user_type" ref="user_type_tiers_payable_fr" />
+		<field name="type">other</field>
+		<field name="user_type" ref="account.data_account_type_liability"/>
 		<field name="reconcile" eval="True"/>
 		<field name="name">TVP/TVQ à payer</field>
 	</record>
@@ -272,8 +272,8 @@
 	<record id="chart2133_fr" model="account.account.template">
 		<field name="code">2133</field>
 		<field name="parent_id" ref="chart213_fr"/>
-		<field name="type">payable</field>
-		<field name="user_type" ref="user_type_tiers_payable_fr" />
+		<field name="type">other</field>
+		<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_code_fr.xml b/addons/l10n_ca/account_tax_code_fr.xml
index 849842b2453..d8abf73dd93 100644
--- a/addons/l10n_ca/account_tax_code_fr.xml
+++ b/addons/l10n_ca/account_tax_code_fr.xml
@@ -12,42 +12,42 @@
 	</record>
 
 	<record model="account.tax.code.template" id="vat_code_receivable_tva_fr">
-		<field name="name">Taxes à recevoir</field>
+		<field name="name">Taxes payées</field>
 		<field name="parent_id" ref="vat_code_balance_net_fr"/>
 	</record>
 
 	<record model="account.tax.code.template" id="vat_code_receivable_tps_fr">
-		<field name="name">TPS à recevoir</field>
+		<field name="name">TPS payée</field>
 		<field name="parent_id" ref="vat_code_receivable_tva_fr"/>
 	</record>
 
 	<record model="account.tax.code.template" id="vat_code_receivable_tvp_fr">
-		<field name="name">TVP/TVQ à recevoir</field>
+		<field name="name">TVP/TVQ payée</field>
 		<field name="parent_id" ref="vat_code_receivable_tva_fr"/>
 	</record>
 
 	<record model="account.tax.code.template" id="vat_code_receivable_tvh_fr">
-		<field name="name">TVH à recevoir</field>
+		<field name="name">TVH payée</field>
 		<field name="parent_id" ref="vat_code_receivable_tva_fr"/>
 	</record>
 
 	<record model="account.tax.code.template" id="vat_code_payable_fr">
-		<field name="name">Taxes à payer</field>
+		<field name="name">Taxes reçues</field>
 		<field name="parent_id" ref="vat_code_balance_net_fr"/>
 	</record>
 
 	<record model="account.tax.code.template" id="vat_code_payable_tps_fr">
-		<field name="name">TPS à payer</field>
+		<field name="name">TPS reçue</field>
 		<field name="parent_id" ref="vat_code_payable_fr"/>
 	</record>
 
 	<record model="account.tax.code.template" id="vat_code_payable_tvp_fr">
-		<field name="name">TVP/TVQ à payer</field>
+		<field name="name">TVP/TVQ reçue</field>
 		<field name="parent_id" ref="vat_code_payable_fr"/>
 	</record>
 
 	<record model="account.tax.code.template" id="vat_code_payable_tvh_fr">
-		<field name="name">TVH à payer</field>
+		<field name="name">TVH reçue</field>
 		<field name="parent_id" ref="vat_code_payable_fr"/>
 	</record>
 
diff --git a/addons/l10n_ca/account_tax_en.xml b/addons/l10n_ca/account_tax_en.xml
index 662ac4b52fc..f185f7f9198 100644
--- a/addons/l10n_ca/account_tax_en.xml
+++ b/addons/l10n_ca/account_tax_en.xml
@@ -2,263 +2,544 @@
 <openerp>
     <data noupdate="1">
 
+    <!-- SALES TAXES -->
+
     <!-- Manitoba PST -->
 
-    <record id="gstpst_mb_en" model="account.tax.template">
+    <record id="gstpst_mb_sale_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">GST + PST (MB)</field>
-        <field name="description">GSTPST_MB</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>
         <field name="type">percent</field>
     </record>
 
-    <record id="gstpst_mb_gst_en" model="account.tax.template">
+    <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">GST - 5% (MB)</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>
         <field name="sequence">1</field>
         <field name="include_base_amount" eval="True"/>
-        <field name="account_collected_id" ref="chart1181_en"/>
+        <field name="account_collected_id" ref="chart2121_en"/>
         <field name="account_paid_id" ref="chart2121_en"/>
         <field name="base_code_id" ref="vat_code_base_receivable_gst_en"/>
-        <field name="tax_code_id" ref="vat_code_receivable_gst_en"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_gst_en"/>
+        <field name="tax_code_id" ref="vat_code_payable_gst_en"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_gst_en"/>
         <field name="ref_tax_code_id" ref="vat_code_payable_gst_en"/>
-        <field name="parent_id" ref="gstpst_mb_en"/>
+        <field name="parent_id" ref="gstpst_mb_sale_en"/>
     </record>
 
-    <record id="pst_mb_en" model="account.tax.template">
+    <record id="pst_mb_sale_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">PST - 7%</field>
+        <field name="name">PST for sales - 7%</field>
         <field name="description">PST</field>
-        <field name="amount">0.070000</field>
+        <field name="type_tax_use">sale</field>
+        <field name="amount">0.700000</field>
         <field name="type">percent</field>
-        <field name="sequence">1</field>
-        <field name="account_collected_id" ref="chart1182_en"/>
+        <field name="sequence">2</field>
+        <field name="account_collected_id" ref="chart2122_en"/>
         <field name="account_paid_id" ref="chart2122_en"/>
         <field name="base_code_id" ref="vat_code_base_receivable_pst_en"/>
-        <field name="tax_code_id" ref="vat_code_receivable_pst_en"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_pst_en"/>
+        <field name="tax_code_id" ref="vat_code_payable_pst_en"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_pst_en"/>
         <field name="ref_tax_code_id" ref="vat_code_payable_pst_en"/>
-        <field name="parent_id" ref="gstpst_mb_en"/>
+        <field name="parent_id" ref="gstpst_mb_sale_en"/>
     </record>
 
     <!-- Prince Edward Island PST -->
 
-    <record id="gstpst_pe_en" model="account.tax.template">
+    <record id="gstpst_pe_sale_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">GST + PST (PE)</field>
-        <field name="description">GSTPST_PE</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>
         <field name="type">percent</field>
     </record>
 
-    <record id="gstpst_pe_gst_en" model="account.tax.template">
+    <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">GST - 5% (PE)</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>
         <field name="sequence">1</field>
         <field name="include_base_amount" eval="True"/>
-        <field name="account_collected_id" ref="chart1181_en"/>
+        <field name="account_collected_id" ref="chart2121_en"/>
         <field name="account_paid_id" ref="chart2121_en"/>
         <field name="base_code_id" ref="vat_code_base_receivable_gst_en"/>
-        <field name="tax_code_id" ref="vat_code_receivable_gst_en"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_gst_en"/>
+        <field name="tax_code_id" ref="vat_code_payable_gst_en"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_gst_en"/>
         <field name="ref_tax_code_id" ref="vat_code_payable_gst_en"/>
-        <field name="parent_id" ref="gstpst_pe_en"/>
+        <field name="parent_id" ref="gstpst_pe_sale_en"/>
     </record>
 
-    <record id="pst_pe_en" model="account.tax.template">
+    <record id="pst_pe_sale_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">PST - 10%</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>
-        <field name="sequence">1</field>
-        <field name="account_collected_id" ref="chart1182_en"/>
+        <field name="sequence">2</field>
+        <field name="account_collected_id" ref="chart2122_en"/>
         <field name="account_paid_id" ref="chart2122_en"/>
         <field name="base_code_id" ref="vat_code_base_receivable_pst_en"/>
-        <field name="tax_code_id" ref="vat_code_receivable_pst_en"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_pst_en"/>
+        <field name="tax_code_id" ref="vat_code_payable_pst_en"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_pst_en"/>
         <field name="ref_tax_code_id" ref="vat_code_payable_pst_en"/>
-        <field name="parent_id" ref="gstpst_pe_en"/>
+        <field name="parent_id" ref="gstpst_pe_sale_en"/>
     </record>
 
     <!-- Quebec PST -->
 
-    <record id="gstpst_qc_en" model="account.tax.template">
+    <record id="gsttvq_sale_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">GST + PST (QC)</field>
-        <field name="description">GSTPST_QC</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>
         <field name="type">percent</field>
     </record>
 
-    <record id="gstpst_qc_gst_en" model="account.tax.template">
+    <record id="gsttvq_sale_gst_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">GST - 5% (QC)</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>
         <field name="sequence">1</field>
         <field name="include_base_amount" eval="True"/>
-        <field name="account_collected_id" ref="chart1181_en"/>
+        <field name="account_collected_id" ref="chart2121_en"/>
         <field name="account_paid_id" ref="chart2121_en"/>
         <field name="base_code_id" ref="vat_code_base_receivable_gst_en"/>
-        <field name="tax_code_id" ref="vat_code_receivable_gst_en"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_gst_en"/>
+        <field name="tax_code_id" ref="vat_code_payable_gst_en"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_gst_en"/>
         <field name="ref_tax_code_id" ref="vat_code_payable_gst_en"/>
-        <field name="parent_id" ref="gstpst_qc_en"/>
+        <field name="parent_id" ref="gsttvq_sale_en"/>
     </record>
 
-    <record id="pst_qc_en" model="account.tax.template">
+    <record id="tvq_sale_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">PST - 9.5%</field>
-        <field name="description">PST</field>
+        <field name="name">TVQ for sales - 9.5%</field>
+        <field name="description">TVQ</field>
+        <field name="type_tax_use">sale</field>
         <field name="amount">0.095000</field>
         <field name="type">percent</field>
-        <field name="sequence">1</field>
-        <field name="account_collected_id" ref="chart1182_en"/>
+        <field name="sequence">2</field>
+        <field name="account_collected_id" ref="chart2122_en"/>
         <field name="account_paid_id" ref="chart2122_en"/>
         <field name="base_code_id" ref="vat_code_base_receivable_pst_en"/>
-        <field name="tax_code_id" ref="vat_code_receivable_pst_en"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_pst_en"/>
+        <field name="tax_code_id" ref="vat_code_payable_pst_en"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_pst_en"/>
         <field name="ref_tax_code_id" ref="vat_code_payable_pst_en"/>
-        <field name="parent_id" ref="gstpst_qc_en"/>
+        <field name="parent_id" ref="gsttvq_sale_en"/>
     </record>
 
     <!-- Saskatchewan PST -->
 
-    <record id="gstpst_sk_en" model="account.tax.template">
+    <record id="gstpst_sk_sale_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">GST + PST (SK)</field>
-        <field name="description">GSTPST_SK</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>
         <field name="type">percent</field>
     </record>
 
-    <record id="gstpst_sk_gst_en" model="account.tax.template">
+    <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">GST - 5% (SK)</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>
         <field name="sequence">1</field>
         <field name="include_base_amount" eval="True"/>
-        <field name="account_collected_id" ref="chart1181_en"/>
+        <field name="account_collected_id" ref="chart2121_en"/>
         <field name="account_paid_id" ref="chart2121_en"/>
         <field name="base_code_id" ref="vat_code_base_receivable_gst_en"/>
-        <field name="tax_code_id" ref="vat_code_receivable_gst_en"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_gst_en"/>
+        <field name="tax_code_id" ref="vat_code_payable_gst_en"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_gst_en"/>
         <field name="ref_tax_code_id" ref="vat_code_payable_gst_en"/>
-        <field name="parent_id" ref="gstpst_sk_en"/>
+        <field name="parent_id" ref="gstpst_sk_sale_en"/>
     </record>
 
-    <record id="pst_sk_en" model="account.tax.template">
+    <record id="pst_sk_sale_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">PST - 5%</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>
-        <field name="sequence">1</field>
-        <field name="account_collected_id" ref="chart1182_en"/>
+        <field name="sequence">2</field>
+        <field name="account_collected_id" ref="chart2122_en"/>
         <field name="account_paid_id" ref="chart2122_en"/>
         <field name="base_code_id" ref="vat_code_base_receivable_pst_en"/>
-        <field name="tax_code_id" ref="vat_code_receivable_pst_en"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_pst_en"/>
+        <field name="tax_code_id" ref="vat_code_payable_pst_en"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_pst_en"/>
         <field name="ref_tax_code_id" ref="vat_code_payable_pst_en"/>
-        <field name="parent_id" ref="gstpst_sk_en"/>
+        <field name="parent_id" ref="gstpst_sk_sale_en"/>
     </record>
 
     <!-- HST -->
 
-    <record id="hst12_en" model="account.tax.template">
+    <record id="hst12_sale_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">HST - 12%</field>
-        <field name="description">HST12</field>
+        <field name="name">TVH for sales - 12%</field>
+        <field name="description">TVH12_SALE</field>
+        <field name="type_tax_use">sale</field>
         <field name="amount">0.120000</field>
         <field name="type">percent</field>
-        <field name="account_collected_id" ref="chart1183_en"/>
+        <field name="account_collected_id" ref="chart2123_en"/>
         <field name="account_paid_id" ref="chart2123_en"/>
         <field name="base_code_id" ref="vat_code_base_receivable_hst_en"/>
-        <field name="tax_code_id" ref="vat_code_receivable_hst_en"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_hst_en"/>
+        <field name="tax_code_id" ref="vat_code_payable_hst_en"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_hst_en"/>
         <field name="ref_tax_code_id" ref="vat_code_payable_hst_en"/>
     </record>
 
-    <record id="hst13_en" model="account.tax.template">
+    <record id="hst13_sale_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">HST - 13%</field>
-        <field name="description">HST13</field>
+        <field name="name">TVH for sales - 13%</field>
+        <field name="description">TVH13_SALE</field>
+        <field name="type_tax_use">sale</field>
         <field name="amount">0.130000</field>
         <field name="type">percent</field>
-        <field name="account_collected_id" ref="chart1183_en"/>
+        <field name="account_collected_id" ref="chart2123_en"/>
         <field name="account_paid_id" ref="chart2123_en"/>
         <field name="base_code_id" ref="vat_code_base_receivable_hst_en"/>
-        <field name="tax_code_id" ref="vat_code_receivable_hst_en"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_hst_en"/>
+        <field name="tax_code_id" ref="vat_code_payable_hst_en"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_hst_en"/>
         <field name="ref_tax_code_id" ref="vat_code_payable_hst_en"/>
     </record>
 
-    <record id="hst135_en" model="account.tax.template">
+    <record id="hst135_sale_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">HST - 13.5%</field>
-        <field name="description">HST135</field>
+        <field name="name">TVH for sales - 13.5%</field>
+        <field name="description">TVH135_SALE</field>
+        <field name="type_tax_use">sale</field>
         <field name="amount">0.135000</field>
         <field name="type">percent</field>
-        <field name="account_collected_id" ref="chart1183_en"/>
+        <field name="account_collected_id" ref="chart2123_en"/>
         <field name="account_paid_id" ref="chart2123_en"/>
         <field name="base_code_id" ref="vat_code_base_receivable_hst_en"/>
-        <field name="tax_code_id" ref="vat_code_receivable_hst_en"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_hst_en"/>
+        <field name="tax_code_id" ref="vat_code_payable_hst_en"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_hst_en"/>
         <field name="ref_tax_code_id" ref="vat_code_payable_hst_en"/>
     </record>
 
-    <record id="hst15_en" model="account.tax.template">
+    <record id="hst15_sale_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">HST - 15%</field>
-        <field name="description">HST15</field>
+        <field name="name">TVH for sales - 15%</field>
+        <field name="description">TVH15_SALE</field>
+        <field name="type_tax_use">sale</field>
         <field name="amount">0.150000</field>
         <field name="type">percent</field>
-        <field name="account_collected_id" ref="chart1183_en"/>
+        <field name="account_collected_id" ref="chart2123_en"/>
         <field name="account_paid_id" ref="chart2123_en"/>
         <field name="base_code_id" ref="vat_code_base_receivable_hst_en"/>
-        <field name="tax_code_id" ref="vat_code_receivable_hst_en"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_hst_en"/>
+        <field name="tax_code_id" ref="vat_code_payable_hst_en"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_hst_en"/>
         <field name="ref_tax_code_id" ref="vat_code_payable_hst_en"/>
     </record>
 
     <!-- GST -->
 
-    <record id="gst_en" model="account.tax.template">
+    <record id="gst_sale_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">GST - 5%</field>
-        <field name="description">GST</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>
-        <field name="account_collected_id" ref="chart1181_en"/>
+        <field name="account_collected_id" ref="chart2121_en"/>
         <field name="account_paid_id" ref="chart2121_en"/>
         <field name="base_code_id" ref="vat_code_base_receivable_gst_en"/>
-        <field name="tax_code_id" ref="vat_code_receivable_gst_en"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_gst_en"/>
+        <field name="tax_code_id" ref="vat_code_payable_gst_en"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_gst_en"/>
         <field name="ref_tax_code_id" ref="vat_code_payable_gst_en"/>
     </record>
 
-    <record id="notax_en" model="account.tax.template">
+
+    <!-- PURCHASE TAXES -->
+
+    <!-- Manitoba PST -->
+
+    <record id="gstpst_mb_purc_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">No tax</field>
-        <field name="description">No tax</field>
-        <field name="amount">0.00</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>
         <field name="type">percent</field>
     </record>
 
+    <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">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>
+        <field name="sequence">1</field>
+        <field name="include_base_amount" eval="True"/>
+        <field name="account_collected_id" ref="chart1181_en"/>
+        <field name="account_paid_id" ref="chart1181_en"/>
+        <field name="base_code_id" ref="vat_code_base_payable_gst_en"/>
+        <field name="tax_code_id" ref="vat_code_receivable_gst_en"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_gst_en"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_gst_en"/>
+        <field name="parent_id" ref="gstpst_mb_purc_en"/>
+    </record>
+
+    <record id="pst_mb_purc_en" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+        <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>
+        <field name="sequence">2</field>
+        <field name="account_collected_id" ref="chart1182_en"/>
+        <field name="account_paid_id" ref="chart1182_en"/>
+        <field name="base_code_id" ref="vat_code_base_payable_pst_en"/>
+        <field name="tax_code_id" ref="vat_code_receivable_pst_en"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_pst_en"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_pst_en"/>
+        <field name="parent_id" ref="gstpst_mb_purc_en"/>
+    </record>
+
+    <!-- Prince Edward Island PST -->
+
+    <record id="gstpst_pe_purc_en" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+        <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>
+        <field name="type">percent</field>
+    </record>
+
+    <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">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>
+        <field name="sequence">1</field>
+        <field name="include_base_amount" eval="True"/>
+        <field name="account_collected_id" ref="chart1181_en"/>
+        <field name="account_paid_id" ref="chart1181_en"/>
+        <field name="base_code_id" ref="vat_code_base_payable_gst_en"/>
+        <field name="tax_code_id" ref="vat_code_receivable_gst_en"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_gst_en"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_gst_en"/>
+        <field name="parent_id" ref="gstpst_pe_purc_en"/>
+    </record>
+
+    <record id="pst_pe_purc_en" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+        <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>
+        <field name="sequence">2</field>
+        <field name="account_collected_id" ref="chart1182_en"/>
+        <field name="account_paid_id" ref="chart1182_en"/>
+        <field name="base_code_id" ref="vat_code_base_payable_pst_en"/>
+        <field name="tax_code_id" ref="vat_code_receivable_pst_en"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_pst_en"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_pst_en"/>
+        <field name="parent_id" ref="gstpst_pe_purc_en"/>
+    </record>
+
+    <!-- Quebec PST -->
+
+    <record id="gsttvq_purc_en" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+        <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>
+        <field name="type">percent</field>
+    </record>
+
+    <record id="gsttvq_purc_gst_en" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+        <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>
+        <field name="sequence">1</field>
+        <field name="include_base_amount" eval="True"/>
+        <field name="account_collected_id" ref="chart1181_en"/>
+        <field name="account_paid_id" ref="chart1181_en"/>
+        <field name="base_code_id" ref="vat_code_base_payable_gst_en"/>
+        <field name="tax_code_id" ref="vat_code_receivable_gst_en"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_gst_en"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_gst_en"/>
+        <field name="parent_id" ref="gsttvq_purc_en"/>
+    </record>
+
+    <record id="tvq_purc_en" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+        <field name="name">TVQ for purchases - 9.5%</field>
+        <field name="description">TVQ</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="amount">0.095000</field>
+        <field name="type">percent</field>
+        <field name="sequence">2</field>
+        <field name="account_collected_id" ref="chart1182_en"/>
+        <field name="account_paid_id" ref="chart1182_en"/>
+        <field name="base_code_id" ref="vat_code_base_payable_pst_en"/>
+        <field name="tax_code_id" ref="vat_code_receivable_pst_en"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_pst_en"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_pst_en"/>
+        <field name="parent_id" ref="gsttvq_purc_en"/>
+    </record>
+
+    <!-- Saskatchewan PST -->
+
+    <record id="gstpst_sk_purc_en" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+        <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>
+        <field name="type">percent</field>
+    </record>
+
+    <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">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>
+        <field name="sequence">1</field>
+        <field name="include_base_amount" eval="True"/>
+        <field name="account_collected_id" ref="chart1181_en"/>
+        <field name="account_paid_id" ref="chart1181_en"/>
+        <field name="base_code_id" ref="vat_code_base_payable_gst_en"/>
+        <field name="tax_code_id" ref="vat_code_receivable_gst_en"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_gst_en"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_gst_en"/>
+        <field name="parent_id" ref="gstpst_sk_purc_en"/>
+    </record>
+
+    <record id="pst_sk_purc_en" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+        <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>
+        <field name="sequence">2</field>
+        <field name="account_collected_id" ref="chart1182_en"/>
+        <field name="account_paid_id" ref="chart1182_en"/>
+        <field name="base_code_id" ref="vat_code_base_payable_pst_en"/>
+        <field name="tax_code_id" ref="vat_code_receivable_pst_en"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_pst_en"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_pst_en"/>
+        <field name="parent_id" ref="gstpst_sk_purc_en"/>
+    </record>
+
+    <!-- HST -->
+
+    <record id="hst12_purc_en" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+        <field name="name">TVH for purchases - 12%</field>
+        <field name="description">TVH12_PURC</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="amount">0.120000</field>
+        <field name="type">percent</field>
+        <field name="account_collected_id" ref="chart1183_en"/>
+        <field name="account_paid_id" ref="chart1183_en"/>
+        <field name="base_code_id" ref="vat_code_base_payable_hst_en"/>
+        <field name="tax_code_id" ref="vat_code_receivable_hst_en"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_hst_en"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_hst_en"/>
+    </record>
+
+    <record id="hst13_purc_en" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+        <field name="name">TVH for purchases - 13%</field>
+        <field name="description">TVH13_PURC</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="amount">0.130000</field>
+        <field name="type">percent</field>
+        <field name="account_collected_id" ref="chart1183_en"/>
+        <field name="account_paid_id" ref="chart1183_en"/>
+        <field name="base_code_id" ref="vat_code_base_payable_hst_en"/>
+        <field name="tax_code_id" ref="vat_code_receivable_hst_en"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_hst_en"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_hst_en"/>
+    </record>
+
+    <record id="hst135_purc_en" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+        <field name="name">TVH for purchases - 13.5%</field>
+        <field name="description">TVH135_PURC</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="amount">0.135000</field>
+        <field name="type">percent</field>
+        <field name="account_collected_id" ref="chart1183_en"/>
+        <field name="account_paid_id" ref="chart1183_en"/>
+        <field name="base_code_id" ref="vat_code_base_payable_hst_en"/>
+        <field name="tax_code_id" ref="vat_code_receivable_hst_en"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_hst_en"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_hst_en"/>
+    </record>
+
+    <record id="hst15_purc_en" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+        <field name="name">TVH for purchases - 15%</field>
+        <field name="description">TVH15_PURC</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="amount">0.150000</field>
+        <field name="type">percent</field>
+        <field name="account_collected_id" ref="chart1183_en"/>
+        <field name="account_paid_id" ref="chart1183_en"/>
+        <field name="base_code_id" ref="vat_code_base_payable_hst_en"/>
+        <field name="tax_code_id" ref="vat_code_receivable_hst_en"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_hst_en"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_hst_en"/>
+    </record>
+
+    <!-- GST -->
+
+    <record id="gst_purc_en" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+        <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>
+        <field name="account_collected_id" ref="chart1181_en"/>
+        <field name="account_paid_id" ref="chart1181_en"/>
+        <field name="base_code_id" ref="vat_code_base_payable_gst_en"/>
+        <field name="tax_code_id" ref="vat_code_receivable_gst_en"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_gst_en"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_gst_en"/>
+    </record>
+
     </data>
 </openerp>
diff --git a/addons/l10n_ca/account_tax_fr.xml b/addons/l10n_ca/account_tax_fr.xml
index 5df4446c611..169bfe4f20b 100644
--- a/addons/l10n_ca/account_tax_fr.xml
+++ b/addons/l10n_ca/account_tax_fr.xml
@@ -2,263 +2,544 @@
 <openerp>
     <data noupdate="1">
 
+    <!-- SALES TAXES -->
+
     <!-- Manitoba PST -->
 
-    <record id="tpstvp_mb_fr" model="account.tax.template">
+    <record id="tpstvp_mb_sale_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">TPS + TVP (MB)</field>
-        <field name="description">TPSTVP_MB</field>
+        <field name="name">TPS + TVP sur les ventes (MB)</field>
+        <field name="description">TPSTVP_MB_SALE</field>
+        <field name="type_tax_use">sale</field>
         <field name="amount">1</field>
         <field name="child_depend">1</field>
         <field name="type">percent</field>
     </record>
 
-    <record id="tpstvp_mb_tps_fr" model="account.tax.template">
+    <record id="tpstvp_sale_mb_tps_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">TPS - 5% (MB)</field>
+        <field name="name">TPS sur les ventes - 5% (MB)</field>
         <field name="description">TPS</field>
+        <field name="type_tax_use">sale</field>
         <field name="amount">0.050000</field>
         <field name="type">percent</field>
         <field name="sequence">1</field>
         <field name="include_base_amount" eval="True"/>
-        <field name="account_collected_id" ref="chart1181_fr"/>
+        <field name="account_collected_id" ref="chart2131_fr"/>
         <field name="account_paid_id" ref="chart2131_fr"/>
         <field name="base_code_id" ref="vat_code_base_receivable_tps_fr"/>
-        <field name="tax_code_id" ref="vat_code_receivable_tps_fr"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_tps_fr"/>
+        <field name="tax_code_id" ref="vat_code_payable_tps_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_tps_fr"/>
         <field name="ref_tax_code_id" ref="vat_code_payable_tps_fr"/>
-        <field name="parent_id" ref="tpstvp_mb_fr"/>
+        <field name="parent_id" ref="tpstvp_mb_sale_fr"/>
     </record>
 
-    <record id="tvp_mb_fr" model="account.tax.template">
+    <record id="tvp_mb_sale_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">TVP - 7%</field>
+        <field name="name">TVP sur les ventes - 7%</field>
         <field name="description">TVP</field>
+        <field name="type_tax_use">sale</field>
         <field name="amount">0.700000</field>
         <field name="type">percent</field>
-        <field name="sequence">1</field>
-        <field name="account_collected_id" ref="chart1182_fr"/>
+        <field name="sequence">2</field>
+        <field name="account_collected_id" ref="chart2132_fr"/>
         <field name="account_paid_id" ref="chart2132_fr"/>
         <field name="base_code_id" ref="vat_code_base_receivable_tvp_fr"/>
-        <field name="tax_code_id" ref="vat_code_receivable_tvp_fr"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_tvp_fr"/>
+        <field name="tax_code_id" ref="vat_code_payable_tvp_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_tvp_fr"/>
         <field name="ref_tax_code_id" ref="vat_code_payable_tvp_fr"/>
-        <field name="parent_id" ref="tpstvp_mb_fr"/>
+        <field name="parent_id" ref="tpstvp_mb_sale_fr"/>
     </record>
 
     <!-- Prince Edward Island PST -->
 
-    <record id="tpstvp_pe_fr" model="account.tax.template">
+    <record id="tpstvp_pe_sale_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">TPS + TVP (PE)</field>
-        <field name="description">TPSTVP_PE</field>
+        <field name="name">TPS + TVP sur les ventes (PE)</field>
+        <field name="description">TPSTVP_PE_SALE</field>
+        <field name="type_tax_use">sale</field>
         <field name="amount">1</field>
         <field name="child_depend">1</field>
         <field name="type">percent</field>
     </record>
 
-    <record id="tpstvp_pe_tps_fr" model="account.tax.template">
+    <record id="tpstvp_sale_pe_tps_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">TPS - 5% (PE)</field>
+        <field name="name">TPS sur les ventes - 5% (PE)</field>
         <field name="description">TPS</field>
+        <field name="type_tax_use">sale</field>
         <field name="amount">0.050000</field>
         <field name="type">percent</field>
         <field name="sequence">1</field>
         <field name="include_base_amount" eval="True"/>
-        <field name="account_collected_id" ref="chart1181_fr"/>
+        <field name="account_collected_id" ref="chart2131_fr"/>
         <field name="account_paid_id" ref="chart2131_fr"/>
         <field name="base_code_id" ref="vat_code_base_receivable_tps_fr"/>
-        <field name="tax_code_id" ref="vat_code_receivable_tps_fr"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_tps_fr"/>
+        <field name="tax_code_id" ref="vat_code_payable_tps_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_tps_fr"/>
         <field name="ref_tax_code_id" ref="vat_code_payable_tps_fr"/>
-        <field name="parent_id" ref="tpstvp_pe_fr"/>
+        <field name="parent_id" ref="tpstvp_pe_sale_fr"/>
     </record>
 
-    <record id="tvp_pe_fr" model="account.tax.template">
+    <record id="tvp_pe_sale_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">TVP - 10%</field>
+        <field name="name">TVP for sale - 10%</field>
         <field name="description">TVP</field>
+        <field name="type_tax_use">sale</field>
         <field name="amount">0.100000</field>
         <field name="type">percent</field>
-        <field name="sequence">1</field>
-        <field name="account_collected_id" ref="chart1182_fr"/>
+        <field name="sequence">2</field>
+        <field name="account_collected_id" ref="chart2132_fr"/>
         <field name="account_paid_id" ref="chart2132_fr"/>
         <field name="base_code_id" ref="vat_code_base_receivable_tvp_fr"/>
-        <field name="tax_code_id" ref="vat_code_receivable_tvp_fr"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_tvp_fr"/>
+        <field name="tax_code_id" ref="vat_code_payable_tvp_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_tvp_fr"/>
         <field name="ref_tax_code_id" ref="vat_code_payable_tvp_fr"/>
-        <field name="parent_id" ref="tpstvp_pe_fr"/>
+        <field name="parent_id" ref="tpstvp_pe_sale_fr"/>
     </record>
 
     <!-- Quebec PST -->
 
-    <record id="tpstvq_fr" model="account.tax.template">
+    <record id="tpstvq_sale_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">TPS + TVQ</field>
-        <field name="description">TPSTVQ</field>
+        <field name="name">TPS + TVQ sur les ventes</field>
+        <field name="description">TPSTVQ_SALE</field>
+        <field name="type_tax_use">sale</field>
         <field name="amount">1</field>
         <field name="child_depend">1</field>
         <field name="type">percent</field>
     </record>
 
-    <record id="tpstvq_tps_fr" model="account.tax.template">
+    <record id="tpstvq_sale_tps_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">TPS - 5% (QC)</field>
+        <field name="name">TPS sur les ventes - 5% (QC)</field>
         <field name="description">TPS</field>
+        <field name="type_tax_use">sale</field>
         <field name="amount">0.050000</field>
         <field name="type">percent</field>
         <field name="sequence">1</field>
         <field name="include_base_amount" eval="True"/>
-        <field name="account_collected_id" ref="chart1181_fr"/>
+        <field name="account_collected_id" ref="chart2131_fr"/>
         <field name="account_paid_id" ref="chart2131_fr"/>
         <field name="base_code_id" ref="vat_code_base_receivable_tps_fr"/>
-        <field name="tax_code_id" ref="vat_code_receivable_tps_fr"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_tps_fr"/>
+        <field name="tax_code_id" ref="vat_code_payable_tps_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_tps_fr"/>
         <field name="ref_tax_code_id" ref="vat_code_payable_tps_fr"/>
-        <field name="parent_id" ref="tpstvq_fr"/>
+        <field name="parent_id" ref="tpstvq_sale_fr"/>
     </record>
 
-    <record id="tvq_fr" model="account.tax.template">
+    <record id="tvq_sale_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">TVQ - 9.5%</field>
+        <field name="name">TVQ sur les ventes - 9.5%</field>
         <field name="description">TVQ</field>
+        <field name="type_tax_use">sale</field>
         <field name="amount">0.095000</field>
         <field name="type">percent</field>
-        <field name="sequence">1</field>
-        <field name="account_collected_id" ref="chart1182_fr"/>
+        <field name="sequence">2</field>
+        <field name="account_collected_id" ref="chart2132_fr"/>
         <field name="account_paid_id" ref="chart2132_fr"/>
         <field name="base_code_id" ref="vat_code_base_receivable_tvp_fr"/>
-        <field name="tax_code_id" ref="vat_code_receivable_tvp_fr"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_tvp_fr"/>
+        <field name="tax_code_id" ref="vat_code_payable_tvp_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_tvp_fr"/>
         <field name="ref_tax_code_id" ref="vat_code_payable_tvp_fr"/>
-        <field name="parent_id" ref="tpstvq_fr"/>
+        <field name="parent_id" ref="tpstvq_sale_fr"/>
     </record>
 
     <!-- Saskatchewan PST -->
 
-    <record id="tpstvp_sk_fr" model="account.tax.template">
+    <record id="tpstvp_sk_sale_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">TPS + TVP (SK)</field>
-        <field name="description">TPSTVP_SK</field>
+        <field name="name">TPS + TVP sur les ventes (SK)</field>
+        <field name="description">TPSTVP_SK_SALE</field>
+        <field name="type_tax_use">sale</field>
         <field name="amount">1</field>
         <field name="child_depend">1</field>
         <field name="type">percent</field>
     </record>
 
-    <record id="tpstvp_sk_tps_fr" model="account.tax.template">
+    <record id="tpstvp_sale_sk_tps_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">TPS - 5% (SK)</field>
+        <field name="name">TPS sur les ventes - 5% (SK)</field>
         <field name="description">TPS</field>
+        <field name="type_tax_use">sale</field>
         <field name="amount">0.050000</field>
         <field name="type">percent</field>
         <field name="sequence">1</field>
         <field name="include_base_amount" eval="True"/>
-        <field name="account_collected_id" ref="chart1181_fr"/>
+        <field name="account_collected_id" ref="chart2131_fr"/>
         <field name="account_paid_id" ref="chart2131_fr"/>
         <field name="base_code_id" ref="vat_code_base_receivable_tps_fr"/>
-        <field name="tax_code_id" ref="vat_code_receivable_tps_fr"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_tps_fr"/>
+        <field name="tax_code_id" ref="vat_code_payable_tps_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_tps_fr"/>
         <field name="ref_tax_code_id" ref="vat_code_payable_tps_fr"/>
-        <field name="parent_id" ref="tpstvp_sk_fr"/>
+        <field name="parent_id" ref="tpstvp_sk_sale_fr"/>
     </record>
 
-    <record id="tvp_sk_fr" model="account.tax.template">
+    <record id="tvp_sk_sale_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">TVP - 5% (SK)</field>
+        <field name="name">TVP sur les ventes - 5% (SK)</field>
         <field name="description">TVP</field>
+        <field name="type_tax_use">sale</field>
         <field name="amount">0.050000</field>
         <field name="type">percent</field>
-        <field name="sequence">1</field>
-        <field name="account_collected_id" ref="chart1182_fr"/>
+        <field name="sequence">2</field>
+        <field name="account_collected_id" ref="chart2132_fr"/>
         <field name="account_paid_id" ref="chart2132_fr"/>
         <field name="base_code_id" ref="vat_code_base_receivable_tvp_fr"/>
-        <field name="tax_code_id" ref="vat_code_receivable_tvp_fr"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_tvp_fr"/>
+        <field name="tax_code_id" ref="vat_code_payable_tvp_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_tvp_fr"/>
         <field name="ref_tax_code_id" ref="vat_code_payable_tvp_fr"/>
-        <field name="parent_id" ref="tpstvp_sk_fr"/>
+        <field name="parent_id" ref="tpstvp_sk_sale_fr"/>
     </record>
 
     <!-- HST -->
 
-    <record id="tvh12_fr" model="account.tax.template">
+    <record id="tvh12_sale_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">TVH - 12%</field>
-        <field name="description">TVH12</field>
+        <field name="name">TVH sur les ventes - 12%</field>
+        <field name="description">TVH12_SALE</field>
+        <field name="type_tax_use">sale</field>
         <field name="amount">0.120000</field>
         <field name="type">percent</field>
-        <field name="account_collected_id" ref="chart1183_fr"/>
+        <field name="account_collected_id" ref="chart2133_fr"/>
         <field name="account_paid_id" ref="chart2133_fr"/>
         <field name="base_code_id" ref="vat_code_base_receivable_tvh_fr"/>
-        <field name="tax_code_id" ref="vat_code_receivable_tvh_fr"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_tvh_fr"/>
+        <field name="tax_code_id" ref="vat_code_payable_tvh_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_tvh_fr"/>
         <field name="ref_tax_code_id" ref="vat_code_payable_tvh_fr"/>
     </record>
 
-    <record id="tvh13_fr" model="account.tax.template">
+    <record id="tvh13_sale_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">TVH - 13%</field>
-        <field name="description">TVH13</field>
+        <field name="name">TVH sur les ventes - 13%</field>
+        <field name="description">TVH13_SALE</field>
+        <field name="type_tax_use">sale</field>
         <field name="amount">0.130000</field>
         <field name="type">percent</field>
-        <field name="account_collected_id" ref="chart1183_fr"/>
+        <field name="account_collected_id" ref="chart2133_fr"/>
         <field name="account_paid_id" ref="chart2133_fr"/>
         <field name="base_code_id" ref="vat_code_base_receivable_tvh_fr"/>
-        <field name="tax_code_id" ref="vat_code_receivable_tvh_fr"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_tvh_fr"/>
+        <field name="tax_code_id" ref="vat_code_payable_tvh_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_tvh_fr"/>
         <field name="ref_tax_code_id" ref="vat_code_payable_tvh_fr"/>
     </record>
 
-    <record id="tvh135_fr" model="account.tax.template">
+    <record id="tvh135_sale_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">TVH - 13.5%</field>
-        <field name="description">TVH135</field>
+        <field name="name">TVH sur les ventes - 13.5%</field>
+        <field name="description">TVH135_SALE</field>
+        <field name="type_tax_use">sale</field>
         <field name="amount">0.135000</field>
         <field name="type">percent</field>
-        <field name="account_collected_id" ref="chart1183_fr"/>
+        <field name="account_collected_id" ref="chart2133_fr"/>
         <field name="account_paid_id" ref="chart2133_fr"/>
         <field name="base_code_id" ref="vat_code_base_receivable_tvh_fr"/>
-        <field name="tax_code_id" ref="vat_code_receivable_tvh_fr"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_tvh_fr"/>
+        <field name="tax_code_id" ref="vat_code_payable_tvh_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_tvh_fr"/>
         <field name="ref_tax_code_id" ref="vat_code_payable_tvh_fr"/>
     </record>
 
-    <record id="tvh15_fr" model="account.tax.template">
+    <record id="tvh15_sale_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">TVH - 15%</field>
-        <field name="description">TVH15</field>
+        <field name="name">TVH sur les ventes - 15%</field>
+        <field name="description">TVH15_SALE</field>
+        <field name="type_tax_use">sale</field>
         <field name="amount">0.150000</field>
         <field name="type">percent</field>
-        <field name="account_collected_id" ref="chart1183_fr"/>
+        <field name="account_collected_id" ref="chart2133_fr"/>
         <field name="account_paid_id" ref="chart2133_fr"/>
         <field name="base_code_id" ref="vat_code_base_receivable_tvh_fr"/>
-        <field name="tax_code_id" ref="vat_code_receivable_tvh_fr"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_tvh_fr"/>
+        <field name="tax_code_id" ref="vat_code_payable_tvh_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_tvh_fr"/>
         <field name="ref_tax_code_id" ref="vat_code_payable_tvh_fr"/>
     </record>
 
     <!-- GST -->
 
-    <record id="tps_fr" model="account.tax.template">
+    <record id="tps_sale_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">TPS - 5%</field>
-        <field name="description">TPS</field>
+        <field name="name">TPS sur les ventes - 5%</field>
+        <field name="description">TPS_SALE</field>
+        <field name="type_tax_use">sale</field>
         <field name="amount">0.050000</field>
         <field name="type">percent</field>
-        <field name="account_collected_id" ref="chart1181_fr"/>
+        <field name="account_collected_id" ref="chart2131_fr"/>
         <field name="account_paid_id" ref="chart2131_fr"/>
         <field name="base_code_id" ref="vat_code_base_receivable_tps_fr"/>
-        <field name="tax_code_id" ref="vat_code_receivable_tps_fr"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_tps_fr"/>
+        <field name="tax_code_id" ref="vat_code_payable_tps_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_tps_fr"/>
         <field name="ref_tax_code_id" ref="vat_code_payable_tps_fr"/>
     </record>
 
-    <record id="notax_fr" model="account.tax.template">
+
+    <!-- PURCHASE TAXES -->
+
+    <!-- Manitoba PST -->
+
+    <record id="tpstvp_mb_purc_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="name">TPS + TVP sur les achats (MB)</field>
+        <field name="description">TPSTVP_MB_PURC</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="amount">1</field>
+        <field name="child_depend">1</field>
         <field name="type">percent</field>
     </record>
 
+    <record id="tpstvp_purc_mb_tps_fr" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+        <field name="name">TPS sur les achats - 5% (MB)</field>
+        <field name="description">TPS</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="amount">0.050000</field>
+        <field name="type">percent</field>
+        <field name="sequence">1</field>
+        <field name="include_base_amount" eval="True"/>
+        <field name="account_collected_id" ref="chart1181_fr"/>
+        <field name="account_paid_id" ref="chart1181_fr"/>
+        <field name="base_code_id" ref="vat_code_base_payable_tps_fr"/>
+        <field name="tax_code_id" ref="vat_code_receivable_tps_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_tps_fr"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_tps_fr"/>
+        <field name="parent_id" ref="tpstvp_mb_purc_fr"/>
+    </record>
+
+    <record id="tvp_mb_purc_fr" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+        <field name="name">TVP sur les achats - 7%</field>
+        <field name="description">TVP</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="amount">0.700000</field>
+        <field name="type">percent</field>
+        <field name="sequence">2</field>
+        <field name="account_collected_id" ref="chart1182_fr"/>
+        <field name="account_paid_id" ref="chart1182_fr"/>
+        <field name="base_code_id" ref="vat_code_base_payable_tvp_fr"/>
+        <field name="tax_code_id" ref="vat_code_receivable_tvp_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_tvp_fr"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_tvp_fr"/>
+        <field name="parent_id" ref="tpstvp_mb_purc_fr"/>
+    </record>
+
+    <!-- Prince Edward Island PST -->
+
+    <record id="tpstvp_pe_purc_fr" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+        <field name="name">TPS + TVP sur les achats (PE)</field>
+        <field name="description">TPSTVP_PE_PURC</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="amount">1</field>
+        <field name="child_depend">1</field>
+        <field name="type">percent</field>
+    </record>
+
+    <record id="tpstvp_purc_pe_tps_fr" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+        <field name="name">TPS sur les achats - 5% (PE)</field>
+        <field name="description">TPS</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="amount">0.050000</field>
+        <field name="type">percent</field>
+        <field name="sequence">1</field>
+        <field name="include_base_amount" eval="True"/>
+        <field name="account_collected_id" ref="chart1181_fr"/>
+        <field name="account_paid_id" ref="chart1181_fr"/>
+        <field name="base_code_id" ref="vat_code_base_payable_tps_fr"/>
+        <field name="tax_code_id" ref="vat_code_receivable_tps_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_tps_fr"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_tps_fr"/>
+        <field name="parent_id" ref="tpstvp_pe_purc_fr"/>
+    </record>
+
+    <record id="tvp_pe_purc_fr" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+        <field name="name">TVP sur les achats - 10%</field>
+        <field name="description">TVP</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="amount">0.100000</field>
+        <field name="type">percent</field>
+        <field name="sequence">2</field>
+        <field name="account_collected_id" ref="chart1182_fr"/>
+        <field name="account_paid_id" ref="chart1182_fr"/>
+        <field name="base_code_id" ref="vat_code_base_payable_tvp_fr"/>
+        <field name="tax_code_id" ref="vat_code_receivable_tvp_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_tvp_fr"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_tvp_fr"/>
+        <field name="parent_id" ref="tpstvp_pe_purc_fr"/>
+    </record>
+
+    <!-- Quebec PST -->
+
+    <record id="tpstvq_purc_fr" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+        <field name="name">TPS + TVQ sur les achats</field>
+        <field name="description">TPSTVQ_PURC</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="amount">1</field>
+        <field name="child_depend">1</field>
+        <field name="type">percent</field>
+    </record>
+
+    <record id="tpstvq_purc_tps_fr" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+        <field name="name">TPS sur les achats - 5% (QC)</field>
+        <field name="description">TPS</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="amount">0.050000</field>
+        <field name="type">percent</field>
+        <field name="sequence">1</field>
+        <field name="include_base_amount" eval="True"/>
+        <field name="account_collected_id" ref="chart1181_fr"/>
+        <field name="account_paid_id" ref="chart1181_fr"/>
+        <field name="base_code_id" ref="vat_code_base_payable_tps_fr"/>
+        <field name="tax_code_id" ref="vat_code_receivable_tps_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_tps_fr"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_tps_fr"/>
+        <field name="parent_id" ref="tpstvq_purc_fr"/>
+    </record>
+
+    <record id="tvq_purc_fr" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+        <field name="name">TVQ sur les achats - 9.5%</field>
+        <field name="description">TVQ</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="amount">0.095000</field>
+        <field name="type">percent</field>
+        <field name="sequence">2</field>
+        <field name="account_collected_id" ref="chart1182_fr"/>
+        <field name="account_paid_id" ref="chart1182_fr"/>
+        <field name="base_code_id" ref="vat_code_base_payable_tvp_fr"/>
+        <field name="tax_code_id" ref="vat_code_receivable_tvp_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_tvp_fr"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_tvp_fr"/>
+        <field name="parent_id" ref="tpstvq_purc_fr"/>
+    </record>
+
+    <!-- Saskatchewan PST -->
+
+    <record id="tpstvp_sk_purc_fr" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+        <field name="name">TPS + TVP sur les achats (SK)</field>
+        <field name="description">TPSTVP_SK_PURC</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="amount">1</field>
+        <field name="child_depend">1</field>
+        <field name="type">percent</field>
+    </record>
+
+    <record id="tpstvp_purc_sk_tps_fr" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+        <field name="name">TPS sur les achats - 5% (SK)</field>
+        <field name="description">TPS</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="amount">0.050000</field>
+        <field name="type">percent</field>
+        <field name="sequence">1</field>
+        <field name="include_base_amount" eval="True"/>
+        <field name="account_collected_id" ref="chart1181_fr"/>
+        <field name="account_paid_id" ref="chart1181_fr"/>
+        <field name="base_code_id" ref="vat_code_base_payable_tps_fr"/>
+        <field name="tax_code_id" ref="vat_code_receivable_tps_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_tps_fr"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_tps_fr"/>
+        <field name="parent_id" ref="tpstvp_sk_purc_fr"/>
+    </record>
+
+    <record id="tvp_sk_purc_fr" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+        <field name="name">TVP sur les achats - 5% (SK)</field>
+        <field name="description">TVP</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="amount">0.050000</field>
+        <field name="type">percent</field>
+        <field name="sequence">2</field>
+        <field name="account_collected_id" ref="chart1182_fr"/>
+        <field name="account_paid_id" ref="chart1182_fr"/>
+        <field name="base_code_id" ref="vat_code_base_payable_tvp_fr"/>
+        <field name="tax_code_id" ref="vat_code_receivable_tvp_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_tvp_fr"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_tvp_fr"/>
+        <field name="parent_id" ref="tpstvp_sk_purc_fr"/>
+    </record>
+
+    <!-- HST -->
+
+    <record id="tvh12_purc_fr" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+        <field name="name">TVH sur les achats - 12%</field>
+        <field name="description">TVH12_PURC</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="amount">0.120000</field>
+        <field name="type">percent</field>
+        <field name="account_collected_id" ref="chart1183_fr"/>
+        <field name="account_paid_id" ref="chart1183_fr"/>
+        <field name="base_code_id" ref="vat_code_base_payable_tvh_fr"/>
+        <field name="tax_code_id" ref="vat_code_receivable_tvh_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_tvh_fr"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_tvh_fr"/>
+    </record>
+
+    <record id="tvh13_purc_fr" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+        <field name="name">TVH sur les achats - 13%</field>
+        <field name="description">TVH13_PURC</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="amount">0.130000</field>
+        <field name="type">percent</field>
+        <field name="account_collected_id" ref="chart1183_fr"/>
+        <field name="account_paid_id" ref="chart1183_fr"/>
+        <field name="base_code_id" ref="vat_code_base_payable_tvh_fr"/>
+        <field name="tax_code_id" ref="vat_code_receivable_tvh_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_tvh_fr"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_tvh_fr"/>
+    </record>
+
+    <record id="tvh135_purc_fr" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+        <field name="name">TVH sur les achats - 13.5%</field>
+        <field name="description">TVH135_PURC</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="amount">0.135000</field>
+        <field name="type">percent</field>
+        <field name="account_collected_id" ref="chart1183_fr"/>
+        <field name="account_paid_id" ref="chart1183_fr"/>
+        <field name="base_code_id" ref="vat_code_base_payable_tvh_fr"/>
+        <field name="tax_code_id" ref="vat_code_receivable_tvh_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_tvh_fr"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_tvh_fr"/>
+    </record>
+
+    <record id="tvh15_purc_fr" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+        <field name="name">TVH sur les achats - 15%</field>
+        <field name="description">TVH15_PURC</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="amount">0.150000</field>
+        <field name="type">percent</field>
+        <field name="account_collected_id" ref="chart1183_fr"/>
+        <field name="account_paid_id" ref="chart1183_fr"/>
+        <field name="base_code_id" ref="vat_code_base_payable_tvh_fr"/>
+        <field name="tax_code_id" ref="vat_code_receivable_tvh_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_tvh_fr"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_tvh_fr"/>
+    </record>
+
+    <!-- GST -->
+
+    <record id="tps_purc_fr" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+        <field name="name">TPS sur les achats - 5%</field>
+        <field name="description">TPS_PURC</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="amount">0.050000</field>
+        <field name="type">percent</field>
+        <field name="account_collected_id" ref="chart1181_fr"/>
+        <field name="account_paid_id" ref="chart1181_fr"/>
+        <field name="base_code_id" ref="vat_code_base_payable_tps_fr"/>
+        <field name="tax_code_id" ref="vat_code_receivable_tps_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_tps_fr"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_tps_fr"/>
+    </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 1af3fd92205..00000000000
--- a/addons/l10n_ca/account_types_en.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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" >
-		<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_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>
-	</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_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 cff6c01e6f2..00000000000
--- a/addons/l10n_ca/account_types_fr.xml
+++ /dev/null
@@ -1,79 +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_capitaux_fr" model="account.account.type">
-		<field name="name">Capital</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="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="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="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>
-		<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 d7b6a3ee7da..54f9c21b5e1 100644
--- a/addons/l10n_ca/fiscal_templates_en.xml
+++ b/addons/l10n_ca/fiscal_templates_en.xml
@@ -39,354 +39,618 @@
 		<field name="chart_template_id" ref="ca_en_chart_template_en"/>
 	</record>
 
+        <!-- PURCHASES TAXES -->
+
 	<!--  Alberta Fiscal Position Tax Templates (default is gst) -->
 
-	<record id="fiscal_position_tax_template_21_ab_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_en"/>
-		<field name="tax_src_id" ref="gst_en"/>
-		<field name="tax_dest_id" ref="hst12_en"/>
+	<record id="fiscal_position_tax_template_21_ab_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_21_en"  />
+		<field name="tax_src_id" ref="gst_purc_en" />
+		<field name="tax_dest_id" ref="hst12_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_22_ab_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_en"/>
-		<field name="tax_src_id" ref="gst_en"/>
-		<field name="tax_dest_id" ref="hst13_en"/>
+	<record id="fiscal_position_tax_template_22_ab_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_22_en"  />
+		<field name="tax_src_id" ref="gst_purc_en" />
+		<field name="tax_dest_id" ref="hst13_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_23_ab_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_en"/>
-		<field name="tax_src_id" ref="gst_en"/>
-		<field name="tax_dest_id" ref="hst135_en"/>
+	<record id="fiscal_position_tax_template_23_ab_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_23_en"  />
+		<field name="tax_src_id" ref="gst_purc_en" />
+		<field name="tax_dest_id" ref="hst135_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_24_ab_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_en"/>
-		<field name="tax_src_id" ref="gst_en"/>
-		<field name="tax_dest_id" ref="hst15_en"/>
+	<record id="fiscal_position_tax_template_24_ab_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_24_en"  />
+		<field name="tax_src_id" ref="gst_purc_en" />
+		<field name="tax_dest_id" ref="hst15_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_4_ab_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_4_en"/>
-		<field name="tax_src_id" ref="gst_en"/>
-		<field name="tax_dest_id" ref="notax_en"/>
+	<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" />
 	</record>
 
 	<!--  British Columbia Fiscal Position Tax Templates (default is hst12) -->
 
-	<record id="fiscal_position_tax_template_22_12c_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_en"/>
-		<field name="tax_src_id" ref="hst12_en"/>
-		<field name="tax_dest_id" ref="hst13_en"/>
+	<record id="fiscal_position_tax_template_22_12_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_22_en"  />
+		<field name="tax_src_id" ref="hst12_purc_en" />
+		<field name="tax_dest_id" ref="hst13_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_23_12_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_en"/>
-		<field name="tax_src_id" ref="hst12_en"/>
-		<field name="tax_dest_id" ref="hst135_en"/>
+	<record id="fiscal_position_tax_template_23_12_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_23_en"  />
+		<field name="tax_src_id" ref="hst12_purc_en" />
+		<field name="tax_dest_id" ref="hst135_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_24_12_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_en"/>
-		<field name="tax_src_id" ref="hst12_en"/>
-		<field name="tax_dest_id" ref="hst15_en"/>
+	<record id="fiscal_position_tax_template_24_12_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_24_en"  />
+		<field name="tax_src_id" ref="hst12_purc_en" />
+		<field name="tax_dest_id" ref="hst15_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_3_12_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_en"/>
-		<field name="tax_src_id" ref="hst12_en"/>
-		<field name="tax_dest_id" ref="gst_en"/>
+	<record id="fiscal_position_tax_template_3_12_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_3_en"  />
+		<field name="tax_src_id" ref="hst12_purc_en" />
+		<field name="tax_dest_id" ref="gst_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_4_12_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_4_en"/>
-		<field name="tax_src_id" ref="hst12_en"/>
-		<field name="tax_dest_id" ref="notax_en"/>
+	<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" />
 	</record>
 
 	<!--  Manitoba Fiscal Position Tax Templates (default is gstpst_mb) -->
 
-	<record id="fiscal_position_tax_template_21_mb_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_en"/>
-		<field name="tax_src_id" ref="gstpst_mb_en"/>
-		<field name="tax_dest_id" ref="hst12_en"/>
+	<record id="fiscal_position_tax_template_21_mb_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_21_en"  />
+		<field name="tax_src_id" ref="gstpst_mb_purc_en" />
+		<field name="tax_dest_id" ref="hst12_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_22_mb_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_en"/>
-		<field name="tax_src_id" ref="gstpst_mb_en"/>
-		<field name="tax_dest_id" ref="hst13_en"/>
+	<record id="fiscal_position_tax_template_22_mb_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_22_en"  />
+		<field name="tax_src_id" ref="gstpst_mb_purc_en" />
+		<field name="tax_dest_id" ref="hst13_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_23_mb_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_en"/>
-		<field name="tax_src_id" ref="gstpst_mb_en"/>
-		<field name="tax_dest_id" ref="hst135_en"/>
+	<record id="fiscal_position_tax_template_23_mb_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_23_en"  />
+		<field name="tax_src_id" ref="gstpst_mb_purc_en" />
+		<field name="tax_dest_id" ref="hst135_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_24_mb_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_en"/>
-		<field name="tax_src_id" ref="gstpst_mb_en"/>
-		<field name="tax_dest_id" ref="hst15_en"/>
+	<record id="fiscal_position_tax_template_24_mb_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_24_en"  />
+		<field name="tax_src_id" ref="gstpst_mb_purc_en" />
+		<field name="tax_dest_id" ref="hst15_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_3_mb_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_en"/>
-		<field name="tax_src_id" ref="gstpst_mb_en"/>
-		<field name="tax_dest_id" ref="gst_en"/>
+	<record id="fiscal_position_tax_template_3_mb_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_3_en"  />
+		<field name="tax_src_id" ref="gstpst_mb_purc_en" />
+		<field name="tax_dest_id" ref="gst_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_4_mb_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_en"/>
-		<field name="tax_dest_id" ref="notax_en"/>
+	<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" />
 	</record>
 
 	<!--  New Brunswick, Newfoundland and Labrador and Ontario Fiscal Position Tax Templates (default is hst13) -->
 
-	<record id="fiscal_position_tax_template_21_13_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_en"/>
-		<field name="tax_src_id" ref="hst13_en"/>
-		<field name="tax_dest_id" ref="hst12_en"/>
+	<record id="fiscal_position_tax_template_21_13_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_21_en"  />
+		<field name="tax_src_id" ref="hst13_purc_en" />
+		<field name="tax_dest_id" ref="hst12_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_23_13_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_en"/>
-		<field name="tax_src_id" ref="hst13_en"/>
-		<field name="tax_dest_id" ref="hst135_en"/>
+	<record id="fiscal_position_tax_template_23_13_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_23_en"  />
+		<field name="tax_src_id" ref="hst13_purc_en" />
+		<field name="tax_dest_id" ref="hst135_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_24_13_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_en"/>
-		<field name="tax_src_id" ref="hst13_en"/>
-		<field name="tax_dest_id" ref="hst15_en"/>
+	<record id="fiscal_position_tax_template_24_13_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_24_en"  />
+		<field name="tax_src_id" ref="hst13_purc_en" />
+		<field name="tax_dest_id" ref="hst15_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_3_13_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_en"/>
-		<field name="tax_src_id" ref="hst13_en"/>
-		<field name="tax_dest_id" ref="gst_en"/>
+	<record id="fiscal_position_tax_template_3_13_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_3_en"  />
+		<field name="tax_src_id" ref="hst13_purc_en" />
+		<field name="tax_dest_id" ref="gst_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_4_13_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_4_en"/>
-		<field name="tax_src_id" ref="hst13_en"/>
-		<field name="tax_dest_id" ref="notax_en"/>
+	<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" />
 	</record>
 
 	<!--  Nova Scotia Fiscal Position Tax Templates (default is hst15) -->
 
-	<record id="fiscal_position_tax_template_21_15_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_en"/>
-		<field name="tax_src_id" ref="hst15_en"/>
-		<field name="tax_dest_id" ref="hst12_en"/>
+	<record id="fiscal_position_tax_template_21_15_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_21_en"  />
+		<field name="tax_src_id" ref="hst15_purc_en" />
+		<field name="tax_dest_id" ref="hst12_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_22_15_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_en"/>
-		<field name="tax_src_id" ref="hst15_en"/>
-		<field name="tax_dest_id" ref="hst13_en"/>
+	<record id="fiscal_position_tax_template_22_15_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_22_en"  />
+		<field name="tax_src_id" ref="hst15_purc_en" />
+		<field name="tax_dest_id" ref="hst13_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_23_15_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_en"/>
-		<field name="tax_src_id" ref="hst15_en"/>
-		<field name="tax_dest_id" ref="hst135_en"/>
+	<record id="fiscal_position_tax_template_23_15_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_23_en"  />
+		<field name="tax_src_id" ref="hst15_purc_en" />
+		<field name="tax_dest_id" ref="hst135_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_3_15_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_en"/>
-		<field name="tax_src_id" ref="hst15_en"/>
-		<field name="tax_dest_id" ref="gst_en"/>
+	<record id="fiscal_position_tax_template_3_15_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_3_en"  />
+		<field name="tax_src_id" ref="hst15_purc_en" />
+		<field name="tax_dest_id" ref="gst_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_4_15_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_4_en"/>
-		<field name="tax_src_id" ref="hst15_en"/>
-		<field name="tax_dest_id" ref="notax_en"/>
+	<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" />
 	</record>
 
 	<!--  Prince Edward Island Fiscal Position Tax Templates (default is gstpst_pe)-->
 
-	<record id="fiscal_position_tax_template_21_pe_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_en"/>
-		<field name="tax_src_id" ref="gstpst_pe_en"/>
-		<field name="tax_dest_id" ref="hst12_en"/>
+	<record id="fiscal_position_tax_template_21_pe_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_21_en"  />
+		<field name="tax_src_id" ref="gstpst_pe_purc_en" />
+		<field name="tax_dest_id" ref="hst12_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_22_pe_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_en"/>
-		<field name="tax_src_id" ref="gstpst_pe_en"/>
-		<field name="tax_dest_id" ref="hst13_en"/>
+	<record id="fiscal_position_tax_template_22_pe_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_22_en"  />
+		<field name="tax_src_id" ref="gstpst_pe_purc_en" />
+		<field name="tax_dest_id" ref="hst13_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_23_pe_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_en"/>
-		<field name="tax_src_id" ref="gstpst_pe_en"/>
-		<field name="tax_dest_id" ref="hst135_en"/>
+	<record id="fiscal_position_tax_template_23_pe_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_23_en"  />
+		<field name="tax_src_id" ref="gstpst_pe_purc_en" />
+		<field name="tax_dest_id" ref="hst135_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_24_pe_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_en"/>
-		<field name="tax_src_id" ref="gstpst_pe_en"/>
-		<field name="tax_dest_id" ref="hst15_en"/>
+	<record id="fiscal_position_tax_template_24_pe_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_24_en"  />
+		<field name="tax_src_id" ref="gstpst_pe_purc_en" />
+		<field name="tax_dest_id" ref="hst15_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_3_pe_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_en"/>
-		<field name="tax_src_id" ref="gstpst_pe_en"/>
-		<field name="tax_dest_id" ref="gst_en"/>
+	<record id="fiscal_position_tax_template_3_pe_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_3_en"  />
+		<field name="tax_src_id" ref="gstpst_pe_purc_en" />
+		<field name="tax_dest_id" ref="gst_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_4_qc_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_en"/>
-		<field name="tax_dest_id" ref="notax_en"/>
+	<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" />
 	</record>
 
-	<!--  Quebec Fiscal Position Tax Templates (default is gstpst_qc)-->
+	<!--  Quebec Fiscal Position Tax Templates (default is gsttvq)-->
 
-	<record id="fiscal_position_tax_template_21_qc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_en"/>
-		<field name="tax_src_id" ref="gstpst_qc_en"/>
-		<field name="tax_dest_id" ref="hst12_en"/>
+	<record id="fiscal_position_tax_template_21_qc_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_21_en"  />
+		<field name="tax_src_id" ref="gsttvq_purc_en" />
+		<field name="tax_dest_id" ref="hst12_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_22_qc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_en"/>
-		<field name="tax_src_id" ref="gstpst_qc_en"/>
-		<field name="tax_dest_id" ref="hst13_en"/>
+	<record id="fiscal_position_tax_template_22_qc_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_22_en"  />
+		<field name="tax_src_id" ref="gsttvq_purc_en" />
+		<field name="tax_dest_id" ref="hst13_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_24_qc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_en"/>
-		<field name="tax_src_id" ref="gstpst_qc_en"/>
-		<field name="tax_dest_id" ref="hst15_en"/>
+	<record id="fiscal_position_tax_template_24_qc_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_24_en"  />
+		<field name="tax_src_id" ref="gsttvq_purc_en" />
+		<field name="tax_dest_id" ref="hst15_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_3_qc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_en"/>
-		<field name="tax_src_id" ref="gstpst_qc_en"/>
-		<field name="tax_dest_id" ref="gst_en"/>
+	<record id="fiscal_position_tax_template_3_qc_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_3_en"  />
+		<field name="tax_src_id" ref="gsttvq_purc_en" />
+		<field name="tax_dest_id" ref="gst_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_4_qc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_4_en"/>
-		<field name="tax_src_id" ref="gstpst_qc_en"/>
-		<field name="tax_dest_id" ref="notax_en"/>
+	<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" />
 	</record>
 
 	<!--  Saskatchewan Fiscal Position Tax Templates (default is gstpst_sk)-->
 
-	<record id="fiscal_position_tax_template_21_sk_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_en"/>
-		<field name="tax_src_id" ref="gstpst_sk_en"/>
-		<field name="tax_dest_id" ref="hst12_en"/>
+	<record id="fiscal_position_tax_template_21_sk_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_21_en"  />
+		<field name="tax_src_id" ref="gstpst_sk_purc_en" />
+		<field name="tax_dest_id" ref="hst12_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_22_sk_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_en"/>
-		<field name="tax_src_id" ref="gstpst_sk_en"/>
-		<field name="tax_dest_id" ref="hst13_en"/>
+	<record id="fiscal_position_tax_template_22_sk_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_22_en"  />
+		<field name="tax_src_id" ref="gstpst_sk_purc_en" />
+		<field name="tax_dest_id" ref="hst13_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_23_sk_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_en"/>
-		<field name="tax_src_id" ref="gstpst_sk_en"/>
-		<field name="tax_dest_id" ref="hst135_en"/>
+	<record id="fiscal_position_tax_template_23_sk_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_23_en"  />
+		<field name="tax_src_id" ref="gstpst_sk_purc_en" />
+		<field name="tax_dest_id" ref="hst135_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_24_sk_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_en"/>
-		<field name="tax_src_id" ref="gstpst_sk_en"/>
-		<field name="tax_dest_id" ref="hst15_en"/>
+	<record id="fiscal_position_tax_template_24_sk_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_24_en"  />
+		<field name="tax_src_id" ref="gstpst_sk_purc_en" />
+		<field name="tax_dest_id" ref="hst15_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_3_sk_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_en"/>
-		<field name="tax_src_id" ref="gstpst_sk_en"/>
-		<field name="tax_dest_id" ref="gst_en"/>
+	<record id="fiscal_position_tax_template_3_sk_purc_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_3_en"  />
+		<field name="tax_src_id" ref="gstpst_sk_purc_en" />
+		<field name="tax_dest_id" ref="gst_purc_en" />
 	</record>
 
-	<record id="fiscal_position_tax_template_4_sk_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_en"/>
-		<field name="tax_dest_id" ref="notax_en"/>
+	<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" />
 	</record>
 
-	<!-- Fiscal Position Account Templates - Incomes -->
 
-	<record id="fiscal_position_account_template_21_income_en" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_21_en"/>
-		<field name="account_src_id" ref="chart411_en"/>
-		<field name="account_dest_id" ref="chart412_en"/>
+        <!-- SALES TAXES -->
+
+
+	<!--  Alberta Fiscal Position Tax Templates (default is gst) -->
+
+	<record id="fiscal_position_tax_template_21_ab_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_21_en"  />
+		<field name="tax_src_id" ref="gst_sale_en" />
+		<field name="tax_dest_id" ref="hst12_sale_en" />
 	</record>
 
-	<record id="fiscal_position_account_template_22_income_en" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_22_en"/>
-		<field name="account_src_id" ref="chart411_en"/>
-		<field name="account_dest_id" ref="chart412_en"/>
+	<record id="fiscal_position_tax_template_22_ab_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_22_en"  />
+		<field name="tax_src_id" ref="gst_sale_en" />
+		<field name="tax_dest_id" ref="hst13_sale_en" />
 	</record>
 
-	<record id="fiscal_position_account_template_23_income_en" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_23_en"/>
-		<field name="account_src_id" ref="chart411_en"/>
-		<field name="account_dest_id" ref="chart412_en"/>
+	<record id="fiscal_position_tax_template_23_ab_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_23_en"  />
+		<field name="tax_src_id" ref="gst_sale_en" />
+		<field name="tax_dest_id" ref="hst135_sale_en" />
 	</record>
 
-	<record id="fiscal_position_account_template_24_income_en" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_24_en"/>
-		<field name="account_src_id" ref="chart411_en"/>
-		<field name="account_dest_id" ref="chart412_en"/>
+	<record id="fiscal_position_tax_template_24_ab_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_24_en"  />
+		<field name="tax_src_id" ref="gst_sale_en" />
+		<field name="tax_dest_id" ref="hst15_sale_en" />
 	</record>
 
-	<record id="fiscal_position_account_template_3_income_en" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_3_en"/>
-		<field name="account_src_id" ref="chart411_en"/>
-		<field name="account_dest_id" ref="chart413_en"/>
+	<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" />
 	</record>
 
-	<record id="fiscal_position_account_template_4_income_en" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_4_en"/>
-		<field name="account_src_id" ref="chart411_en"/>
-		<field name="account_dest_id" ref="chart414_en"/>
+	<!--  British Columbia Fiscal Position Tax Templates (default is hst12) -->
+
+	<record id="fiscal_position_tax_template_22_12c_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_22_en"  />
+		<field name="tax_src_id" ref="hst12_sale_en" />
+		<field name="tax_dest_id" ref="hst13_sale_en" />
 	</record>
 
-	<!-- Fiscal Position Account Templates - Expenses -->
-
-	<record id="fiscal_position_account_template_21_expense_en" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_21_en"/>
-		<field name="account_src_id" ref="chart5111_en"/>
-		<field name="account_dest_id" ref="chart5112_en"/>
+	<record id="fiscal_position_tax_template_23_12_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_23_en"  />
+		<field name="tax_src_id" ref="hst12_sale_en" />
+		<field name="tax_dest_id" ref="hst135_sale_en" />
 	</record>
 
-	<record id="fiscal_position_account_template_22_expense_en" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_22_en"/>
-		<field name="account_src_id" ref="chart5111_en"/>
-		<field name="account_dest_id" ref="chart5112_en"/>
+	<record id="fiscal_position_tax_template_24_12_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_24_en"  />
+		<field name="tax_src_id" ref="hst12_sale_en" />
+		<field name="tax_dest_id" ref="hst15_sale_en" />
 	</record>
 
-	<record id="fiscal_position_account_template_23_expense_en" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_23_en"/>
-		<field name="account_src_id" ref="chart5111_en"/>
-		<field name="account_dest_id" ref="chart5112_en"/>
+	<record id="fiscal_position_tax_template_3_12_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_3_en"  />
+		<field name="tax_src_id" ref="hst12_sale_en" />
+		<field name="tax_dest_id" ref="gst_sale_en" />
 	</record>
 
-	<record id="fiscal_position_account_template_24_expense_en" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_24_en"/>
-		<field name="account_src_id" ref="chart5111_en"/>
-		<field name="account_dest_id" ref="chart5112_en"/>
+	<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" />
 	</record>
 
-	<record id="fiscal_position_account_template_3_expense_en" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_3_en"/>
-		<field name="account_src_id" ref="chart5111_en"/>
-		<field name="account_dest_id" ref="chart5113_en"/>
+	<!--  Manitoba Fiscal Position Tax Templates (default is gstpst_mb) -->
+
+	<record id="fiscal_position_tax_template_21_mb_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_21_en"  />
+		<field name="tax_src_id" ref="gstpst_mb_sale_en" />
+		<field name="tax_dest_id" ref="hst12_sale_en" />
 	</record>
 
-	<record id="fiscal_position_account_template_4_expense_en" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_4_en"/>
-		<field name="account_src_id" ref="chart5111_en"/>
-		<field name="account_dest_id" ref="chart5114_en"/>
+	<record id="fiscal_position_tax_template_22_mb_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_22_en"  />
+		<field name="tax_src_id" ref="gstpst_mb_sale_en" />
+		<field name="tax_dest_id" ref="hst13_sale_en" />
+	</record>
+
+	<record id="fiscal_position_tax_template_23_mb_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_23_en"  />
+		<field name="tax_src_id" ref="gstpst_mb_sale_en" />
+		<field name="tax_dest_id" ref="hst135_sale_en" />
+	</record>
+
+	<record id="fiscal_position_tax_template_24_mb_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_24_en"  />
+		<field name="tax_src_id" ref="gstpst_mb_sale_en" />
+		<field name="tax_dest_id" ref="hst15_sale_en" />
+	</record>
+
+	<record id="fiscal_position_tax_template_3_mb_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_3_en"  />
+		<field name="tax_src_id" ref="gstpst_mb_sale_en" />
+		<field name="tax_dest_id" ref="gst_sale_en" />
+	</record>
+
+	<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" />
+	</record>
+
+	<!--  New Brunswick, Newfoundland and Labrador and Ontario Fiscal Position Tax Templates (default is hst13) -->
+
+	<record id="fiscal_position_tax_template_21_13_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_21_en"  />
+		<field name="tax_src_id" ref="hst13_sale_en" />
+		<field name="tax_dest_id" ref="hst12_sale_en" />
+	</record>
+
+	<record id="fiscal_position_tax_template_23_13_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_23_en"  />
+		<field name="tax_src_id" ref="hst13_sale_en" />
+		<field name="tax_dest_id" ref="hst135_sale_en" />
+	</record>
+
+	<record id="fiscal_position_tax_template_24_13_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_24_en"  />
+		<field name="tax_src_id" ref="hst13_sale_en" />
+		<field name="tax_dest_id" ref="hst15_sale_en" />
+	</record>
+
+	<record id="fiscal_position_tax_template_3_13_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_3_en"  />
+		<field name="tax_src_id" ref="hst13_sale_en" />
+		<field name="tax_dest_id" ref="gst_sale_en" />
+	</record>
+
+	<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" />
+	</record>
+
+	<!--  Nova Scotia Fiscal Position Tax Templates (default is hst15) -->
+
+	<record id="fiscal_position_tax_template_21_15_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_21_en"  />
+		<field name="tax_src_id" ref="hst15_sale_en" />
+		<field name="tax_dest_id" ref="hst12_sale_en" />
+	</record>
+
+	<record id="fiscal_position_tax_template_22_15_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_22_en"  />
+		<field name="tax_src_id" ref="hst15_sale_en" />
+		<field name="tax_dest_id" ref="hst13_sale_en" />
+	</record>
+
+	<record id="fiscal_position_tax_template_23_15_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_23_en"  />
+		<field name="tax_src_id" ref="hst15_sale_en" />
+		<field name="tax_dest_id" ref="hst135_sale_en" />
+	</record>
+
+	<record id="fiscal_position_tax_template_3_15_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_3_en"  />
+		<field name="tax_src_id" ref="hst15_sale_en" />
+		<field name="tax_dest_id" ref="gst_sale_en" />
+	</record>
+
+	<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" />
+	</record>
+
+	<!--  Prince Edward Island Fiscal Position Tax Templates (default is gstpst_pe)-->
+
+	<record id="fiscal_position_tax_template_21_pe_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_21_en"  />
+		<field name="tax_src_id" ref="gstpst_pe_sale_en" />
+		<field name="tax_dest_id" ref="hst12_sale_en" />
+	</record>
+
+	<record id="fiscal_position_tax_template_22_pe_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_22_en"  />
+		<field name="tax_src_id" ref="gstpst_pe_sale_en" />
+		<field name="tax_dest_id" ref="hst13_sale_en" />
+	</record>
+
+	<record id="fiscal_position_tax_template_23_pe_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_23_en"  />
+		<field name="tax_src_id" ref="gstpst_pe_sale_en" />
+		<field name="tax_dest_id" ref="hst135_sale_en" />
+	</record>
+
+	<record id="fiscal_position_tax_template_24_pe_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_24_en"  />
+		<field name="tax_src_id" ref="gstpst_pe_sale_en" />
+		<field name="tax_dest_id" ref="hst15_sale_en" />
+	</record>
+
+	<record id="fiscal_position_tax_template_3_pe_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_3_en"  />
+		<field name="tax_src_id" ref="gstpst_pe_sale_en" />
+		<field name="tax_dest_id" ref="gst_sale_en" />
+	</record>
+
+	<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" />
+	</record>
+
+	<!--  Quebec Fiscal Position Tax Templates (default is gsttvq)-->
+
+	<record id="fiscal_position_tax_template_21_qc_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_21_en"  />
+		<field name="tax_src_id" ref="gsttvq_sale_en" />
+		<field name="tax_dest_id" ref="hst12_sale_en" />
+	</record>
+
+	<record id="fiscal_position_tax_template_22_qc_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_22_en"  />
+		<field name="tax_src_id" ref="gsttvq_sale_en" />
+		<field name="tax_dest_id" ref="hst13_sale_en" />
+	</record>
+
+	<record id="fiscal_position_tax_template_24_qc_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_24_en"  />
+		<field name="tax_src_id" ref="gsttvq_sale_en" />
+		<field name="tax_dest_id" ref="hst15_sale_en" />
+	</record>
+
+	<record id="fiscal_position_tax_template_3_qc_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_3_en"  />
+		<field name="tax_src_id" ref="gsttvq_sale_en" />
+		<field name="tax_dest_id" ref="gst_sale_en" />
+	</record>
+
+	<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" />
+	</record>
+
+	<!--  Saskatchewan Fiscal Position Tax Templates (default is gstpst_sk)-->
+
+	<record id="fiscal_position_tax_template_21_sk_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_21_en"  />
+		<field name="tax_src_id" ref="gstpst_sk_sale_en" />
+		<field name="tax_dest_id" ref="hst12_sale_en" />
+	</record>
+
+	<record id="fiscal_position_tax_template_22_sk_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_22_en"  />
+		<field name="tax_src_id" ref="gstpst_sk_sale_en" />
+		<field name="tax_dest_id" ref="hst13_sale_en" />
+	</record>
+
+	<record id="fiscal_position_tax_template_23_sk_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_23_en"  />
+		<field name="tax_src_id" ref="gstpst_sk_sale_en" />
+		<field name="tax_dest_id" ref="hst135_sale_en" />
+	</record>
+
+	<record id="fiscal_position_tax_template_24_sk_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_24_en"  />
+		<field name="tax_src_id" ref="gstpst_sk_sale_en" />
+		<field name="tax_dest_id" ref="hst15_sale_en" />
+	</record>
+
+	<record id="fiscal_position_tax_template_3_sk_sale_en" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_3_en"  />
+		<field name="tax_src_id" ref="gstpst_sk_sale_en" />
+		<field name="tax_dest_id" ref="gst_sale_en" />
+	</record>
+
+	<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" />
+	</record>
+
+	<!-- Fiscal Position Account Templates - Products -->
+
+	<record id="fiscal_position_product_template_21_en" model="account.fiscal.position.account.template">
+		<field name="position_id" ref="fiscal_position_template_21_en"  />
+		<field name="account_src_id" ref="chart411_en" />
+		<field name="account_dest_id" ref="chart412_en" />
+	</record>
+
+	<record id="fiscal_position_product_template_22_en" model="account.fiscal.position.account.template">
+		<field name="position_id" ref="fiscal_position_template_22_en"  />
+		<field name="account_src_id" ref="chart411_en" />
+		<field name="account_dest_id" ref="chart412_en" />
+	</record>
+
+	<record id="fiscal_position_product_template_23_en" model="account.fiscal.position.account.template">
+		<field name="position_id" ref="fiscal_position_template_23_en"  />
+		<field name="account_src_id" ref="chart411_en" />
+		<field name="account_dest_id" ref="chart412_en" />
+	</record>
+
+	<record id="fiscal_position_product_template_24_en" model="account.fiscal.position.account.template">
+		<field name="position_id" ref="fiscal_position_template_24_en"  />
+		<field name="account_src_id" ref="chart411_en" />
+		<field name="account_dest_id" ref="chart412_en" />
+	</record>
+
+	<record id="fiscal_position_product_template_3_en" model="account.fiscal.position.account.template">
+		<field name="position_id" ref="fiscal_position_template_3_en"  />
+		<field name="account_src_id" ref="chart411_en" />
+		<field name="account_dest_id" ref="chart413_en" />
+	</record>
+
+	<record id="fiscal_position_product_template_4_en" model="account.fiscal.position.account.template">
+		<field name="position_id" ref="fiscal_position_template_4_en"  />
+		<field name="account_src_id" ref="chart411_en" />
+		<field name="account_dest_id" ref="chart414_en" />
+	</record>
+
+	<!-- Fiscal Position Account Templates - Charges -->
+
+	<record id="fiscal_position_charge_template_21_en" model="account.fiscal.position.account.template">
+		<field name="position_id" ref="fiscal_position_template_21_en"  />
+		<field name="account_src_id" ref="chart5111_en" />
+		<field name="account_dest_id" ref="chart5112_en" />
+	</record>
+
+	<record id="fiscal_position_charge_template_22_en" model="account.fiscal.position.account.template">
+		<field name="position_id" ref="fiscal_position_template_22_en"  />
+		<field name="account_src_id" ref="chart5111_en" />
+		<field name="account_dest_id" ref="chart5112_en" />
+	</record>
+
+	<record id="fiscal_position_charge_template_23_en" model="account.fiscal.position.account.template">
+		<field name="position_id" ref="fiscal_position_template_23_en"  />
+		<field name="account_src_id" ref="chart5111_en" />
+		<field name="account_dest_id" ref="chart5112_en" />
+	</record>
+
+	<record id="fiscal_position_charge_template_24_en" model="account.fiscal.position.account.template">
+		<field name="position_id" ref="fiscal_position_template_24_en"  />
+		<field name="account_src_id" ref="chart5111_en" />
+		<field name="account_dest_id" ref="chart5112_en" />
+	</record>
+
+	<record id="fiscal_position_charge_template_3_en" model="account.fiscal.position.account.template">
+		<field name="position_id" ref="fiscal_position_template_3_en"  />
+		<field name="account_src_id" ref="chart5111_en" />
+		<field name="account_dest_id" ref="chart5113_en" />
+	</record>
+
+	<record id="fiscal_position_charge_template_4_en" model="account.fiscal.position.account.template">
+		<field name="position_id" ref="fiscal_position_template_4_en"  />
+		<field name="account_src_id" ref="chart5111_en" />
+		<field name="account_dest_id" ref="chart5114_en" />
 	</record>
 
     </data>
diff --git a/addons/l10n_ca/fiscal_templates_fr.xml b/addons/l10n_ca/fiscal_templates_fr.xml
index 2ce50e5d6e1..0acd7388a52 100644
--- a/addons/l10n_ca/fiscal_templates_fr.xml
+++ b/addons/l10n_ca/fiscal_templates_fr.xml
@@ -39,278 +39,542 @@
 		<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
 	</record>
 
+        <!-- PURCHASES TAXES -->
+
 	<!--  Alberta Fiscal Position Tax Templates (default is tps) -->
 
-	<record id="fiscal_position_tax_template_21_ab_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_21_ab_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_21_fr"  />
-		<field name="tax_src_id" ref="tps_fr" />
-		<field name="tax_dest_id" ref="tvh12_fr" />
+		<field name="tax_src_id" ref="tps_purc_fr" />
+		<field name="tax_dest_id" ref="tvh12_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_22_ab_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_22_ab_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_22_fr"  />
-		<field name="tax_src_id" ref="tps_fr" />
-		<field name="tax_dest_id" ref="tvh13_fr" />
+		<field name="tax_src_id" ref="tps_purc_fr" />
+		<field name="tax_dest_id" ref="tvh13_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_23_ab_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_23_ab_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_23_fr"  />
-		<field name="tax_src_id" ref="tps_fr" />
-		<field name="tax_dest_id" ref="tvh135_fr" />
+		<field name="tax_src_id" ref="tps_purc_fr" />
+		<field name="tax_dest_id" ref="tvh135_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_24_ab_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_24_ab_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_24_fr"  />
-		<field name="tax_src_id" ref="tps_fr" />
-		<field name="tax_dest_id" ref="tvh15_fr" />
+		<field name="tax_src_id" ref="tps_purc_fr" />
+		<field name="tax_dest_id" ref="tvh15_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_4_ab_fr" model="account.fiscal.position.tax.template">
+	<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_fr" />
-		<field name="tax_dest_id" ref="notax_fr" />
+		<field name="tax_src_id" ref="tps_purc_fr" />
 	</record>
 
 	<!--  British Columbia Fiscal Position Tax Templates (default is hst12) -->
 
-	<record id="fiscal_position_tax_template_22_12c_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_22_12_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_22_fr"  />
-		<field name="tax_src_id" ref="tvh12_fr" />
-		<field name="tax_dest_id" ref="tvh13_fr" />
+		<field name="tax_src_id" ref="tvh12_purc_fr" />
+		<field name="tax_dest_id" ref="tvh13_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_23_12_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_23_12_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_23_fr"  />
-		<field name="tax_src_id" ref="tvh12_fr" />
-		<field name="tax_dest_id" ref="tvh135_fr" />
+		<field name="tax_src_id" ref="tvh12_purc_fr" />
+		<field name="tax_dest_id" ref="tvh135_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_24_12_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_24_12_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_24_fr"  />
-		<field name="tax_src_id" ref="tvh12_fr" />
-		<field name="tax_dest_id" ref="tvh15_fr" />
+		<field name="tax_src_id" ref="tvh12_purc_fr" />
+		<field name="tax_dest_id" ref="tvh15_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_3_12_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_3_12_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_3_fr"  />
-		<field name="tax_src_id" ref="tvh12_fr" />
-		<field name="tax_dest_id" ref="tps_fr" />
+		<field name="tax_src_id" ref="tvh12_purc_fr" />
+		<field name="tax_dest_id" ref="tps_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_4_12_fr" model="account.fiscal.position.tax.template">
+	<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_fr" />
-		<field name="tax_dest_id" ref="notax_fr" />
+		<field name="tax_src_id" ref="tvh12_purc_fr" />
 	</record>
 
 	<!--  Manitoba Fiscal Position Tax Templates (default is tpstvp_mb) -->
 
-	<record id="fiscal_position_tax_template_21_mb_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_21_mb_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_21_fr"  />
-		<field name="tax_src_id" ref="tpstvp_mb_fr" />
-		<field name="tax_dest_id" ref="tvh12_fr" />
+		<field name="tax_src_id" ref="tpstvp_mb_purc_fr" />
+		<field name="tax_dest_id" ref="tvh12_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_22_mb_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_22_mb_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_22_fr"  />
-		<field name="tax_src_id" ref="tpstvp_mb_fr" />
-		<field name="tax_dest_id" ref="tvh13_fr" />
+		<field name="tax_src_id" ref="tpstvp_mb_purc_fr" />
+		<field name="tax_dest_id" ref="tvh13_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_23_mb_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_23_mb_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_23_fr"  />
-		<field name="tax_src_id" ref="tpstvp_mb_fr" />
-		<field name="tax_dest_id" ref="tvh135_fr" />
+		<field name="tax_src_id" ref="tpstvp_mb_purc_fr" />
+		<field name="tax_dest_id" ref="tvh135_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_24_mb_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_24_mb_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_24_fr"  />
-		<field name="tax_src_id" ref="tpstvp_mb_fr" />
-		<field name="tax_dest_id" ref="tvh15_fr" />
+		<field name="tax_src_id" ref="tpstvp_mb_purc_fr" />
+		<field name="tax_dest_id" ref="tvh15_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_3_mb_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_3_mb_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_3_fr"  />
-		<field name="tax_src_id" ref="tpstvp_mb_fr" />
-		<field name="tax_dest_id" ref="tps_fr" />
+		<field name="tax_src_id" ref="tpstvp_mb_purc_fr" />
+		<field name="tax_dest_id" ref="tps_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_4_mb_fr" model="account.fiscal.position.tax.template">
+	<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_fr" />
-		<field name="tax_dest_id" ref="notax_fr" />
+		<field name="tax_src_id" ref="tpstvp_mb_purc_fr" />
 	</record>
 
 	<!--  New Brunswick, Newfoundland and Labrador and Ontario Fiscal Position Tax Templates (default is hst13) -->
 
-	<record id="fiscal_position_tax_template_21_13_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_21_13_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_21_fr"  />
-		<field name="tax_src_id" ref="tvh13_fr" />
-		<field name="tax_dest_id" ref="tvh12_fr" />
+		<field name="tax_src_id" ref="tvh13_purc_fr" />
+		<field name="tax_dest_id" ref="tvh12_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_23_13_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_23_13_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_23_fr"  />
-		<field name="tax_src_id" ref="tvh13_fr" />
-		<field name="tax_dest_id" ref="tvh135_fr" />
+		<field name="tax_src_id" ref="tvh13_purc_fr" />
+		<field name="tax_dest_id" ref="tvh135_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_24_13_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_24_13_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_24_fr"  />
-		<field name="tax_src_id" ref="tvh13_fr" />
-		<field name="tax_dest_id" ref="tvh15_fr" />
+		<field name="tax_src_id" ref="tvh13_purc_fr" />
+		<field name="tax_dest_id" ref="tvh15_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_3_13_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_3_13_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_3_fr"  />
-		<field name="tax_src_id" ref="tvh13_fr" />
-		<field name="tax_dest_id" ref="tps_fr" />
+		<field name="tax_src_id" ref="tvh13_purc_fr" />
+		<field name="tax_dest_id" ref="tps_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_4_13_fr" model="account.fiscal.position.tax.template">
+	<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_fr" />
-		<field name="tax_dest_id" ref="notax_fr" />
+		<field name="tax_src_id" ref="tvh13_purc_fr" />
 	</record>
 
 	<!--  Nova Scotia Fiscal Position Tax Templates (default is hst15) -->
 
-	<record id="fiscal_position_tax_template_21_15_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_21_15_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_21_fr"  />
-		<field name="tax_src_id" ref="tvh15_fr" />
-		<field name="tax_dest_id" ref="tvh12_fr" />
+		<field name="tax_src_id" ref="tvh15_purc_fr" />
+		<field name="tax_dest_id" ref="tvh12_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_22_15_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_22_15_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_22_fr"  />
-		<field name="tax_src_id" ref="tvh15_fr" />
-		<field name="tax_dest_id" ref="tvh13_fr" />
+		<field name="tax_src_id" ref="tvh15_purc_fr" />
+		<field name="tax_dest_id" ref="tvh13_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_23_15_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_23_15_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_23_fr"  />
-		<field name="tax_src_id" ref="tvh15_fr" />
-		<field name="tax_dest_id" ref="tvh135_fr" />
+		<field name="tax_src_id" ref="tvh15_purc_fr" />
+		<field name="tax_dest_id" ref="tvh135_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_3_15_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_3_15_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_3_fr"  />
-		<field name="tax_src_id" ref="tvh15_fr" />
-		<field name="tax_dest_id" ref="tps_fr" />
+		<field name="tax_src_id" ref="tvh15_purc_fr" />
+		<field name="tax_dest_id" ref="tps_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_4_15_fr" model="account.fiscal.position.tax.template">
+	<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_fr" />
-		<field name="tax_dest_id" ref="notax_fr" />
+		<field name="tax_src_id" ref="tvh15_purc_fr" />
 	</record>
 
 	<!--  Prince Edward Island Fiscal Position Tax Templates (default is tpstvp_pe)-->
 
-	<record id="fiscal_position_tax_template_21_pe_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_21_pe_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_21_fr"  />
-		<field name="tax_src_id" ref="tpstvp_pe_fr" />
-		<field name="tax_dest_id" ref="tvh12_fr" />
+		<field name="tax_src_id" ref="tpstvp_pe_purc_fr" />
+		<field name="tax_dest_id" ref="tvh12_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_22_pe_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_22_pe_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_22_fr"  />
-		<field name="tax_src_id" ref="tpstvp_pe_fr" />
-		<field name="tax_dest_id" ref="tvh13_fr" />
+		<field name="tax_src_id" ref="tpstvp_pe_purc_fr" />
+		<field name="tax_dest_id" ref="tvh13_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_23_pe_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_23_pe_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_23_fr"  />
-		<field name="tax_src_id" ref="tpstvp_pe_fr" />
-		<field name="tax_dest_id" ref="tvh135_fr" />
+		<field name="tax_src_id" ref="tpstvp_pe_purc_fr" />
+		<field name="tax_dest_id" ref="tvh135_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_24_pe_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_24_pe_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_24_fr"  />
-		<field name="tax_src_id" ref="tpstvp_pe_fr" />
-		<field name="tax_dest_id" ref="tvh15_fr" />
+		<field name="tax_src_id" ref="tpstvp_pe_purc_fr" />
+		<field name="tax_dest_id" ref="tvh15_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_3_pe_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_3_pe_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_3_fr"  />
-		<field name="tax_src_id" ref="tpstvp_pe_fr" />
-		<field name="tax_dest_id" ref="tps_fr" />
+		<field name="tax_src_id" ref="tpstvp_pe_purc_fr" />
+		<field name="tax_dest_id" ref="tps_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_4_qc_fr" model="account.fiscal.position.tax.template">
+	<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_fr" />
-		<field name="tax_dest_id" ref="notax_fr" />
+		<field name="tax_src_id" ref="tpstvp_pe_purc_fr" />
 	</record>
 
 	<!--  Quebec Fiscal Position Tax Templates (default is tpstvq)-->
 
-	<record id="fiscal_position_tax_template_21_qc_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_21_qc_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_21_fr"  />
-		<field name="tax_src_id" ref="tpstvq_fr" />
-		<field name="tax_dest_id" ref="tvh12_fr" />
+		<field name="tax_src_id" ref="tpstvq_purc_fr" />
+		<field name="tax_dest_id" ref="tvh12_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_22_qc_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_22_qc_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_22_fr"  />
-		<field name="tax_src_id" ref="tpstvq_fr" />
-		<field name="tax_dest_id" ref="tvh13_fr" />
+		<field name="tax_src_id" ref="tpstvq_purc_fr" />
+		<field name="tax_dest_id" ref="tvh13_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_24_qc_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_24_qc_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_24_fr"  />
-		<field name="tax_src_id" ref="tpstvq_fr" />
-		<field name="tax_dest_id" ref="tvh15_fr" />
+		<field name="tax_src_id" ref="tpstvq_purc_fr" />
+		<field name="tax_dest_id" ref="tvh15_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_3_qc_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_3_qc_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_3_fr"  />
-		<field name="tax_src_id" ref="tpstvq_fr" />
-		<field name="tax_dest_id" ref="tps_fr" />
+		<field name="tax_src_id" ref="tpstvq_purc_fr" />
+		<field name="tax_dest_id" ref="tps_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_4_qc_fr" model="account.fiscal.position.tax.template">
+	<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_fr" />
-		<field name="tax_dest_id" ref="notax_fr" />
+		<field name="tax_src_id" ref="tpstvq_purc_fr" />
 	</record>
 
 	<!--  Saskatchewan Fiscal Position Tax Templates (default is tpstvp_sk)-->
 
-	<record id="fiscal_position_tax_template_21_sk_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_21_sk_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_21_fr"  />
-		<field name="tax_src_id" ref="tpstvp_sk_fr" />
-		<field name="tax_dest_id" ref="tvh12_fr" />
+		<field name="tax_src_id" ref="tpstvp_sk_purc_fr" />
+		<field name="tax_dest_id" ref="tvh12_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_22_sk_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_22_sk_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_22_fr"  />
-		<field name="tax_src_id" ref="tpstvp_sk_fr" />
-		<field name="tax_dest_id" ref="tvh13_fr" />
+		<field name="tax_src_id" ref="tpstvp_sk_purc_fr" />
+		<field name="tax_dest_id" ref="tvh13_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_23_sk_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_23_sk_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_23_fr"  />
-		<field name="tax_src_id" ref="tpstvp_sk_fr" />
-		<field name="tax_dest_id" ref="tvh135_fr" />
+		<field name="tax_src_id" ref="tpstvp_sk_purc_fr" />
+		<field name="tax_dest_id" ref="tvh135_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_24_sk_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_24_sk_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_24_fr"  />
-		<field name="tax_src_id" ref="tpstvp_sk_fr" />
-		<field name="tax_dest_id" ref="tvh15_fr" />
+		<field name="tax_src_id" ref="tpstvp_sk_purc_fr" />
+		<field name="tax_dest_id" ref="tvh15_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_3_sk_fr" model="account.fiscal.position.tax.template">
+	<record id="fiscal_position_tax_template_3_sk_purc_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_3_fr"  />
-		<field name="tax_src_id" ref="tpstvp_sk_fr" />
-		<field name="tax_dest_id" ref="tps_fr" />
+		<field name="tax_src_id" ref="tpstvp_sk_purc_fr" />
+		<field name="tax_dest_id" ref="tps_purc_fr" />
 	</record>
 
-	<record id="fiscal_position_tax_template_4_sk_fr" model="account.fiscal.position.tax.template">
+	<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_fr" />
-		<field name="tax_dest_id" ref="notax_fr" />
+		<field name="tax_src_id" ref="tpstvp_sk_purc_fr" />
+	</record>
+
+
+        <!-- SALES TAXES -->
+
+
+	<!--  Alberta Fiscal Position Tax Templates (default is tps) -->
+
+	<record id="fiscal_position_tax_template_21_ab_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_21_fr"  />
+		<field name="tax_src_id" ref="tps_sale_fr" />
+		<field name="tax_dest_id" ref="tvh12_sale_fr" />
+	</record>
+
+	<record id="fiscal_position_tax_template_22_ab_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_22_fr"  />
+		<field name="tax_src_id" ref="tps_sale_fr" />
+		<field name="tax_dest_id" ref="tvh13_sale_fr" />
+	</record>
+
+	<record id="fiscal_position_tax_template_23_ab_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_23_fr"  />
+		<field name="tax_src_id" ref="tps_sale_fr" />
+		<field name="tax_dest_id" ref="tvh135_sale_fr" />
+	</record>
+
+	<record id="fiscal_position_tax_template_24_ab_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_24_fr"  />
+		<field name="tax_src_id" ref="tps_sale_fr" />
+		<field name="tax_dest_id" ref="tvh15_sale_fr" />
+	</record>
+
+	<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" />
+	</record>
+
+	<!--  British Columbia Fiscal Position Tax Templates (default is hst12) -->
+
+	<record id="fiscal_position_tax_template_22_12c_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_22_fr"  />
+		<field name="tax_src_id" ref="tvh12_sale_fr" />
+		<field name="tax_dest_id" ref="tvh13_sale_fr" />
+	</record>
+
+	<record id="fiscal_position_tax_template_23_12_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_23_fr"  />
+		<field name="tax_src_id" ref="tvh12_sale_fr" />
+		<field name="tax_dest_id" ref="tvh135_sale_fr" />
+	</record>
+
+	<record id="fiscal_position_tax_template_24_12_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_24_fr"  />
+		<field name="tax_src_id" ref="tvh12_sale_fr" />
+		<field name="tax_dest_id" ref="tvh15_sale_fr" />
+	</record>
+
+	<record id="fiscal_position_tax_template_3_12_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_3_fr"  />
+		<field name="tax_src_id" ref="tvh12_sale_fr" />
+		<field name="tax_dest_id" ref="tps_sale_fr" />
+	</record>
+
+	<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" />
+	</record>
+
+	<!--  Manitoba Fiscal Position Tax Templates (default is tpstvp_mb) -->
+
+	<record id="fiscal_position_tax_template_21_mb_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_21_fr"  />
+		<field name="tax_src_id" ref="tpstvp_mb_sale_fr" />
+		<field name="tax_dest_id" ref="tvh12_sale_fr" />
+	</record>
+
+	<record id="fiscal_position_tax_template_22_mb_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_22_fr"  />
+		<field name="tax_src_id" ref="tpstvp_mb_sale_fr" />
+		<field name="tax_dest_id" ref="tvh13_sale_fr" />
+	</record>
+
+	<record id="fiscal_position_tax_template_23_mb_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_23_fr"  />
+		<field name="tax_src_id" ref="tpstvp_mb_sale_fr" />
+		<field name="tax_dest_id" ref="tvh135_sale_fr" />
+	</record>
+
+	<record id="fiscal_position_tax_template_24_mb_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_24_fr"  />
+		<field name="tax_src_id" ref="tpstvp_mb_sale_fr" />
+		<field name="tax_dest_id" ref="tvh15_sale_fr" />
+	</record>
+
+	<record id="fiscal_position_tax_template_3_mb_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_3_fr"  />
+		<field name="tax_src_id" ref="tpstvp_mb_sale_fr" />
+		<field name="tax_dest_id" ref="tps_sale_fr" />
+	</record>
+
+	<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" />
+	</record>
+
+	<!--  New Brunswick, Newfoundland and Labrador and Ontario Fiscal Position Tax Templates (default is hst13) -->
+
+	<record id="fiscal_position_tax_template_21_13_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_21_fr"  />
+		<field name="tax_src_id" ref="tvh13_sale_fr" />
+		<field name="tax_dest_id" ref="tvh12_sale_fr" />
+	</record>
+
+	<record id="fiscal_position_tax_template_23_13_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_23_fr"  />
+		<field name="tax_src_id" ref="tvh13_sale_fr" />
+		<field name="tax_dest_id" ref="tvh135_sale_fr" />
+	</record>
+
+	<record id="fiscal_position_tax_template_24_13_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_24_fr"  />
+		<field name="tax_src_id" ref="tvh13_sale_fr" />
+		<field name="tax_dest_id" ref="tvh15_sale_fr" />
+	</record>
+
+	<record id="fiscal_position_tax_template_3_13_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_3_fr"  />
+		<field name="tax_src_id" ref="tvh13_sale_fr" />
+		<field name="tax_dest_id" ref="tps_sale_fr" />
+	</record>
+
+	<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" />
+	</record>
+
+	<!--  Nova Scotia Fiscal Position Tax Templates (default is hst15) -->
+
+	<record id="fiscal_position_tax_template_21_15_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_21_fr"  />
+		<field name="tax_src_id" ref="tvh15_sale_fr" />
+		<field name="tax_dest_id" ref="tvh12_sale_fr" />
+	</record>
+
+	<record id="fiscal_position_tax_template_22_15_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_22_fr"  />
+		<field name="tax_src_id" ref="tvh15_sale_fr" />
+		<field name="tax_dest_id" ref="tvh13_sale_fr" />
+	</record>
+
+	<record id="fiscal_position_tax_template_23_15_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_23_fr"  />
+		<field name="tax_src_id" ref="tvh15_sale_fr" />
+		<field name="tax_dest_id" ref="tvh135_sale_fr" />
+	</record>
+
+	<record id="fiscal_position_tax_template_3_15_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_3_fr"  />
+		<field name="tax_src_id" ref="tvh15_sale_fr" />
+		<field name="tax_dest_id" ref="tps_sale_fr" />
+	</record>
+
+	<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" />
+	</record>
+
+	<!--  Prince Edward Island Fiscal Position Tax Templates (default is tpstvp_pe)-->
+
+	<record id="fiscal_position_tax_template_21_pe_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_21_fr"  />
+		<field name="tax_src_id" ref="tpstvp_pe_sale_fr" />
+		<field name="tax_dest_id" ref="tvh12_sale_fr" />
+	</record>
+
+	<record id="fiscal_position_tax_template_22_pe_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_22_fr"  />
+		<field name="tax_src_id" ref="tpstvp_pe_sale_fr" />
+		<field name="tax_dest_id" ref="tvh13_sale_fr" />
+	</record>
+
+	<record id="fiscal_position_tax_template_23_pe_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_23_fr"  />
+		<field name="tax_src_id" ref="tpstvp_pe_sale_fr" />
+		<field name="tax_dest_id" ref="tvh135_sale_fr" />
+	</record>
+
+	<record id="fiscal_position_tax_template_24_pe_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_24_fr"  />
+		<field name="tax_src_id" ref="tpstvp_pe_sale_fr" />
+		<field name="tax_dest_id" ref="tvh15_sale_fr" />
+	</record>
+
+	<record id="fiscal_position_tax_template_3_pe_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_3_fr"  />
+		<field name="tax_src_id" ref="tpstvp_pe_sale_fr" />
+		<field name="tax_dest_id" ref="tps_sale_fr" />
+	</record>
+
+	<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" />
+	</record>
+
+	<!--  Quebec Fiscal Position Tax Templates (default is tpstvq)-->
+
+	<record id="fiscal_position_tax_template_21_qc_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_21_fr"  />
+		<field name="tax_src_id" ref="tpstvq_sale_fr" />
+		<field name="tax_dest_id" ref="tvh12_sale_fr" />
+	</record>
+
+	<record id="fiscal_position_tax_template_22_qc_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_22_fr"  />
+		<field name="tax_src_id" ref="tpstvq_sale_fr" />
+		<field name="tax_dest_id" ref="tvh13_sale_fr" />
+	</record>
+
+	<record id="fiscal_position_tax_template_24_qc_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_24_fr"  />
+		<field name="tax_src_id" ref="tpstvq_sale_fr" />
+		<field name="tax_dest_id" ref="tvh15_sale_fr" />
+	</record>
+
+	<record id="fiscal_position_tax_template_3_qc_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_3_fr"  />
+		<field name="tax_src_id" ref="tpstvq_sale_fr" />
+		<field name="tax_dest_id" ref="tps_sale_fr" />
+	</record>
+
+	<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" />
+	</record>
+
+	<!--  Saskatchewan Fiscal Position Tax Templates (default is tpstvp_sk)-->
+
+	<record id="fiscal_position_tax_template_21_sk_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_21_fr"  />
+		<field name="tax_src_id" ref="tpstvp_sk_sale_fr" />
+		<field name="tax_dest_id" ref="tvh12_sale_fr" />
+	</record>
+
+	<record id="fiscal_position_tax_template_22_sk_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_22_fr"  />
+		<field name="tax_src_id" ref="tpstvp_sk_sale_fr" />
+		<field name="tax_dest_id" ref="tvh13_sale_fr" />
+	</record>
+
+	<record id="fiscal_position_tax_template_23_sk_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_23_fr"  />
+		<field name="tax_src_id" ref="tpstvp_sk_sale_fr" />
+		<field name="tax_dest_id" ref="tvh135_sale_fr" />
+	</record>
+
+	<record id="fiscal_position_tax_template_24_sk_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_24_fr"  />
+		<field name="tax_src_id" ref="tpstvp_sk_sale_fr" />
+		<field name="tax_dest_id" ref="tvh15_sale_fr" />
+	</record>
+
+	<record id="fiscal_position_tax_template_3_sk_sale_fr" model="account.fiscal.position.tax.template">
+		<field name="position_id" ref="fiscal_position_template_3_fr"  />
+		<field name="tax_src_id" ref="tpstvp_sk_sale_fr" />
+		<field name="tax_dest_id" ref="tps_sale_fr" />
+	</record>
+
+	<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" />
 	</record>
 
 	<!-- Fiscal Position Account Templates - Products -->

From 4f15336078c3fc2e50a69ed0fc78ac54ac65cd97 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Mon, 30 Jul 2012 04:59:15 +0000
Subject: [PATCH 2/6] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120730045534-skdqxm52z48qlae1
bzr revid: launchpad_translations_on_behalf_of_openerp-20120730045915-0rv3el9erxc6y6dr
---
 addons/account/i18n/es_EC.po             |  29 +-
 addons/account_asset/i18n/es_EC.po       |  14 +-
 addons/fetchmail/i18n/pt_BR.po           |   4 +-
 addons/google_base_account/i18n/pt_BR.po |   4 +-
 addons/lunch/i18n/nl.po                  | 552 +++++++++++++++++
 addons/web/i18n/pt_BR.po                 | 722 ++++++++++++-----------
 6 files changed, 946 insertions(+), 379 deletions(-)
 create mode 100644 addons/lunch/i18n/nl.po

diff --git a/addons/account/i18n/es_EC.po b/addons/account/i18n/es_EC.po
index 7eff1938061..5b6bbffea1f 100644
--- a/addons/account/i18n/es_EC.po
+++ b/addons/account/i18n/es_EC.po
@@ -10,15 +10,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2011-12-31 16:16+0000\n"
-"Last-Translator: Christopher Ormaza - (Ecuadorenlinea.net) "
-"<chris.ormaza@gmail.com>\n"
+"PO-Revision-Date: 2012-07-30 03:26+0000\n"
+"Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\n"
 "Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:58+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-30 04:55+0000\n"
+"X-Generator: Launchpad (build 15702)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -446,7 +445,7 @@ msgstr "Total crédito"
 #. module: account
 #: view:account.move.line.unreconcile.select:0
 msgid "Open for Unreconciliation"
-msgstr ""
+msgstr "Abrir para romper conciliación"
 
 #. module: account
 #: field:account.account.template,chart_template_id:0
@@ -1612,7 +1611,7 @@ msgstr "Base Imponible"
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Go to Next Partner"
-msgstr ""
+msgstr "Ir a la siguiente empresa"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -2859,7 +2858,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_tax_code_list
 #: model:ir.ui.menu,name:account.menu_action_tax_code_list
 msgid "Tax Codes"
-msgstr ""
+msgstr "Códigos de impuestos"
 
 #. module: account
 #: view:account.account:0
@@ -3229,7 +3228,7 @@ msgstr "Plantillas para el plan contable"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
 msgid "Set Your Accounting Options"
-msgstr ""
+msgstr "Configurar tu Contabilidad"
 
 #. module: account
 #: view:report.account.sales:0
@@ -4405,7 +4404,7 @@ msgstr "Reconcile Writeoff"
 #. module: account
 #: view:report.account.receivable:0
 msgid "Accounts by Type"
-msgstr ""
+msgstr "Cuentas por tipo"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -4447,7 +4446,7 @@ msgstr "res_config_contents"
 #. module: account
 #: view:account.unreconcile:0
 msgid "Unreconciliate Transactions"
-msgstr ""
+msgstr "Transacciones no conciliadas"
 
 #. module: account
 #: help:account.chart.template,visible:0
@@ -4650,7 +4649,7 @@ msgstr "Fecha de realizacion"
 #. module: account
 #: view:account.unreconcile.reconcile:0
 msgid "Unreconciliation Transactions"
-msgstr ""
+msgstr "Desconcialiación de Transacciones"
 
 #. module: account
 #: field:account.tax,ref_tax_code_id:0
@@ -4785,7 +4784,7 @@ msgstr "Pagado"
 #. module: account
 #: view:account.period.close:0
 msgid "Are you sure?"
-msgstr ""
+msgstr "¿Está Seguro?"
 
 #. module: account
 #: help:account.move.line,statement_id:0
@@ -5183,7 +5182,7 @@ msgstr "Cuenta impuesto"
 #. module: account
 #: view:account.automatic.reconcile:0
 msgid "Reconciliation Result"
-msgstr ""
+msgstr "Resultado de conciliación"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
@@ -6173,7 +6172,7 @@ msgstr "Impuesto de venta(%)"
 #. module: account
 #: view:account.addtmpl.wizard:0
 msgid "Create an Account Based on this Template"
-msgstr ""
+msgstr "Crear una cuenta basada en esta plantilla"
 
 #. module: account
 #: view:account.account.type:0
diff --git a/addons/account_asset/i18n/es_EC.po b/addons/account_asset/i18n/es_EC.po
index 0aea9f1a44e..b9e3fc013a5 100644
--- a/addons/account_asset/i18n/es_EC.po
+++ b/addons/account_asset/i18n/es_EC.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-03-24 03:16+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-07-30 03:27+0000\n"
+"Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\n"
 "Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:27+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-30 04:55+0000\n"
+"X-Generator: Launchpad (build 15702)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -438,12 +438,12 @@ msgstr "Método de tiempo"
 #. module: account_asset
 #: view:account.asset.category:0
 msgid "Analytic Information"
-msgstr ""
+msgstr "Información analítica"
 
 #. module: account_asset
 #: view:asset.modify:0
 msgid "Asset Durations to Modify"
-msgstr ""
+msgstr "Duraciones de activo para modificar"
 
 #. module: account_asset
 #: constraint:account.move.line:0
@@ -619,7 +619,7 @@ msgstr "Prorata Temporis"
 #. module: account_asset
 #: view:account.asset.category:0
 msgid "Accounting Information"
-msgstr ""
+msgstr "Información Contable"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice
diff --git a/addons/fetchmail/i18n/pt_BR.po b/addons/fetchmail/i18n/pt_BR.po
index 7eb7095729b..6b74bfa4910 100644
--- a/addons/fetchmail/i18n/pt_BR.po
+++ b/addons/fetchmail/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-29 04:37+0000\n"
-"X-Generator: Launchpad (build 15694)\n"
+"X-Launchpad-Export-Date: 2012-07-30 04:55+0000\n"
+"X-Generator: Launchpad (build 15702)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/google_base_account/i18n/pt_BR.po b/addons/google_base_account/i18n/pt_BR.po
index dd694f0ca6e..e8e510c183c 100644
--- a/addons/google_base_account/i18n/pt_BR.po
+++ b/addons/google_base_account/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-29 04:38+0000\n"
-"X-Generator: Launchpad (build 15694)\n"
+"X-Launchpad-Export-Date: 2012-07-30 04:55+0000\n"
+"X-Generator: Launchpad (build 15702)\n"
 
 #. module: google_base_account
 #: field:res.users,gmail_user:0
diff --git a/addons/lunch/i18n/nl.po b/addons/lunch/i18n/nl.po
new file mode 100644
index 00000000000..481e8a4f79a
--- /dev/null
+++ b/addons/lunch/i18n/nl.po
@@ -0,0 +1,552 @@
+# Dutch translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-07-29 09:58+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Dutch <nl@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-07-30 04:55+0000\n"
+"X-Generator: Launchpad (build 15702)\n"
+
+#. module: lunch
+#: view:lunch.cashbox.clean:0
+msgid "Reset cashbox"
+msgstr "Reset kas"
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "Box amount in current year"
+msgstr "Kasbedrag in huidig jaar"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_order_form
+#: model:ir.ui.menu,name:lunch.menu_lunch_order_form
+#: model:ir.ui.menu,name:lunch.menu_lunch_reporting_order
+msgid "Lunch Orders"
+msgstr "Lunch Orders"
+
+#. module: lunch
+#: view:lunch.order.cancel:0
+msgid "Are you sure you want to cancel this order ?"
+msgstr "Weet u zeker dat u deze order wilt annuleren?"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_cashmove_form
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove_form
+msgid "Cash Moves"
+msgstr "Kas mutaties"
+
+#. module: lunch
+#: view:lunch.cashmove:0 view:lunch.order:0 view:report.lunch.amount:0
+#: view:report.lunch.order:0
+msgid "Group By..."
+msgstr "Groepeer op.."
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_order_confirm
+msgid "confirm Order"
+msgstr "Bevestig order"
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "    7 Days    "
+msgstr "    7 Dagen    "
+
+#. module: lunch
+#: view:lunch.cashmove:0 view:lunch.order:0
+msgid "Today"
+msgstr "Vandaag"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
+msgid "March"
+msgstr "Maart"
+
+#. module: lunch
+#: report:lunch.order:0
+msgid "Total :"
+msgstr "Totaal :"
+
+#. module: lunch
+#: field:report.lunch.amount,day:0 view:report.lunch.order:0
+#: field:report.lunch.order,day:0
+msgid "Day"
+msgstr "Dag"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_order_cancel
+#: model:ir.actions.act_window,name:lunch.action_lunch_order_cancel_values
+#: model:ir.model,name:lunch.model_lunch_order_cancel view:lunch.order:0
+#: view:lunch.order.cancel:0
+msgid "Cancel Order"
+msgstr "Annuleer order"
+
+#. module: lunch
+#: model:ir.actions.act_window,help:lunch.action_create_cashbox
+msgid ""
+"You can create on cashbox by employee if you want to keep track of the "
+"amount due by employee according to what have been ordered."
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashmove,amount:0 field:report.lunch.amount,amount:0
+msgid "Amount"
+msgstr "Bedrag"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_product_form
+#: model:ir.ui.menu,name:lunch.menu_lunch_product_form view:lunch.product:0
+msgid "Products"
+msgstr "Producten"
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_report_lunch_amount
+msgid "Amount available by user and box"
+msgstr "Bedrag beschikbaar per gebruiker en kas"
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "   Month   "
+msgstr "   Maand   "
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_report_lunch_order
+msgid "Lunch Orders Statistics"
+msgstr "Lunch order analyses"
+
+#. module: lunch
+#: view:lunch.cashmove:0 field:lunch.order,cashmove:0
+msgid "CashMove"
+msgstr "Kas muttatie"
+
+#. module: lunch
+#: view:lunch.order:0 selection:lunch.order,state:0
+msgid "Confirmed"
+msgstr "Bevestigd"
+
+#. module: lunch
+#: view:lunch.order.confirm:0
+msgid "Confirm"
+msgstr "Bevestig"
+
+#. module: lunch
+#: view:lunch.order:0
+msgid "Search Lunch Order"
+msgstr "Zoek lunchorders"
+
+#. module: lunch
+#: field:lunch.order,state:0
+msgid "State"
+msgstr "Status"
+
+#. module: lunch
+#: selection:lunch.order,state:0
+msgid "New"
+msgstr "Nieuw"
+
+#. module: lunch
+#: field:report.lunch.order,price_total:0
+msgid "Total Price"
+msgstr "Totaalprijs"
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "Box Amount by User"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashmove,create_date:0
+msgid "Creation Date"
+msgstr "Aanmaakdatum"
+
+#. module: lunch
+#: report:lunch.order:0
+msgid "Name/Date"
+msgstr "Naam/Datum"
+
+#. module: lunch
+#: field:lunch.order,descript:0
+msgid "Description Order"
+msgstr "Order omschrijving"
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "Box amount in last month"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_order_confirm
+#: model:ir.actions.act_window,name:lunch.action_lunch_order_confirm_values
+#: view:lunch.order:0 view:lunch.order.confirm:0
+msgid "Confirm Order"
+msgstr "Bevestig Order"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
+msgid "July"
+msgstr "Juli"
+
+#. module: lunch
+#: view:lunch.cashmove:0 view:report.lunch.amount:0 view:report.lunch.order:0
+msgid "Box"
+msgstr ""
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "  365 Days  "
+msgstr "  365 Dagen  "
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "    Month-1    "
+msgstr "    Maand-1    "
+
+#. module: lunch
+#: field:report.lunch.amount,date:0
+msgid "Created Date"
+msgstr "Aanmaakdatum"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_category_form
+msgid " Product Categories "
+msgstr " Product categorieën "
+
+#. module: lunch
+#: view:lunch.cashbox.clean:0
+msgid "Set to Zero"
+msgstr "Zet op nul"
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_cashmove
+msgid "Cash Move"
+msgstr "Kas mutatie"
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "Tasks performed in last 365 days"
+msgstr "Taken uitgevoert de laatste 365 dagen"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
+msgid "April"
+msgstr "April"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
+msgid "September"
+msgstr "September"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
+msgid "December"
+msgstr "December"
+
+#. module: lunch
+#: field:report.lunch.amount,month:0 view:report.lunch.order:0
+#: field:report.lunch.order,month:0
+msgid "Month"
+msgstr "Maand"
+
+#. module: lunch
+#: field:lunch.order.confirm,confirm_cashbox:0
+msgid "Name of box"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.order.cancel:0
+msgid "Yes"
+msgstr "Ja"
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_category view:lunch.category:0
+#: view:lunch.order:0 field:lunch.order,category:0
+#: field:lunch.product,category_id:0
+msgid "Category"
+msgstr "Categorie"
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "  Year  "
+msgstr "  Jaar  "
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_category_form
+msgid "Product Categories"
+msgstr "Product categorieën"
+
+#. module: lunch
+#: view:lunch.cashbox.clean:0 view:lunch.order.cancel:0
+msgid "No"
+msgstr "Nee"
+
+#. module: lunch
+#: view:lunch.order.confirm:0
+msgid "Orders Confirmation"
+msgstr "Order bevestigen"
+
+#. module: lunch
+#: view:lunch.cashbox.clean:0
+msgid "Are you sure you want to reset this cashbox ?"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,help:lunch.view_lunch_product_form_installer
+msgid ""
+"Define all products that the employees can order for the lunch time. If you "
+"order lunch at several places, you can use the product categories to split "
+"by supplier. It will be easier for the lunch manager to filter lunch orders "
+"by categories."
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
+msgid "August"
+msgstr "Augustus"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_report_lunch_order_all
+#: view:report.lunch.order:0
+msgid "Lunch Order Analysis"
+msgstr "Lunch orders analyse"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
+msgid "June"
+msgstr "Juni"
+
+#. module: lunch
+#: field:lunch.cashmove,user_cashmove:0 field:lunch.order,user_id:0
+#: field:report.lunch.amount,user_id:0 field:report.lunch.order,user_id:0
+msgid "User Name"
+msgstr "Gebruikersnaam"
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "Sales Analysis"
+msgstr "Verkoopanalyse"
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_category_root_configuration
+msgid "Lunch"
+msgstr "Lunch"
+
+#. module: lunch
+#: view:lunch.cashmove:0 view:report.lunch.order:0
+msgid "User"
+msgstr "Gebruiker"
+
+#. module: lunch
+#: view:lunch.cashmove:0 field:lunch.order,date:0
+msgid "Date"
+msgstr "Datum"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
+msgid "November"
+msgstr "November"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
+msgid "October"
+msgstr "Oktober"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
+msgid "January"
+msgstr "Januari"
+
+#. module: lunch
+#: field:lunch.cashmove,box:0 field:report.lunch.amount,box:0
+msgid "Box Name"
+msgstr ""
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_cashbox_clean
+msgid "clean cashbox"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashmove,active:0 field:lunch.product,active:0
+msgid "Active"
+msgstr "Actief"
+
+#. module: lunch
+#: field:report.lunch.order,date:0
+msgid "Date Order"
+msgstr "Orderdatum"
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_cashbox
+msgid "Cashbox for Lunch "
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_cashbox_clean
+#: model:ir.actions.act_window,name:lunch.action_lunch_cashbox_clean_values
+msgid "Set CashBox to Zero"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.product:0
+msgid "General Information"
+msgstr "Algemene informatie"
+
+#. module: lunch
+#: view:lunch.order.confirm:0
+msgid "Cancel"
+msgstr "Anulleren"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_cashbox_form
+msgid " Cashboxes "
+msgstr ""
+
+#. module: lunch
+#: report:lunch.order:0
+msgid "Unit Price"
+msgstr "Eenheidsprijs"
+
+#. module: lunch
+#: field:lunch.order,product:0
+msgid "Product"
+msgstr "Product"
+
+#. module: lunch
+#: field:lunch.cashmove,name:0 report:lunch.order:0 view:lunch.product:0
+#: field:lunch.product,description:0
+msgid "Description"
+msgstr "Omschrijving"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
+msgid "May"
+msgstr "Mei"
+
+#. module: lunch
+#: field:lunch.order,price:0 field:lunch.product,price:0
+msgid "Price"
+msgstr "Prijs"
+
+#. module: lunch
+#: view:lunch.cashmove:0
+msgid "Search CashMove"
+msgstr ""
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "Total box"
+msgstr ""
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_product
+msgid "Lunch Product"
+msgstr "Lunch product"
+
+#. module: lunch
+#: field:lunch.cashbox,sum_remain:0
+msgid "Total Remaining"
+msgstr "Totaal overgebleven"
+
+#. module: lunch
+#: view:lunch.order:0
+msgid "Total price"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
+msgid "February"
+msgstr "Februari"
+
+#. module: lunch
+#: field:lunch.cashbox,name:0 field:lunch.category,name:0
+#: field:lunch.product,name:0 field:report.lunch.order,box_name:0
+msgid "Name"
+msgstr "Naam"
+
+#. module: lunch
+#: view:lunch.cashmove:0
+msgid "Total amount"
+msgstr "Totaalbedrag"
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "Tasks performed in last 30 days"
+msgstr "Taken uitgevoerd in de laatste 30 dagen"
+
+#. module: lunch
+#: view:lunch.category:0
+msgid "Category Related to Products"
+msgstr ""
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashbox_form view:lunch.cashbox:0
+msgid "Cashboxes"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.category:0 report:lunch.order:0 view:lunch.order:0
+msgid "Order"
+msgstr "Order"
+
+#. module: lunch
+#: model:ir.actions.report.xml,name:lunch.report_lunch_order
+#: model:ir.model,name:lunch.model_lunch_order
+#: model:ir.ui.menu,name:lunch.menu_lunch report:lunch.order:0
+msgid "Lunch Order"
+msgstr "Luchorder"
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "Box amount in current month"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.view_lunch_product_form_installer
+msgid "Define Your Lunch Products"
+msgstr "Definieer uw lunch producten"
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "Tasks during last 7 days"
+msgstr "Taken afgelopen 7 dagen"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_report_lunch_amount_tree
+#: model:ir.ui.menu,name:lunch.menu_lunch_report_amount_tree
+msgid "Cash Position by User"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashbox,manager:0
+msgid "Manager"
+msgstr "Manager"
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "   30 Days   "
+msgstr "   30 Dagen   "
+
+#. module: lunch
+#: view:lunch.order:0
+msgid "To Confirm"
+msgstr ""
+
+#. module: lunch
+#: field:report.lunch.amount,year:0 view:report.lunch.order:0
+#: field:report.lunch.order,year:0
+msgid "Year"
+msgstr "Jaar"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_create_cashbox
+msgid "Create Lunch Cash Boxes"
+msgstr ""
diff --git a/addons/web/i18n/pt_BR.po b/addons/web/i18n/pt_BR.po
index 789202e6474..516ef990a6d 100644
--- a/addons/web/i18n/pt_BR.po
+++ b/addons/web/i18n/pt_BR.po
@@ -8,179 +8,183 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-07-02 09:06+0200\n"
-"PO-Revision-Date: 2012-02-16 01:36+0000\n"
-"Last-Translator: Rafael Sales - http://www.tompast.com.br <Unknown>\n"
+"PO-Revision-Date: 2012-07-30 00:28+0000\n"
+"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-03 05:54+0000\n"
-"X-Generator: Launchpad (build 15531)\n"
+"X-Launchpad-Export-Date: 2012-07-30 04:59+0000\n"
+"X-Generator: Launchpad (build 15702)\n"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:170
-#: addons/web/static/src/js/chrome.js:196
-#: addons/web/static/src/js/chrome.js:364
-#: addons/web/static/src/js/view_form.js:531
-#: addons/web/static/src/js/view_form.js:1665
-#: addons/web/static/src/xml/base.xml:1641
+#: addons/web/static/src/js/chrome.js:176
+#: addons/web/static/src/js/chrome.js:202
+#: addons/web/static/src/js/chrome.js:380
+#: addons/web/static/src/js/view_form.js:457
+#: addons/web/static/src/js/view_form.js:1292
+#: addons/web/static/src/xml/base.xml:1701
 msgid "Ok"
 msgstr "Ok"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:178
+#: addons/web/static/src/js/chrome.js:184
 msgid "Send OpenERP Enterprise Report"
 msgstr "Enviar Relatório OpenERP Enterprise"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:192
+#: addons/web/static/src/js/chrome.js:198
 msgid "Dont send"
 msgstr "Não enviar"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:212
-#: addons/web/static/src/js/chrome.js:914
+#: addons/web/static/src/js/chrome.js:1119
 msgid "Client Error"
 msgstr "Erro no aplicativo cliente"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:253
+#: addons/web/static/src/js/chrome.js:260
 #, python-format
 msgid "Loading (%d)"
 msgstr "Carregando (%d)"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:276
+#: addons/web/static/src/js/chrome.js:292
 msgid "Invalid database name"
 msgstr "Nome de banco de dados inválido"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:402
+#: addons/web/static/src/js/chrome.js:455
 msgid "Backed"
 msgstr "Copiado"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:402
+#: addons/web/static/src/js/chrome.js:456
 msgid "Database backed up successfully"
 msgstr "Backup do banco de dado realizado com sucesso"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:442
+#: addons/web/static/src/js/chrome.js:499
 msgid "Restored"
 msgstr "Restaurado"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:442
+#: addons/web/static/src/js/chrome.js:499
 msgid "Database restored successfully"
 msgstr "Banco de dados restaurado com sucesso"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:735
-#: addons/web/static/src/xml/base.xml:259
-#: addons/web/static/src/xml/base.xml:367
+#: addons/web/static/src/js/chrome.js:783
+#: addons/web/static/src/xml/base.xml:226
+#: addons/web/static/src/xml/base.xml:1735
 msgid "Change Password"
 msgstr "Alterar Senha"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:809
-#: addons/web/static/src/xml/base.xml:326
+#: addons/web/static/src/js/chrome.js:759
+#: addons/web/static/src/xml/base.xml:356
 msgid "Preferences"
 msgstr "Preferências"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:812
+#: addons/web/static/src/js/chrome.js:763
 msgid "Change password"
 msgstr "Alterar Senha"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:813
-#: addons/web/static/src/js/view_editor.js:96
-#: addons/web/static/src/js/view_editor.js:832
-#: addons/web/static/src/js/view_editor.js:960
-#: addons/web/static/src/js/view_form.js:1660
-#: addons/web/static/src/xml/base.xml:1468
-#: addons/web/static/src/xml/base.xml:1478
+#: addons/web/static/src/js/chrome.js:762
+#: addons/web/static/src/js/search.js:241
+#: addons/web/static/src/js/search.js:300
+#: addons/web/static/src/js/view_editor.js:95
+#: addons/web/static/src/js/view_editor.js:836
+#: addons/web/static/src/js/view_editor.js:962
+#: addons/web/static/src/js/view_form.js:1287
+#: addons/web/static/src/xml/base.xml:743
+#: addons/web/static/src/xml/base.xml:1502
+#: addons/web/static/src/xml/base.xml:1512
+#: addons/web/static/src/xml/base.xml:1521
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:814
-#: addons/web/static/src/js/view_editor.js:74
-#: addons/web/static/src/js/views.js:899 addons/web/static/src/xml/base.xml:687
-#: addons/web/static/src/xml/base.xml:1384
-#: addons/web/static/src/xml/base.xml:1472
+#: addons/web/static/src/js/chrome.js:764
+#: addons/web/static/src/js/view_editor.js:73
+#: addons/web/static/src/js/views.js:967 addons/web/static/src/xml/base.xml:742
+#: addons/web/static/src/xml/base.xml:1506
+#: addons/web/static/src/xml/base.xml:1520
 msgid "Save"
 msgstr "Salvar"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:839
+#: addons/web/static/src/js/chrome.js:680
+#: addons/web/static/src/xml/base.xml:359
 msgid "About"
 msgstr "Sobre"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:856
+#: addons/web/static/src/js/chrome.js:1052
 msgid "OpenERP - Unsupported/Community Version"
-msgstr "OpenERP - Versão da Comunidade/Não Suportada"
+msgstr "Versão da Comunidade - Sem suporte oficial da OpenERP S/A"
 
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:619
 msgid "less than a minute ago"
-msgstr ""
+msgstr "menos de um minuto atrás"
 
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:620
 msgid "about a minute ago"
-msgstr ""
+msgstr "por volta de um minuto atrás"
 
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:621
 #, python-format
 msgid "%d minutes ago"
-msgstr ""
+msgstr "%d minutos atrás"
 
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:622
 msgid "about an hour ago"
-msgstr ""
+msgstr "por volta de uma hora atrás"
 
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:623
 #, python-format
 msgid "%d hours ago"
-msgstr ""
+msgstr "%d horas atrás"
 
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:624
 msgid "a day ago"
-msgstr ""
+msgstr "há um dia"
 
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:625
 #, python-format
 msgid "%d days ago"
-msgstr ""
+msgstr "%d dias atrás"
 
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:626
 msgid "about a month ago"
-msgstr ""
+msgstr "por volta de um mês atrás"
 
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:627
 #, python-format
 msgid "%d months ago"
-msgstr ""
+msgstr "%d meses atrás"
 
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:628
 msgid "about a year ago"
-msgstr ""
+msgstr "por volta de um ano atrás"
 
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:629
 #, python-format
 msgid "%d years ago"
-msgstr ""
+msgstr "%d anos atrás"
 
 #. openerp-web
 #: addons/web/static/src/js/data_export.js:6
@@ -191,10 +195,10 @@ msgstr "Exportar Dados"
 #: addons/web/static/src/js/data_export.js:19
 #: addons/web/static/src/js/data_import.js:70
 #: addons/web/static/src/js/view_editor.js:49
-#: addons/web/static/src/js/view_editor.js:399
-#: addons/web/static/src/js/view_form.js:891
-#: addons/web/static/src/js/view_form.js:3901
-#: addons/web/static/src/js/views.js:900
+#: addons/web/static/src/js/view_editor.js:398
+#: addons/web/static/src/js/view_form.js:734
+#: addons/web/static/src/js/view_form.js:3298
+#: addons/web/static/src/js/views.js:968
 msgid "Close"
 msgstr "Fechar"
 
@@ -204,17 +208,17 @@ msgid "Export To File"
 msgstr "Exportar para Arquivo"
 
 #. openerp-web
-#: addons/web/static/src/js/data_export.js:125
+#: addons/web/static/src/js/data_export.js:126
 msgid "Please enter save field list name"
 msgstr "Por favor, entre o nome da lista de campos salva"
 
 #. openerp-web
-#: addons/web/static/src/js/data_export.js:360
+#: addons/web/static/src/js/data_export.js:362
 msgid "Please select fields to save export list..."
 msgstr "Por favor, selecione os campos para salvar na lista de exportação"
 
 #. openerp-web
-#: addons/web/static/src/js/data_export.js:373
+#: addons/web/static/src/js/data_export.js:375
 msgid "Please select fields to export..."
 msgstr "Por favor, selecione os campos para exportar..."
 
@@ -239,42 +243,44 @@ msgid ""
 "Destination fields should only be selected once, some fields are selected "
 "more than once:"
 msgstr ""
+"Campos de destino devem ser selecionados apenas uma vez, alguns campos foram "
+"selecionados mais de uma vez:"
 
 #. openerp-web
 #: addons/web/static/src/js/data_import.js:383
 msgid "*Required Fields are not selected :"
-msgstr ""
+msgstr "*Campos Obrigatórios não selecionados :"
 
 #. openerp-web
-#: addons/web/static/src/js/formats.js:141
+#: addons/web/static/src/js/formats.js:139
 #, python-format
 msgid "(%d records)"
-msgstr ""
+msgstr "(%d registos)"
 
 #. openerp-web
-#: addons/web/static/src/js/formats.js:327
-#: addons/web/static/src/js/view_form.js:4301
+#: addons/web/static/src/js/formats.js:325
+#: addons/web/static/src/js/view_page.js:268
 msgid "Download"
 msgstr "Download"
 
 #. openerp-web
-#: addons/web/static/src/js/formats.js:332
+#: addons/web/static/src/js/formats.js:330
 #, python-format
 msgid "Download \"%s\""
 msgstr "Download \"%s\""
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:798
+#: addons/web/static/src/js/search.js:437
 msgid "Invalid Search"
 msgstr "Pesquisa Inválida"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:798
+#: addons/web/static/src/js/search.js:437
 msgid "triggered from search view"
 msgstr "desencadeada a partir da visão de busca"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:839
+#: addons/web/static/src/js/search.js:528
 #, python-format
 msgid "Incorrect value for field %(fieldname)s: [%(value)s] is %(message)s"
 msgstr "Valor incorreto para campo %(fieldname)s: [%(value)s] é %(message)s"
@@ -283,48 +289,48 @@ msgstr "Valor incorreto para campo %(fieldname)s: [%(value)s] é %(message)s"
 #: addons/web/static/src/js/search.js:948
 #, python-format
 msgid "Filter on: %s"
-msgstr ""
+msgstr "Filtrar por: %s"
 
 #. openerp-web
 #: addons/web/static/src/js/search.js:999
 msgid "Filter"
-msgstr ""
+msgstr "Filtrar"
 
 #. openerp-web
 #: addons/web/static/src/js/search.js:1108
 #, python-format
 msgid "Group by: %s"
-msgstr ""
+msgstr "Agrupar por: %s"
 
 #. openerp-web
 #: addons/web/static/src/js/search.js:1132
 msgid "GroupBy"
-msgstr ""
+msgstr "AgruparPor"
 
 #. openerp-web
 #: addons/web/static/src/js/search.js:1267
 #, python-format
 msgid "Search %(field)s for: %(value)s"
-msgstr ""
+msgstr "Procurar %(field)s por: %(value)s"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:1301
+#: addons/web/static/src/js/search.js:869
 msgid "not a valid integer"
 msgstr "não é um número inteiro válido"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:1315
+#: addons/web/static/src/js/search.js:883
 msgid "not a valid number"
 msgstr "não é um número válido"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:1398
-#: addons/web/static/src/xml/base.xml:840
+#: addons/web/static/src/js/search.js:962
+#: addons/web/static/src/xml/base.xml:973
 msgid "Yes"
 msgstr "Sim"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:1399
+#: addons/web/static/src/js/search.js:963
 msgid "No"
 msgstr "Não"
 
@@ -332,97 +338,106 @@ msgstr "Não"
 #: addons/web/static/src/js/search.js:1416
 #, python-format
 msgid "Search %(field)s at: %(value)s"
-msgstr ""
+msgstr "Procurar %(field)s em: %(value)s"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:1622
-#: addons/web/static/src/xml/base.xml:1229
+#: addons/web/static/src/xml/base.xml:1286
 msgid "Filters"
 msgstr "Filtros"
 
 #. openerp-web
 #: addons/web/static/src/js/search.js:1762
 msgid "Advanced"
-msgstr ""
+msgstr "Avançado"
 
 #. openerp-web
 #: addons/web/static/src/js/search.js:1853
 #, python-format
 msgid "%(field)s %(operator)s \"%(value)s\""
-msgstr ""
+msgstr "%(field)s %(operator)s \"%(value)s\""
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:1888
+#: addons/web/static/src/js/search.js:1341
 msgid "contains"
 msgstr "contém"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:1889
+#: addons/web/static/src/js/search.js:1342
 msgid "doesn't contain"
 msgstr "não contém"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:1890
-#: addons/web/static/src/js/search.js:1900
-#: addons/web/static/src/js/search.js:1928
-#: addons/web/static/src/js/search.js:1952
+#: addons/web/static/src/js/search.js:1343
+#: addons/web/static/src/js/search.js:1359
+#: addons/web/static/src/js/search.js:1380
+#: addons/web/static/src/js/search.js:1401
+#: addons/web/static/src/js/search.js:1424
 msgid "is equal to"
 msgstr "é igual a"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:1891
-#: addons/web/static/src/js/search.js:1901
-#: addons/web/static/src/js/search.js:1929
-#: addons/web/static/src/js/search.js:1953
+#: addons/web/static/src/js/search.js:1344
+#: addons/web/static/src/js/search.js:1360
+#: addons/web/static/src/js/search.js:1381
+#: addons/web/static/src/js/search.js:1402
+#: addons/web/static/src/js/search.js:1425
 msgid "is not equal to"
 msgstr "é diferente de"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:1902
-#: addons/web/static/src/js/search.js:1930
-#: addons/web/static/src/js/search.js:1954
+#: addons/web/static/src/js/search.js:1345
+#: addons/web/static/src/js/search.js:1361
+#: addons/web/static/src/js/search.js:1382
+#: addons/web/static/src/js/search.js:1403
+#: addons/web/static/src/js/search.js:1426
 msgid "greater than"
 msgstr "maior que"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:1903
-#: addons/web/static/src/js/search.js:1931
-#: addons/web/static/src/js/search.js:1955
+#: addons/web/static/src/js/search.js:1346
+#: addons/web/static/src/js/search.js:1362
+#: addons/web/static/src/js/search.js:1383
+#: addons/web/static/src/js/search.js:1404
+#: addons/web/static/src/js/search.js:1427
 msgid "less than"
 msgstr "menor que"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:1904
-#: addons/web/static/src/js/search.js:1932
-#: addons/web/static/src/js/search.js:1956
+#: addons/web/static/src/js/search.js:1347
+#: addons/web/static/src/js/search.js:1363
+#: addons/web/static/src/js/search.js:1384
+#: addons/web/static/src/js/search.js:1405
+#: addons/web/static/src/js/search.js:1428
 msgid "greater or equal than"
 msgstr "maior ou igual a"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:1905
-#: addons/web/static/src/js/search.js:1933
-#: addons/web/static/src/js/search.js:1957
+#: addons/web/static/src/js/search.js:1348
+#: addons/web/static/src/js/search.js:1364
+#: addons/web/static/src/js/search.js:1385
+#: addons/web/static/src/js/search.js:1406
+#: addons/web/static/src/js/search.js:1429
 msgid "less or equal than"
 msgstr "menor ou igual a"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:1947
-#: addons/web/static/src/js/search.js:1973
+#: addons/web/static/src/js/search.js:1419
+#: addons/web/static/src/js/search.js:1444
 msgid "is"
 msgstr "é"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:1974
+#: addons/web/static/src/js/search.js:1445
 msgid "is not"
 msgstr "não é"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:1988
+#: addons/web/static/src/js/search.js:1459
 msgid "is true"
 msgstr "é verdadeiro"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:1989
+#: addons/web/static/src/js/search.js:1460
 msgid "is false"
 msgstr "é falso"
 
@@ -435,195 +450,194 @@ msgstr "Administrar Visões (%s)"
 #. openerp-web
 #: addons/web/static/src/js/view_editor.js:46
 #: addons/web/static/src/js/view_list.js:17
-#: addons/web/static/src/xml/base.xml:121
-#: addons/web/static/src/xml/base.xml:164
-#: addons/web/static/src/xml/base.xml:684
+#: addons/web/static/src/xml/base.xml:100
+#: addons/web/static/src/xml/base.xml:327
+#: addons/web/static/src/xml/base.xml:761
 msgid "Create"
 msgstr "Criar"
 
 #. openerp-web
 #: addons/web/static/src/js/view_editor.js:47
-#: addons/web/static/src/xml/base.xml:456
-#: addons/web/static/src/xml/base.xml:683
+#: addons/web/static/src/xml/base.xml:483
+#: addons/web/static/src/xml/base.xml:760
 msgid "Edit"
 msgstr "Editar"
 
 #. openerp-web
 #: addons/web/static/src/js/view_editor.js:48
-#: addons/web/static/src/xml/base.xml:1595
+#: addons/web/static/src/xml/base.xml:1653
 msgid "Remove"
 msgstr "Remover"
 
 #. openerp-web
-#: addons/web/static/src/js/view_editor.js:72
+#: addons/web/static/src/js/view_editor.js:71
 #, python-format
 msgid "Create a view (%s)"
 msgstr "Criar a visão (%s)"
 
 #. openerp-web
-#: addons/web/static/src/js/view_editor.js:169
+#: addons/web/static/src/js/view_editor.js:168
 msgid "Do you really want to remove this view?"
 msgstr "Deseja remover essa visão?"
 
 #. openerp-web
-#: addons/web/static/src/js/view_editor.js:365
+#: addons/web/static/src/js/view_editor.js:364
 #, python-format
 msgid "View Editor %d - %s"
 msgstr "Editar Visão %d - %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_editor.js:368
+#: addons/web/static/src/js/view_editor.js:367
 msgid "Inherited View"
 msgstr "View herdada"
 
 #. openerp-web
-#: addons/web/static/src/js/view_editor.js:372
+#: addons/web/static/src/js/view_editor.js:371
 msgid "Do you really wants to create an inherited view here?"
 msgstr "Quer realmente criar uma view herdada aqui?"
 
 #. openerp-web
-#: addons/web/static/src/js/view_editor.js:382
+#: addons/web/static/src/js/view_editor.js:381
 msgid "Preview"
 msgstr "Pré-visualizar"
 
 #. openerp-web
-#: addons/web/static/src/js/view_editor.js:502
+#: addons/web/static/src/js/view_editor.js:501
 msgid "Do you really want to remove this node?"
 msgstr "Deseja remover esse nó?"
 
 #. openerp-web
-#: addons/web/static/src/js/view_editor.js:811
-#: addons/web/static/src/js/view_editor.js:937
+#: addons/web/static/src/js/view_editor.js:815
+#: addons/web/static/src/js/view_editor.js:939
 msgid "Properties"
 msgstr "Propriedades"
 
 #. openerp-web
-#: addons/web/static/src/js/view_editor.js:814
-#: addons/web/static/src/js/view_editor.js:940
+#: addons/web/static/src/js/view_editor.js:818
+#: addons/web/static/src/js/view_editor.js:942
 msgid "Update"
 msgstr "Atualizar"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:43
+#: addons/web/static/src/js/view_form.js:16
+#: addons/web/static/src/js/view_form.js:210
 msgid "Form"
 msgstr "Formulário"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:147
-#: addons/web/static/src/js/view_list.js:358
-#: addons/web/static/src/xml/base.xml:1653
+#: addons/web/static/src/xml/base.xml:632
+#: addons/web/static/src/xml/base.xml:763
+#: addons/web/static/src/xml/base.xml:1714
 msgid "Delete"
 msgstr "Excluir"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:148
+#: addons/web/static/src/xml/base.xml:762
 msgid "Duplicate"
 msgstr "Duplicar"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:149
-#: addons/web/static/src/js/view_form.js:885
+#: addons/web/static/src/js/view_form.js:133
+#: addons/web/static/src/js/view_form.js:728
 msgid "Set Default"
 msgstr "Definir como Padrão"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:643
+#: addons/web/static/src/js/view_page.js:59
 msgid "Do you really want to delete this record?"
 msgstr "Deseja remover esse registro?"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:657
+#: addons/web/static/src/js/view_form.js:508
 msgid ""
 "Warning, the record has been modified, your changes will be discarded."
 msgstr "Aviso, o registro foi modificado, suas alterações serão descartadas."
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:892
+#: addons/web/static/src/js/view_form.js:735
 msgid "Save default"
 msgstr "Salvar padrão"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1402
+#: addons/web/static/src/js/view_form.js:867
 #, python-format
 msgid "Unknown operator %s in domain %s"
 msgstr "Operador desconhecido %s no domínio %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1410
+#: addons/web/static/src/js/view_form.js:875
 #, python-format
 msgid "Unknown field %s in domain %s"
 msgstr "Campo desconhecido %s no domínio %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1448
+#: addons/web/static/src/js/view_form.js:913
 #, python-format
 msgid "Unsupported operator %s in domain %s"
 msgstr "Operador não suportado %s no domínio %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1657
+#: addons/web/static/src/js/view_form.js:1284
 msgid "Confirm"
 msgstr "Confirmar"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2478
+#: addons/web/static/src/js/view_form.js:2193
 msgid "<em>   Search More...</em>"
 msgstr "<em>   Procurar Mais...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2488
+#: addons/web/static/src/js/view_form.js:2211
 #, python-format
 msgid "<em>   Create \"<strong>%s</strong>\"</em>"
 msgstr "<em>   Criar \"<strong>%s</strong>\"</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2494
+#: addons/web/static/src/js/view_form.js:2217
 msgid "<em>   Create and Edit...</em>"
 msgstr "<em>   Criar e Editar...</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2527
+#: addons/web/static/src/js/view_form.js:2250
+#: addons/web/static/src/js/views.js:680
 msgid "Search: "
 msgstr "Pesquisar: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2527
-#: addons/web/static/src/js/view_form.js:3210
+#: addons/web/static/src/js/view_form.js:2250
+#: addons/web/static/src/js/view_form.js:2738
 msgid "Create: "
 msgstr "Criar: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2596
-#: addons/web/static/src/js/view_form.js:3125
-#: addons/web/static/src/js/view_form.js:3238
-#: addons/web/static/src/js/view_form.js:3586
-#: addons/web/static/src/js/view_form.js:3702
+#: addons/web/static/src/js/view_form.js:2040
+#: addons/web/static/src/js/view_form.js:2766
+#: addons/web/static/src/js/view_form.js:2991
 msgid "Open: "
 msgstr "Aberto: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:3517
-#: addons/web/static/src/js/view_form.js:3644
-#: addons/web/static/src/xml/base.xml:1184
-#: addons/web/static/src/xml/base.xml:1594
+#: addons/web/static/src/js/view_form.js:2911
+#: addons/web/static/src/xml/base.xml:755
+#: addons/web/static/src/xml/base.xml:777
+#: addons/web/static/src/xml/base.xml:1652
 msgid "Add"
 msgstr "Adicionar"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:3566
-#: addons/web/static/src/js/view_form.js:3684
+#: addons/web/static/src/js/view_form.js:2971
 msgid "Add: "
 msgstr "Adicionar: "
 
 #. openerp-web
 #: addons/web/static/src/js/view_form.js:4230
 msgid "Save As..."
-msgstr ""
+msgstr "Salvar como..."
 
 #. openerp-web
 #: addons/web/static/src/js/view_form.js:4230
 msgid "The field is empty, there's nothing to save !"
-msgstr ""
+msgstr "O campo está vazio, não tem nada para salvar!"
 
 #. openerp-web
 #: addons/web/static/src/js/view_list.js:8
@@ -631,51 +645,49 @@ msgid "List"
 msgstr "Lista"
 
 #. openerp-web
-#: addons/web/static/src/js/view_list.js:338
+#: addons/web/static/src/js/view_list.js:277
 msgid "Unlimited"
 msgstr "Ilimitado"
 
 #. openerp-web
-#: addons/web/static/src/js/view_list.js:356
-#: addons/web/static/src/xml/base.xml:622
-#: addons/web/static/src/xml/base.xml:1657
+#: addons/web/static/src/js/views.js:819
+#: addons/web/static/src/xml/base.xml:1742
 msgid "Import"
 msgstr "Importar"
 
 #. openerp-web
-#: addons/web/static/src/js/view_list.js:357
-#: addons/web/static/src/xml/base.xml:1554
+#: addons/web/static/src/js/views.js:822
+#: addons/web/static/src/xml/base.xml:1612
 msgid "Export"
 msgstr "Exportar"
 
 #. openerp-web
-#: addons/web/static/src/js/view_list.js:436
+#: addons/web/static/src/js/view_list.js:374
 msgid "Group"
 msgstr "Grupo"
 
 #. openerp-web
-#: addons/web/static/src/js/view_list.js:623
+#: addons/web/static/src/js/view_list.js:549
 msgid "Do you really want to remove these records?"
 msgstr "Deseja remover esse registro?"
 
 #. openerp-web
-#: addons/web/static/src/js/view_list.js:716
-#: addons/web/static/src/js/views.js:820
+#: addons/web/static/src/js/views.js:925
 msgid "Warning"
 msgstr "Atenção"
 
 #. openerp-web
 #: addons/web/static/src/js/view_list.js:716
 msgid "You must select at least one record."
-msgstr ""
+msgstr "Você precisa selecionar ao menos um registro."
 
 #. openerp-web
-#: addons/web/static/src/js/view_list.js:1332
+#: addons/web/static/src/js/view_list.js:1243
 msgid "Undefined"
 msgstr "Indefinida"
 
 #. openerp-web
-#: addons/web/static/src/js/view_list.js:1428
+#: addons/web/static/src/js/view_list.js:1342
 #, python-format
 msgid "%(page)d/%(page_count)d"
 msgstr "%(page)d/%(page_count)d"
@@ -686,84 +698,84 @@ msgid "Tree"
 msgstr "Árvore"
 
 #. openerp-web
-#: addons/web/static/src/js/views.js:566 addons/web/static/src/xml/base.xml:452
+#: addons/web/static/src/js/views.js:570 addons/web/static/src/xml/base.xml:480
 msgid "Fields View Get"
 msgstr "Fields View Get"
 
 #. openerp-web
-#: addons/web/static/src/js/views.js:574
+#: addons/web/static/src/js/views.js:578
 #, python-format
 msgid "View Log (%s)"
 msgstr "Ver o Log (%s)"
 
 #. openerp-web
-#: addons/web/static/src/js/views.js:604
+#: addons/web/static/src/js/views.js:605
 #, python-format
 msgid "Model %s fields"
 msgstr "Modelo %s campos"
 
 #. openerp-web
-#: addons/web/static/src/js/views.js:614 addons/web/static/src/xml/base.xml:455
+#: addons/web/static/src/js/views.js:615 addons/web/static/src/xml/base.xml:482
 msgid "Manage Views"
 msgstr "Administrar Visões"
 
 #. openerp-web
-#: addons/web/static/src/js/views.js:615
+#: addons/web/static/src/js/views.js:616
 msgid "Could not find current view declaration"
 msgstr "Não foi possível encontrar a declaração da visão atual"
 
 #. openerp-web
 #: addons/web/static/src/js/views.js:716
 msgid "Print"
-msgstr ""
+msgstr "Imprimir"
 
 #. openerp-web
 #: addons/web/static/src/js/views.js:717
 msgid "Attachment"
-msgstr ""
+msgstr "Anexo"
 
 #. openerp-web
 #: addons/web/static/src/js/views.js:718 addons/web/static/src/xml/base.xml:276
 msgid "More"
-msgstr ""
+msgstr "Mais"
 
 #. openerp-web
-#: addons/web/static/src/js/views.js:726
+#: addons/web/static/src/js/views.js:810
 msgid "Translate"
 msgstr "Traduzir"
 
 #. openerp-web
-#: addons/web/static/src/js/views.js:726
+#: addons/web/static/src/js/views.js:812
 msgid "Technical translation"
 msgstr "Tradução Técnica"
 
 #. openerp-web
-#: addons/web/static/src/js/views.js:820
+#: addons/web/static/src/js/views.js:924
 msgid "You must choose at least one record."
 msgstr "Você deve escolher pelo menos um registro."
 
 #. openerp-web
 #: addons/web/static/src/js/views.js:875
 msgid "Uploading..."
-msgstr ""
+msgstr "Enviando..."
 
 #. openerp-web
 #: addons/web/static/src/js/views.js:885
 msgid "Do you really want to delete this attachment ?"
-msgstr ""
+msgstr "Você deseja excluir este anexo?"
 
 #. openerp-web
-#: addons/web/static/src/js/views.js:894
+#: addons/web/static/src/js/views.js:962
 msgid "Translations"
 msgstr "Traduções"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:9
+#: addons/web/static/src/xml/base.xml:52
 msgid "Loading..."
 msgstr "Carregando..."
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:48
+#: addons/web/static/src/xml/base.xml:251
 msgid ""
 "Your version of OpenERP is unsupported. Support & maintenance services are "
 "available here:"
@@ -772,265 +784,266 @@ msgstr ""
 "disponíveis aqui:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:48
+#: addons/web/static/src/xml/base.xml:251
 msgid "OpenERP Entreprise"
 msgstr "OpenERP Entreprise"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:53
+#: addons/web/static/src/xml/base.xml:256
 msgid "OpenERP Enterprise Contract."
 msgstr "Contrato Corporativo OpenERP"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:54
+#: addons/web/static/src/xml/base.xml:257
 msgid "Your report will be sent to the OpenERP Enterprise team."
 msgstr "Seu relatório será enviado à equipe do OpenERP"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:56
+#: addons/web/static/src/xml/base.xml:259
 msgid "Summary:"
 msgstr "Resumo:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:60
+#: addons/web/static/src/xml/base.xml:263
 msgid "Description:"
 msgstr "Descrição :"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:64
+#: addons/web/static/src/xml/base.xml:267
 msgid "What you did:"
 msgstr "O que você fez:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:80
+#: addons/web/static/src/xml/base.xml:297
 msgid "Invalid username or password"
 msgstr "Nome de usuário ou senha inválidos"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:84 addons/web/static/src/xml/base.xml:174
-#: addons/web/static/src/xml/base.xml:200
+#: addons/web/static/src/xml/base.xml:116
+#: addons/web/static/src/xml/base.xml:150
+#: addons/web/static/src/xml/base.xml:301
 msgid "Database:"
 msgstr "Banco de Dados:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:89
+#: addons/web/static/src/xml/base.xml:306
 msgid "Username"
 msgstr "Nome do usuário"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:91 addons/web/static/src/xml/base.xml:125
+#: addons/web/static/src/xml/base.xml:308
+#: addons/web/static/src/xml/base.xml:331
 msgid "Password"
 msgstr "Senha"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:93
+#: addons/web/static/src/xml/base.xml:310
 msgid "Log in"
 msgstr "Autenticar"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:97
+#: addons/web/static/src/xml/base.xml:314
 msgid "Manage Databases"
 msgstr "Administrar bancos de dados"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:98 addons/web/static/src/xml/base.xml:389
+#: addons/web/static/src/xml/base.xml:44 addons/web/static/src/xml/base.xml:315
 msgid "Powered by"
 msgstr "Desenvolvido Por"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:98 addons/web/static/src/xml/base.xml:334
+#: addons/web/static/src/xml/base.xml:44 addons/web/static/src/xml/base.xml:315
+#: addons/web/static/src/xml/base.xml:1819
 msgid "OpenERP"
 msgstr "OpenERP"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:122
-#: addons/web/static/src/xml/base.xml:189
+#: addons/web/static/src/xml/base.xml:132
+#: addons/web/static/src/xml/base.xml:328
 msgid "Drop"
 msgstr "Soltar"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:123
-#: addons/web/static/src/xml/base.xml:215
+#: addons/web/static/src/xml/base.xml:166
+#: addons/web/static/src/xml/base.xml:329
 msgid "Backup"
 msgstr "Cópia de Segurança"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:124
-#: addons/web/static/src/xml/base.xml:237
+#: addons/web/static/src/xml/base.xml:195
+#: addons/web/static/src/xml/base.xml:330
 msgid "Restore"
 msgstr "Restaurar"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:126
+#: addons/web/static/src/xml/base.xml:332
 msgid "Back to Login"
 msgstr "Voltar ao Login"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:131
+#: addons/web/static/src/xml/base.xml:61
 msgid "CREATE DATABASE"
 msgstr "CRIAR BANCO DE DADOS"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:134
-#: addons/web/static/src/xml/base.xml:247
+#: addons/web/static/src/xml/base.xml:68 addons/web/static/src/xml/base.xml:211
 msgid "Master password:"
 msgstr "Senha Super Admin:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:138
-#: addons/web/static/src/xml/base.xml:233
+#: addons/web/static/src/xml/base.xml:72 addons/web/static/src/xml/base.xml:191
 msgid "New database name:"
 msgstr "Nome do Novo banco de dados:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:142
+#: addons/web/static/src/xml/base.xml:77
 msgid "Load Demonstration data:"
 msgstr "Carregar dados de demonstração:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:146
+#: addons/web/static/src/xml/base.xml:81
 msgid "Default language:"
 msgstr "Idioma padrão:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:156
+#: addons/web/static/src/xml/base.xml:91
 msgid "Admin password:"
 msgstr "Senha do Administrador"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:160
+#: addons/web/static/src/xml/base.xml:95
 msgid "Confirm password:"
 msgstr "Confirmar Senha:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:171
+#: addons/web/static/src/xml/base.xml:109
 msgid "DROP DATABASE"
 msgstr "EXCLUIR BANCO DE DADOS"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:185
-#: addons/web/static/src/xml/base.xml:211
-#: addons/web/static/src/xml/base.xml:229
+#: addons/web/static/src/xml/base.xml:128
+#: addons/web/static/src/xml/base.xml:162
+#: addons/web/static/src/xml/base.xml:187
 msgid "Master Password:"
 msgstr "Senha do Super Admin"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:197
+#: addons/web/static/src/xml/base.xml:143
 msgid "BACKUP DATABASE"
 msgstr "BACKUP"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:222
+#: addons/web/static/src/xml/base.xml:175
 msgid "RESTORE DATABASE"
 msgstr "RESTAURAR BANCO DE DADOS"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:225
+#: addons/web/static/src/xml/base.xml:182
 msgid "File:"
 msgstr "Arquivo:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:244
+#: addons/web/static/src/xml/base.xml:204
 msgid "CHANGE MASTER PASSWORD"
 msgstr "ALTERAR SENHA DO SUPER ADMIN"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:251
+#: addons/web/static/src/xml/base.xml:216
 msgid "New master password:"
 msgstr "Nova Senha do Super Admin:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:255
+#: addons/web/static/src/xml/base.xml:221
 msgid "Confirm new master password:"
 msgstr "Confirme a Senha do Super Admin:"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:325
 msgid "About OpenERP"
-msgstr ""
+msgstr "Sobre OpenERP"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:327
 msgid "Log out"
-msgstr ""
+msgstr "Sair"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:333
 msgid "Activate the developer mode"
-msgstr ""
+msgstr "Ativar o modo de desenvolvedor"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:335
+#: addons/web/static/src/xml/base.xml:1820
 msgid "Version"
 msgstr "Versão"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:336
+#: addons/web/static/src/xml/base.xml:1821
 msgid "Copyright © 2004-TODAY OpenERP SA. All Rights Reserved."
 msgstr "Copyright © 2004-HOJE OpenERP SA. Alguns Direitos Reservados."
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:337
+#: addons/web/static/src/xml/base.xml:1822
 msgid "OpenERP is a trademark of the"
 msgstr "OpenERP é uma marca de"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:338
+#: addons/web/static/src/xml/base.xml:1823
 msgid "OpenERP SA Company"
 msgstr "Empresa OpenERP SA"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:340
+#: addons/web/static/src/xml/base.xml:1825
 msgid "Licenced under the terms of"
 msgstr "Licenciado sobre os termos de"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:341
+#: addons/web/static/src/xml/base.xml:1826
 msgid "GNU Affero General Public License"
 msgstr "Licença Pública Geral GNU Affero"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:343
+#: addons/web/static/src/xml/base.xml:1828
 msgid "For more information visit"
 msgstr "Para mais informações visite"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:344
+#: addons/web/static/src/xml/base.xml:1829
 msgid "OpenERP.com"
 msgstr "OpenERP.com"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:352
+#: addons/web/static/src/xml/base.xml:1720
 msgid "Old Password:"
 msgstr "Senha Anterior"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:357
+#: addons/web/static/src/xml/base.xml:1725
 msgid "New Password:"
 msgstr "Nova Senha"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:362
+#: addons/web/static/src/xml/base.xml:1730
 msgid "Confirm Password:"
 msgstr "Confirmar Senha:"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:390
 msgid "Open"
-msgstr ""
+msgstr "Abrir"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:390
 msgid "ERP"
-msgstr ""
+msgstr "ERP"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:448
+#: addons/web/static/src/xml/base.xml:477
 msgid "Debug View#"
 msgstr "Visão de Depuração#"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:449
+#: addons/web/static/src/xml/base.xml:478
 msgid "View Log (perm_read)"
 msgstr "Visualiza Log (perm_read)"
 
@@ -1040,70 +1053,69 @@ msgid "Toggle Form Layout Outline"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:451
+#: addons/web/static/src/xml/base.xml:479
 msgid "View Fields"
 msgstr "Visualiza Campos"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:453
-#: addons/web/static/src/xml/base.xml:1242
+#: addons/web/static/src/xml/base.xml:1300
 msgid "Manage Filters"
 msgstr "Gerenciar Filtros"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:456
+#: addons/web/static/src/xml/base.xml:483
 msgid "View"
 msgstr "Visão"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:457
+#: addons/web/static/src/xml/base.xml:484
 msgid "Edit SearchView"
 msgstr "Editar Busca"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:458
+#: addons/web/static/src/xml/base.xml:485
 msgid "Edit Action"
 msgstr "Editar Ação"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:459
+#: addons/web/static/src/xml/base.xml:486
 msgid "Edit Workflow"
 msgstr "Editar Workflow"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:464
+#: addons/web/static/src/xml/base.xml:491
 msgid "ID:"
 msgstr "ID:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:467
+#: addons/web/static/src/xml/base.xml:494
 msgid "XML ID:"
 msgstr "ID XML:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:470
+#: addons/web/static/src/xml/base.xml:497
 msgid "Creation User:"
 msgstr "Usuário de criação:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:473
+#: addons/web/static/src/xml/base.xml:500
 msgid "Creation Date:"
 msgstr "Data de Criação:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:476
+#: addons/web/static/src/xml/base.xml:503
 msgid "Latest Modification by:"
 msgstr "Última Modificação por:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:479
+#: addons/web/static/src/xml/base.xml:506
 msgid "Latest Modification Date:"
 msgstr "Data da Última Modificação:"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:518
 msgid "Delete this attachment"
-msgstr ""
+msgstr "Excluir este anexo"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:523
@@ -1113,297 +1125,301 @@ msgstr ""
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:527
 msgid "Add..."
-msgstr ""
+msgstr "Adicionar..."
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:622
 #: addons/web/static/src/xml/base.xml:687
 msgid "or"
-msgstr ""
+msgstr "ou"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:687
 msgid "Discard"
-msgstr ""
+msgstr "Descartar"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:704
+#: addons/web/static/src/xml/base.xml:806
 msgid "Default:"
 msgstr "Padrão:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:721
+#: addons/web/static/src/xml/base.xml:823
 msgid "Condition:"
 msgstr "Condição:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:740
+#: addons/web/static/src/xml/base.xml:842
 msgid "Only you"
 msgstr "Somente voce"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:747
+#: addons/web/static/src/xml/base.xml:849
 msgid "All users"
 msgstr "Todos os usuários"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:797
+#: addons/web/static/src/xml/base.xml:856
 msgid "Unhandled widget"
 msgstr "Widget não utilizado"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:803
+#: addons/web/static/src/xml/base.xml:936
 msgid "(nolabel)"
 msgstr "(nolabel)"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:808
+#: addons/web/static/src/xml/base.xml:941
 msgid "Field:"
 msgstr "Campo:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:812
+#: addons/web/static/src/xml/base.xml:945
 msgid "Object:"
 msgstr "Objeto:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:816
+#: addons/web/static/src/xml/base.xml:949
 msgid "Type:"
 msgstr "Tipo:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:820
+#: addons/web/static/src/xml/base.xml:953
 msgid "Widget:"
 msgstr "Componente:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:824
+#: addons/web/static/src/xml/base.xml:957
 msgid "Size:"
 msgstr "Tamanho:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:828
+#: addons/web/static/src/xml/base.xml:961
 msgid "Context:"
 msgstr "Contexto:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:832
+#: addons/web/static/src/xml/base.xml:965
 msgid "Domain:"
 msgstr "Domínio:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:836
+#: addons/web/static/src/xml/base.xml:910
+#: addons/web/static/src/xml/base.xml:969
 msgid "Modifiers:"
 msgstr "Modificadores:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:840
+#: addons/web/static/src/xml/base.xml:973
 msgid "Change default:"
 msgstr "Trocar padrão"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:844
+#: addons/web/static/src/xml/base.xml:977
 msgid "On change:"
 msgstr "Ao alterar:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:848
+#: addons/web/static/src/xml/base.xml:981
 msgid "Relation:"
 msgstr "Relação:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:852
+#: addons/web/static/src/xml/base.xml:985
 msgid "Selection:"
 msgstr "Seleção:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:895
+#: addons/web/static/src/xml/base.xml:1040
 msgid "Open this resource"
 msgstr "Abrir este recurso"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:922
+#: addons/web/static/src/xml/base.xml:1063
 msgid "Select date"
 msgstr "Data selecionada"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:948
 msgid "Open Resource"
-msgstr ""
+msgstr "Abrir Recurso"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1026
-#: addons/web/static/src/xml/base.xml:1067
+#: addons/web/static/src/xml/base.xml:1162
+#: addons/web/static/src/xml/base.xml:1205
 msgid "Set Image"
 msgstr "Definir Imagem"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1030
-#: addons/web/static/src/xml/base.xml:1082
-#: addons/web/static/src/xml/base.xml:1084
+#: addons/web/static/src/js/view_form.js:1620
+#: addons/web/static/src/xml/base.xml:1170
+#: addons/web/static/src/xml/base.xml:1220
+#: addons/web/static/src/xml/base.xml:1222
+#: addons/web/static/src/xml/base.xml:1279
 msgid "Clear"
 msgstr "Limpar"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1035
-#: addons/web/static/src/xml/base.xml:1092
+#: addons/web/static/src/xml/base.xml:1179
+#: addons/web/static/src/xml/base.xml:1230
 msgid "Uploading ..."
 msgstr "Tranferindo..."
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:1066
 msgid "width: 83px;"
-msgstr ""
+msgstr "largura: 83px;"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1069
-#: addons/web/static/src/xml/base.xml:1467
+#: addons/web/static/src/xml/base.xml:1207
+#: addons/web/static/src/xml/base.xml:1501
 msgid "Select"
 msgstr "Selecionar"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1075
-#: addons/web/static/src/xml/base.xml:1077
+#: addons/web/static/src/xml/base.xml:1214
+#: addons/web/static/src/xml/base.xml:1216
 msgid "Save As"
 msgstr "Salvar Como"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1126
+#: addons/web/static/src/xml/base.xml:1245
 msgid "Button"
 msgstr "Botão"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1129
+#: addons/web/static/src/xml/base.xml:1248
 msgid "(no string)"
 msgstr "(sem string)"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1136
+#: addons/web/static/src/xml/base.xml:1255
 msgid "Special:"
 msgstr "Especial:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1141
+#: addons/web/static/src/xml/base.xml:1260
 msgid "Button Type:"
 msgstr "Tipo do Botão:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1145
+#: addons/web/static/src/xml/base.xml:1264
 msgid "Method:"
 msgstr "Método:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1149
+#: addons/web/static/src/xml/base.xml:1268
 msgid "Action ID:"
 msgstr "ID da Ação:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1159
+#: addons/web/static/src/xml/base.xml:542
 msgid "Field"
 msgstr "Campo"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:1205
 msgid "Advanced Search..."
-msgstr ""
+msgstr "Busca Avançada..."
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1230
+#: addons/web/static/src/xml/base.xml:1287
 msgid "-- Filters --"
 msgstr "-- Filtros --"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1239
+#: addons/web/static/src/xml/base.xml:1296
 msgid "-- Actions --"
 msgstr "-- Ações --"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1240
+#: addons/web/static/src/xml/base.xml:1297
 msgid "Add Advanced Filter"
 msgstr "Adiciona Filtro Avançado"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1241
+#: addons/web/static/src/xml/base.xml:1298
 msgid "Save Filter"
 msgstr "Salvar Filtro"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1247
+#: addons/web/static/src/xml/base.xml:1305
 msgid "Filter Name:"
 msgstr "Nome do Filtro"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1249
+#: addons/web/static/src/xml/base.xml:1307
 msgid "(Any existing filter with the same name will be replaced)"
 msgstr "(Qualquer filtro existente com o mesmo nome será substituído)"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:1376
 msgid "Custom Filters"
-msgstr ""
+msgstr "Filtros personalizados"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:1379
 msgid "Save current filter"
-msgstr ""
+msgstr "Salvar o filtro atual"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:1381
 msgid "Filter name"
-msgstr ""
+msgstr "Nome do filtro"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:1383
 msgid "Share with all users"
-msgstr ""
+msgstr "Compartilhar com todos os usuários"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1392
+#: addons/web/static/src/js/search.js:298
+#: addons/web/static/src/xml/base.xml:1299
 msgid "Add to Dashboard"
 msgstr "Adicionar ao Painel"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:1394
 msgid "Title of new Dashboard item"
-msgstr ""
+msgstr "Título do novo item do painel"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:1395
 msgid "save"
-msgstr ""
+msgstr "salvar"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:1399
 msgid "Select Dashboard to add this filter to"
-msgstr ""
+msgstr "Escolha o Painel para adicionar este filtro"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:1406
 msgid "Advanced Search"
-msgstr ""
+msgstr "Busca Avançada"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:1411
 msgid "Add a condition"
-msgstr ""
+msgstr "Adicionar uma condição"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:1412
 msgid "Apply"
-msgstr ""
+msgstr "Aplicar"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1475
+#: addons/web/static/src/xml/base.xml:1509
 msgid "Save & New"
 msgstr "Salvar & Novo"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1476
+#: addons/web/static/src/xml/base.xml:1510
 msgid "Save & Close"
 msgstr "Salvar & Fechar"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1559
+#: addons/web/static/src/xml/base.xml:1617
 msgid ""
 "This wizard will export all data that matches the current search criteria to "
 "a CSV file.\n"
@@ -1416,67 +1432,67 @@ msgstr ""
 "ser reimportados após a modificação."
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1566
+#: addons/web/static/src/xml/base.xml:1624
 msgid "Export Type:"
 msgstr "Tipo de Exportação:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1568
+#: addons/web/static/src/xml/base.xml:1626
 msgid "Import Compatible Export"
 msgstr "Importar Exportação Compatível"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1569
+#: addons/web/static/src/xml/base.xml:1627
 msgid "Export all Data"
 msgstr "Exportar todos os Dados"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1572
+#: addons/web/static/src/xml/base.xml:1630
 msgid "Export Formats"
 msgstr "Formatos de Exportação"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1578
+#: addons/web/static/src/xml/base.xml:1636
 msgid "Available fields"
 msgstr "Campos Disponíveis"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1580
+#: addons/web/static/src/xml/base.xml:1638
 msgid "Fields to export"
 msgstr "Campos para exportar"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1582
+#: addons/web/static/src/xml/base.xml:1640
 msgid "Save fields list"
 msgstr "Salvar lista de campos"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1596
+#: addons/web/static/src/xml/base.xml:1654
 msgid "Remove All"
 msgstr "Remover Tudo"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1607
+#: addons/web/static/src/xml/base.xml:1666
 msgid "Name"
 msgstr "Nome"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1639
+#: addons/web/static/src/xml/base.xml:1699
 msgid "Save as:"
 msgstr "Salvar como:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1645
+#: addons/web/static/src/xml/base.xml:1706
 msgid "Saved exports:"
 msgstr "Exportações salvas"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1663
+#: addons/web/static/src/xml/base.xml:1748
 msgid "1. Import a .CSV file"
 msgstr "Importar um arquivo CSV."
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1664
+#: addons/web/static/src/xml/base.xml:1749
 msgid ""
 "Select a .CSV file to import. If you need a sample of file to import,\n"
 "       you should use the export tool with the \"Import Compatible\" option."
@@ -1487,57 +1503,57 @@ msgstr ""
 "Compatível\"."
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1668
+#: addons/web/static/src/xml/base.xml:1753
 msgid "CSV File:"
 msgstr "Arquivo CSV:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1671
+#: addons/web/static/src/xml/base.xml:1756
 msgid "2. Check your file format"
 msgstr "Verifique seu formato de arquivo"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1674
+#: addons/web/static/src/xml/base.xml:1759
 msgid "Import Options"
 msgstr "Opções de importação"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1678
+#: addons/web/static/src/xml/base.xml:1763
 msgid "Does your file have titles?"
 msgstr "O seu arquivo tem títulos?"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1684
+#: addons/web/static/src/xml/base.xml:1769
 msgid "Separator:"
 msgstr "Separador:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1686
+#: addons/web/static/src/xml/base.xml:1771
 msgid "Delimiter:"
 msgstr "Delimitador:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1690
+#: addons/web/static/src/xml/base.xml:1775
 msgid "Encoding:"
 msgstr "Codificação:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1693
+#: addons/web/static/src/xml/base.xml:1778
 msgid "UTF-8"
 msgstr "UTF-8"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1694
+#: addons/web/static/src/xml/base.xml:1779
 msgid "Latin 1"
 msgstr "Latin 1"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1697
+#: addons/web/static/src/xml/base.xml:1782
 msgid "Lines to skip"
 msgstr "Linhas para ignorar"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1697
+#: addons/web/static/src/xml/base.xml:1782
 msgid ""
 "For use if CSV files have titles on multiple lines, skips more than a single "
 "line during import"
@@ -1548,15 +1564,15 @@ msgstr ""
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:1713
 msgid "--- Don't Import ---"
-msgstr ""
+msgstr "--- Não Importar ---"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1724
+#: addons/web/static/src/xml/base.xml:1809
 msgid "The import failed due to:"
 msgstr "A importação falhou devido a:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1726
+#: addons/web/static/src/xml/base.xml:1811
 msgid "Here is a preview of the file we could not import:"
 msgstr "Aqui está uma visualização do arquivo que não pode ser importado:"
 

From 83f15b73630a202d250db8d19283bb9bf6435e0b Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Mon, 30 Jul 2012 09:52:10 +0200
Subject: [PATCH 3/6] small_layout_change_in_wall

bzr revid: fp@openerp.com-20120730075210-mdzu549s018i72rz
---
 addons/mail/static/src/js/mail.js   |  8 ++++----
 addons/mail/static/src/xml/mail.xml | 21 +++++++++++----------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index f488225d8b6..0f50cbb1549 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -521,7 +521,7 @@ openerp.mail = function(session) {
             this.params.parent_id = this.params.parent_id || false;
             this.params.thread_level = this.params.thread_level || 0;
             this.params.is_wall = this.params.is_wall || (this.params.records != undefined) || false;
-            this.params.msg_more_limit = this.params.msg_more_limit || 150;
+            this.params.msg_more_limit = this.params.msg_more_limit || 250;
             this.params.limit = this.params.limit || 100;
             // this.params.limit = 3; // tmp for testing
             this.params.offset = this.params.offset || 0;
@@ -758,11 +758,11 @@ openerp.mail = function(session) {
             // expand feature
             this.$element.find('div.oe_mail_msg_body:last').expander({
                 slicePoint: this.params.msg_more_limit,
-                expandText: 'see more',
-                userCollapseText: 'see less',
+                expandText: 'read more',
+                userCollapseText: '[^]',
                 detailClass: 'oe_mail_msg_tail',
                 moreClass: 'oe_mail_expand',
-                lesClass: 'oe_mail_reduce',
+                lessClass: 'oe_mail_reduce',
                 });
         },
 
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index bf8d7fd1475..86d115f29c8 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -33,7 +33,7 @@
                 <!-- contains threads -->
             </ul>
             <div class="oe_mail_wall_more">
-                <button class="oe_mail_wall_button_more" type="button">See more discussions</button>
+                <button class="oe_mail_wall_button_more" type="button">See more...</button>
             </div>
         </div>
         <div class="oe_mail_wall_aside">
@@ -129,7 +129,7 @@
                         <t t-if="display['show_delete']">
                                 <li t-if="record.is_author"><a href="#" class="oe_mail_msg_delete" t-attf-data-id='{record.id}'>Delete</a></li>
                         </t>
-                        <li t-if="display['show_hide']"><a href="#" class="oe_mail_msg_hide" t-attf-data-id='{record.id}'>Remove from Wall</a></li>
+                        <li t-if="display['show_hide']"><a href="#" class="oe_mail_msg_hide" t-attf-data-id='{record.id}'>Hide</a></li>
 <!--                    Uncomment when adding subtype hiding
                         <li t-if="display['show_hide']">
                             <a href="#" class="oe_mail_msg_hide_type" t-attf-data-subtype='{record.subtype}'>Hide '<t t-esc="record.subtype"/>' for this document</a>
@@ -143,16 +143,17 @@
                     <h1 t-if="record.subject" class="oe_mail_msg_title">
                         <t t-raw="record.subject"/>
                     </h1>
-                    <div t-if="params.thread_level > 0" class="oe_mail_msg_subtitle">
-                        <a t-attf-href="#model=#{params.res_model}&amp;id=#{params.res_id}"><t t-raw="record.record_name"/></a>
-                    </div>
-                    <div class="oe_clear"/>
                     <div class="oe_mail_msg_body">
-                        <a t-attf-href="#model=res.users&amp;id=#{record.user_id[0]}"><t t-raw="record.user_id[1]"/></a>
-                        <div class="oe_mail_msg_record_body"><t t-raw="record.body"/></div>
+                        
+                        <div class="oe_mail_msg_record_body">
+                            <a t-attf-href="#model=#{params.res_model}&amp;id=#{params.res_id}" t-if="(params.thread_level > 0) &amp; (!record.subject)"><t t-raw="record.record_name"/></a>
+                            <t t-raw="record.body"/>
+                        </div>
                     </div>
                     <div class="oe_clear"/>
                     <ul class="oe_mail_msg_footer">
+                      <li t-if="record.subject &amp; params.thread_level > 0"><a t-attf-href="#model=#{params.res_model}&amp;id=#{params.res_id}"><t t-raw="record.record_name"/></a></li>
+                      <li><a t-attf-href="#model=res.users&amp;id=#{record.user_id[0]}"><t t-raw="record.user_id[1]"/></a></li>
                       <li><span t-att-title="record.date"><t t-raw="record.timerelative"/></span></li>
                       <li t-if="display['show_reply']"><a href="#" class="oe_mail_msg_reply">Reply</a></li>
                       <!-- uncomment when merging vote
@@ -160,8 +161,8 @@
                       -->
                       <li t-if="record.attachment_ids.length > 0">
                           <a href="#" class="oe_mail_msg_view_attachments">
-                              <t t-if="record.attachment_ids.length == 1">Attachment</t>
-                              <t t-if="record.attachment_ids.length > 1">Attachments (<t t-raw="record.attachment_ids.length"/>)</t>
+                              <t t-if="record.attachment_ids.length == 1">1 Attachment</t>
+                              <t t-if="record.attachment_ids.length > 1"><t t-raw="record.attachment_ids.length"/> Attachments</t>
                           </a>
                       </li>
                     </ul>

From 55214947e36b45d8735646522e04736be1966d08 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 30 Jul 2012 11:21:27 +0200
Subject: [PATCH 4/6] [REF] l10n_ca: replaced tabs with 4 spaces

bzr revid: qdp-launchpad@openerp.com-20120730092127-a21xgdqiwbwr4210
---
 addons/l10n_ca/account_chart_en.xml    | 1052 ++++++++++-----------
 addons/l10n_ca/account_chart_fr.xml    | 1154 ++++++++++++------------
 addons/l10n_ca/account_tax_code_en.xml |  152 ++--
 addons/l10n_ca/account_tax_code_fr.xml |  152 ++--
 addons/l10n_ca/fiscal_templates_en.xml | 1042 ++++++++++-----------
 addons/l10n_ca/fiscal_templates_fr.xml | 1042 ++++++++++-----------
 6 files changed, 2297 insertions(+), 2297 deletions(-)

diff --git a/addons/l10n_ca/account_chart_en.xml b/addons/l10n_ca/account_chart_en.xml
index 14cbc993b2b..0d67e081d08 100644
--- a/addons/l10n_ca/account_chart_en.xml
+++ b/addons/l10n_ca/account_chart_en.xml
@@ -11,389 +11,389 @@
             <field name="user_type" ref="account.data_account_type_view"/>
         </record>
 
-	<!-- ASSET -->
+    <!-- ASSET -->
 
-	<record id="chart1_en" model="account.account.template">
-		<field name="code">1</field>
-		<field name="parent_id" ref="chart0_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">ASSETS</field>
-	</record>
-	
-	<record id="chart11_en" model="account.account.template">
-		<field name="code">11</field>
-		<field name="parent_id" ref="chart1_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">CURRENT ASSETS</field>
-	</record>
-	
-	<record id="chart111_en" model="account.account.template">
-		<field name="code">111</field>
-		<field name="parent_id" ref="chart11_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">CASH</field>
-	</record>
+    <record id="chart1_en" model="account.account.template">
+        <field name="code">1</field>
+        <field name="parent_id" ref="chart0_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">ASSETS</field>
+    </record>
+    
+    <record id="chart11_en" model="account.account.template">
+        <field name="code">11</field>
+        <field name="parent_id" ref="chart1_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">CURRENT ASSETS</field>
+    </record>
+    
+    <record id="chart111_en" model="account.account.template">
+        <field name="code">111</field>
+        <field name="parent_id" ref="chart11_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">CASH</field>
+    </record>
 
-	<record id="chart1111_en" model="account.account.template">
-		<field name="code">1111</field>
-		<field name="parent_id" ref="chart111_en"/>
-		<field name="type">liquidity</field>
-		<field name="user_type" ref="account.data_account_type_bank"/>
-		<field name="name">Checking Account</field>
-	</record>
+    <record id="chart1111_en" model="account.account.template">
+        <field name="code">1111</field>
+        <field name="parent_id" ref="chart111_en"/>
+        <field name="type">liquidity</field>
+        <field name="user_type" ref="account.data_account_type_bank"/>
+        <field name="name">Checking Account</field>
+    </record>
 
-	<record id="chart112_en" model="account.account.template">
-		<field name="code">112</field>
-		<field name="parent_id" ref="chart11_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">TREASURY OR TREASURY EQUIVALENTS</field>
-	</record>
+    <record id="chart112_en" model="account.account.template">
+        <field name="code">112</field>
+        <field name="parent_id" ref="chart11_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">TREASURY OR TREASURY EQUIVALENTS</field>
+    </record>
 
-	<record id="chart113_en" model="account.account.template">
-		<field name="code">113</field>
-		<field name="parent_id" ref="chart11_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">CERTIFICATES OF DEPOSITS</field>
-	</record>
+    <record id="chart113_en" model="account.account.template">
+        <field name="code">113</field>
+        <field name="parent_id" ref="chart11_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">CERTIFICATES OF DEPOSITS</field>
+    </record>
 
-	<record id="chart114_en" model="account.account.template">
-		<field name="code">114</field>
-		<field name="parent_id" ref="chart11_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">STOCKS</field>
-	</record>
+    <record id="chart114_en" model="account.account.template">
+        <field name="code">114</field>
+        <field name="parent_id" ref="chart11_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">STOCKS</field>
+    </record>
 
-	<record id="chart115_en" model="account.account.template">
-		<field name="code">115</field>
-		<field name="parent_id" ref="chart11_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">ACCOUNTS RECEIVABLES</field>
-	</record>
+    <record id="chart115_en" model="account.account.template">
+        <field name="code">115</field>
+        <field name="parent_id" ref="chart11_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">ACCOUNTS RECEIVABLES</field>
+    </record>
 
-	<record id="chart1151_en" model="account.account.template">
-		<field name="code">1151</field>
-		<field name="parent_id" ref="chart115_en"/>
-		<field name="type">receivable</field>
-		<field name="user_type" ref="account.data_account_type_receivable"/>
-		<field name="reconcile" eval="True"/>
-		<field name="name">Customers Account</field>
-	</record>
+    <record id="chart1151_en" model="account.account.template">
+        <field name="code">1151</field>
+        <field name="parent_id" ref="chart115_en"/>
+        <field name="type">receivable</field>
+        <field name="user_type" ref="account.data_account_type_receivable"/>
+        <field name="reconcile" eval="True"/>
+        <field name="name">Customers Account</field>
+    </record>
 
-	<record id="chart1152_en" model="account.account.template">
-		<field name="code">1152</field>
-		<field name="parent_id" ref="chart115_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">ALLOWANCE FOR DOUBTFUL ACCOUNTS</field>
-	</record>
+    <record id="chart1152_en" model="account.account.template">
+        <field name="code">1152</field>
+        <field name="parent_id" ref="chart115_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">ALLOWANCE FOR DOUBTFUL ACCOUNTS</field>
+    </record>
 
-	<record id="chart116_en" model="account.account.template">
-		<field name="code">116</field>
-		<field name="parent_id" ref="chart11_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">PREPAID EXPENSES</field>
-	</record>
+    <record id="chart116_en" model="account.account.template">
+        <field name="code">116</field>
+        <field name="parent_id" ref="chart11_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">PREPAID EXPENSES</field>
+    </record>
 
-	<record id="chart117_en" model="account.account.template">
-		<field name="code">117</field>
-		<field name="parent_id" ref="chart11_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">INVESTMENTS HELD FOR TRADING</field>
-	</record>
+    <record id="chart117_en" model="account.account.template">
+        <field name="code">117</field>
+        <field name="parent_id" ref="chart11_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">INVESTMENTS HELD FOR TRADING</field>
+    </record>
 
-	<record id="chart118_en" model="account.account.template">
-		<field name="code">118</field>
-		<field name="parent_id" ref="chart11_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">TAXES RECEIVABLES</field>
-	</record>
+    <record id="chart118_en" model="account.account.template">
+        <field name="code">118</field>
+        <field name="parent_id" ref="chart11_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">TAXES RECEIVABLES</field>
+    </record>
 
-	<record id="chart1181_en" model="account.account.template">
-		<field name="code">1181</field>
-		<field name="parent_id" ref="chart118_en"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_receivable"/>
-		<field name="reconcile" eval="True"/>
-		<field name="name">GST receivable</field>
-	</record>
+    <record id="chart1181_en" model="account.account.template">
+        <field name="code">1181</field>
+        <field name="parent_id" ref="chart118_en"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_receivable"/>
+        <field name="reconcile" eval="True"/>
+        <field name="name">GST receivable</field>
+    </record>
 
-	<record id="chart1182_en" model="account.account.template">
-		<field name="code">1182</field>
-		<field name="parent_id" ref="chart118_en"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_receivable"/>
-		<field name="reconcile" eval="True"/>
-		<field name="name">PST/QST receivable</field>
-	</record>
+    <record id="chart1182_en" model="account.account.template">
+        <field name="code">1182</field>
+        <field name="parent_id" ref="chart118_en"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_receivable"/>
+        <field name="reconcile" eval="True"/>
+        <field name="name">PST/QST receivable</field>
+    </record>
 
-	<record id="chart1183_en" model="account.account.template">
-		<field name="code">1183</field>
-		<field name="parent_id" ref="chart118_en"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_receivable"/>
-		<field name="reconcile" eval="True"/>
-		<field name="name">HST receivable</field>
-	</record>
+    <record id="chart1183_en" model="account.account.template">
+        <field name="code">1183</field>
+        <field name="parent_id" ref="chart118_en"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_receivable"/>
+        <field name="reconcile" eval="True"/>
+        <field name="name">HST receivable</field>
+    </record>
 
-	<record id="chart15_en" model="account.account.template">
-		<field name="code">15</field>
-		<field name="parent_id" ref="chart1_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">NON-CURRENT ASSETS</field>
-	</record>
+    <record id="chart15_en" model="account.account.template">
+        <field name="code">15</field>
+        <field name="parent_id" ref="chart1_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">NON-CURRENT ASSETS</field>
+    </record>
 
-	<record id="chart151_en" model="account.account.template">
-		<field name="code">151</field>
-		<field name="parent_id" ref="chart15_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">INVESTMENTS AVAILABLE FOR SALE</field>
-	</record>
+    <record id="chart151_en" model="account.account.template">
+        <field name="code">151</field>
+        <field name="parent_id" ref="chart15_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">INVESTMENTS AVAILABLE FOR SALE</field>
+    </record>
 
-	<record id="chart152_en" model="account.account.template">
-		<field name="code">152</field>
-		<field name="parent_id" ref="chart15_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">TANGIBLE ASSETS</field>
-	</record>
+    <record id="chart152_en" model="account.account.template">
+        <field name="code">152</field>
+        <field name="parent_id" ref="chart15_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">TANGIBLE ASSETS</field>
+    </record>
 
-	<record id="chart1527_en" model="account.account.template">
-		<field name="code">1527</field>
-		<field name="parent_id" ref="chart152_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">ACCUMULATED DEPRECIATIONS</field>
-	</record>
+    <record id="chart1527_en" model="account.account.template">
+        <field name="code">1527</field>
+        <field name="parent_id" ref="chart152_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">ACCUMULATED DEPRECIATIONS</field>
+    </record>
 
-	<record id="chart153_en" model="account.account.template">
-		<field name="code">153</field>
-		<field name="parent_id" ref="chart15_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">INTANGIBLE ASSETS</field>
-	</record>
+    <record id="chart153_en" model="account.account.template">
+        <field name="code">153</field>
+        <field name="parent_id" ref="chart15_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">INTANGIBLE ASSETS</field>
+    </record>
 
-	<record id="chart1531_en" model="account.account.template">
-		<field name="code">1531</field>
-		<field name="parent_id" ref="chart153_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">PATENTS, TRADEMARKS AND COPYRIGHTS</field>
-	</record>
+    <record id="chart1531_en" model="account.account.template">
+        <field name="code">1531</field>
+        <field name="parent_id" ref="chart153_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">PATENTS, TRADEMARKS AND COPYRIGHTS</field>
+    </record>
 
-	<!-- LIABILITIES -->
+    <!-- LIABILITIES -->
 
-	<record id="chart2_en" model="account.account.template">
-		<field name="code">2</field>
-		<field name="parent_id" ref="chart0_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">LIABILITIES</field>
-	</record>
+    <record id="chart2_en" model="account.account.template">
+        <field name="code">2</field>
+        <field name="parent_id" ref="chart0_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">LIABILITIES</field>
+    </record>
 
-	<record id="chart21_en" model="account.account.template">
-		<field name="code">21</field>
-		<field name="parent_id" ref="chart2_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">CURRENT LIABILITIES</field>
-	</record>
+    <record id="chart21_en" model="account.account.template">
+        <field name="code">21</field>
+        <field name="parent_id" ref="chart2_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">CURRENT LIABILITIES</field>
+    </record>
 
-	<record id="chart211_en" model="account.account.template">
-		<field name="code">211</field>
-		<field name="parent_id" ref="chart21_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">ACCOUNTS PAYABLES</field>
-	</record>
+    <record id="chart211_en" model="account.account.template">
+        <field name="code">211</field>
+        <field name="parent_id" ref="chart21_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">ACCOUNTS PAYABLES</field>
+    </record>
 
-	<record id="chart2111_en" model="account.account.template">
-		<field name="code">2111</field>
-		<field name="parent_id" ref="chart211_en"/>
-		<field name="type">payable</field>
-		<field name="user_type" ref="account.data_account_type_payable"/>
-		<field name="reconcile" eval="True"/>
-		<field name="name">Suppliers Account</field>
-	</record>
+    <record id="chart2111_en" model="account.account.template">
+        <field name="code">2111</field>
+        <field name="parent_id" ref="chart211_en"/>
+        <field name="type">payable</field>
+        <field name="user_type" ref="account.data_account_type_payable"/>
+        <field name="reconcile" eval="True"/>
+        <field name="name">Suppliers Account</field>
+    </record>
 
-	<record id="chart212_en" model="account.account.template">
-		<field name="code">212</field>
-		<field name="parent_id" ref="chart21_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">TAXES PAYABLES</field>
-	</record>
+    <record id="chart212_en" model="account.account.template">
+        <field name="code">212</field>
+        <field name="parent_id" ref="chart21_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">TAXES PAYABLES</field>
+    </record>
 
-	<record id="chart2121_en" model="account.account.template">
-		<field name="code">2121</field>
-		<field name="parent_id" ref="chart212_en"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_payable"/>
-		<field name="reconcile" eval="True"/>
-		<field name="name">GST to pay</field>
-	</record>
+    <record id="chart2121_en" model="account.account.template">
+        <field name="code">2121</field>
+        <field name="parent_id" ref="chart212_en"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_payable"/>
+        <field name="reconcile" eval="True"/>
+        <field name="name">GST to pay</field>
+    </record>
 
-	<record id="chart2122_en" model="account.account.template">
-		<field name="code">2122</field>
-		<field name="parent_id" ref="chart212_en"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_payable"/>
-		<field name="reconcile" eval="True"/>
-		<field name="name">PST/QST to pay</field>
-	</record>
+    <record id="chart2122_en" model="account.account.template">
+        <field name="code">2122</field>
+        <field name="parent_id" ref="chart212_en"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_payable"/>
+        <field name="reconcile" eval="True"/>
+        <field name="name">PST/QST to pay</field>
+    </record>
 
-	<record id="chart2123_en" model="account.account.template">
-		<field name="code">2123</field>
-		<field name="parent_id" ref="chart212_en"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_payable"/>
-		<field name="reconcile" eval="True"/>
-		<field name="name">HST to pay</field>
-	</record>
+    <record id="chart2123_en" model="account.account.template">
+        <field name="code">2123</field>
+        <field name="parent_id" ref="chart212_en"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_payable"/>
+        <field name="reconcile" eval="True"/>
+        <field name="name">HST to pay</field>
+    </record>
 
-	<record id="chart213_en" model="account.account.template">
-		<field name="code">213</field>
-		<field name="parent_id" ref="chart21_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">CURRENT FINANCIAL DEBTS</field>
-	</record>
+    <record id="chart213_en" model="account.account.template">
+        <field name="code">213</field>
+        <field name="parent_id" ref="chart21_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">CURRENT FINANCIAL DEBTS</field>
+    </record>
 
-	<record id="chart25_en" model="account.account.template">
-		<field name="code">25</field>
-		<field name="parent_id" ref="chart2_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">NON-CURRENT LIABILITIES</field>
-	</record>
+    <record id="chart25_en" model="account.account.template">
+        <field name="code">25</field>
+        <field name="parent_id" ref="chart2_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">NON-CURRENT LIABILITIES</field>
+    </record>
 
-	<record id="chart251_en" model="account.account.template">
-		<field name="code">251</field>
-		<field name="parent_id" ref="chart25_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">NON-CURRENT FINANCIAL DEBTS</field>
-	</record>
+    <record id="chart251_en" model="account.account.template">
+        <field name="code">251</field>
+        <field name="parent_id" ref="chart25_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">NON-CURRENT FINANCIAL DEBTS</field>
+    </record>
 
-	<record id="chart252_en" model="account.account.template">
-		<field name="code">252</field>
-		<field name="parent_id" ref="chart25_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">PROVISIONS FOR PENSIONS AND OTHER POST-EMPLOYMENT ADVANTAGES</field>
-	</record>
+    <record id="chart252_en" model="account.account.template">
+        <field name="code">252</field>
+        <field name="parent_id" ref="chart25_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">PROVISIONS FOR PENSIONS AND OTHER POST-EMPLOYMENT ADVANTAGES</field>
+    </record>
 
-	<record id="chart253_en" model="account.account.template">
-		<field name="code">253</field>
-		<field name="parent_id" ref="chart25_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">DEFERRED TAXES</field>
-	</record>
+    <record id="chart253_en" model="account.account.template">
+        <field name="code">253</field>
+        <field name="parent_id" ref="chart25_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">DEFERRED TAXES</field>
+    </record>
 
-	<record id="chart259_en" model="account.account.template">
-		<field name="code">259</field>
-		<field name="parent_id" ref="chart25_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">OTHER NON-CURRENT LIABILITIES</field>
-	</record>
+    <record id="chart259_en" model="account.account.template">
+        <field name="code">259</field>
+        <field name="parent_id" ref="chart25_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">OTHER NON-CURRENT LIABILITIES</field>
+    </record>
 
-	<!-- EQUITY -->
+    <!-- EQUITY -->
 
-	<record id="chart3_en" model="account.account.template">
-		<field name="code">3</field>
-		<field name="parent_id" ref="chart0_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">EQUITY</field>
-	</record>
+    <record id="chart3_en" model="account.account.template">
+        <field name="code">3</field>
+        <field name="parent_id" ref="chart0_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">EQUITY</field>
+    </record>
 
-	<record id="chart31_en" model="account.account.template">
-		<field name="code">31</field>
-		<field name="parent_id" ref="chart3_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">SHARE CAPITAL</field>
-	</record>
+    <record id="chart31_en" model="account.account.template">
+        <field name="code">31</field>
+        <field name="parent_id" ref="chart3_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">SHARE CAPITAL</field>
+    </record>
 
-	<record id="chart32_en" model="account.account.template">
-		<field name="code">32</field>
-		<field name="parent_id" ref="chart3_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">PREMIUMS</field>
-	</record>
+    <record id="chart32_en" model="account.account.template">
+        <field name="code">32</field>
+        <field name="parent_id" ref="chart3_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">PREMIUMS</field>
+    </record>
 
-	<record id="chart33_en" model="account.account.template">
-		<field name="code">33</field>
-		<field name="parent_id" ref="chart3_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">RETAINED EARNINGS</field>
-	</record>
+    <record id="chart33_en" model="account.account.template">
+        <field name="code">33</field>
+        <field name="parent_id" ref="chart3_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">RETAINED EARNINGS</field>
+    </record>
 
-	<record id="chart34_en" model="account.account.template">
-		<field name="code">34</field>
-		<field name="parent_id" ref="chart3_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">DIVIDENDS</field>
-	</record>
+    <record id="chart34_en" model="account.account.template">
+        <field name="code">34</field>
+        <field name="parent_id" ref="chart3_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">DIVIDENDS</field>
+    </record>
 
-	<record id="chart35_en" model="account.account.template">
-		<field name="code">35</field>
-		<field name="parent_id" ref="chart3_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">TRANSLATION ADJUSTMENTS</field>
-	</record>
+    <record id="chart35_en" model="account.account.template">
+        <field name="code">35</field>
+        <field name="parent_id" ref="chart3_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">TRANSLATION ADJUSTMENTS</field>
+    </record>
 
-	<record id="chart36_en" model="account.account.template">
-		<field name="code">36</field>
-		<field name="parent_id" ref="chart3_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">CONTRIBUTED SURPLUS</field>
-	</record>
+    <record id="chart36_en" model="account.account.template">
+        <field name="code">36</field>
+        <field name="parent_id" ref="chart3_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">CONTRIBUTED SURPLUS</field>
+    </record>
 
-	<!-- INCOME -->
+    <!-- INCOME -->
 
-	<record id="chart4_en" model="account.account.template">
-		<field name="code">4</field>
-		<field name="parent_id" ref="chart0_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">INCOMES</field>
-	</record>
+    <record id="chart4_en" model="account.account.template">
+        <field name="code">4</field>
+        <field name="parent_id" ref="chart0_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">INCOMES</field>
+    </record>
 
-	<record id="chart41_en" model="account.account.template">
-		<field name="code">41</field>
-		<field name="parent_id" ref="chart4_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">OPERATING INCOMES</field>
-	</record>
+    <record id="chart41_en" model="account.account.template">
+        <field name="code">41</field>
+        <field name="parent_id" ref="chart4_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">OPERATING INCOMES</field>
+    </record>
 
-	<record id="chart411_en" model="account.account.template">
-		<field name="code">411</field>
-		<field name="parent_id" ref="chart41_en"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_income"/>
-		<field name="name">Inside Sales</field>
-	</record>
+    <record id="chart411_en" model="account.account.template">
+        <field name="code">411</field>
+        <field name="parent_id" ref="chart41_en"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_income"/>
+        <field name="name">Inside Sales</field>
+    </record>
 
         <record id="chart412_en" model="account.account.template">
                 <field name="code">412</field>
@@ -419,223 +419,223 @@
                 <field name="name">International Sales</field>
         </record>
 
-	<record id="chart419_en" model="account.account.template">
-		<field name="code">419</field>
-		<field name="parent_id" ref="chart41_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">OTHER OPERATING INCOMES</field>
-	</record>
+    <record id="chart419_en" model="account.account.template">
+        <field name="code">419</field>
+        <field name="parent_id" ref="chart41_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">OTHER OPERATING INCOMES</field>
+    </record>
 
-	<record id="chart42_en" model="account.account.template">
-		<field name="code">42</field>
-		<field name="parent_id" ref="chart4_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">NON-OPERATING INCOMES</field>
-	</record>
+    <record id="chart42_en" model="account.account.template">
+        <field name="code">42</field>
+        <field name="parent_id" ref="chart4_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">NON-OPERATING INCOMES</field>
+    </record>
 
-	<record id="chart421_en" model="account.account.template">
-		<field name="code">421</field>
-		<field name="parent_id" ref="chart42_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">INTERESTS</field>
-	</record>
+    <record id="chart421_en" model="account.account.template">
+        <field name="code">421</field>
+        <field name="parent_id" ref="chart42_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">INTERESTS</field>
+    </record>
 
-	<record id="chart429_en" model="account.account.template">
-		<field name="code">429</field>
-		<field name="parent_id" ref="chart42_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">OTHER NON-OPERATING INCOMES</field>
-	</record>
+    <record id="chart429_en" model="account.account.template">
+        <field name="code">429</field>
+        <field name="parent_id" ref="chart42_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">OTHER NON-OPERATING INCOMES</field>
+    </record>
 
-	<!-- EXPENSES -->
+    <!-- EXPENSES -->
 
-	<record id="chart5_en" model="account.account.template">
-		<field name="code">5</field>
-		<field name="parent_id" ref="chart0_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">EXPENSES</field>
-	</record>
+    <record id="chart5_en" model="account.account.template">
+        <field name="code">5</field>
+        <field name="parent_id" ref="chart0_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">EXPENSES</field>
+    </record>
 
-	<record id="chart51_en" model="account.account.template">
-		<field name="code">51</field>
-		<field name="parent_id" ref="chart5_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">OPERATING EXPENSES</field>
-	</record>
+    <record id="chart51_en" model="account.account.template">
+        <field name="code">51</field>
+        <field name="parent_id" ref="chart5_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">OPERATING EXPENSES</field>
+    </record>
 
-	<record id="chart511_en" model="account.account.template">
-		<field name="code">511</field>
-		<field name="parent_id" ref="chart51_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">COST OF GOODS SOLD</field>
-	</record>
+    <record id="chart511_en" model="account.account.template">
+        <field name="code">511</field>
+        <field name="parent_id" ref="chart51_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">COST OF GOODS SOLD</field>
+    </record>
 
-	<record id="chart5111_en" model="account.account.template">
-		<field name="code">5111</field>
-		<field name="parent_id" ref="chart511_en"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_expense"/>
-		<field name="name">Inside Purchases</field>
-	</record>
+    <record id="chart5111_en" model="account.account.template">
+        <field name="code">5111</field>
+        <field name="parent_id" ref="chart511_en"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_expense"/>
+        <field name="name">Inside Purchases</field>
+    </record>
 
-	<record id="chart5112_en" model="account.account.template">
-		<field name="code">5112</field>
-		<field name="parent_id" ref="chart511_en"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_expense"/>
-		<field name="name">Purchases in harmonized provinces</field>
-	</record>
+    <record id="chart5112_en" model="account.account.template">
+        <field name="code">5112</field>
+        <field name="parent_id" ref="chart511_en"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_expense"/>
+        <field name="name">Purchases in harmonized provinces</field>
+    </record>
 
-	<record id="chart5113_en" model="account.account.template">
-		<field name="code">5113</field>
-		<field name="parent_id" ref="chart511_en"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_expense"/>
-		<field name="name">Purchases in non-harmonized provinces</field>
-	</record>
+    <record id="chart5113_en" model="account.account.template">
+        <field name="code">5113</field>
+        <field name="parent_id" ref="chart511_en"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_expense"/>
+        <field name="name">Purchases in non-harmonized provinces</field>
+    </record>
 
-	<record id="chart5114_en" model="account.account.template">
-		<field name="code">5114</field>
-		<field name="parent_id" ref="chart511_en"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_expense"/>
-		<field name="name">International Purchases</field>
-	</record>
+    <record id="chart5114_en" model="account.account.template">
+        <field name="code">5114</field>
+        <field name="parent_id" ref="chart511_en"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_expense"/>
+        <field name="name">International Purchases</field>
+    </record>
 
-	<record id="chart512_en" model="account.account.template">
-		<field name="code">512</field>
-		<field name="parent_id" ref="chart51_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">LABOUR EXPENSES</field>
-	</record>
+    <record id="chart512_en" model="account.account.template">
+        <field name="code">512</field>
+        <field name="parent_id" ref="chart51_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">LABOUR EXPENSES</field>
+    </record>
 
-	<record id="chart5121_en" model="account.account.template">
-		<field name="code">5121</field>
-		<field name="parent_id" ref="chart512_en"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_expense"/>
-		<field name="name">Salaries, wages and commissions</field>
-	</record>
+    <record id="chart5121_en" model="account.account.template">
+        <field name="code">5121</field>
+        <field name="parent_id" ref="chart512_en"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_expense"/>
+        <field name="name">Salaries, wages and commissions</field>
+    </record>
 
-	<record id="chart5122_en" model="account.account.template">
-		<field name="code">5122</field>
-		<field name="parent_id" ref="chart512_en"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_expense"/>
-		<field name="name">Holidays</field>
-	</record>
+    <record id="chart5122_en" model="account.account.template">
+        <field name="code">5122</field>
+        <field name="parent_id" ref="chart512_en"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_expense"/>
+        <field name="name">Holidays</field>
+    </record>
 
-	<record id="chart5123_en" model="account.account.template">
-		<field name="code">5123</field>
-		<field name="parent_id" ref="chart512_en"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_expense"/>
-		<field name="name">Employment Insurance</field>
-	</record>
+    <record id="chart5123_en" model="account.account.template">
+        <field name="code">5123</field>
+        <field name="parent_id" ref="chart512_en"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_expense"/>
+        <field name="name">Employment Insurance</field>
+    </record>
 
-	<record id="chart5124_en" model="account.account.template">
-		<field name="code">5124</field>
-		<field name="parent_id" ref="chart512_en"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_expense"/>
-		<field name="name">Health Services Fund</field>
-	</record>
+    <record id="chart5124_en" model="account.account.template">
+        <field name="code">5124</field>
+        <field name="parent_id" ref="chart512_en"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_expense"/>
+        <field name="name">Health Services Fund</field>
+    </record>
 
-	<record id="chart5125_en" model="account.account.template">
-		<field name="code">5125</field>
-		<field name="parent_id" ref="chart512_en"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_expense"/>
-		<field name="name">Annuities</field>
-	</record>
+    <record id="chart5125_en" model="account.account.template">
+        <field name="code">5125</field>
+        <field name="parent_id" ref="chart512_en"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_expense"/>
+        <field name="name">Annuities</field>
+    </record>
 
-	<record id="chart5126_en" model="account.account.template">
-		<field name="code">5126</field>
-		<field name="parent_id" ref="chart512_en"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_expense"/>
-		<field name="name">Parental Insurance</field>
-	</record>
+    <record id="chart5126_en" model="account.account.template">
+        <field name="code">5126</field>
+        <field name="parent_id" ref="chart512_en"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_expense"/>
+        <field name="name">Parental Insurance</field>
+    </record>
 
-	<record id="chart5127_en" model="account.account.template">
-		<field name="code">5127</field>
-		<field name="parent_id" ref="chart512_en"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_expense"/>
-		<field name="name">Labour Health and Safety</field>
-	</record>
+    <record id="chart5127_en" model="account.account.template">
+        <field name="code">5127</field>
+        <field name="parent_id" ref="chart512_en"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_expense"/>
+        <field name="name">Labour Health and Safety</field>
+    </record>
 
-	<record id="chart5128_en" model="account.account.template">
-		<field name="code">5128</field>
-		<field name="parent_id" ref="chart512_en"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_expense"/>
-		<field name="name">Labour Standards</field>
-	</record>
+    <record id="chart5128_en" model="account.account.template">
+        <field name="code">5128</field>
+        <field name="parent_id" ref="chart512_en"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_expense"/>
+        <field name="name">Labour Standards</field>
+    </record>
 
-	<record id="chart513_en" model="account.account.template">
-		<field name="code">513</field>
-		<field name="parent_id" ref="chart51_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">SALES EXPENSES</field>
-	</record>
+    <record id="chart513_en" model="account.account.template">
+        <field name="code">513</field>
+        <field name="parent_id" ref="chart51_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">SALES EXPENSES</field>
+    </record>
 
-	<record id="chart514_en" model="account.account.template">
-		<field name="code">514</field>
-		<field name="parent_id" ref="chart51_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">GENERAL EXPENSES</field>
-	</record>
+    <record id="chart514_en" model="account.account.template">
+        <field name="code">514</field>
+        <field name="parent_id" ref="chart51_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">GENERAL EXPENSES</field>
+    </record>
 
-	<record id="chart515_en" model="account.account.template">
-		<field name="code">515</field>
-		<field name="parent_id" ref="chart51_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">RESEARCH AND DEVELOPMENT EXPENSES</field>
-	</record>
+    <record id="chart515_en" model="account.account.template">
+        <field name="code">515</field>
+        <field name="parent_id" ref="chart51_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">RESEARCH AND DEVELOPMENT EXPENSES</field>
+    </record>
 
-	<record id="chart519_en" model="account.account.template">
-		<field name="code">519</field>
-		<field name="parent_id" ref="chart51_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">OTHER OPERATING EXPENSES</field>
-	</record>
+    <record id="chart519_en" model="account.account.template">
+        <field name="code">519</field>
+        <field name="parent_id" ref="chart51_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">OTHER OPERATING EXPENSES</field>
+    </record>
 
-	<record id="chart55_en" model="account.account.template">
-		<field name="code">55</field>
-		<field name="parent_id" ref="chart5_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">NON-OPERATING EXPENSES</field>
-	</record>
+    <record id="chart55_en" model="account.account.template">
+        <field name="code">55</field>
+        <field name="parent_id" ref="chart5_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">NON-OPERATING EXPENSES</field>
+    </record>
 
-	<record id="chart551_en" model="account.account.template">
-		<field name="code">551</field>
-		<field name="parent_id" ref="chart55_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">INTEREST EXPENSES</field>
-	</record>
+    <record id="chart551_en" model="account.account.template">
+        <field name="code">551</field>
+        <field name="parent_id" ref="chart55_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">INTEREST EXPENSES</field>
+    </record>
 
-	<record id="chart559_en" model="account.account.template">
-		<field name="code">559</field>
-		<field name="parent_id" ref="chart55_en"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">OTHER NON-OPERATING EXPENSES</field>
-	</record>
+    <record id="chart559_en" model="account.account.template">
+        <field name="code">559</field>
+        <field name="parent_id" ref="chart55_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">OTHER NON-OPERATING EXPENSES</field>
+    </record>
 
     </data>
 </openerp>
diff --git a/addons/l10n_ca/account_chart_fr.xml b/addons/l10n_ca/account_chart_fr.xml
index e50ac7ff4dc..dbf4f9aad7c 100644
--- a/addons/l10n_ca/account_chart_fr.xml
+++ b/addons/l10n_ca/account_chart_fr.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data noupdate="1">
      
-	<!-- Account Templates-->
+    <!-- Account Templates-->
         <record id="chart0_fr" model="account.account.template">
             <field name="code">0</field>
             <field name="type">view</field>
@@ -10,663 +10,663 @@
             <field name="name">Account Chart CA FR</field>
         </record>
 
-	<!-- ACTIF -->
+    <!-- ACTIF -->
 
-	<record id="chart1_fr" model="account.account.template">
-		<field name="code">1</field>
-		<field name="parent_id" ref="chart0_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">ACTIF</field>
-	</record>
-	
-	<record id="chart11_fr" model="account.account.template">
-		<field name="code">11</field>
-		<field name="parent_id" ref="chart1_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">ACTIFS COURANTS</field>
-	</record>
-	
-	<record id="chart111_fr" model="account.account.template">
-		<field name="code">111</field>
-		<field name="parent_id" ref="chart11_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">ENCAISSE</field>
-	</record>
+    <record id="chart1_fr" model="account.account.template">
+        <field name="code">1</field>
+        <field name="parent_id" ref="chart0_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">ACTIF</field>
+    </record>
+    
+    <record id="chart11_fr" model="account.account.template">
+        <field name="code">11</field>
+        <field name="parent_id" ref="chart1_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">ACTIFS COURANTS</field>
+    </record>
+    
+    <record id="chart111_fr" model="account.account.template">
+        <field name="code">111</field>
+        <field name="parent_id" ref="chart11_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">ENCAISSE</field>
+    </record>
 
-	<record id="chart1111_fr" model="account.account.template">
-		<field name="code">1111</field>
-		<field name="parent_id" ref="chart111_fr"/>
-		<field name="type">liquidity</field>
-		<field name="user_type" ref="account.data_account_type_bank"/>
-		<field name="name">Compte chèque</field>
-	</record>
+    <record id="chart1111_fr" model="account.account.template">
+        <field name="code">1111</field>
+        <field name="parent_id" ref="chart111_fr"/>
+        <field name="type">liquidity</field>
+        <field name="user_type" ref="account.data_account_type_bank"/>
+        <field name="name">Compte chèque</field>
+    </record>
 
-	<record id="chart1112_fr" model="account.account.template">
-		<field name="code">1112</field>
-		<field name="parent_id" ref="chart111_fr"/>
-		<field name="type">liquidity</field>
-		<field name="user_type" ref="account.data_account_type_cash"/>
-		<field name="name">Petite caisse</field>
-	</record>
+    <record id="chart1112_fr" model="account.account.template">
+        <field name="code">1112</field>
+        <field name="parent_id" ref="chart111_fr"/>
+        <field name="type">liquidity</field>
+        <field name="user_type" ref="account.data_account_type_cash"/>
+        <field name="name">Petite caisse</field>
+    </record>
 
-	<record id="chart112_fr" model="account.account.template">
-		<field name="code">112</field>
-		<field name="parent_id" ref="chart11_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">TRÉSORERIE OU ÉQUIVALENTS DE TRÉSORERIE</field>
-	</record>
+    <record id="chart112_fr" model="account.account.template">
+        <field name="code">112</field>
+        <field name="parent_id" ref="chart11_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">TRÉSORERIE OU ÉQUIVALENTS DE TRÉSORERIE</field>
+    </record>
 
-	<record id="chart113_fr" model="account.account.template">
-		<field name="code">113</field>
-		<field name="parent_id" ref="chart11_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">CERTIFICATS DE DÉPÔTS</field>
-	</record>
+    <record id="chart113_fr" model="account.account.template">
+        <field name="code">113</field>
+        <field name="parent_id" ref="chart11_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">CERTIFICATS DE DÉPÔTS</field>
+    </record>
 
-	<record id="chart114_fr" model="account.account.template">
-		<field name="code">114</field>
-		<field name="parent_id" ref="chart11_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">STOCKS</field>
-	</record>
+    <record id="chart114_fr" model="account.account.template">
+        <field name="code">114</field>
+        <field name="parent_id" ref="chart11_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">STOCKS</field>
+    </record>
 
-	<record id="chart115_fr" model="account.account.template">
-		<field name="code">115</field>
-		<field name="parent_id" ref="chart11_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">COMPTES CLIENTS</field>
-	</record>
+    <record id="chart115_fr" model="account.account.template">
+        <field name="code">115</field>
+        <field name="parent_id" ref="chart11_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">COMPTES CLIENTS</field>
+    </record>
 
-	<record id="chart1151_fr" model="account.account.template">
-		<field name="code">1151</field>
-		<field name="parent_id" ref="chart115_fr"/>
-		<field name="type">receivable</field>
-		<field name="user_type" ref="account.data_account_type_receivable"/>
-		<field name="reconcile" eval="True"/>
-		<field name="name">Comptes clients</field>
-	</record>
+    <record id="chart1151_fr" model="account.account.template">
+        <field name="code">1151</field>
+        <field name="parent_id" ref="chart115_fr"/>
+        <field name="type">receivable</field>
+        <field name="user_type" ref="account.data_account_type_receivable"/>
+        <field name="reconcile" eval="True"/>
+        <field name="name">Comptes clients</field>
+    </record>
 
-	<record id="chart1152_fr" model="account.account.template">
-		<field name="code">1152</field>
-		<field name="parent_id" ref="chart115_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">PROVISION POUR CRÉANCES DOUTEUSES</field>
-	</record>
+    <record id="chart1152_fr" model="account.account.template">
+        <field name="code">1152</field>
+        <field name="parent_id" ref="chart115_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">PROVISION POUR CRÉANCES DOUTEUSES</field>
+    </record>
 
-	<record id="chart116_fr" model="account.account.template">
-		<field name="code">116</field>
-		<field name="parent_id" ref="chart11_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">FRAIS PAYÉS D'AVANCE</field>
-	</record>
+    <record id="chart116_fr" model="account.account.template">
+        <field name="code">116</field>
+        <field name="parent_id" ref="chart11_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">FRAIS PAYÉS D'AVANCE</field>
+    </record>
 
-	<record id="chart117_fr" model="account.account.template">
-		<field name="code">117</field>
-		<field name="parent_id" ref="chart11_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">PLACEMENTS DÉTENUS À DES FINS DE TRANSACTION</field>
-	</record>
+    <record id="chart117_fr" model="account.account.template">
+        <field name="code">117</field>
+        <field name="parent_id" ref="chart11_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">PLACEMENTS DÉTENUS À DES FINS DE TRANSACTION</field>
+    </record>
 
-	<record id="chart118_fr" model="account.account.template">
-		<field name="code">118</field>
-		<field name="parent_id" ref="chart11_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">IMPÔTS À RECEVOIR</field>
-	</record>
+    <record id="chart118_fr" model="account.account.template">
+        <field name="code">118</field>
+        <field name="parent_id" ref="chart11_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">IMPÔTS À RECEVOIR</field>
+    </record>
 
-	<record id="chart1181_fr" model="account.account.template">
-		<field name="code">1181</field>
-		<field name="parent_id" ref="chart118_fr"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_asset"/>
-		<field name="reconcile" eval="True"/>
-		<field name="name">TPS à recevoir</field>
-	</record>
+    <record id="chart1181_fr" model="account.account.template">
+        <field name="code">1181</field>
+        <field name="parent_id" ref="chart118_fr"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_asset"/>
+        <field name="reconcile" eval="True"/>
+        <field name="name">TPS à recevoir</field>
+    </record>
 
-	<record id="chart1182_fr" model="account.account.template">
-		<field name="code">1182</field>
-		<field name="parent_id" ref="chart118_fr"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_asset"/>
-		<field name="reconcile" eval="True"/>
-		<field name="name">TVP/TVQ à recevoir</field>
-	</record>
+    <record id="chart1182_fr" model="account.account.template">
+        <field name="code">1182</field>
+        <field name="parent_id" ref="chart118_fr"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_asset"/>
+        <field name="reconcile" eval="True"/>
+        <field name="name">TVP/TVQ à recevoir</field>
+    </record>
 
-	<record id="chart1183_fr" model="account.account.template">
-		<field name="code">1183</field>
-		<field name="parent_id" ref="chart118_fr"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_asset"/>
-		<field name="reconcile" eval="True"/>
-		<field name="name">TVH à recevoir</field>
-	</record>
+    <record id="chart1183_fr" model="account.account.template">
+        <field name="code">1183</field>
+        <field name="parent_id" ref="chart118_fr"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_asset"/>
+        <field name="reconcile" eval="True"/>
+        <field name="name">TVH à recevoir</field>
+    </record>
 
-	<record id="chart15_fr" model="account.account.template">
-		<field name="code">15</field>
-		<field name="parent_id" ref="chart1_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">ACTIFS NON-COURANTS</field>
-	</record>
+    <record id="chart15_fr" model="account.account.template">
+        <field name="code">15</field>
+        <field name="parent_id" ref="chart1_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">ACTIFS NON-COURANTS</field>
+    </record>
 
-	<record id="chart151_fr" model="account.account.template">
-		<field name="code">151</field>
-		<field name="parent_id" ref="chart15_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">PLACEMENTS DISPONIBLES À LA VENTE</field>
-	</record>
+    <record id="chart151_fr" model="account.account.template">
+        <field name="code">151</field>
+        <field name="parent_id" ref="chart15_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">PLACEMENTS DISPONIBLES À LA VENTE</field>
+    </record>
 
-	<record id="chart152_fr" model="account.account.template">
-		<field name="code">152</field>
-		<field name="parent_id" ref="chart15_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">IMMOBILISATIONS CORPORELLES</field>
-	</record>
+    <record id="chart152_fr" model="account.account.template">
+        <field name="code">152</field>
+        <field name="parent_id" ref="chart15_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">IMMOBILISATIONS CORPORELLES</field>
+    </record>
 
-	<record id="chart1527_fr" model="account.account.template">
-		<field name="code">1527</field>
-		<field name="parent_id" ref="chart152_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">AMORTISSEMENTS CUMULÉS</field>
-	</record>
+    <record id="chart1527_fr" model="account.account.template">
+        <field name="code">1527</field>
+        <field name="parent_id" ref="chart152_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">AMORTISSEMENTS CUMULÉS</field>
+    </record>
 
-	<record id="chart153_fr" model="account.account.template">
-		<field name="code">153</field>
-		<field name="parent_id" ref="chart15_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">IMMOBILISATIONS INCORPORELLES</field>
-	</record>
+    <record id="chart153_fr" model="account.account.template">
+        <field name="code">153</field>
+        <field name="parent_id" ref="chart15_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">IMMOBILISATIONS INCORPORELLES</field>
+    </record>
 
-	<record id="chart1531_fr" model="account.account.template">
-		<field name="code">1531</field>
-		<field name="parent_id" ref="chart153_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">BREVETS, MARQUES DE COMMERCE ET DROITS D'AUTEURS</field>
-	</record>
+    <record id="chart1531_fr" model="account.account.template">
+        <field name="code">1531</field>
+        <field name="parent_id" ref="chart153_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">BREVETS, MARQUES DE COMMERCE ET DROITS D'AUTEURS</field>
+    </record>
 
-	<!-- PASSIF -->
+    <!-- PASSIF -->
 
-	<record id="chart2_fr" model="account.account.template">
-		<field name="code">2</field>
-		<field name="parent_id" ref="chart0_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">PASSIF</field>
-	</record>
+    <record id="chart2_fr" model="account.account.template">
+        <field name="code">2</field>
+        <field name="parent_id" ref="chart0_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">PASSIF</field>
+    </record>
 
-	<record id="chart21_fr" model="account.account.template">
-		<field name="code">21</field>
-		<field name="parent_id" ref="chart2_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">PASSIFS COURANTS</field>
-	</record>
+    <record id="chart21_fr" model="account.account.template">
+        <field name="code">21</field>
+        <field name="parent_id" ref="chart2_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">PASSIFS COURANTS</field>
+    </record>
 
-	<record id="chart211_fr" model="account.account.template">
-		<field name="code">211</field>
-		<field name="parent_id" ref="chart21_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">FOURNISSEURS ET COMPTES RATTACHÉS</field>
-	</record>
+    <record id="chart211_fr" model="account.account.template">
+        <field name="code">211</field>
+        <field name="parent_id" ref="chart21_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">FOURNISSEURS ET COMPTES RATTACHÉS</field>
+    </record>
 
-	<record id="chart2111_fr" model="account.account.template">
-		<field name="code">2111</field>
-		<field name="parent_id" ref="chart211_fr"/>
-		<field name="type">payable</field>
-		<field name="user_type" ref="account.data_account_type_payable"/>
-		<field name="reconcile" eval="True"/>
-		<field name="name">Comptes fournisseurs</field>
-	</record>
+    <record id="chart2111_fr" model="account.account.template">
+        <field name="code">2111</field>
+        <field name="parent_id" ref="chart211_fr"/>
+        <field name="type">payable</field>
+        <field name="user_type" ref="account.data_account_type_payable"/>
+        <field name="reconcile" eval="True"/>
+        <field name="name">Comptes fournisseurs</field>
+    </record>
 
-	<record id="chart212_fr" model="account.account.template">
-		<field name="code">212</field>
-		<field name="parent_id" ref="chart21_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">AUTRES COMPTES CRÉDITEURS</field>
-	</record>
+    <record id="chart212_fr" model="account.account.template">
+        <field name="code">212</field>
+        <field name="parent_id" ref="chart21_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">AUTRES COMPTES CRÉDITEURS</field>
+    </record>
 
-	<record id="chart213_fr" model="account.account.template">
-		<field name="code">213</field>
-		<field name="parent_id" ref="chart21_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">IMPÔTS À PAYER</field>
-	</record>
+    <record id="chart213_fr" model="account.account.template">
+        <field name="code">213</field>
+        <field name="parent_id" ref="chart21_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">IMPÔTS À PAYER</field>
+    </record>
 
-	<record id="chart2131_fr" model="account.account.template">
-		<field name="code">2131</field>
-		<field name="parent_id" ref="chart213_fr"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_liability"/>
-		<field name="reconcile" eval="True"/>
-		<field name="name">TPS à payer</field>
-	</record>
+    <record id="chart2131_fr" model="account.account.template">
+        <field name="code">2131</field>
+        <field name="parent_id" ref="chart213_fr"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_liability"/>
+        <field name="reconcile" eval="True"/>
+        <field name="name">TPS à payer</field>
+    </record>
 
-	<record id="chart2132_fr" model="account.account.template">
-		<field name="code">2132</field>
-		<field name="parent_id" ref="chart213_fr"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_liability"/>
-		<field name="reconcile" eval="True"/>
-		<field name="name">TVP/TVQ à payer</field>
-	</record>
+    <record id="chart2132_fr" model="account.account.template">
+        <field name="code">2132</field>
+        <field name="parent_id" ref="chart213_fr"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_liability"/>
+        <field name="reconcile" eval="True"/>
+        <field name="name">TVP/TVQ à payer</field>
+    </record>
 
-	<record id="chart2133_fr" model="account.account.template">
-		<field name="code">2133</field>
-		<field name="parent_id" ref="chart213_fr"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_liability"/>
-		<field name="reconcile" eval="True"/>
-		<field name="name">TVH à payer</field>
-	</record>
+    <record id="chart2133_fr" model="account.account.template">
+        <field name="code">2133</field>
+        <field name="parent_id" ref="chart213_fr"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_liability"/>
+        <field name="reconcile" eval="True"/>
+        <field name="name">TVH à payer</field>
+    </record>
 
-	<record id="chart214_fr" model="account.account.template">
-		<field name="code">214</field>
-		<field name="parent_id" ref="chart21_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">DETTES FINANCIÈRES COURANTES</field>
-	</record>
+    <record id="chart214_fr" model="account.account.template">
+        <field name="code">214</field>
+        <field name="parent_id" ref="chart21_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">DETTES FINANCIÈRES COURANTES</field>
+    </record>
 
-	<record id="chart215_fr" model="account.account.template">
-		<field name="code">215</field>
-		<field name="parent_id" ref="chart21_fr"/>
-		<field name="type">view</field>
-		<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>
+    <record id="chart215_fr" model="account.account.template">
+        <field name="code">215</field>
+        <field name="parent_id" ref="chart21_fr"/>
+        <field name="type">view</field>
+        <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>
 
-	<record id="chart25_fr" model="account.account.template">
-		<field name="code">25</field>
-		<field name="parent_id" ref="chart2_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">PASSIFS NON-COURANTS</field>
-	</record>
+    <record id="chart25_fr" model="account.account.template">
+        <field name="code">25</field>
+        <field name="parent_id" ref="chart2_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">PASSIFS NON-COURANTS</field>
+    </record>
 
-	<record id="chart251_fr" model="account.account.template">
-		<field name="code">251</field>
-		<field name="parent_id" ref="chart25_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">DETTES FINANCIÈRES NON-COURANTES</field>
-	</record>
+    <record id="chart251_fr" model="account.account.template">
+        <field name="code">251</field>
+        <field name="parent_id" ref="chart25_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">DETTES FINANCIÈRES NON-COURANTES</field>
+    </record>
 
-	<record id="chart252_fr" model="account.account.template">
-		<field name="code">252</field>
-		<field name="parent_id" ref="chart25_fr"/>
-		<field name="type">view</field>
-		<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>
+    <record id="chart252_fr" model="account.account.template">
+        <field name="code">252</field>
+        <field name="parent_id" ref="chart25_fr"/>
+        <field name="type">view</field>
+        <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>
 
-	<record id="chart253_fr" model="account.account.template">
-		<field name="code">253</field>
-		<field name="parent_id" ref="chart25_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">IMPÔTS DIFFÉRÉS</field>
-	</record>
+    <record id="chart253_fr" model="account.account.template">
+        <field name="code">253</field>
+        <field name="parent_id" ref="chart25_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">IMPÔTS DIFFÉRÉS</field>
+    </record>
 
-	<record id="chart254_fr" model="account.account.template">
-		<field name="code">254</field>
-		<field name="parent_id" ref="chart25_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">AUTRES PASSIFS NON-COURANTS</field>
-	</record>
+    <record id="chart254_fr" model="account.account.template">
+        <field name="code">254</field>
+        <field name="parent_id" ref="chart25_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">AUTRES PASSIFS NON-COURANTS</field>
+    </record>
 
-	<!-- CAPITAUX PROPRES -->
+    <!-- CAPITAUX PROPRES -->
 
-	<record id="chart3_fr" model="account.account.template">
-		<field name="code">3</field>
-		<field name="parent_id" ref="chart0_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">CAPITAUX PROPRES</field>
-	</record>
+    <record id="chart3_fr" model="account.account.template">
+        <field name="code">3</field>
+        <field name="parent_id" ref="chart0_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">CAPITAUX PROPRES</field>
+    </record>
 
-	<record id="chart31_fr" model="account.account.template">
-		<field name="code">31</field>
-		<field name="parent_id" ref="chart3_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">CAPITAL-ACTIONS</field>
-	</record>
+    <record id="chart31_fr" model="account.account.template">
+        <field name="code">31</field>
+        <field name="parent_id" ref="chart3_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">CAPITAL-ACTIONS</field>
+    </record>
 
-	<record id="chart32_fr" model="account.account.template">
-		<field name="code">32</field>
-		<field name="parent_id" ref="chart3_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">PRIMES</field>
-	</record>
+    <record id="chart32_fr" model="account.account.template">
+        <field name="code">32</field>
+        <field name="parent_id" ref="chart3_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">PRIMES</field>
+    </record>
 
-	<record id="chart33_fr" model="account.account.template">
-		<field name="code">33</field>
-		<field name="parent_id" ref="chart3_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">BÉNÉFICES NON RÉPARTIS</field>
-	</record>
+    <record id="chart33_fr" model="account.account.template">
+        <field name="code">33</field>
+        <field name="parent_id" ref="chart3_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">BÉNÉFICES NON RÉPARTIS</field>
+    </record>
 
-	<record id="chart34_fr" model="account.account.template">
-		<field name="code">34</field>
-		<field name="parent_id" ref="chart3_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">DIVIDENDES</field>
-	</record>
+    <record id="chart34_fr" model="account.account.template">
+        <field name="code">34</field>
+        <field name="parent_id" ref="chart3_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">DIVIDENDES</field>
+    </record>
 
-	<record id="chart35_fr" model="account.account.template">
-		<field name="code">35</field>
-		<field name="parent_id" ref="chart3_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">ÉCARTS DE CONVERSION</field>
-	</record>
+    <record id="chart35_fr" model="account.account.template">
+        <field name="code">35</field>
+        <field name="parent_id" ref="chart3_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">ÉCARTS DE CONVERSION</field>
+    </record>
 
-	<record id="chart36_fr" model="account.account.template">
-		<field name="code">36</field>
-		<field name="parent_id" ref="chart3_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">SURPLUS D'APPORT</field>
-	</record>
+    <record id="chart36_fr" model="account.account.template">
+        <field name="code">36</field>
+        <field name="parent_id" ref="chart3_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">SURPLUS D'APPORT</field>
+    </record>
 
-	<record id="chart39_fr" model="account.account.template">
-		<field name="code">39</field>
-		<field name="parent_id" ref="chart3_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">AUTRES ÉLÉMENTS DU RÉSULTAT GLOBAL</field>
-	</record>
+    <record id="chart39_fr" model="account.account.template">
+        <field name="code">39</field>
+        <field name="parent_id" ref="chart3_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">AUTRES ÉLÉMENTS DU RÉSULTAT GLOBAL</field>
+    </record>
 
         <!-- PRODUITS -->
 
-	<record id="chart4_fr" model="account.account.template">
-		<field name="code">4</field>
-		<field name="parent_id" ref="chart0_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">PRODUITS</field>
-	</record>
+    <record id="chart4_fr" model="account.account.template">
+        <field name="code">4</field>
+        <field name="parent_id" ref="chart0_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">PRODUITS</field>
+    </record>
 
-	<record id="chart41_fr" model="account.account.template">
-		<field name="code">41</field>
-		<field name="parent_id" ref="chart4_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">PRODUITS D'EXPLOITATION</field>
-	</record>
+    <record id="chart41_fr" model="account.account.template">
+        <field name="code">41</field>
+        <field name="parent_id" ref="chart4_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">PRODUITS D'EXPLOITATION</field>
+    </record>
 
-	<record id="chart411_fr" model="account.account.template">
-		<field name="code">411</field>
-		<field name="parent_id" ref="chart41_fr"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_income"/>
-		<field name="name">Ventes</field>
-	</record>
+    <record id="chart411_fr" model="account.account.template">
+        <field name="code">411</field>
+        <field name="parent_id" ref="chart41_fr"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_income"/>
+        <field name="name">Ventes</field>
+    </record>
 
-	<record id="chart412_fr" model="account.account.template">
-		<field name="code">412</field>
-		<field name="parent_id" ref="chart41_fr"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_income"/>
-		<field name="name">Ventes avec des provinces harmonisées</field>
-	</record>
-	
-	<record id="chart413_fr" model="account.account.template">
-		<field name="code">413</field>
-		<field name="parent_id" ref="chart41_fr"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_income"/>
-		<field name="name">Ventes avec des provinces non-harmonisées</field>
-	</record>
+    <record id="chart412_fr" model="account.account.template">
+        <field name="code">412</field>
+        <field name="parent_id" ref="chart41_fr"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_income"/>
+        <field name="name">Ventes avec des provinces harmonisées</field>
+    </record>
+    
+    <record id="chart413_fr" model="account.account.template">
+        <field name="code">413</field>
+        <field name="parent_id" ref="chart41_fr"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_income"/>
+        <field name="name">Ventes avec des provinces non-harmonisées</field>
+    </record>
 
-	<record id="chart414_fr" model="account.account.template">
-		<field name="code">414</field>
-		<field name="parent_id" ref="chart41_fr"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_income"/>
-		<field name="name">Ventes à l'étranger</field>
-	</record>
+    <record id="chart414_fr" model="account.account.template">
+        <field name="code">414</field>
+        <field name="parent_id" ref="chart41_fr"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_income"/>
+        <field name="name">Ventes à l'étranger</field>
+    </record>
 
-	<record id="chart419_fr" model="account.account.template">
-		<field name="code">419</field>
-		<field name="parent_id" ref="chart41_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">AUTRES PRODUITS D'EXPLOITATION</field>
-	</record>
+    <record id="chart419_fr" model="account.account.template">
+        <field name="code">419</field>
+        <field name="parent_id" ref="chart41_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">AUTRES PRODUITS D'EXPLOITATION</field>
+    </record>
 
-	<record id="chart42_fr" model="account.account.template">
-		<field name="code">42</field>
-		<field name="parent_id" ref="chart4_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">PRODUITS NON LIÉS À L'EXPLOITATION</field>
-	</record>
+    <record id="chart42_fr" model="account.account.template">
+        <field name="code">42</field>
+        <field name="parent_id" ref="chart4_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">PRODUITS NON LIÉS À L'EXPLOITATION</field>
+    </record>
 
-	<record id="chart425_fr" model="account.account.template">
-		<field name="code">425</field>
-		<field name="parent_id" ref="chart42_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">INTÉRÊTS</field>
-	</record>
+    <record id="chart425_fr" model="account.account.template">
+        <field name="code">425</field>
+        <field name="parent_id" ref="chart42_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">INTÉRÊTS</field>
+    </record>
 
-	<record id="chart429_fr" model="account.account.template">
-		<field name="code">429</field>
-		<field name="parent_id" ref="chart42_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">AUTRES PRODUITS NON LIÉS À L'EXPLOITATION</field>
-	</record>
+    <record id="chart429_fr" model="account.account.template">
+        <field name="code">429</field>
+        <field name="parent_id" ref="chart42_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">AUTRES PRODUITS NON LIÉS À L'EXPLOITATION</field>
+    </record>
 
-	<!-- CHARGES -->
+    <!-- CHARGES -->
 
-	<record id="chart5_fr" model="account.account.template">
-		<field name="code">5</field>
-		<field name="parent_id" ref="chart0_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">CHARGES</field>
-	</record>
+    <record id="chart5_fr" model="account.account.template">
+        <field name="code">5</field>
+        <field name="parent_id" ref="chart0_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">CHARGES</field>
+    </record>
 
-	<record id="chart51_fr" model="account.account.template">
-		<field name="code">51</field>
-		<field name="parent_id" ref="chart5_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">CHARGES D'EXPLOITATION</field>
-	</record>
+    <record id="chart51_fr" model="account.account.template">
+        <field name="code">51</field>
+        <field name="parent_id" ref="chart5_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">CHARGES D'EXPLOITATION</field>
+    </record>
 
-	<record id="chart511_fr" model="account.account.template">
-		<field name="code">511</field>
-		<field name="parent_id" ref="chart51_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">COÛT DES PRODUITS VENDUS</field>
-	</record>
-	
+    <record id="chart511_fr" model="account.account.template">
+        <field name="code">511</field>
+        <field name="parent_id" ref="chart51_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">COÛT DES PRODUITS VENDUS</field>
+    </record>
+    
         <record id="chart5111_fr" model="account.account.template">
-		<field name="code">5111</field>
-		<field name="parent_id" ref="chart511_fr"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_expense"/>
-		<field name="name">Achats</field>
-	</record>
+        <field name="code">5111</field>
+        <field name="parent_id" ref="chart511_fr"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_expense"/>
+        <field name="name">Achats</field>
+    </record>
 
-	<record id="chart5112_fr" model="account.account.template">
-		<field name="code">5112</field>
-		<field name="parent_id" ref="chart511_fr"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_income"/>
-		<field name="name">Achats dans des provinces harmonisées</field>
-	</record>
-	
-	<record id="chart5113_fr" model="account.account.template">
-		<field name="code">5113</field>
-		<field name="parent_id" ref="chart511_fr"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_income"/>
-		<field name="name">Achats dans des provinces non-harmonisées</field>
-	</record>
+    <record id="chart5112_fr" model="account.account.template">
+        <field name="code">5112</field>
+        <field name="parent_id" ref="chart511_fr"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_income"/>
+        <field name="name">Achats dans des provinces harmonisées</field>
+    </record>
+    
+    <record id="chart5113_fr" model="account.account.template">
+        <field name="code">5113</field>
+        <field name="parent_id" ref="chart511_fr"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_income"/>
+        <field name="name">Achats dans des provinces non-harmonisées</field>
+    </record>
 
-	<record id="chart5114_fr" model="account.account.template">
-		<field name="code">5114</field>
-		<field name="parent_id" ref="chart511_fr"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_income"/>
-		<field name="name">Achats à l'étranger</field>
-	</record>
+    <record id="chart5114_fr" model="account.account.template">
+        <field name="code">5114</field>
+        <field name="parent_id" ref="chart511_fr"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_income"/>
+        <field name="name">Achats à l'étranger</field>
+    </record>
 
-	<record id="chart512_fr" model="account.account.template">
-		<field name="code">512</field>
-		<field name="parent_id" ref="chart51_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">SALAIRES ET CHARGES SOCIALES</field>
-	</record>
+    <record id="chart512_fr" model="account.account.template">
+        <field name="code">512</field>
+        <field name="parent_id" ref="chart51_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">SALAIRES ET CHARGES SOCIALES</field>
+    </record>
 
-	<record id="chart51201_fr" model="account.account.template">
-		<field name="code">51201</field>
-		<field name="parent_id" ref="chart512_fr"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_expense"/>
-		<field name="name">Salaires</field>
-	</record>
+    <record id="chart51201_fr" model="account.account.template">
+        <field name="code">51201</field>
+        <field name="parent_id" ref="chart512_fr"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_expense"/>
+        <field name="name">Salaires</field>
+    </record>
 
-	<record id="chart51202_fr" model="account.account.template">
-		<field name="code">51202</field>
-		<field name="parent_id" ref="chart512_fr"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_expense"/>
-		<field name="name">Vacances</field>
-	</record>
+    <record id="chart51202_fr" model="account.account.template">
+        <field name="code">51202</field>
+        <field name="parent_id" ref="chart512_fr"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_expense"/>
+        <field name="name">Vacances</field>
+    </record>
 
-	<record id="chart51203_fr" model="account.account.template">
-		<field name="code">51203</field>
-		<field name="parent_id" ref="chart512_fr"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_expense"/>
-		<field name="name">Assurance Emploi</field>
-	</record>
+    <record id="chart51203_fr" model="account.account.template">
+        <field name="code">51203</field>
+        <field name="parent_id" ref="chart512_fr"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_expense"/>
+        <field name="name">Assurance Emploi</field>
+    </record>
 
-	<record id="chart51204_fr" model="account.account.template">
-		<field name="code">51204</field>
-		<field name="parent_id" ref="chart512_fr"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_expense"/>
-		<field name="name">Fonds des services de santé</field>
-	</record>
+    <record id="chart51204_fr" model="account.account.template">
+        <field name="code">51204</field>
+        <field name="parent_id" ref="chart512_fr"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_expense"/>
+        <field name="name">Fonds des services de santé</field>
+    </record>
 
-	<record id="chart51205_fr" model="account.account.template">
-		<field name="code">51205</field>
-		<field name="parent_id" ref="chart512_fr"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_expense"/>
-		<field name="name">Rentes</field>
-	</record>
+    <record id="chart51205_fr" model="account.account.template">
+        <field name="code">51205</field>
+        <field name="parent_id" ref="chart512_fr"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_expense"/>
+        <field name="name">Rentes</field>
+    </record>
 
-	<record id="chart51206_fr" model="account.account.template">
-		<field name="code">51206</field>
-		<field name="parent_id" ref="chart512_fr"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_expense"/>
-		<field name="name">Assurance parental</field>
-	</record>
+    <record id="chart51206_fr" model="account.account.template">
+        <field name="code">51206</field>
+        <field name="parent_id" ref="chart512_fr"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_expense"/>
+        <field name="name">Assurance parental</field>
+    </record>
 
-	<record id="chart51207_fr" model="account.account.template">
-		<field name="code">51207</field>
-		<field name="parent_id" ref="chart512_fr"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_expense"/>
-		<field name="name">Santé et sécurité au travail</field>
-	</record>
+    <record id="chart51207_fr" model="account.account.template">
+        <field name="code">51207</field>
+        <field name="parent_id" ref="chart512_fr"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_expense"/>
+        <field name="name">Santé et sécurité au travail</field>
+    </record>
 
-	<record id="chart51208_fr" model="account.account.template">
-		<field name="code">51208</field>
-		<field name="parent_id" ref="chart512_fr"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_expense"/>
-		<field name="name">Normes du travail</field>
-	</record>
+    <record id="chart51208_fr" model="account.account.template">
+        <field name="code">51208</field>
+        <field name="parent_id" ref="chart512_fr"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_expense"/>
+        <field name="name">Normes du travail</field>
+    </record>
 
-	<record id="chart513_fr" model="account.account.template">
-		<field name="code">513</field>
-		<field name="parent_id" ref="chart51_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">FRAIS SUR VENTE</field>
-	</record>
+    <record id="chart513_fr" model="account.account.template">
+        <field name="code">513</field>
+        <field name="parent_id" ref="chart51_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">FRAIS SUR VENTE</field>
+    </record>
 
-	<record id="chart514_fr" model="account.account.template">
-		<field name="code">514</field>
-		<field name="parent_id" ref="chart51_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">FRAIS GÉNÉRAUX</field>
-	</record>
+    <record id="chart514_fr" model="account.account.template">
+        <field name="code">514</field>
+        <field name="parent_id" ref="chart51_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">FRAIS GÉNÉRAUX</field>
+    </record>
 
-	<record id="chart515_fr" model="account.account.template">
-		<field name="code">515</field>
-		<field name="parent_id" ref="chart51_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">FRAIS DE RECHERCHE ET DÉVELOPPEMENT</field>
-	</record>
+    <record id="chart515_fr" model="account.account.template">
+        <field name="code">515</field>
+        <field name="parent_id" ref="chart51_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">FRAIS DE RECHERCHE ET DÉVELOPPEMENT</field>
+    </record>
 
-	<record id="chart519_fr" model="account.account.template">
-		<field name="code">519</field>
-		<field name="parent_id" ref="chart51_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">AUTRES FRAIS D'EXPLOITATION</field>
-	</record>
+    <record id="chart519_fr" model="account.account.template">
+        <field name="code">519</field>
+        <field name="parent_id" ref="chart51_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">AUTRES FRAIS D'EXPLOITATION</field>
+    </record>
 
-	<record id="chart52_fr" model="account.account.template">
-		<field name="code">52</field>
-		<field name="parent_id" ref="chart5_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">FRAIS NON LIÉS À L'EXPLOITATION</field>
-	</record>
+    <record id="chart52_fr" model="account.account.template">
+        <field name="code">52</field>
+        <field name="parent_id" ref="chart5_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">FRAIS NON LIÉS À L'EXPLOITATION</field>
+    </record>
 
-	<record id="chart521_fr" model="account.account.template">
-		<field name="code">521</field>
-		<field name="parent_id" ref="chart52_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">INTÉRÊTS DÉBITEURS</field>
-	</record>
+    <record id="chart521_fr" model="account.account.template">
+        <field name="code">521</field>
+        <field name="parent_id" ref="chart52_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">INTÉRÊTS DÉBITEURS</field>
+    </record>
 
-	<record id="chart529_fr" model="account.account.template">
-		<field name="code">529</field>
-		<field name="parent_id" ref="chart52_fr"/>
-		<field name="type">view</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
-		<field name="name">AUTRES FRAIS NON LIÉS À L'EXPLOITATION</field>
-	</record>
+    <record id="chart529_fr" model="account.account.template">
+        <field name="code">529</field>
+        <field name="parent_id" ref="chart52_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">AUTRES FRAIS NON LIÉS À L'EXPLOITATION</field>
+    </record>
 
     </data>
 </openerp>
diff --git a/addons/l10n_ca/account_tax_code_en.xml b/addons/l10n_ca/account_tax_code_en.xml
index bb628a39f15..d446f431c96 100644
--- a/addons/l10n_ca/account_tax_code_en.xml
+++ b/addons/l10n_ca/account_tax_code_en.xml
@@ -2,99 +2,99 @@
 <openerp>
     <data>
 
-	<record model="account.tax.code.template" id="vat_code_tax_en">
-		<field name="name">Tax</field>
-	</record>
-	
-	<record model="account.tax.code.template" id="vat_code_balance_net_en">
-		<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_tax_en">
+        <field name="name">Tax</field>
+    </record>
+    
+    <record model="account.tax.code.template" id="vat_code_balance_net_en">
+        <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">Taxes paid</field>
-		<field name="parent_id" ref="vat_code_balance_net_en"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_receivable_tva_en">
+        <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 paid</field>
-		<field name="parent_id" ref="vat_code_receivable_tva_en"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_receivable_gst_en">
+        <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 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 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 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 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">Taxes received</field>
-		<field name="parent_id" ref="vat_code_balance_net_en"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_payable_en">
+        <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 received</field>
-		<field name="parent_id" ref="vat_code_payable_en"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_payable_gst_en">
+        <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 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 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 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 received</field>
+        <field name="parent_id" ref="vat_code_payable_en"/>
+    </record>
 
-	<record model="account.tax.code.template" id="vat_code_base_net_en">
-		<field name="name">Taxes Base</field>
-		<field name="parent_id" ref="vat_code_tax_en"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_base_net_en">
+        <field name="name">Taxes Base</field>
+        <field name="parent_id" ref="vat_code_tax_en"/>
+    </record>
 
-	<record model="account.tax.code.template" id="vat_code_base_receivable_en">
-		<field name="name">Base of Sales Tax</field>
-		<field name="parent_id" ref="vat_code_base_net_en"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_base_receivable_en">
+        <field name="name">Base of Sales Tax</field>
+        <field name="parent_id" ref="vat_code_base_net_en"/>
+    </record>
 
-	<record model="account.tax.code.template" id="vat_code_base_receivable_gst_en">
-		<field name="name">Base of GST for Sales</field>
-		<field name="parent_id" ref="vat_code_base_receivable_en"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_base_receivable_gst_en">
+        <field name="name">Base of GST for Sales</field>
+        <field name="parent_id" ref="vat_code_base_receivable_en"/>
+    </record>
 
-	<record model="account.tax.code.template" id="vat_code_base_receivable_pst_en">
-		<field name="name">Base of PST for Sales</field>
-		<field name="parent_id" ref="vat_code_base_receivable_en"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_base_receivable_pst_en">
+        <field name="name">Base of PST for Sales</field>
+        <field name="parent_id" ref="vat_code_base_receivable_en"/>
+    </record>
 
-	<record model="account.tax.code.template" id="vat_code_base_receivable_hst_en">
-		<field name="name">Base of HST for Sales</field>
-		<field name="parent_id" ref="vat_code_base_receivable_en"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_base_receivable_hst_en">
+        <field name="name">Base of HST for Sales</field>
+        <field name="parent_id" ref="vat_code_base_receivable_en"/>
+    </record>
 
-	<record model="account.tax.code.template" id="vat_code_base_payable_en">
-		<field name="name">Base of Purchases Tax</field>
-		<field name="parent_id" ref="vat_code_base_net_en"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_base_payable_en">
+        <field name="name">Base of Purchases Tax</field>
+        <field name="parent_id" ref="vat_code_base_net_en"/>
+    </record>
 
-	<record model="account.tax.code.template" id="vat_code_base_payable_gst_en">
-		<field name="name">Base of GST for Purchases</field>
-		<field name="parent_id" ref="vat_code_base_payable_en"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_base_payable_gst_en">
+        <field name="name">Base of GST for Purchases</field>
+        <field name="parent_id" ref="vat_code_base_payable_en"/>
+    </record>
 
-	<record model="account.tax.code.template" id="vat_code_base_payable_pst_en">
-		<field name="name">Base of PST for Purchases</field>
-		<field name="parent_id" ref="vat_code_base_payable_en"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_base_payable_pst_en">
+        <field name="name">Base of PST for Purchases</field>
+        <field name="parent_id" ref="vat_code_base_payable_en"/>
+    </record>
 
-	<record model="account.tax.code.template" id="vat_code_base_payable_hst_en">
-		<field name="name">Base of HST for Purchases</field>
-		<field name="parent_id" ref="vat_code_base_payable_en"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_base_payable_hst_en">
+        <field name="name">Base of HST for Purchases</field>
+        <field name="parent_id" ref="vat_code_base_payable_en"/>
+    </record>
 
     </data>
 </openerp>
diff --git a/addons/l10n_ca/account_tax_code_fr.xml b/addons/l10n_ca/account_tax_code_fr.xml
index d8abf73dd93..2b6acd2b992 100644
--- a/addons/l10n_ca/account_tax_code_fr.xml
+++ b/addons/l10n_ca/account_tax_code_fr.xml
@@ -2,99 +2,99 @@
 <openerp>
     <data>
 
-	<record model="account.tax.code.template" id="vat_code_tax_fr">
-		<field name="name">Taxes</field>
-	</record>
-	
-	<record model="account.tax.code.template" id="vat_code_balance_net_fr">
-		<field name="name">Balance des taxes à payer</field>
-		<field name="parent_id" ref="vat_code_tax_fr"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_tax_fr">
+        <field name="name">Taxes</field>
+    </record>
+    
+    <record model="account.tax.code.template" id="vat_code_balance_net_fr">
+        <field name="name">Balance des taxes à payer</field>
+        <field name="parent_id" ref="vat_code_tax_fr"/>
+    </record>
 
-	<record model="account.tax.code.template" id="vat_code_receivable_tva_fr">
-		<field name="name">Taxes payées</field>
-		<field name="parent_id" ref="vat_code_balance_net_fr"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_receivable_tva_fr">
+        <field name="name">Taxes payées</field>
+        <field name="parent_id" ref="vat_code_balance_net_fr"/>
+    </record>
 
-	<record model="account.tax.code.template" id="vat_code_receivable_tps_fr">
-		<field name="name">TPS payée</field>
-		<field name="parent_id" ref="vat_code_receivable_tva_fr"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_receivable_tps_fr">
+        <field name="name">TPS payée</field>
+        <field name="parent_id" ref="vat_code_receivable_tva_fr"/>
+    </record>
 
-	<record model="account.tax.code.template" id="vat_code_receivable_tvp_fr">
-		<field name="name">TVP/TVQ payée</field>
-		<field name="parent_id" ref="vat_code_receivable_tva_fr"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_receivable_tvp_fr">
+        <field name="name">TVP/TVQ payée</field>
+        <field name="parent_id" ref="vat_code_receivable_tva_fr"/>
+    </record>
 
-	<record model="account.tax.code.template" id="vat_code_receivable_tvh_fr">
-		<field name="name">TVH payée</field>
-		<field name="parent_id" ref="vat_code_receivable_tva_fr"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_receivable_tvh_fr">
+        <field name="name">TVH payée</field>
+        <field name="parent_id" ref="vat_code_receivable_tva_fr"/>
+    </record>
 
-	<record model="account.tax.code.template" id="vat_code_payable_fr">
-		<field name="name">Taxes reçues</field>
-		<field name="parent_id" ref="vat_code_balance_net_fr"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_payable_fr">
+        <field name="name">Taxes reçues</field>
+        <field name="parent_id" ref="vat_code_balance_net_fr"/>
+    </record>
 
-	<record model="account.tax.code.template" id="vat_code_payable_tps_fr">
-		<field name="name">TPS reçue</field>
-		<field name="parent_id" ref="vat_code_payable_fr"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_payable_tps_fr">
+        <field name="name">TPS reçue</field>
+        <field name="parent_id" ref="vat_code_payable_fr"/>
+    </record>
 
-	<record model="account.tax.code.template" id="vat_code_payable_tvp_fr">
-		<field name="name">TVP/TVQ reçue</field>
-		<field name="parent_id" ref="vat_code_payable_fr"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_payable_tvp_fr">
+        <field name="name">TVP/TVQ reçue</field>
+        <field name="parent_id" ref="vat_code_payable_fr"/>
+    </record>
 
-	<record model="account.tax.code.template" id="vat_code_payable_tvh_fr">
-		<field name="name">TVH reçue</field>
-		<field name="parent_id" ref="vat_code_payable_fr"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_payable_tvh_fr">
+        <field name="name">TVH reçue</field>
+        <field name="parent_id" ref="vat_code_payable_fr"/>
+    </record>
 
-	<record model="account.tax.code.template" id="vat_code_base_net_fr">
-		<field name="name">Base de taxes</field>
-		<field name="parent_id" ref="vat_code_tax_fr"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_base_net_fr">
+        <field name="name">Base de taxes</field>
+        <field name="parent_id" ref="vat_code_tax_fr"/>
+    </record>
 
-	<record model="account.tax.code.template" id="vat_code_base_receivable_fr">
-		<field name="name">Base des taxes de ventes</field>
-		<field name="parent_id" ref="vat_code_base_net_fr"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_base_receivable_fr">
+        <field name="name">Base des taxes de ventes</field>
+        <field name="parent_id" ref="vat_code_base_net_fr"/>
+    </record>
 
-	<record model="account.tax.code.template" id="vat_code_base_receivable_tps_fr">
-		<field name="name">Base de la TPS pour les ventes</field>
-		<field name="parent_id" ref="vat_code_base_receivable_fr"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_base_receivable_tps_fr">
+        <field name="name">Base de la TPS pour les ventes</field>
+        <field name="parent_id" ref="vat_code_base_receivable_fr"/>
+    </record>
 
-	<record model="account.tax.code.template" id="vat_code_base_receivable_tvp_fr">
-		<field name="name">Base de la TVP/TVQ pour les ventes</field>
-		<field name="parent_id" ref="vat_code_base_receivable_fr"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_base_receivable_tvp_fr">
+        <field name="name">Base de la TVP/TVQ pour les ventes</field>
+        <field name="parent_id" ref="vat_code_base_receivable_fr"/>
+    </record>
 
-	<record model="account.tax.code.template" id="vat_code_base_receivable_tvh_fr">
-		<field name="name">Base de la TVH pour les ventes</field>
-		<field name="parent_id" ref="vat_code_base_receivable_fr"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_base_receivable_tvh_fr">
+        <field name="name">Base de la TVH pour les ventes</field>
+        <field name="parent_id" ref="vat_code_base_receivable_fr"/>
+    </record>
 
-	<record model="account.tax.code.template" id="vat_code_base_payable_fr">
-		<field name="name">Base des taxes d'achats</field>
-		<field name="parent_id" ref="vat_code_base_net_fr"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_base_payable_fr">
+        <field name="name">Base des taxes d'achats</field>
+        <field name="parent_id" ref="vat_code_base_net_fr"/>
+    </record>
 
-	<record model="account.tax.code.template" id="vat_code_base_payable_tps_fr">
-		<field name="name">Base de la TPS pour les achats</field>
-		<field name="parent_id" ref="vat_code_base_payable_fr"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_base_payable_tps_fr">
+        <field name="name">Base de la TPS pour les achats</field>
+        <field name="parent_id" ref="vat_code_base_payable_fr"/>
+    </record>
 
-	<record model="account.tax.code.template" id="vat_code_base_payable_tvp_fr">
-		<field name="name">Base de la TVP/TVQ pour les achats</field>
-		<field name="parent_id" ref="vat_code_base_payable_fr"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_base_payable_tvp_fr">
+        <field name="name">Base de la TVP/TVQ pour les achats</field>
+        <field name="parent_id" ref="vat_code_base_payable_fr"/>
+    </record>
 
-	<record model="account.tax.code.template" id="vat_code_base_payable_tvh_fr">
-		<field name="name">Base de la TVH pour les achats</field>
-		<field name="parent_id" ref="vat_code_base_payable_fr"/>
-	</record>
+    <record model="account.tax.code.template" id="vat_code_base_payable_tvh_fr">
+        <field name="name">Base de la TVH pour les achats</field>
+        <field name="parent_id" ref="vat_code_base_payable_fr"/>
+    </record>
 
     </data>
 </openerp>
diff --git a/addons/l10n_ca/fiscal_templates_en.xml b/addons/l10n_ca/fiscal_templates_en.xml
index 54f9c21b5e1..68e881c3541 100644
--- a/addons/l10n_ca/fiscal_templates_en.xml
+++ b/addons/l10n_ca/fiscal_templates_en.xml
@@ -2,656 +2,656 @@
 <openerp>
     <data>
 
-	<!-- Fiscal Position Templates -->
+    <!-- Fiscal Position Templates -->
 
-	<record id="fiscal_position_template_1_en" model="account.fiscal.position.template">
-		<field name="name">Provincial Regime</field>
-		<field name="chart_template_id" ref="ca_en_chart_template_en"/>
-	</record>
+    <record id="fiscal_position_template_1_en" model="account.fiscal.position.template">
+        <field name="name">Provincial Regime</field>
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+    </record>
 
-	<record id="fiscal_position_template_21_en" model="account.fiscal.position.template">
-		<field name="name">Harmonized Provinces Regime (12%)</field>
-		<field name="chart_template_id" ref="ca_en_chart_template_en"/>
-	</record>
+    <record id="fiscal_position_template_21_en" model="account.fiscal.position.template">
+        <field name="name">Harmonized Provinces Regime (12%)</field>
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+    </record>
 
-	<record id="fiscal_position_template_22_en" model="account.fiscal.position.template">
-		<field name="name">Harmonized Provinces Regime (13%)</field>
-		<field name="chart_template_id" ref="ca_en_chart_template_en"/>
-	</record>
+    <record id="fiscal_position_template_22_en" model="account.fiscal.position.template">
+        <field name="name">Harmonized Provinces Regime (13%)</field>
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+    </record>
 
-	<record id="fiscal_position_template_23_en" model="account.fiscal.position.template">
-		<field name="name">Harmonized Provinces Regime (13.5%)</field>
-		<field name="chart_template_id" ref="ca_en_chart_template_en"/>
-	</record>
+    <record id="fiscal_position_template_23_en" model="account.fiscal.position.template">
+        <field name="name">Harmonized Provinces Regime (13.5%)</field>
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+    </record>
 
-	<record id="fiscal_position_template_24_en" model="account.fiscal.position.template">
-		<field name="name">Harmonized Provinces Regime (15%)</field>
-		<field name="chart_template_id" ref="ca_en_chart_template_en"/>
-	</record>
+    <record id="fiscal_position_template_24_en" model="account.fiscal.position.template">
+        <field name="name">Harmonized Provinces Regime (15%)</field>
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+    </record>
 
-	<record id="fiscal_position_template_3_en" model="account.fiscal.position.template">
-		<field name="name">Non-Harmonized Provinces Regime</field>
-		<field name="chart_template_id" ref="ca_en_chart_template_en"/>
-	</record>
+    <record id="fiscal_position_template_3_en" model="account.fiscal.position.template">
+        <field name="name">Non-Harmonized Provinces Regime</field>
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+    </record>
 
-	<record id="fiscal_position_template_4_en" model="account.fiscal.position.template">
-		<field name="name">International Regime</field>
-		<field name="chart_template_id" ref="ca_en_chart_template_en"/>
-	</record>
+    <record id="fiscal_position_template_4_en" model="account.fiscal.position.template">
+        <field name="name">International Regime</field>
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+    </record>
 
         <!-- PURCHASES TAXES -->
 
-	<!--  Alberta Fiscal Position Tax Templates (default is gst) -->
+    <!--  Alberta Fiscal Position Tax Templates (default is gst) -->
 
-	<record id="fiscal_position_tax_template_21_ab_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_en"  />
-		<field name="tax_src_id" ref="gst_purc_en" />
-		<field name="tax_dest_id" ref="hst12_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_21_ab_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_21_en"  />
+        <field name="tax_src_id" ref="gst_purc_en" />
+        <field name="tax_dest_id" ref="hst12_purc_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_22_ab_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_en"  />
-		<field name="tax_src_id" ref="gst_purc_en" />
-		<field name="tax_dest_id" ref="hst13_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_22_ab_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_22_en"  />
+        <field name="tax_src_id" ref="gst_purc_en" />
+        <field name="tax_dest_id" ref="hst13_purc_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_23_ab_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_en"  />
-		<field name="tax_src_id" ref="gst_purc_en" />
-		<field name="tax_dest_id" ref="hst135_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_23_ab_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_23_en"  />
+        <field name="tax_src_id" ref="gst_purc_en" />
+        <field name="tax_dest_id" ref="hst135_purc_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_24_ab_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_en"  />
-		<field name="tax_src_id" ref="gst_purc_en" />
-		<field name="tax_dest_id" ref="hst15_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_24_ab_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_24_en"  />
+        <field name="tax_src_id" ref="gst_purc_en" />
+        <field name="tax_dest_id" ref="hst15_purc_en" />
+    </record>
 
-	<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" />
-	</record>
+    <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" />
+    </record>
 
-	<!--  British Columbia Fiscal Position Tax Templates (default is hst12) -->
+    <!--  British Columbia Fiscal Position Tax Templates (default is hst12) -->
 
-	<record id="fiscal_position_tax_template_22_12_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_en"  />
-		<field name="tax_src_id" ref="hst12_purc_en" />
-		<field name="tax_dest_id" ref="hst13_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_22_12_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_22_en"  />
+        <field name="tax_src_id" ref="hst12_purc_en" />
+        <field name="tax_dest_id" ref="hst13_purc_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_23_12_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_en"  />
-		<field name="tax_src_id" ref="hst12_purc_en" />
-		<field name="tax_dest_id" ref="hst135_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_23_12_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_23_en"  />
+        <field name="tax_src_id" ref="hst12_purc_en" />
+        <field name="tax_dest_id" ref="hst135_purc_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_24_12_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_en"  />
-		<field name="tax_src_id" ref="hst12_purc_en" />
-		<field name="tax_dest_id" ref="hst15_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_24_12_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_24_en"  />
+        <field name="tax_src_id" ref="hst12_purc_en" />
+        <field name="tax_dest_id" ref="hst15_purc_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_3_12_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_en"  />
-		<field name="tax_src_id" ref="hst12_purc_en" />
-		<field name="tax_dest_id" ref="gst_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_3_12_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_3_en"  />
+        <field name="tax_src_id" ref="hst12_purc_en" />
+        <field name="tax_dest_id" ref="gst_purc_en" />
+    </record>
 
-	<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" />
-	</record>
+    <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" />
+    </record>
 
-	<!--  Manitoba Fiscal Position Tax Templates (default is gstpst_mb) -->
+    <!--  Manitoba Fiscal Position Tax Templates (default is gstpst_mb) -->
 
-	<record id="fiscal_position_tax_template_21_mb_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_en"  />
-		<field name="tax_src_id" ref="gstpst_mb_purc_en" />
-		<field name="tax_dest_id" ref="hst12_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_21_mb_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_21_en"  />
+        <field name="tax_src_id" ref="gstpst_mb_purc_en" />
+        <field name="tax_dest_id" ref="hst12_purc_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_22_mb_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_en"  />
-		<field name="tax_src_id" ref="gstpst_mb_purc_en" />
-		<field name="tax_dest_id" ref="hst13_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_22_mb_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_22_en"  />
+        <field name="tax_src_id" ref="gstpst_mb_purc_en" />
+        <field name="tax_dest_id" ref="hst13_purc_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_23_mb_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_en"  />
-		<field name="tax_src_id" ref="gstpst_mb_purc_en" />
-		<field name="tax_dest_id" ref="hst135_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_23_mb_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_23_en"  />
+        <field name="tax_src_id" ref="gstpst_mb_purc_en" />
+        <field name="tax_dest_id" ref="hst135_purc_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_24_mb_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_en"  />
-		<field name="tax_src_id" ref="gstpst_mb_purc_en" />
-		<field name="tax_dest_id" ref="hst15_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_24_mb_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_24_en"  />
+        <field name="tax_src_id" ref="gstpst_mb_purc_en" />
+        <field name="tax_dest_id" ref="hst15_purc_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_3_mb_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_en"  />
-		<field name="tax_src_id" ref="gstpst_mb_purc_en" />
-		<field name="tax_dest_id" ref="gst_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_3_mb_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_3_en"  />
+        <field name="tax_src_id" ref="gstpst_mb_purc_en" />
+        <field name="tax_dest_id" ref="gst_purc_en" />
+    </record>
 
-	<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" />
-	</record>
+    <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" />
+    </record>
 
-	<!--  New Brunswick, Newfoundland and Labrador and Ontario Fiscal Position Tax Templates (default is hst13) -->
+    <!--  New Brunswick, Newfoundland and Labrador and Ontario Fiscal Position Tax Templates (default is hst13) -->
 
-	<record id="fiscal_position_tax_template_21_13_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_en"  />
-		<field name="tax_src_id" ref="hst13_purc_en" />
-		<field name="tax_dest_id" ref="hst12_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_21_13_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_21_en"  />
+        <field name="tax_src_id" ref="hst13_purc_en" />
+        <field name="tax_dest_id" ref="hst12_purc_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_23_13_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_en"  />
-		<field name="tax_src_id" ref="hst13_purc_en" />
-		<field name="tax_dest_id" ref="hst135_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_23_13_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_23_en"  />
+        <field name="tax_src_id" ref="hst13_purc_en" />
+        <field name="tax_dest_id" ref="hst135_purc_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_24_13_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_en"  />
-		<field name="tax_src_id" ref="hst13_purc_en" />
-		<field name="tax_dest_id" ref="hst15_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_24_13_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_24_en"  />
+        <field name="tax_src_id" ref="hst13_purc_en" />
+        <field name="tax_dest_id" ref="hst15_purc_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_3_13_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_en"  />
-		<field name="tax_src_id" ref="hst13_purc_en" />
-		<field name="tax_dest_id" ref="gst_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_3_13_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_3_en"  />
+        <field name="tax_src_id" ref="hst13_purc_en" />
+        <field name="tax_dest_id" ref="gst_purc_en" />
+    </record>
 
-	<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" />
-	</record>
+    <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" />
+    </record>
 
-	<!--  Nova Scotia Fiscal Position Tax Templates (default is hst15) -->
+    <!--  Nova Scotia Fiscal Position Tax Templates (default is hst15) -->
 
-	<record id="fiscal_position_tax_template_21_15_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_en"  />
-		<field name="tax_src_id" ref="hst15_purc_en" />
-		<field name="tax_dest_id" ref="hst12_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_21_15_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_21_en"  />
+        <field name="tax_src_id" ref="hst15_purc_en" />
+        <field name="tax_dest_id" ref="hst12_purc_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_22_15_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_en"  />
-		<field name="tax_src_id" ref="hst15_purc_en" />
-		<field name="tax_dest_id" ref="hst13_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_22_15_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_22_en"  />
+        <field name="tax_src_id" ref="hst15_purc_en" />
+        <field name="tax_dest_id" ref="hst13_purc_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_23_15_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_en"  />
-		<field name="tax_src_id" ref="hst15_purc_en" />
-		<field name="tax_dest_id" ref="hst135_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_23_15_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_23_en"  />
+        <field name="tax_src_id" ref="hst15_purc_en" />
+        <field name="tax_dest_id" ref="hst135_purc_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_3_15_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_en"  />
-		<field name="tax_src_id" ref="hst15_purc_en" />
-		<field name="tax_dest_id" ref="gst_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_3_15_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_3_en"  />
+        <field name="tax_src_id" ref="hst15_purc_en" />
+        <field name="tax_dest_id" ref="gst_purc_en" />
+    </record>
 
-	<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" />
-	</record>
+    <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" />
+    </record>
 
-	<!--  Prince Edward Island Fiscal Position Tax Templates (default is gstpst_pe)-->
+    <!--  Prince Edward Island Fiscal Position Tax Templates (default is gstpst_pe)-->
 
-	<record id="fiscal_position_tax_template_21_pe_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_en"  />
-		<field name="tax_src_id" ref="gstpst_pe_purc_en" />
-		<field name="tax_dest_id" ref="hst12_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_21_pe_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_21_en"  />
+        <field name="tax_src_id" ref="gstpst_pe_purc_en" />
+        <field name="tax_dest_id" ref="hst12_purc_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_22_pe_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_en"  />
-		<field name="tax_src_id" ref="gstpst_pe_purc_en" />
-		<field name="tax_dest_id" ref="hst13_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_22_pe_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_22_en"  />
+        <field name="tax_src_id" ref="gstpst_pe_purc_en" />
+        <field name="tax_dest_id" ref="hst13_purc_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_23_pe_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_en"  />
-		<field name="tax_src_id" ref="gstpst_pe_purc_en" />
-		<field name="tax_dest_id" ref="hst135_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_23_pe_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_23_en"  />
+        <field name="tax_src_id" ref="gstpst_pe_purc_en" />
+        <field name="tax_dest_id" ref="hst135_purc_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_24_pe_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_en"  />
-		<field name="tax_src_id" ref="gstpst_pe_purc_en" />
-		<field name="tax_dest_id" ref="hst15_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_24_pe_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_24_en"  />
+        <field name="tax_src_id" ref="gstpst_pe_purc_en" />
+        <field name="tax_dest_id" ref="hst15_purc_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_3_pe_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_en"  />
-		<field name="tax_src_id" ref="gstpst_pe_purc_en" />
-		<field name="tax_dest_id" ref="gst_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_3_pe_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_3_en"  />
+        <field name="tax_src_id" ref="gstpst_pe_purc_en" />
+        <field name="tax_dest_id" ref="gst_purc_en" />
+    </record>
 
-	<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" />
-	</record>
+    <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" />
+    </record>
 
-	<!--  Quebec Fiscal Position Tax Templates (default is gsttvq)-->
+    <!--  Quebec Fiscal Position Tax Templates (default is gsttvq)-->
 
-	<record id="fiscal_position_tax_template_21_qc_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_en"  />
-		<field name="tax_src_id" ref="gsttvq_purc_en" />
-		<field name="tax_dest_id" ref="hst12_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_21_qc_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_21_en"  />
+        <field name="tax_src_id" ref="gsttvq_purc_en" />
+        <field name="tax_dest_id" ref="hst12_purc_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_22_qc_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_en"  />
-		<field name="tax_src_id" ref="gsttvq_purc_en" />
-		<field name="tax_dest_id" ref="hst13_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_22_qc_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_22_en"  />
+        <field name="tax_src_id" ref="gsttvq_purc_en" />
+        <field name="tax_dest_id" ref="hst13_purc_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_24_qc_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_en"  />
-		<field name="tax_src_id" ref="gsttvq_purc_en" />
-		<field name="tax_dest_id" ref="hst15_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_24_qc_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_24_en"  />
+        <field name="tax_src_id" ref="gsttvq_purc_en" />
+        <field name="tax_dest_id" ref="hst15_purc_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_3_qc_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_en"  />
-		<field name="tax_src_id" ref="gsttvq_purc_en" />
-		<field name="tax_dest_id" ref="gst_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_3_qc_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_3_en"  />
+        <field name="tax_src_id" ref="gsttvq_purc_en" />
+        <field name="tax_dest_id" ref="gst_purc_en" />
+    </record>
 
-	<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" />
-	</record>
+    <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" />
+    </record>
 
-	<!--  Saskatchewan Fiscal Position Tax Templates (default is gstpst_sk)-->
+    <!--  Saskatchewan Fiscal Position Tax Templates (default is gstpst_sk)-->
 
-	<record id="fiscal_position_tax_template_21_sk_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_en"  />
-		<field name="tax_src_id" ref="gstpst_sk_purc_en" />
-		<field name="tax_dest_id" ref="hst12_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_21_sk_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_21_en"  />
+        <field name="tax_src_id" ref="gstpst_sk_purc_en" />
+        <field name="tax_dest_id" ref="hst12_purc_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_22_sk_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_en"  />
-		<field name="tax_src_id" ref="gstpst_sk_purc_en" />
-		<field name="tax_dest_id" ref="hst13_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_22_sk_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_22_en"  />
+        <field name="tax_src_id" ref="gstpst_sk_purc_en" />
+        <field name="tax_dest_id" ref="hst13_purc_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_23_sk_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_en"  />
-		<field name="tax_src_id" ref="gstpst_sk_purc_en" />
-		<field name="tax_dest_id" ref="hst135_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_23_sk_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_23_en"  />
+        <field name="tax_src_id" ref="gstpst_sk_purc_en" />
+        <field name="tax_dest_id" ref="hst135_purc_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_24_sk_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_en"  />
-		<field name="tax_src_id" ref="gstpst_sk_purc_en" />
-		<field name="tax_dest_id" ref="hst15_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_24_sk_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_24_en"  />
+        <field name="tax_src_id" ref="gstpst_sk_purc_en" />
+        <field name="tax_dest_id" ref="hst15_purc_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_3_sk_purc_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_en"  />
-		<field name="tax_src_id" ref="gstpst_sk_purc_en" />
-		<field name="tax_dest_id" ref="gst_purc_en" />
-	</record>
+    <record id="fiscal_position_tax_template_3_sk_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_3_en"  />
+        <field name="tax_src_id" ref="gstpst_sk_purc_en" />
+        <field name="tax_dest_id" ref="gst_purc_en" />
+    </record>
 
-	<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" />
-	</record>
+    <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" />
+    </record>
 
 
         <!-- SALES TAXES -->
 
 
-	<!--  Alberta Fiscal Position Tax Templates (default is gst) -->
+    <!--  Alberta Fiscal Position Tax Templates (default is gst) -->
 
-	<record id="fiscal_position_tax_template_21_ab_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_en"  />
-		<field name="tax_src_id" ref="gst_sale_en" />
-		<field name="tax_dest_id" ref="hst12_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_21_ab_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_21_en"  />
+        <field name="tax_src_id" ref="gst_sale_en" />
+        <field name="tax_dest_id" ref="hst12_sale_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_22_ab_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_en"  />
-		<field name="tax_src_id" ref="gst_sale_en" />
-		<field name="tax_dest_id" ref="hst13_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_22_ab_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_22_en"  />
+        <field name="tax_src_id" ref="gst_sale_en" />
+        <field name="tax_dest_id" ref="hst13_sale_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_23_ab_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_en"  />
-		<field name="tax_src_id" ref="gst_sale_en" />
-		<field name="tax_dest_id" ref="hst135_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_23_ab_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_23_en"  />
+        <field name="tax_src_id" ref="gst_sale_en" />
+        <field name="tax_dest_id" ref="hst135_sale_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_24_ab_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_en"  />
-		<field name="tax_src_id" ref="gst_sale_en" />
-		<field name="tax_dest_id" ref="hst15_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_24_ab_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_24_en"  />
+        <field name="tax_src_id" ref="gst_sale_en" />
+        <field name="tax_dest_id" ref="hst15_sale_en" />
+    </record>
 
-	<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" />
-	</record>
+    <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" />
+    </record>
 
-	<!--  British Columbia Fiscal Position Tax Templates (default is hst12) -->
+    <!--  British Columbia Fiscal Position Tax Templates (default is hst12) -->
 
-	<record id="fiscal_position_tax_template_22_12c_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_en"  />
-		<field name="tax_src_id" ref="hst12_sale_en" />
-		<field name="tax_dest_id" ref="hst13_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_22_12c_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_22_en"  />
+        <field name="tax_src_id" ref="hst12_sale_en" />
+        <field name="tax_dest_id" ref="hst13_sale_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_23_12_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_en"  />
-		<field name="tax_src_id" ref="hst12_sale_en" />
-		<field name="tax_dest_id" ref="hst135_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_23_12_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_23_en"  />
+        <field name="tax_src_id" ref="hst12_sale_en" />
+        <field name="tax_dest_id" ref="hst135_sale_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_24_12_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_en"  />
-		<field name="tax_src_id" ref="hst12_sale_en" />
-		<field name="tax_dest_id" ref="hst15_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_24_12_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_24_en"  />
+        <field name="tax_src_id" ref="hst12_sale_en" />
+        <field name="tax_dest_id" ref="hst15_sale_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_3_12_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_en"  />
-		<field name="tax_src_id" ref="hst12_sale_en" />
-		<field name="tax_dest_id" ref="gst_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_3_12_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_3_en"  />
+        <field name="tax_src_id" ref="hst12_sale_en" />
+        <field name="tax_dest_id" ref="gst_sale_en" />
+    </record>
 
-	<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" />
-	</record>
+    <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" />
+    </record>
 
-	<!--  Manitoba Fiscal Position Tax Templates (default is gstpst_mb) -->
+    <!--  Manitoba Fiscal Position Tax Templates (default is gstpst_mb) -->
 
-	<record id="fiscal_position_tax_template_21_mb_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_en"  />
-		<field name="tax_src_id" ref="gstpst_mb_sale_en" />
-		<field name="tax_dest_id" ref="hst12_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_21_mb_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_21_en"  />
+        <field name="tax_src_id" ref="gstpst_mb_sale_en" />
+        <field name="tax_dest_id" ref="hst12_sale_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_22_mb_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_en"  />
-		<field name="tax_src_id" ref="gstpst_mb_sale_en" />
-		<field name="tax_dest_id" ref="hst13_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_22_mb_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_22_en"  />
+        <field name="tax_src_id" ref="gstpst_mb_sale_en" />
+        <field name="tax_dest_id" ref="hst13_sale_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_23_mb_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_en"  />
-		<field name="tax_src_id" ref="gstpst_mb_sale_en" />
-		<field name="tax_dest_id" ref="hst135_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_23_mb_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_23_en"  />
+        <field name="tax_src_id" ref="gstpst_mb_sale_en" />
+        <field name="tax_dest_id" ref="hst135_sale_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_24_mb_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_en"  />
-		<field name="tax_src_id" ref="gstpst_mb_sale_en" />
-		<field name="tax_dest_id" ref="hst15_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_24_mb_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_24_en"  />
+        <field name="tax_src_id" ref="gstpst_mb_sale_en" />
+        <field name="tax_dest_id" ref="hst15_sale_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_3_mb_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_en"  />
-		<field name="tax_src_id" ref="gstpst_mb_sale_en" />
-		<field name="tax_dest_id" ref="gst_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_3_mb_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_3_en"  />
+        <field name="tax_src_id" ref="gstpst_mb_sale_en" />
+        <field name="tax_dest_id" ref="gst_sale_en" />
+    </record>
 
-	<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" />
-	</record>
+    <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" />
+    </record>
 
-	<!--  New Brunswick, Newfoundland and Labrador and Ontario Fiscal Position Tax Templates (default is hst13) -->
+    <!--  New Brunswick, Newfoundland and Labrador and Ontario Fiscal Position Tax Templates (default is hst13) -->
 
-	<record id="fiscal_position_tax_template_21_13_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_en"  />
-		<field name="tax_src_id" ref="hst13_sale_en" />
-		<field name="tax_dest_id" ref="hst12_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_21_13_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_21_en"  />
+        <field name="tax_src_id" ref="hst13_sale_en" />
+        <field name="tax_dest_id" ref="hst12_sale_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_23_13_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_en"  />
-		<field name="tax_src_id" ref="hst13_sale_en" />
-		<field name="tax_dest_id" ref="hst135_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_23_13_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_23_en"  />
+        <field name="tax_src_id" ref="hst13_sale_en" />
+        <field name="tax_dest_id" ref="hst135_sale_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_24_13_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_en"  />
-		<field name="tax_src_id" ref="hst13_sale_en" />
-		<field name="tax_dest_id" ref="hst15_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_24_13_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_24_en"  />
+        <field name="tax_src_id" ref="hst13_sale_en" />
+        <field name="tax_dest_id" ref="hst15_sale_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_3_13_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_en"  />
-		<field name="tax_src_id" ref="hst13_sale_en" />
-		<field name="tax_dest_id" ref="gst_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_3_13_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_3_en"  />
+        <field name="tax_src_id" ref="hst13_sale_en" />
+        <field name="tax_dest_id" ref="gst_sale_en" />
+    </record>
 
-	<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" />
-	</record>
+    <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" />
+    </record>
 
-	<!--  Nova Scotia Fiscal Position Tax Templates (default is hst15) -->
+    <!--  Nova Scotia Fiscal Position Tax Templates (default is hst15) -->
 
-	<record id="fiscal_position_tax_template_21_15_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_en"  />
-		<field name="tax_src_id" ref="hst15_sale_en" />
-		<field name="tax_dest_id" ref="hst12_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_21_15_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_21_en"  />
+        <field name="tax_src_id" ref="hst15_sale_en" />
+        <field name="tax_dest_id" ref="hst12_sale_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_22_15_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_en"  />
-		<field name="tax_src_id" ref="hst15_sale_en" />
-		<field name="tax_dest_id" ref="hst13_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_22_15_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_22_en"  />
+        <field name="tax_src_id" ref="hst15_sale_en" />
+        <field name="tax_dest_id" ref="hst13_sale_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_23_15_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_en"  />
-		<field name="tax_src_id" ref="hst15_sale_en" />
-		<field name="tax_dest_id" ref="hst135_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_23_15_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_23_en"  />
+        <field name="tax_src_id" ref="hst15_sale_en" />
+        <field name="tax_dest_id" ref="hst135_sale_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_3_15_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_en"  />
-		<field name="tax_src_id" ref="hst15_sale_en" />
-		<field name="tax_dest_id" ref="gst_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_3_15_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_3_en"  />
+        <field name="tax_src_id" ref="hst15_sale_en" />
+        <field name="tax_dest_id" ref="gst_sale_en" />
+    </record>
 
-	<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" />
-	</record>
+    <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" />
+    </record>
 
-	<!--  Prince Edward Island Fiscal Position Tax Templates (default is gstpst_pe)-->
+    <!--  Prince Edward Island Fiscal Position Tax Templates (default is gstpst_pe)-->
 
-	<record id="fiscal_position_tax_template_21_pe_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_en"  />
-		<field name="tax_src_id" ref="gstpst_pe_sale_en" />
-		<field name="tax_dest_id" ref="hst12_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_21_pe_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_21_en"  />
+        <field name="tax_src_id" ref="gstpst_pe_sale_en" />
+        <field name="tax_dest_id" ref="hst12_sale_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_22_pe_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_en"  />
-		<field name="tax_src_id" ref="gstpst_pe_sale_en" />
-		<field name="tax_dest_id" ref="hst13_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_22_pe_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_22_en"  />
+        <field name="tax_src_id" ref="gstpst_pe_sale_en" />
+        <field name="tax_dest_id" ref="hst13_sale_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_23_pe_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_en"  />
-		<field name="tax_src_id" ref="gstpst_pe_sale_en" />
-		<field name="tax_dest_id" ref="hst135_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_23_pe_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_23_en"  />
+        <field name="tax_src_id" ref="gstpst_pe_sale_en" />
+        <field name="tax_dest_id" ref="hst135_sale_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_24_pe_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_en"  />
-		<field name="tax_src_id" ref="gstpst_pe_sale_en" />
-		<field name="tax_dest_id" ref="hst15_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_24_pe_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_24_en"  />
+        <field name="tax_src_id" ref="gstpst_pe_sale_en" />
+        <field name="tax_dest_id" ref="hst15_sale_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_3_pe_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_en"  />
-		<field name="tax_src_id" ref="gstpst_pe_sale_en" />
-		<field name="tax_dest_id" ref="gst_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_3_pe_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_3_en"  />
+        <field name="tax_src_id" ref="gstpst_pe_sale_en" />
+        <field name="tax_dest_id" ref="gst_sale_en" />
+    </record>
 
-	<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" />
-	</record>
+    <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" />
+    </record>
 
-	<!--  Quebec Fiscal Position Tax Templates (default is gsttvq)-->
+    <!--  Quebec Fiscal Position Tax Templates (default is gsttvq)-->
 
-	<record id="fiscal_position_tax_template_21_qc_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_en"  />
-		<field name="tax_src_id" ref="gsttvq_sale_en" />
-		<field name="tax_dest_id" ref="hst12_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_21_qc_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_21_en"  />
+        <field name="tax_src_id" ref="gsttvq_sale_en" />
+        <field name="tax_dest_id" ref="hst12_sale_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_22_qc_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_en"  />
-		<field name="tax_src_id" ref="gsttvq_sale_en" />
-		<field name="tax_dest_id" ref="hst13_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_22_qc_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_22_en"  />
+        <field name="tax_src_id" ref="gsttvq_sale_en" />
+        <field name="tax_dest_id" ref="hst13_sale_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_24_qc_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_en"  />
-		<field name="tax_src_id" ref="gsttvq_sale_en" />
-		<field name="tax_dest_id" ref="hst15_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_24_qc_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_24_en"  />
+        <field name="tax_src_id" ref="gsttvq_sale_en" />
+        <field name="tax_dest_id" ref="hst15_sale_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_3_qc_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_en"  />
-		<field name="tax_src_id" ref="gsttvq_sale_en" />
-		<field name="tax_dest_id" ref="gst_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_3_qc_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_3_en"  />
+        <field name="tax_src_id" ref="gsttvq_sale_en" />
+        <field name="tax_dest_id" ref="gst_sale_en" />
+    </record>
 
-	<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" />
-	</record>
+    <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" />
+    </record>
 
-	<!--  Saskatchewan Fiscal Position Tax Templates (default is gstpst_sk)-->
+    <!--  Saskatchewan Fiscal Position Tax Templates (default is gstpst_sk)-->
 
-	<record id="fiscal_position_tax_template_21_sk_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_en"  />
-		<field name="tax_src_id" ref="gstpst_sk_sale_en" />
-		<field name="tax_dest_id" ref="hst12_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_21_sk_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_21_en"  />
+        <field name="tax_src_id" ref="gstpst_sk_sale_en" />
+        <field name="tax_dest_id" ref="hst12_sale_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_22_sk_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_en"  />
-		<field name="tax_src_id" ref="gstpst_sk_sale_en" />
-		<field name="tax_dest_id" ref="hst13_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_22_sk_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_22_en"  />
+        <field name="tax_src_id" ref="gstpst_sk_sale_en" />
+        <field name="tax_dest_id" ref="hst13_sale_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_23_sk_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_en"  />
-		<field name="tax_src_id" ref="gstpst_sk_sale_en" />
-		<field name="tax_dest_id" ref="hst135_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_23_sk_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_23_en"  />
+        <field name="tax_src_id" ref="gstpst_sk_sale_en" />
+        <field name="tax_dest_id" ref="hst135_sale_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_24_sk_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_en"  />
-		<field name="tax_src_id" ref="gstpst_sk_sale_en" />
-		<field name="tax_dest_id" ref="hst15_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_24_sk_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_24_en"  />
+        <field name="tax_src_id" ref="gstpst_sk_sale_en" />
+        <field name="tax_dest_id" ref="hst15_sale_en" />
+    </record>
 
-	<record id="fiscal_position_tax_template_3_sk_sale_en" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_en"  />
-		<field name="tax_src_id" ref="gstpst_sk_sale_en" />
-		<field name="tax_dest_id" ref="gst_sale_en" />
-	</record>
+    <record id="fiscal_position_tax_template_3_sk_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_3_en"  />
+        <field name="tax_src_id" ref="gstpst_sk_sale_en" />
+        <field name="tax_dest_id" ref="gst_sale_en" />
+    </record>
 
-	<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" />
-	</record>
+    <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" />
+    </record>
 
-	<!-- Fiscal Position Account Templates - Products -->
+    <!-- Fiscal Position Account Templates - Products -->
 
-	<record id="fiscal_position_product_template_21_en" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_21_en"  />
-		<field name="account_src_id" ref="chart411_en" />
-		<field name="account_dest_id" ref="chart412_en" />
-	</record>
+    <record id="fiscal_position_product_template_21_en" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_21_en"  />
+        <field name="account_src_id" ref="chart411_en" />
+        <field name="account_dest_id" ref="chart412_en" />
+    </record>
 
-	<record id="fiscal_position_product_template_22_en" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_22_en"  />
-		<field name="account_src_id" ref="chart411_en" />
-		<field name="account_dest_id" ref="chart412_en" />
-	</record>
+    <record id="fiscal_position_product_template_22_en" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_22_en"  />
+        <field name="account_src_id" ref="chart411_en" />
+        <field name="account_dest_id" ref="chart412_en" />
+    </record>
 
-	<record id="fiscal_position_product_template_23_en" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_23_en"  />
-		<field name="account_src_id" ref="chart411_en" />
-		<field name="account_dest_id" ref="chart412_en" />
-	</record>
+    <record id="fiscal_position_product_template_23_en" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_23_en"  />
+        <field name="account_src_id" ref="chart411_en" />
+        <field name="account_dest_id" ref="chart412_en" />
+    </record>
 
-	<record id="fiscal_position_product_template_24_en" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_24_en"  />
-		<field name="account_src_id" ref="chart411_en" />
-		<field name="account_dest_id" ref="chart412_en" />
-	</record>
+    <record id="fiscal_position_product_template_24_en" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_24_en"  />
+        <field name="account_src_id" ref="chart411_en" />
+        <field name="account_dest_id" ref="chart412_en" />
+    </record>
 
-	<record id="fiscal_position_product_template_3_en" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_3_en"  />
-		<field name="account_src_id" ref="chart411_en" />
-		<field name="account_dest_id" ref="chart413_en" />
-	</record>
+    <record id="fiscal_position_product_template_3_en" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_3_en"  />
+        <field name="account_src_id" ref="chart411_en" />
+        <field name="account_dest_id" ref="chart413_en" />
+    </record>
 
-	<record id="fiscal_position_product_template_4_en" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_4_en"  />
-		<field name="account_src_id" ref="chart411_en" />
-		<field name="account_dest_id" ref="chart414_en" />
-	</record>
+    <record id="fiscal_position_product_template_4_en" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_4_en"  />
+        <field name="account_src_id" ref="chart411_en" />
+        <field name="account_dest_id" ref="chart414_en" />
+    </record>
 
-	<!-- Fiscal Position Account Templates - Charges -->
+    <!-- Fiscal Position Account Templates - Charges -->
 
-	<record id="fiscal_position_charge_template_21_en" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_21_en"  />
-		<field name="account_src_id" ref="chart5111_en" />
-		<field name="account_dest_id" ref="chart5112_en" />
-	</record>
+    <record id="fiscal_position_charge_template_21_en" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_21_en"  />
+        <field name="account_src_id" ref="chart5111_en" />
+        <field name="account_dest_id" ref="chart5112_en" />
+    </record>
 
-	<record id="fiscal_position_charge_template_22_en" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_22_en"  />
-		<field name="account_src_id" ref="chart5111_en" />
-		<field name="account_dest_id" ref="chart5112_en" />
-	</record>
+    <record id="fiscal_position_charge_template_22_en" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_22_en"  />
+        <field name="account_src_id" ref="chart5111_en" />
+        <field name="account_dest_id" ref="chart5112_en" />
+    </record>
 
-	<record id="fiscal_position_charge_template_23_en" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_23_en"  />
-		<field name="account_src_id" ref="chart5111_en" />
-		<field name="account_dest_id" ref="chart5112_en" />
-	</record>
+    <record id="fiscal_position_charge_template_23_en" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_23_en"  />
+        <field name="account_src_id" ref="chart5111_en" />
+        <field name="account_dest_id" ref="chart5112_en" />
+    </record>
 
-	<record id="fiscal_position_charge_template_24_en" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_24_en"  />
-		<field name="account_src_id" ref="chart5111_en" />
-		<field name="account_dest_id" ref="chart5112_en" />
-	</record>
+    <record id="fiscal_position_charge_template_24_en" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_24_en"  />
+        <field name="account_src_id" ref="chart5111_en" />
+        <field name="account_dest_id" ref="chart5112_en" />
+    </record>
 
-	<record id="fiscal_position_charge_template_3_en" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_3_en"  />
-		<field name="account_src_id" ref="chart5111_en" />
-		<field name="account_dest_id" ref="chart5113_en" />
-	</record>
+    <record id="fiscal_position_charge_template_3_en" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_3_en"  />
+        <field name="account_src_id" ref="chart5111_en" />
+        <field name="account_dest_id" ref="chart5113_en" />
+    </record>
 
-	<record id="fiscal_position_charge_template_4_en" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_4_en"  />
-		<field name="account_src_id" ref="chart5111_en" />
-		<field name="account_dest_id" ref="chart5114_en" />
-	</record>
+    <record id="fiscal_position_charge_template_4_en" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_4_en"  />
+        <field name="account_src_id" ref="chart5111_en" />
+        <field name="account_dest_id" ref="chart5114_en" />
+    </record>
 
     </data>
 </openerp>    
diff --git a/addons/l10n_ca/fiscal_templates_fr.xml b/addons/l10n_ca/fiscal_templates_fr.xml
index 0acd7388a52..722517366a8 100644
--- a/addons/l10n_ca/fiscal_templates_fr.xml
+++ b/addons/l10n_ca/fiscal_templates_fr.xml
@@ -2,656 +2,656 @@
 <openerp>
     <data>
 
-	<!-- Fiscal Position Templates -->
+    <!-- Fiscal Position Templates -->
 
-	<record id="fiscal_position_template_1_fr" model="account.fiscal.position.template">
-		<field name="name">Régime Provincial</field>
-		<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-	</record>
+    <record id="fiscal_position_template_1_fr" model="account.fiscal.position.template">
+        <field name="name">Régime Provincial</field>
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+    </record>
 
-	<record id="fiscal_position_template_21_fr" model="account.fiscal.position.template">
-		<field name="name">Régime Provinces Harmonisées (12%)</field>
-		<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-	</record>
+    <record id="fiscal_position_template_21_fr" model="account.fiscal.position.template">
+        <field name="name">Régime Provinces Harmonisées (12%)</field>
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+    </record>
 
-	<record id="fiscal_position_template_22_fr" model="account.fiscal.position.template">
-		<field name="name">Régime Provinces Harmonisées (13%)</field>
-		<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-	</record>
+    <record id="fiscal_position_template_22_fr" model="account.fiscal.position.template">
+        <field name="name">Régime Provinces Harmonisées (13%)</field>
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+    </record>
 
-	<record id="fiscal_position_template_23_fr" model="account.fiscal.position.template">
-		<field name="name">Régime Provinces Harmonisées (13.5%)</field>
-		<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-	</record>
+    <record id="fiscal_position_template_23_fr" model="account.fiscal.position.template">
+        <field name="name">Régime Provinces Harmonisées (13.5%)</field>
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+    </record>
 
-	<record id="fiscal_position_template_24_fr" model="account.fiscal.position.template">
-		<field name="name">Régime Provinces Harmonisées (15%)</field>
-		<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-	</record>
+    <record id="fiscal_position_template_24_fr" model="account.fiscal.position.template">
+        <field name="name">Régime Provinces Harmonisées (15%)</field>
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+    </record>
 
-	<record id="fiscal_position_template_3_fr" model="account.fiscal.position.template">
-		<field name="name">Régime Provinces Non-Harmonisées</field>
-		<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-	</record>
+    <record id="fiscal_position_template_3_fr" model="account.fiscal.position.template">
+        <field name="name">Régime Provinces Non-Harmonisées</field>
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+    </record>
 
-	<record id="fiscal_position_template_4_fr" model="account.fiscal.position.template">
-		<field name="name">Régime International</field>
-		<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-	</record>
+    <record id="fiscal_position_template_4_fr" model="account.fiscal.position.template">
+        <field name="name">Régime International</field>
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+    </record>
 
         <!-- PURCHASES TAXES -->
 
-	<!--  Alberta Fiscal Position Tax Templates (default is tps) -->
+    <!--  Alberta Fiscal Position Tax Templates (default is tps) -->
 
-	<record id="fiscal_position_tax_template_21_ab_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_fr"  />
-		<field name="tax_src_id" ref="tps_purc_fr" />
-		<field name="tax_dest_id" ref="tvh12_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_21_ab_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_21_fr"  />
+        <field name="tax_src_id" ref="tps_purc_fr" />
+        <field name="tax_dest_id" ref="tvh12_purc_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_22_ab_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_fr"  />
-		<field name="tax_src_id" ref="tps_purc_fr" />
-		<field name="tax_dest_id" ref="tvh13_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_22_ab_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_22_fr"  />
+        <field name="tax_src_id" ref="tps_purc_fr" />
+        <field name="tax_dest_id" ref="tvh13_purc_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_23_ab_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_fr"  />
-		<field name="tax_src_id" ref="tps_purc_fr" />
-		<field name="tax_dest_id" ref="tvh135_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_23_ab_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_23_fr"  />
+        <field name="tax_src_id" ref="tps_purc_fr" />
+        <field name="tax_dest_id" ref="tvh135_purc_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_24_ab_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_fr"  />
-		<field name="tax_src_id" ref="tps_purc_fr" />
-		<field name="tax_dest_id" ref="tvh15_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_24_ab_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_24_fr"  />
+        <field name="tax_src_id" ref="tps_purc_fr" />
+        <field name="tax_dest_id" ref="tvh15_purc_fr" />
+    </record>
 
-	<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" />
-	</record>
+    <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" />
+    </record>
 
-	<!--  British Columbia Fiscal Position Tax Templates (default is hst12) -->
+    <!--  British Columbia Fiscal Position Tax Templates (default is hst12) -->
 
-	<record id="fiscal_position_tax_template_22_12_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_fr"  />
-		<field name="tax_src_id" ref="tvh12_purc_fr" />
-		<field name="tax_dest_id" ref="tvh13_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_22_12_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_22_fr"  />
+        <field name="tax_src_id" ref="tvh12_purc_fr" />
+        <field name="tax_dest_id" ref="tvh13_purc_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_23_12_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_fr"  />
-		<field name="tax_src_id" ref="tvh12_purc_fr" />
-		<field name="tax_dest_id" ref="tvh135_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_23_12_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_23_fr"  />
+        <field name="tax_src_id" ref="tvh12_purc_fr" />
+        <field name="tax_dest_id" ref="tvh135_purc_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_24_12_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_fr"  />
-		<field name="tax_src_id" ref="tvh12_purc_fr" />
-		<field name="tax_dest_id" ref="tvh15_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_24_12_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_24_fr"  />
+        <field name="tax_src_id" ref="tvh12_purc_fr" />
+        <field name="tax_dest_id" ref="tvh15_purc_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_3_12_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_fr"  />
-		<field name="tax_src_id" ref="tvh12_purc_fr" />
-		<field name="tax_dest_id" ref="tps_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_3_12_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_3_fr"  />
+        <field name="tax_src_id" ref="tvh12_purc_fr" />
+        <field name="tax_dest_id" ref="tps_purc_fr" />
+    </record>
 
-	<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" />
-	</record>
+    <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" />
+    </record>
 
-	<!--  Manitoba Fiscal Position Tax Templates (default is tpstvp_mb) -->
+    <!--  Manitoba Fiscal Position Tax Templates (default is tpstvp_mb) -->
 
-	<record id="fiscal_position_tax_template_21_mb_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_fr"  />
-		<field name="tax_src_id" ref="tpstvp_mb_purc_fr" />
-		<field name="tax_dest_id" ref="tvh12_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_21_mb_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_21_fr"  />
+        <field name="tax_src_id" ref="tpstvp_mb_purc_fr" />
+        <field name="tax_dest_id" ref="tvh12_purc_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_22_mb_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_fr"  />
-		<field name="tax_src_id" ref="tpstvp_mb_purc_fr" />
-		<field name="tax_dest_id" ref="tvh13_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_22_mb_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_22_fr"  />
+        <field name="tax_src_id" ref="tpstvp_mb_purc_fr" />
+        <field name="tax_dest_id" ref="tvh13_purc_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_23_mb_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_fr"  />
-		<field name="tax_src_id" ref="tpstvp_mb_purc_fr" />
-		<field name="tax_dest_id" ref="tvh135_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_23_mb_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_23_fr"  />
+        <field name="tax_src_id" ref="tpstvp_mb_purc_fr" />
+        <field name="tax_dest_id" ref="tvh135_purc_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_24_mb_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_fr"  />
-		<field name="tax_src_id" ref="tpstvp_mb_purc_fr" />
-		<field name="tax_dest_id" ref="tvh15_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_24_mb_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_24_fr"  />
+        <field name="tax_src_id" ref="tpstvp_mb_purc_fr" />
+        <field name="tax_dest_id" ref="tvh15_purc_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_3_mb_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_fr"  />
-		<field name="tax_src_id" ref="tpstvp_mb_purc_fr" />
-		<field name="tax_dest_id" ref="tps_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_3_mb_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_3_fr"  />
+        <field name="tax_src_id" ref="tpstvp_mb_purc_fr" />
+        <field name="tax_dest_id" ref="tps_purc_fr" />
+    </record>
 
-	<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" />
-	</record>
+    <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" />
+    </record>
 
-	<!--  New Brunswick, Newfoundland and Labrador and Ontario Fiscal Position Tax Templates (default is hst13) -->
+    <!--  New Brunswick, Newfoundland and Labrador and Ontario Fiscal Position Tax Templates (default is hst13) -->
 
-	<record id="fiscal_position_tax_template_21_13_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_fr"  />
-		<field name="tax_src_id" ref="tvh13_purc_fr" />
-		<field name="tax_dest_id" ref="tvh12_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_21_13_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_21_fr"  />
+        <field name="tax_src_id" ref="tvh13_purc_fr" />
+        <field name="tax_dest_id" ref="tvh12_purc_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_23_13_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_fr"  />
-		<field name="tax_src_id" ref="tvh13_purc_fr" />
-		<field name="tax_dest_id" ref="tvh135_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_23_13_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_23_fr"  />
+        <field name="tax_src_id" ref="tvh13_purc_fr" />
+        <field name="tax_dest_id" ref="tvh135_purc_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_24_13_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_fr"  />
-		<field name="tax_src_id" ref="tvh13_purc_fr" />
-		<field name="tax_dest_id" ref="tvh15_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_24_13_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_24_fr"  />
+        <field name="tax_src_id" ref="tvh13_purc_fr" />
+        <field name="tax_dest_id" ref="tvh15_purc_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_3_13_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_fr"  />
-		<field name="tax_src_id" ref="tvh13_purc_fr" />
-		<field name="tax_dest_id" ref="tps_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_3_13_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_3_fr"  />
+        <field name="tax_src_id" ref="tvh13_purc_fr" />
+        <field name="tax_dest_id" ref="tps_purc_fr" />
+    </record>
 
-	<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" />
-	</record>
+    <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" />
+    </record>
 
-	<!--  Nova Scotia Fiscal Position Tax Templates (default is hst15) -->
+    <!--  Nova Scotia Fiscal Position Tax Templates (default is hst15) -->
 
-	<record id="fiscal_position_tax_template_21_15_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_fr"  />
-		<field name="tax_src_id" ref="tvh15_purc_fr" />
-		<field name="tax_dest_id" ref="tvh12_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_21_15_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_21_fr"  />
+        <field name="tax_src_id" ref="tvh15_purc_fr" />
+        <field name="tax_dest_id" ref="tvh12_purc_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_22_15_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_fr"  />
-		<field name="tax_src_id" ref="tvh15_purc_fr" />
-		<field name="tax_dest_id" ref="tvh13_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_22_15_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_22_fr"  />
+        <field name="tax_src_id" ref="tvh15_purc_fr" />
+        <field name="tax_dest_id" ref="tvh13_purc_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_23_15_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_fr"  />
-		<field name="tax_src_id" ref="tvh15_purc_fr" />
-		<field name="tax_dest_id" ref="tvh135_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_23_15_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_23_fr"  />
+        <field name="tax_src_id" ref="tvh15_purc_fr" />
+        <field name="tax_dest_id" ref="tvh135_purc_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_3_15_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_fr"  />
-		<field name="tax_src_id" ref="tvh15_purc_fr" />
-		<field name="tax_dest_id" ref="tps_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_3_15_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_3_fr"  />
+        <field name="tax_src_id" ref="tvh15_purc_fr" />
+        <field name="tax_dest_id" ref="tps_purc_fr" />
+    </record>
 
-	<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" />
-	</record>
+    <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" />
+    </record>
 
-	<!--  Prince Edward Island Fiscal Position Tax Templates (default is tpstvp_pe)-->
+    <!--  Prince Edward Island Fiscal Position Tax Templates (default is tpstvp_pe)-->
 
-	<record id="fiscal_position_tax_template_21_pe_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_fr"  />
-		<field name="tax_src_id" ref="tpstvp_pe_purc_fr" />
-		<field name="tax_dest_id" ref="tvh12_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_21_pe_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_21_fr"  />
+        <field name="tax_src_id" ref="tpstvp_pe_purc_fr" />
+        <field name="tax_dest_id" ref="tvh12_purc_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_22_pe_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_fr"  />
-		<field name="tax_src_id" ref="tpstvp_pe_purc_fr" />
-		<field name="tax_dest_id" ref="tvh13_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_22_pe_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_22_fr"  />
+        <field name="tax_src_id" ref="tpstvp_pe_purc_fr" />
+        <field name="tax_dest_id" ref="tvh13_purc_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_23_pe_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_fr"  />
-		<field name="tax_src_id" ref="tpstvp_pe_purc_fr" />
-		<field name="tax_dest_id" ref="tvh135_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_23_pe_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_23_fr"  />
+        <field name="tax_src_id" ref="tpstvp_pe_purc_fr" />
+        <field name="tax_dest_id" ref="tvh135_purc_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_24_pe_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_fr"  />
-		<field name="tax_src_id" ref="tpstvp_pe_purc_fr" />
-		<field name="tax_dest_id" ref="tvh15_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_24_pe_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_24_fr"  />
+        <field name="tax_src_id" ref="tpstvp_pe_purc_fr" />
+        <field name="tax_dest_id" ref="tvh15_purc_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_3_pe_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_fr"  />
-		<field name="tax_src_id" ref="tpstvp_pe_purc_fr" />
-		<field name="tax_dest_id" ref="tps_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_3_pe_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_3_fr"  />
+        <field name="tax_src_id" ref="tpstvp_pe_purc_fr" />
+        <field name="tax_dest_id" ref="tps_purc_fr" />
+    </record>
 
-	<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" />
-	</record>
+    <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" />
+    </record>
 
-	<!--  Quebec Fiscal Position Tax Templates (default is tpstvq)-->
+    <!--  Quebec Fiscal Position Tax Templates (default is tpstvq)-->
 
-	<record id="fiscal_position_tax_template_21_qc_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_fr"  />
-		<field name="tax_src_id" ref="tpstvq_purc_fr" />
-		<field name="tax_dest_id" ref="tvh12_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_21_qc_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_21_fr"  />
+        <field name="tax_src_id" ref="tpstvq_purc_fr" />
+        <field name="tax_dest_id" ref="tvh12_purc_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_22_qc_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_fr"  />
-		<field name="tax_src_id" ref="tpstvq_purc_fr" />
-		<field name="tax_dest_id" ref="tvh13_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_22_qc_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_22_fr"  />
+        <field name="tax_src_id" ref="tpstvq_purc_fr" />
+        <field name="tax_dest_id" ref="tvh13_purc_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_24_qc_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_fr"  />
-		<field name="tax_src_id" ref="tpstvq_purc_fr" />
-		<field name="tax_dest_id" ref="tvh15_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_24_qc_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_24_fr"  />
+        <field name="tax_src_id" ref="tpstvq_purc_fr" />
+        <field name="tax_dest_id" ref="tvh15_purc_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_3_qc_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_fr"  />
-		<field name="tax_src_id" ref="tpstvq_purc_fr" />
-		<field name="tax_dest_id" ref="tps_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_3_qc_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_3_fr"  />
+        <field name="tax_src_id" ref="tpstvq_purc_fr" />
+        <field name="tax_dest_id" ref="tps_purc_fr" />
+    </record>
 
-	<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" />
-	</record>
+    <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" />
+    </record>
 
-	<!--  Saskatchewan Fiscal Position Tax Templates (default is tpstvp_sk)-->
+    <!--  Saskatchewan Fiscal Position Tax Templates (default is tpstvp_sk)-->
 
-	<record id="fiscal_position_tax_template_21_sk_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_fr"  />
-		<field name="tax_src_id" ref="tpstvp_sk_purc_fr" />
-		<field name="tax_dest_id" ref="tvh12_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_21_sk_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_21_fr"  />
+        <field name="tax_src_id" ref="tpstvp_sk_purc_fr" />
+        <field name="tax_dest_id" ref="tvh12_purc_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_22_sk_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_fr"  />
-		<field name="tax_src_id" ref="tpstvp_sk_purc_fr" />
-		<field name="tax_dest_id" ref="tvh13_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_22_sk_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_22_fr"  />
+        <field name="tax_src_id" ref="tpstvp_sk_purc_fr" />
+        <field name="tax_dest_id" ref="tvh13_purc_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_23_sk_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_fr"  />
-		<field name="tax_src_id" ref="tpstvp_sk_purc_fr" />
-		<field name="tax_dest_id" ref="tvh135_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_23_sk_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_23_fr"  />
+        <field name="tax_src_id" ref="tpstvp_sk_purc_fr" />
+        <field name="tax_dest_id" ref="tvh135_purc_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_24_sk_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_fr"  />
-		<field name="tax_src_id" ref="tpstvp_sk_purc_fr" />
-		<field name="tax_dest_id" ref="tvh15_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_24_sk_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_24_fr"  />
+        <field name="tax_src_id" ref="tpstvp_sk_purc_fr" />
+        <field name="tax_dest_id" ref="tvh15_purc_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_3_sk_purc_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_fr"  />
-		<field name="tax_src_id" ref="tpstvp_sk_purc_fr" />
-		<field name="tax_dest_id" ref="tps_purc_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_3_sk_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_3_fr"  />
+        <field name="tax_src_id" ref="tpstvp_sk_purc_fr" />
+        <field name="tax_dest_id" ref="tps_purc_fr" />
+    </record>
 
-	<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" />
-	</record>
+    <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" />
+    </record>
 
 
         <!-- SALES TAXES -->
 
 
-	<!--  Alberta Fiscal Position Tax Templates (default is tps) -->
+    <!--  Alberta Fiscal Position Tax Templates (default is tps) -->
 
-	<record id="fiscal_position_tax_template_21_ab_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_fr"  />
-		<field name="tax_src_id" ref="tps_sale_fr" />
-		<field name="tax_dest_id" ref="tvh12_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_21_ab_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_21_fr"  />
+        <field name="tax_src_id" ref="tps_sale_fr" />
+        <field name="tax_dest_id" ref="tvh12_sale_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_22_ab_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_fr"  />
-		<field name="tax_src_id" ref="tps_sale_fr" />
-		<field name="tax_dest_id" ref="tvh13_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_22_ab_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_22_fr"  />
+        <field name="tax_src_id" ref="tps_sale_fr" />
+        <field name="tax_dest_id" ref="tvh13_sale_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_23_ab_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_fr"  />
-		<field name="tax_src_id" ref="tps_sale_fr" />
-		<field name="tax_dest_id" ref="tvh135_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_23_ab_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_23_fr"  />
+        <field name="tax_src_id" ref="tps_sale_fr" />
+        <field name="tax_dest_id" ref="tvh135_sale_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_24_ab_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_fr"  />
-		<field name="tax_src_id" ref="tps_sale_fr" />
-		<field name="tax_dest_id" ref="tvh15_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_24_ab_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_24_fr"  />
+        <field name="tax_src_id" ref="tps_sale_fr" />
+        <field name="tax_dest_id" ref="tvh15_sale_fr" />
+    </record>
 
-	<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" />
-	</record>
+    <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" />
+    </record>
 
-	<!--  British Columbia Fiscal Position Tax Templates (default is hst12) -->
+    <!--  British Columbia Fiscal Position Tax Templates (default is hst12) -->
 
-	<record id="fiscal_position_tax_template_22_12c_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_fr"  />
-		<field name="tax_src_id" ref="tvh12_sale_fr" />
-		<field name="tax_dest_id" ref="tvh13_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_22_12c_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_22_fr"  />
+        <field name="tax_src_id" ref="tvh12_sale_fr" />
+        <field name="tax_dest_id" ref="tvh13_sale_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_23_12_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_fr"  />
-		<field name="tax_src_id" ref="tvh12_sale_fr" />
-		<field name="tax_dest_id" ref="tvh135_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_23_12_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_23_fr"  />
+        <field name="tax_src_id" ref="tvh12_sale_fr" />
+        <field name="tax_dest_id" ref="tvh135_sale_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_24_12_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_fr"  />
-		<field name="tax_src_id" ref="tvh12_sale_fr" />
-		<field name="tax_dest_id" ref="tvh15_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_24_12_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_24_fr"  />
+        <field name="tax_src_id" ref="tvh12_sale_fr" />
+        <field name="tax_dest_id" ref="tvh15_sale_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_3_12_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_fr"  />
-		<field name="tax_src_id" ref="tvh12_sale_fr" />
-		<field name="tax_dest_id" ref="tps_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_3_12_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_3_fr"  />
+        <field name="tax_src_id" ref="tvh12_sale_fr" />
+        <field name="tax_dest_id" ref="tps_sale_fr" />
+    </record>
 
-	<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" />
-	</record>
+    <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" />
+    </record>
 
-	<!--  Manitoba Fiscal Position Tax Templates (default is tpstvp_mb) -->
+    <!--  Manitoba Fiscal Position Tax Templates (default is tpstvp_mb) -->
 
-	<record id="fiscal_position_tax_template_21_mb_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_fr"  />
-		<field name="tax_src_id" ref="tpstvp_mb_sale_fr" />
-		<field name="tax_dest_id" ref="tvh12_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_21_mb_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_21_fr"  />
+        <field name="tax_src_id" ref="tpstvp_mb_sale_fr" />
+        <field name="tax_dest_id" ref="tvh12_sale_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_22_mb_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_fr"  />
-		<field name="tax_src_id" ref="tpstvp_mb_sale_fr" />
-		<field name="tax_dest_id" ref="tvh13_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_22_mb_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_22_fr"  />
+        <field name="tax_src_id" ref="tpstvp_mb_sale_fr" />
+        <field name="tax_dest_id" ref="tvh13_sale_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_23_mb_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_fr"  />
-		<field name="tax_src_id" ref="tpstvp_mb_sale_fr" />
-		<field name="tax_dest_id" ref="tvh135_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_23_mb_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_23_fr"  />
+        <field name="tax_src_id" ref="tpstvp_mb_sale_fr" />
+        <field name="tax_dest_id" ref="tvh135_sale_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_24_mb_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_fr"  />
-		<field name="tax_src_id" ref="tpstvp_mb_sale_fr" />
-		<field name="tax_dest_id" ref="tvh15_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_24_mb_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_24_fr"  />
+        <field name="tax_src_id" ref="tpstvp_mb_sale_fr" />
+        <field name="tax_dest_id" ref="tvh15_sale_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_3_mb_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_fr"  />
-		<field name="tax_src_id" ref="tpstvp_mb_sale_fr" />
-		<field name="tax_dest_id" ref="tps_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_3_mb_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_3_fr"  />
+        <field name="tax_src_id" ref="tpstvp_mb_sale_fr" />
+        <field name="tax_dest_id" ref="tps_sale_fr" />
+    </record>
 
-	<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" />
-	</record>
+    <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" />
+    </record>
 
-	<!--  New Brunswick, Newfoundland and Labrador and Ontario Fiscal Position Tax Templates (default is hst13) -->
+    <!--  New Brunswick, Newfoundland and Labrador and Ontario Fiscal Position Tax Templates (default is hst13) -->
 
-	<record id="fiscal_position_tax_template_21_13_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_fr"  />
-		<field name="tax_src_id" ref="tvh13_sale_fr" />
-		<field name="tax_dest_id" ref="tvh12_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_21_13_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_21_fr"  />
+        <field name="tax_src_id" ref="tvh13_sale_fr" />
+        <field name="tax_dest_id" ref="tvh12_sale_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_23_13_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_fr"  />
-		<field name="tax_src_id" ref="tvh13_sale_fr" />
-		<field name="tax_dest_id" ref="tvh135_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_23_13_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_23_fr"  />
+        <field name="tax_src_id" ref="tvh13_sale_fr" />
+        <field name="tax_dest_id" ref="tvh135_sale_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_24_13_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_fr"  />
-		<field name="tax_src_id" ref="tvh13_sale_fr" />
-		<field name="tax_dest_id" ref="tvh15_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_24_13_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_24_fr"  />
+        <field name="tax_src_id" ref="tvh13_sale_fr" />
+        <field name="tax_dest_id" ref="tvh15_sale_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_3_13_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_fr"  />
-		<field name="tax_src_id" ref="tvh13_sale_fr" />
-		<field name="tax_dest_id" ref="tps_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_3_13_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_3_fr"  />
+        <field name="tax_src_id" ref="tvh13_sale_fr" />
+        <field name="tax_dest_id" ref="tps_sale_fr" />
+    </record>
 
-	<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" />
-	</record>
+    <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" />
+    </record>
 
-	<!--  Nova Scotia Fiscal Position Tax Templates (default is hst15) -->
+    <!--  Nova Scotia Fiscal Position Tax Templates (default is hst15) -->
 
-	<record id="fiscal_position_tax_template_21_15_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_fr"  />
-		<field name="tax_src_id" ref="tvh15_sale_fr" />
-		<field name="tax_dest_id" ref="tvh12_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_21_15_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_21_fr"  />
+        <field name="tax_src_id" ref="tvh15_sale_fr" />
+        <field name="tax_dest_id" ref="tvh12_sale_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_22_15_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_fr"  />
-		<field name="tax_src_id" ref="tvh15_sale_fr" />
-		<field name="tax_dest_id" ref="tvh13_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_22_15_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_22_fr"  />
+        <field name="tax_src_id" ref="tvh15_sale_fr" />
+        <field name="tax_dest_id" ref="tvh13_sale_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_23_15_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_fr"  />
-		<field name="tax_src_id" ref="tvh15_sale_fr" />
-		<field name="tax_dest_id" ref="tvh135_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_23_15_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_23_fr"  />
+        <field name="tax_src_id" ref="tvh15_sale_fr" />
+        <field name="tax_dest_id" ref="tvh135_sale_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_3_15_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_fr"  />
-		<field name="tax_src_id" ref="tvh15_sale_fr" />
-		<field name="tax_dest_id" ref="tps_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_3_15_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_3_fr"  />
+        <field name="tax_src_id" ref="tvh15_sale_fr" />
+        <field name="tax_dest_id" ref="tps_sale_fr" />
+    </record>
 
-	<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" />
-	</record>
+    <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" />
+    </record>
 
-	<!--  Prince Edward Island Fiscal Position Tax Templates (default is tpstvp_pe)-->
+    <!--  Prince Edward Island Fiscal Position Tax Templates (default is tpstvp_pe)-->
 
-	<record id="fiscal_position_tax_template_21_pe_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_fr"  />
-		<field name="tax_src_id" ref="tpstvp_pe_sale_fr" />
-		<field name="tax_dest_id" ref="tvh12_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_21_pe_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_21_fr"  />
+        <field name="tax_src_id" ref="tpstvp_pe_sale_fr" />
+        <field name="tax_dest_id" ref="tvh12_sale_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_22_pe_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_fr"  />
-		<field name="tax_src_id" ref="tpstvp_pe_sale_fr" />
-		<field name="tax_dest_id" ref="tvh13_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_22_pe_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_22_fr"  />
+        <field name="tax_src_id" ref="tpstvp_pe_sale_fr" />
+        <field name="tax_dest_id" ref="tvh13_sale_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_23_pe_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_fr"  />
-		<field name="tax_src_id" ref="tpstvp_pe_sale_fr" />
-		<field name="tax_dest_id" ref="tvh135_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_23_pe_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_23_fr"  />
+        <field name="tax_src_id" ref="tpstvp_pe_sale_fr" />
+        <field name="tax_dest_id" ref="tvh135_sale_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_24_pe_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_fr"  />
-		<field name="tax_src_id" ref="tpstvp_pe_sale_fr" />
-		<field name="tax_dest_id" ref="tvh15_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_24_pe_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_24_fr"  />
+        <field name="tax_src_id" ref="tpstvp_pe_sale_fr" />
+        <field name="tax_dest_id" ref="tvh15_sale_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_3_pe_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_fr"  />
-		<field name="tax_src_id" ref="tpstvp_pe_sale_fr" />
-		<field name="tax_dest_id" ref="tps_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_3_pe_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_3_fr"  />
+        <field name="tax_src_id" ref="tpstvp_pe_sale_fr" />
+        <field name="tax_dest_id" ref="tps_sale_fr" />
+    </record>
 
-	<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" />
-	</record>
+    <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" />
+    </record>
 
-	<!--  Quebec Fiscal Position Tax Templates (default is tpstvq)-->
+    <!--  Quebec Fiscal Position Tax Templates (default is tpstvq)-->
 
-	<record id="fiscal_position_tax_template_21_qc_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_fr"  />
-		<field name="tax_src_id" ref="tpstvq_sale_fr" />
-		<field name="tax_dest_id" ref="tvh12_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_21_qc_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_21_fr"  />
+        <field name="tax_src_id" ref="tpstvq_sale_fr" />
+        <field name="tax_dest_id" ref="tvh12_sale_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_22_qc_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_fr"  />
-		<field name="tax_src_id" ref="tpstvq_sale_fr" />
-		<field name="tax_dest_id" ref="tvh13_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_22_qc_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_22_fr"  />
+        <field name="tax_src_id" ref="tpstvq_sale_fr" />
+        <field name="tax_dest_id" ref="tvh13_sale_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_24_qc_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_fr"  />
-		<field name="tax_src_id" ref="tpstvq_sale_fr" />
-		<field name="tax_dest_id" ref="tvh15_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_24_qc_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_24_fr"  />
+        <field name="tax_src_id" ref="tpstvq_sale_fr" />
+        <field name="tax_dest_id" ref="tvh15_sale_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_3_qc_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_fr"  />
-		<field name="tax_src_id" ref="tpstvq_sale_fr" />
-		<field name="tax_dest_id" ref="tps_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_3_qc_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_3_fr"  />
+        <field name="tax_src_id" ref="tpstvq_sale_fr" />
+        <field name="tax_dest_id" ref="tps_sale_fr" />
+    </record>
 
-	<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" />
-	</record>
+    <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" />
+    </record>
 
-	<!--  Saskatchewan Fiscal Position Tax Templates (default is tpstvp_sk)-->
+    <!--  Saskatchewan Fiscal Position Tax Templates (default is tpstvp_sk)-->
 
-	<record id="fiscal_position_tax_template_21_sk_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_21_fr"  />
-		<field name="tax_src_id" ref="tpstvp_sk_sale_fr" />
-		<field name="tax_dest_id" ref="tvh12_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_21_sk_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_21_fr"  />
+        <field name="tax_src_id" ref="tpstvp_sk_sale_fr" />
+        <field name="tax_dest_id" ref="tvh12_sale_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_22_sk_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_22_fr"  />
-		<field name="tax_src_id" ref="tpstvp_sk_sale_fr" />
-		<field name="tax_dest_id" ref="tvh13_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_22_sk_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_22_fr"  />
+        <field name="tax_src_id" ref="tpstvp_sk_sale_fr" />
+        <field name="tax_dest_id" ref="tvh13_sale_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_23_sk_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_23_fr"  />
-		<field name="tax_src_id" ref="tpstvp_sk_sale_fr" />
-		<field name="tax_dest_id" ref="tvh135_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_23_sk_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_23_fr"  />
+        <field name="tax_src_id" ref="tpstvp_sk_sale_fr" />
+        <field name="tax_dest_id" ref="tvh135_sale_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_24_sk_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_24_fr"  />
-		<field name="tax_src_id" ref="tpstvp_sk_sale_fr" />
-		<field name="tax_dest_id" ref="tvh15_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_24_sk_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_24_fr"  />
+        <field name="tax_src_id" ref="tpstvp_sk_sale_fr" />
+        <field name="tax_dest_id" ref="tvh15_sale_fr" />
+    </record>
 
-	<record id="fiscal_position_tax_template_3_sk_sale_fr" model="account.fiscal.position.tax.template">
-		<field name="position_id" ref="fiscal_position_template_3_fr"  />
-		<field name="tax_src_id" ref="tpstvp_sk_sale_fr" />
-		<field name="tax_dest_id" ref="tps_sale_fr" />
-	</record>
+    <record id="fiscal_position_tax_template_3_sk_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_3_fr"  />
+        <field name="tax_src_id" ref="tpstvp_sk_sale_fr" />
+        <field name="tax_dest_id" ref="tps_sale_fr" />
+    </record>
 
-	<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" />
-	</record>
+    <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" />
+    </record>
 
-	<!-- Fiscal Position Account Templates - Products -->
+    <!-- Fiscal Position Account Templates - Products -->
 
-	<record id="fiscal_position_product_template_21_fr" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_21_fr"  />
-		<field name="account_src_id" ref="chart411_fr" />
-		<field name="account_dest_id" ref="chart412_fr" />
-	</record>
+    <record id="fiscal_position_product_template_21_fr" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_21_fr"  />
+        <field name="account_src_id" ref="chart411_fr" />
+        <field name="account_dest_id" ref="chart412_fr" />
+    </record>
 
-	<record id="fiscal_position_product_template_22_fr" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_22_fr"  />
-		<field name="account_src_id" ref="chart411_fr" />
-		<field name="account_dest_id" ref="chart412_fr" />
-	</record>
+    <record id="fiscal_position_product_template_22_fr" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_22_fr"  />
+        <field name="account_src_id" ref="chart411_fr" />
+        <field name="account_dest_id" ref="chart412_fr" />
+    </record>
 
-	<record id="fiscal_position_product_template_23_fr" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_23_fr"  />
-		<field name="account_src_id" ref="chart411_fr" />
-		<field name="account_dest_id" ref="chart412_fr" />
-	</record>
+    <record id="fiscal_position_product_template_23_fr" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_23_fr"  />
+        <field name="account_src_id" ref="chart411_fr" />
+        <field name="account_dest_id" ref="chart412_fr" />
+    </record>
 
-	<record id="fiscal_position_product_template_24_fr" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_24_fr"  />
-		<field name="account_src_id" ref="chart411_fr" />
-		<field name="account_dest_id" ref="chart412_fr" />
-	</record>
+    <record id="fiscal_position_product_template_24_fr" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_24_fr"  />
+        <field name="account_src_id" ref="chart411_fr" />
+        <field name="account_dest_id" ref="chart412_fr" />
+    </record>
 
-	<record id="fiscal_position_product_template_3_fr" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_3_fr"  />
-		<field name="account_src_id" ref="chart411_fr" />
-		<field name="account_dest_id" ref="chart413_fr" />
-	</record>
+    <record id="fiscal_position_product_template_3_fr" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_3_fr"  />
+        <field name="account_src_id" ref="chart411_fr" />
+        <field name="account_dest_id" ref="chart413_fr" />
+    </record>
 
-	<record id="fiscal_position_product_template_4_fr" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_4_fr"  />
-		<field name="account_src_id" ref="chart411_fr" />
-		<field name="account_dest_id" ref="chart414_fr" />
-	</record>
+    <record id="fiscal_position_product_template_4_fr" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_4_fr"  />
+        <field name="account_src_id" ref="chart411_fr" />
+        <field name="account_dest_id" ref="chart414_fr" />
+    </record>
 
-	<!-- Fiscal Position Account Templates - Charges -->
+    <!-- Fiscal Position Account Templates - Charges -->
 
-	<record id="fiscal_position_charge_template_21_fr" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_21_fr"  />
-		<field name="account_src_id" ref="chart5111_fr" />
-		<field name="account_dest_id" ref="chart5112_fr" />
-	</record>
+    <record id="fiscal_position_charge_template_21_fr" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_21_fr"  />
+        <field name="account_src_id" ref="chart5111_fr" />
+        <field name="account_dest_id" ref="chart5112_fr" />
+    </record>
 
-	<record id="fiscal_position_charge_template_22_fr" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_22_fr"  />
-		<field name="account_src_id" ref="chart5111_fr" />
-		<field name="account_dest_id" ref="chart5112_fr" />
-	</record>
+    <record id="fiscal_position_charge_template_22_fr" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_22_fr"  />
+        <field name="account_src_id" ref="chart5111_fr" />
+        <field name="account_dest_id" ref="chart5112_fr" />
+    </record>
 
-	<record id="fiscal_position_charge_template_23_fr" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_23_fr"  />
-		<field name="account_src_id" ref="chart5111_fr" />
-		<field name="account_dest_id" ref="chart5112_fr" />
-	</record>
+    <record id="fiscal_position_charge_template_23_fr" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_23_fr"  />
+        <field name="account_src_id" ref="chart5111_fr" />
+        <field name="account_dest_id" ref="chart5112_fr" />
+    </record>
 
-	<record id="fiscal_position_charge_template_24_fr" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_24_fr"  />
-		<field name="account_src_id" ref="chart5111_fr" />
-		<field name="account_dest_id" ref="chart5112_fr" />
-	</record>
+    <record id="fiscal_position_charge_template_24_fr" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_24_fr"  />
+        <field name="account_src_id" ref="chart5111_fr" />
+        <field name="account_dest_id" ref="chart5112_fr" />
+    </record>
 
-	<record id="fiscal_position_charge_template_3_fr" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_3_fr"  />
-		<field name="account_src_id" ref="chart5111_fr" />
-		<field name="account_dest_id" ref="chart5113_fr" />
-	</record>
+    <record id="fiscal_position_charge_template_3_fr" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_3_fr"  />
+        <field name="account_src_id" ref="chart5111_fr" />
+        <field name="account_dest_id" ref="chart5113_fr" />
+    </record>
 
-	<record id="fiscal_position_charge_template_4_fr" model="account.fiscal.position.account.template">
-		<field name="position_id" ref="fiscal_position_template_4_fr"  />
-		<field name="account_src_id" ref="chart5111_fr" />
-		<field name="account_dest_id" ref="chart5114_fr" />
-	</record>
+    <record id="fiscal_position_charge_template_4_fr" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_4_fr"  />
+        <field name="account_src_id" ref="chart5111_fr" />
+        <field name="account_dest_id" ref="chart5114_fr" />
+    </record>
 
     </data>
 </openerp>    

From d14c62fbe803f22c1fc9e9a6c8e62b8fd4a211cf Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Mon, 30 Jul 2012 15:28:40 +0200
Subject: [PATCH 5/6] [IMP] copywriting summary of modules

bzr revid: fp@openerp.com-20120730132840-bchv2hmp40uqkwvb
---
 addons/account_accountant/__openerp__.py | 2 +-
 addons/account_voucher/__openerp__.py    | 2 +-
 addons/crm/__openerp__.py                | 2 +-
 addons/event/__openerp__.py              | 2 +-
 addons/hr/__openerp__.py                 | 2 +-
 addons/hr_evaluation/__openerp__.py      | 2 +-
 addons/hr_holidays/__openerp__.py        | 2 +-
 addons/hr_recruitment/__openerp__.py     | 2 +-
 addons/hr_timesheet_sheet/__openerp__.py | 4 ++--
 addons/mail/__openerp__.py               | 2 +-
 addons/mrp/__openerp__.py                | 2 +-
 addons/point_of_sale/__openerp__.py      | 2 +-
 addons/project_issue/__openerp__.py      | 2 +-
 addons/purchase/__openerp__.py           | 2 +-
 addons/sale/__openerp__.py               | 2 +-
 addons/stock/__openerp__.py              | 2 +-
 16 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/addons/account_accountant/__openerp__.py b/addons/account_accountant/__openerp__.py
index ff4e3faa3b6..7c97112b875 100644
--- a/addons/account_accountant/__openerp__.py
+++ b/addons/account_accountant/__openerp__.py
@@ -24,7 +24,7 @@
     "author" : "OpenERP SA",
     "category": 'Accounting & Finance',
     "sequence": 10,
-    "summary": "Accounts Moves, Journals, Chart of Accounts",
+    "summary": "Financial and Analytic Accounting",
     "description": """
 Accounting Access Rights.
 =========================
diff --git a/addons/account_voucher/__openerp__.py b/addons/account_voucher/__openerp__.py
index 0b37bdbd4a2..135c2bc828b 100644
--- a/addons/account_voucher/__openerp__.py
+++ b/addons/account_voucher/__openerp__.py
@@ -23,7 +23,7 @@
     "name" : "eInvoicing & Payments",
     "version" : "1.0",
     "author" : 'OpenERP SA',
-    "summary": 'Supplier & Customer Invoices, Payments',
+    "summary": 'Send Invoices and Track Payments',
     "description": """
 eInvoicing & Payments module manage all Voucher Entries such as "Reconciliation Entries", "Adjustment Entries", "Closing or Opening Entries" for Sales, Purchase, Bank, Cash, Expense, Contra.
 ==============================================================================================================================================================================================
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 6b0d0e1e2c9..643908c1098 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -25,7 +25,7 @@
     'version': '1.0',
     'category': 'Customer Relationship Management',
     "sequence": 2,
-    "summary": "Agenda, Leads, Opportunities",
+    "summary": "Leads, Opportunities, Agenda",
     'description': """
 The generic OpenERP Customer Relationship Management.
 =====================================================
diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index 34707d1c0f6..75c79f06835 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -25,7 +25,7 @@
     'name': 'Events Organisation',
     'version': '0.1',
     'category': 'Tools',
-    'summary': 'Invitations, Subscriptions',
+    'summary': 'For Trainings, Conferences & Meetings',
     'description': """
 Organization and management of Events.
 ======================================
diff --git a/addons/hr/__openerp__.py b/addons/hr/__openerp__.py
index ebf8d7ba83e..39dad795c0b 100644
--- a/addons/hr/__openerp__.py
+++ b/addons/hr/__openerp__.py
@@ -26,7 +26,7 @@
     "category": "Human Resources",
     "sequence": 12,
     "website": "http://www.openerp.com",
-    "summary": "Hierarchy, Jobs, Departments",
+    "summary": "All Infos on Employees",
     "description": """
 Module for Human Resource Management.
 =====================================
diff --git a/addons/hr_evaluation/__openerp__.py b/addons/hr_evaluation/__openerp__.py
index 4748883b1ce..bb1322bccf3 100644
--- a/addons/hr_evaluation/__openerp__.py
+++ b/addons/hr_evaluation/__openerp__.py
@@ -25,7 +25,7 @@
     "author": "OpenERP SA",
     "category": "Human Resources",
     "website": "http://www.openerp.com",
-    "summary": "Top-Down and Bottom-Up Evaluation",
+    "summary": "Periodical Evaluations, Surveys",
     "images": ["images/hr_evaluation_analysis.jpeg","images/hr_evaluation.jpeg"],
     "depends": ["hr","base_calendar","survey"],
     "description": """
diff --git a/addons/hr_holidays/__openerp__.py b/addons/hr_holidays/__openerp__.py
index c8c2bad3489..45dd9ea39a5 100644
--- a/addons/hr_holidays/__openerp__.py
+++ b/addons/hr_holidays/__openerp__.py
@@ -26,7 +26,7 @@
     "author": "OpenERP SA",
     "category": "Human Resources",
     "sequence": 28,
-    "summary": "Allocation and Leave Requests, Reporting by Department",
+    "summary": "Holidays, Allocation and Leave Requests",
     "website": "http://www.openerp.com",
     "description": """
 This module allows you to manage leaves and leave's requests.
diff --git a/addons/hr_recruitment/__openerp__.py b/addons/hr_recruitment/__openerp__.py
index fe6c86c684d..0de2eb5c94e 100644
--- a/addons/hr_recruitment/__openerp__.py
+++ b/addons/hr_recruitment/__openerp__.py
@@ -24,7 +24,7 @@
     'version': '1.0',
     'category': 'Human Resources',
     "sequence": 24,
-    "summary": "Job Descriptions, Recruitment Process",
+    "summary": "Recruitment Process, Job Descriptions",
     'description': """
 Manages job positions and the recruitment process.
 ==================================================
diff --git a/addons/hr_timesheet_sheet/__openerp__.py b/addons/hr_timesheet_sheet/__openerp__.py
index cc788d95a83..1acaa5780b8 100644
--- a/addons/hr_timesheet_sheet/__openerp__.py
+++ b/addons/hr_timesheet_sheet/__openerp__.py
@@ -21,11 +21,11 @@
 
 
 {
-    'name': 'Timesheets Validation',
+    'name': 'Timesheets',
     'version': '1.0',
     'category': 'Human Resources',
     "sequence": 16,
-    "summary": "Attendances, Activities, Timing",
+    "summary": "Timesheets, Attendances, Activities",
     'description': """
 This module helps you to easily encode and validate timesheet and attendances within the same view.
 ===================================================================================================
diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py
index ee22b0c153f..323a647c334 100644
--- a/addons/mail/__openerp__.py
+++ b/addons/mail/__openerp__.py
@@ -24,7 +24,7 @@
     'version': '1.0',
     'category':'Social Network',
     "sequence": 2,
-    "summary": "Discussions, Feeds, Alerts",
+    "summary": "Discussions, Mailing Lists, News",
     'description': """
 A bussiness oriented Social Networking with a fully-integrated email 
 and message management.
diff --git a/addons/mrp/__openerp__.py b/addons/mrp/__openerp__.py
index d7a14237eb0..eae0d004836 100644
--- a/addons/mrp/__openerp__.py
+++ b/addons/mrp/__openerp__.py
@@ -27,7 +27,7 @@
     "website" : "http://www.openerp.com",
     "category" : "Manufacturing",
     "sequence": 18,
-    "summary": "Manufacturing, Production, Bill of Materials",
+    "summary": "Manufacturing Orders, Bill of Materials, Routing",
     "images" : ["images/bill_of_materials.jpeg", "images/manufacturing_order.jpeg", "images/planning_manufacturing_order.jpeg", "images/production_analysis.jpeg", "images/production_dashboard.jpeg","images/routings.jpeg","images/work_centers.jpeg"],
     "depends" : ["procurement", "stock", "resource", "purchase", "product","process"],
     "description": """
diff --git a/addons/point_of_sale/__openerp__.py b/addons/point_of_sale/__openerp__.py
index 9a39871f0c0..9d985d40408 100644
--- a/addons/point_of_sale/__openerp__.py
+++ b/addons/point_of_sale/__openerp__.py
@@ -25,7 +25,7 @@
     'version': '1.0.1',
     'category': 'Point Of Sale',
     "sequence": 6,
-    "summary": "Touchscreen to Manage your Shop",
+    "summary": "Touchscreen Interface for Shops",
     'description': """
 This module provides a quick and easy sale process.
 ===================================================
diff --git a/addons/project_issue/__openerp__.py b/addons/project_issue/__openerp__.py
index fa7d002f571..d5e7ee1985f 100644
--- a/addons/project_issue/__openerp__.py
+++ b/addons/project_issue/__openerp__.py
@@ -25,7 +25,7 @@
     'version': '1.0',
     'category': 'Project Management',
     "sequence": 22,
-    "summary": "Multi Level Support",
+    "summary": "Support, Bug Traker, Helpdesk",
     'description': """
 This module provides Issues/Bugs Management in Project.
 =======================================================
diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py
index cb2e8f093aa..eb8df0ff77b 100644
--- a/addons/purchase/__openerp__.py
+++ b/addons/purchase/__openerp__.py
@@ -25,7 +25,7 @@
     'version': '1.1',
     'category': 'Purchase Management',
     "sequence": 19,
-    "summary": "Requests for Quotation, Invoicing Control",
+    "summary": "RfQ, Purchase Orders, Delivery & Invoicing Control",
     'description': """
 Purchase Management module is for generating a purchase order for purchase of goods from a supplier.
 ====================================================================================================
diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index f5bf1adb436..b6be6f7b1e3 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -24,7 +24,7 @@
     'version': '1.0',
     'category': 'Sales Management',
     "sequence": 14,
-    "summary": "Quotations, Sales, Invoicing",
+    "summary": "Quotations, Sale Orders, Invoicing",
     'description': """
 The base module to manage quotations and sales orders.
 ======================================================
diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py
index d061fb4b033..0f0f758f4d6 100644
--- a/addons/stock/__openerp__.py
+++ b/addons/stock/__openerp__.py
@@ -23,7 +23,7 @@
     "name" : "Warehouse Management",
     "version" : "1.1",
     "author" : "OpenERP SA",
-    "summary": "Incoming Shipments, Deliveries, Inventory, Stock",
+    "summary": "Inventory, Logistic, Storage",
     "description" : """
 OpenERP Inventory Management module can manage multi-warehouses, multi and structured stock locations.
 ======================================================================================================

From 1fc30258ff1b48a6a803aa3eb74409a059a4afff Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Mon, 30 Jul 2012 16:29:43 +0200
Subject: [PATCH 6/6] [FIX] mrp: add the stock.group_locations group

bzr revid: stw@openerp.com-20120730142943-1ruwsyaf5pvehbzm
---
 addons/mrp/mrp_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 3177d578997..0449f590127 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -686,8 +686,8 @@
                     </group>
                     <notebook>
                         <page string="Consumed Products">
-                            <group>
-                                <group groups="stock.group_locations">
+                            <group groups="stock.group_locations">
+                                <group>
                                     <field name="bom_id" domain="[('product_id','=',product_id)]" context="{'default_product_id': product_id}" on_change="bom_id_change(bom_id)"/>
                                 </group>
                                 <group>