diff --git a/addons/l10n_ca/__init__.py b/addons/l10n_ca/__init__.py
index 24ab202267f..2a86c685c01 100644
--- a/addons/l10n_ca/__init__.py
+++ b/addons/l10n_ca/__init__.py
@@ -2,19 +2,19 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2010 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
+#    it under the terms of the GNU General Public License as
 #    published by the Free Software Foundation, either version 3 of the
 #    License, or (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
+#    GNU General Public License for more details.
 #
-#    You should have received a copy of the GNU Affero General Public License
+#    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
 #
 ##############################################################################
diff --git a/addons/l10n_ca/account_tax_en.xml b/addons/l10n_ca/account_tax_en.xml
index ec56371bedb..e87ce37aa0f 100644
--- a/addons/l10n_ca/account_tax_en.xml
+++ b/addons/l10n_ca/account_tax_en.xml
@@ -2,56 +2,56 @@
 <openerp>
     <data noupdate="1">
 
-        <record id="notax_en" model="account.tax.template">
-                <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-                <field name="name">No tax</field>
-                <field name="amount">0.00</field>
-                <field name="type">percent</field>
-                <field name="base_code_id" ref="vat_code_base_due_en"/>
-                <field name="ref_base_code_id" ref="vat_code_receivable_net_en"/>
-        </record>
+    <record id="notax_en" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+        <field name="name">No tax</field>
+        <field name="amount">0.00</field>
+        <field name="type">percent</field>
+        <field name="base_code_id" ref="vat_code_base_due_en"/>
+        <field name="ref_base_code_id" ref="vat_code_receivable_net_en"/>
+    </record>
 
-	<record id="gst_en" model="account.tax.template">
-		<field name="chart_template_id" ref="ca_en_chart_template_en"/>
-		<field name="name">GST (5.0%)</field>
-		<field name="code">GST</field>
-		<field name="amount">0.050000</field>
-		<field name="type">percent</field>
-		<field name="account_collected_id" ref="chart241000_en"/>
-		<field name="account_paid_id" ref="chart243000_en"/>
-		<field name="base_code_id" ref="vat_code_base_due_en"/>
-		<field name="tax_code_id" ref="vat_code_due_tva_en"/>
-		<field name="ref_base_code_id" ref="vat_code_receivable_net_en"/>
-		<field name="ref_tax_code_id" ref="vat_code_payable_en"/>
-	</record>
+    <record id="gst_en" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+        <field name="name">GST (5.0%)</field>
+        <field name="code">GST</field>
+        <field name="amount">0.050000</field>
+        <field name="type">percent</field>
+        <field name="account_collected_id" ref="chart241000_en"/>
+        <field name="account_paid_id" ref="chart243000_en"/>
+        <field name="base_code_id" ref="vat_code_base_due_en"/>
+        <field name="tax_code_id" ref="vat_code_due_tva_en"/>
+        <field name="ref_base_code_id" ref="vat_code_receivable_net_en"/>
+        <field name="ref_tax_code_id" ref="vat_code_payable_en"/>
+    </record>
 
-	<record id="pst_en" model="account.tax.template">
-		<field name="chart_template_id" ref="ca_en_chart_template_en"/>
-		<field name="name">PST (7,5%)</field>
-		<field name="code">PST</field>
-		<field name="amount">0.075000</field>
-		<field name="type">percent</field>
-		<field name="account_collected_id" ref="chart242000_en"/>
-		<field name="account_paid_id" ref="chart244000_en"/>
-		<field name="base_code_id" ref="vat_code_base_due_en"/>
-		<field name="tax_code_id" ref="vat_code_due_tva_en"/>
-		<field name="ref_base_code_id" ref="vat_code_receivable_net_en"/>
-		<field name="ref_tax_code_id" ref="vat_code_payable_en"/>
-	</record>
+    <record id="pst_en" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+        <field name="name">PST (7,5%)</field>
+        <field name="code">PST</field>
+        <field name="amount">0.075000</field>
+        <field name="type">percent</field>
+        <field name="account_collected_id" ref="chart242000_en"/>
+        <field name="account_paid_id" ref="chart244000_en"/>
+        <field name="base_code_id" ref="vat_code_base_due_en"/>
+        <field name="tax_code_id" ref="vat_code_due_tva_en"/>
+        <field name="ref_base_code_id" ref="vat_code_receivable_net_en"/>
+        <field name="ref_tax_code_id" ref="vat_code_payable_en"/>
+    </record>
 
-	<record id="hst_en" model="account.tax.template">
-		<field name="chart_template_id" ref="ca_en_chart_template_en"/>
-		<field name="name">HST (13%)</field>
-		<field name="code">HST</field>
-		<field name="amount">0.130000</field>
-		<field name="type">percent</field>
-		<field name="account_collected_id" ref="chart242000_en"/>
-		<field name="account_paid_id" ref="chart244000_en"/>
-		<field name="base_code_id" ref="vat_code_base_due_en"/>
-		<field name="tax_code_id" ref="vat_code_due_tva_en"/>
-		<field name="ref_base_code_id" ref="vat_code_receivable_net_en"/>
-		<field name="ref_tax_code_id" ref="vat_code_payable_en"/>
-	</record>
+    <record id="hst_en" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+        <field name="name">HST (13%)</field>
+        <field name="code">HST</field>
+        <field name="amount">0.130000</field>
+        <field name="type">percent</field>
+        <field name="account_collected_id" ref="chart242000_en"/>
+        <field name="account_paid_id" ref="chart244000_en"/>
+        <field name="base_code_id" ref="vat_code_base_due_en"/>
+        <field name="tax_code_id" ref="vat_code_due_tva_en"/>
+        <field name="ref_base_code_id" ref="vat_code_receivable_net_en"/>
+        <field name="ref_tax_code_id" ref="vat_code_payable_en"/>
+    </record>
 
     </data>
 </openerp>
diff --git a/addons/l10n_ca/account_tax_fr.xml b/addons/l10n_ca/account_tax_fr.xml
index fbdb756a992..6bcb3abf495 100644
--- a/addons/l10n_ca/account_tax_fr.xml
+++ b/addons/l10n_ca/account_tax_fr.xml
@@ -2,56 +2,85 @@
 <openerp>
     <data noupdate="1">
 
-	<record id="notax_fr" model="account.tax.template">
-        	<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-            	<field name="name">Pas de taxes</field>
-            	<field name="description">Pas de taxes</field>
-            	<field name="amount">0.00</field>
-            	<field name="type">percent</field>
-        </record>
+    <record id="tpstvq_fr" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+        <field name="name">TPS (5%) + TVQ</field>
+        <field name="description">TPSTVQ</field>
+        <field name="amount">1</field>
+        <field name="child_depend">1</field>
+        <field name="type">percent</field>
+    </record>
 
-	<record id="tvq_fr" model="account.tax.template">
-		<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-		<field name="name">TVQ (7.5%)</field>
-		<field name="code">TVQ</field>
-		<field name="amount">0.075000</field>
-		<field name="type">percent</field>
-		<field name="account_collected_id" ref="chart241200_fr"/>
-		<field name="account_paid_id" ref="chart242200_fr"/>
-		<field name="base_code_id" ref="vat_code_base_receivable_tvq_fr"/>
-		<field name="tax_code_id" ref="vat_code_receivable_tvq_fr"/>
-		<field name="ref_base_code_id" ref="vat_code_base_payable_tvq_fr"/>
-		<field name="ref_tax_code_id" ref="vat_code_payable_tvq_fr"/>
-	</record>
 
-	<record id="tps_fr" model="account.tax.template">
-		<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-		<field name="name">TPS (5.0%)</field>
-		<field name="code">TPS</field>
-		<field name="amount">0.050000</field>
-		<field name="type">percent</field>
-		<field name="account_collected_id" ref="chart241100_fr"/>
-		<field name="account_paid_id" ref="chart242100_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="ref_tax_code_id" ref="vat_code_payable_tps_fr"/>
-		<field name="parent_id" ref="tvq_fr"/>
-	</record>
+    <record id="tpstvq_tps_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">TPSTVQ</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="chart241100_fr"/>
+        <field name="account_paid_id" ref="chart242100_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="ref_tax_code_id" ref="vat_code_payable_tps_fr"/>
+        <field name="parent_id" ref="tpstvq_fr"/>
+    </record>
 
-	<record id="tvh_fr" model="account.tax.template">
-		<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-		<field name="name">TVH (13%)</field>
-		<field name="code">TVH</field>
-		<field name="amount">0.130000</field>
-		<field name="type">percent</field>
-		<field name="account_collected_id" ref="chart241300_fr"/>
-		<field name="account_paid_id" ref="chart242300_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="ref_tax_code_id" ref="vat_code_payable_tvh_fr"/>
-	</record>
 
-</data>
+    <record id="tvq_fr" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+        <field name="name">TVQ (8.5%)</field>
+        <field name="description">TVQ</field>
+        <field name="amount">0.085000</field>
+        <field name="type">percent</field>
+        <field name="sequence">1</field>
+        <field name="account_collected_id" ref="chart241200_fr"/>
+        <field name="account_paid_id" ref="chart242200_fr"/>
+        <field name="base_code_id" ref="vat_code_base_receivable_tvq_fr"/>
+        <field name="tax_code_id" ref="vat_code_receivable_tvq_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_tvq_fr"/>
+        <field name="ref_tax_code_id" ref="vat_code_payable_tvq_fr"/>
+        <field name="parent_id" ref="tpstvq_fr"/>
+    </record>
+
+    <record id="tvh_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">TVH</field>
+        <field name="amount">0.130000</field>
+        <field name="type">percent</field>
+        <field name="account_collected_id" ref="chart241300_fr"/>
+        <field name="account_paid_id" ref="chart242300_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="ref_tax_code_id" ref="vat_code_payable_tvh_fr"/>
+    </record>
+
+    <record id="tps_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="amount">0.050000</field>
+        <field name="type">percent</field>
+        <field name="account_collected_id" ref="chart241100_fr"/>
+        <field name="account_paid_id" ref="chart242100_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="ref_tax_code_id" ref="vat_code_payable_tps_fr"/>
+    </record>
+
+    <record id="notax_fr" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+        <field name="name">Pas de taxes</field>
+        <field name="description">Pas de taxes</field>
+        <field name="amount">0.00</field>
+        <field name="type">percent</field>
+    </record>
+
+    </data>
 </openerp>
diff --git a/addons/l10n_ca/fiscal_templates_fr.xml b/addons/l10n_ca/fiscal_templates_fr.xml
index b55572aaf80..c3e2bb78227 100644
--- a/addons/l10n_ca/fiscal_templates_fr.xml
+++ b/addons/l10n_ca/fiscal_templates_fr.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-<data>
+    <data>
 
 	<!-- Fiscal Position Templates -->
 
@@ -29,51 +29,78 @@
 
 	<record id="fiscal_position_tax_template_1_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_1_fr"  />
-		<field name="tax_src_id" ref="tvq_fr" />
-		<field name="tax_dest_id" ref="notax_fr" />
+		<field name="tax_src_id" ref="tpstvq_fr" />
+		<field name="tax_dest_id" ref="tpstvq_fr" />
 	</record>
 
 	<record id="fiscal_position_tax_template_2_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_2_fr"  />
-		<field name="tax_src_id" ref="tvh_fr" />
-		<field name="tax_dest_id" ref="notax_fr" />
+		<field name="tax_src_id" ref="tpstvq_fr" />
+		<field name="tax_dest_id" ref="tvh_fr" />
 	</record>
+
 	<record id="fiscal_position_tax_template_3_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_3_fr"  />
-		<field name="tax_src_id" ref="tps_fr" />
-		<field name="tax_dest_id" ref="notax_fr" />
+		<field name="tax_src_id" ref="tpstvq_fr" />
+		<field name="tax_dest_id" ref="tps_fr" />
 	</record>
+
 	<record id="fiscal_position_tax_template_4_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_4_fr"  />
-		<field name="tax_src_id" ref="notax_fr" />
+		<field name="tax_src_id" ref="tpstvq_fr" />
 		<field name="tax_dest_id" ref="notax_fr" />
 	</record>
 
-	<!-- Fiscal Position Account Templates -->
+	<!-- Fiscal Position Account Templates - Goods -->
 
 	<record id="fiscal_position_account_template_1_fr" model="account.fiscal.position.account.template">
 		<field name="position_id" ref="fiscal_position_template_1_fr"  />
 		<field name="account_src_id" ref="chart411110_fr" />
+		<field name="account_dest_id" ref="chart411110_fr" />
+	</record>
+
+	<record id="fiscal_position_account_template_2_fr" model="account.fiscal.position.account.template">
+		<field name="position_id" ref="fiscal_position_template_2_fr"  />
+		<field name="account_src_id" ref="chart411110_fr" />
+		<field name="account_dest_id" ref="chart411120_fr" />
+	</record>
+
+	<record id="fiscal_position_account_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="chart411110_fr" />
+		<field name="account_dest_id" ref="chart411130_fr" />
+	</record>
+
+	<record id="fiscal_position_account_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="chart411110_fr" />
+		<field name="account_dest_id" ref="chart411140_fr" />
+	</record>
+
+	<!-- Fiscal Position Account Templates - Services -->
+
+	<record id="fiscal_position_account_template_1_fr" model="account.fiscal.position.account.template">
+		<field name="position_id" ref="fiscal_position_template_1_fr"  />
+		<field name="account_src_id" ref="chart411210_fr" />
 		<field name="account_dest_id" ref="chart411210_fr" />
 	</record>
 
 	<record id="fiscal_position_account_template_2_fr" model="account.fiscal.position.account.template">
 		<field name="position_id" ref="fiscal_position_template_2_fr"  />
-		<field name="account_src_id" ref="chart411120_fr" />
+		<field name="account_src_id" ref="chart411210_fr" />
 		<field name="account_dest_id" ref="chart411220_fr" />
 	</record>
 
 	<record id="fiscal_position_account_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="chart411130_fr" />
+		<field name="account_src_id" ref="chart411210_fr" />
 		<field name="account_dest_id" ref="chart411230_fr" />
 	</record>
 
 	<record id="fiscal_position_account_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="chart411140_fr" />
+		<field name="account_src_id" ref="chart411210_fr" />
 		<field name="account_dest_id" ref="chart411240_fr" />
 	</record>
-
-</data>
+    </data>
 </openerp>