← Back to team overview

openerp-canada team mailing list archive

  1. openerp-canada team
  2. Mailing list archive
  3. Message #00034

[Merge] lp:~openerp-canada/openobject-addons/l10n_ca_improvements into lp:openobject-addons

  Thread Previous • Date Previous • • Thread Next 
Maxime Chambreuil (http://www.savoirfairelinux.com) has proposed merging lp:~openerp-canada/openobject-addons/l10n_ca_improvements into lp:openobject-addons.

Requested reviews:
  OpenERP Core Team (openerp)

For more details, see:
https://code.launchpad.net/~openerp-canada/openobject-addons/l10n_ca_improvements/+merge/78672

Upgraded to 6.1.
Fix unicity constraint on tax name
-- 
https://code.launchpad.net/~openerp-canada/openobject-addons/l10n_ca_improvements/+merge/78672
Your team OpenERP Canada Team is subscribed to branch lp:~openerp-canada/openobject-addons/l10n_ca_improvements.

=== modified file 'l10n_ca/account_tax_en.xml'
--- l10n_ca/account_tax_en.xml	2011-01-14 10:14:44 +0000
+++ l10n_ca/account_tax_en.xml	2011-10-07 21:50:34 +0000
@@ -15,7 +15,7 @@
 
     <record id="gstpst_mb_gst_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">GST (5%)</field>
+        <field name="name">GST - 5% (MB)</field>
         <field name="description">GST</field>
         <field name="amount">0.050000</field>
         <field name="type">percent</field>
@@ -32,7 +32,7 @@
 
     <record id="pst_mb_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 - 7%</field>
         <field name="description">PST</field>
         <field name="amount">0.070000</field>
         <field name="type">percent</field>
@@ -59,7 +59,7 @@
 
     <record id="gstpst_pe_gst_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">GST (5%)</field>
+        <field name="name">GST - 5% (PE)</field>
         <field name="description">GST</field>
         <field name="amount">0.050000</field>
         <field name="type">percent</field>
@@ -76,7 +76,7 @@
 
     <record id="pst_pe_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 - 10%</field>
         <field name="description">PST</field>
         <field name="amount">0.100000</field>
         <field name="type">percent</field>
@@ -103,7 +103,7 @@
 
     <record id="gstpst_qc_gst_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">GST (5%)</field>
+        <field name="name">GST - 5% (QC)</field>
         <field name="description">GST</field>
         <field name="amount">0.050000</field>
         <field name="type">percent</field>
@@ -120,7 +120,7 @@
 
     <record id="pst_qc_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">PST (8.5%)</field>
+        <field name="name">PST - 8.5%</field>
         <field name="description">PST</field>
         <field name="amount">0.085000</field>
         <field name="type">percent</field>
@@ -147,7 +147,7 @@
 
     <record id="gstpst_sk_gst_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">GST (5%)</field>
+        <field name="name">GST - 5% (SK)</field>
         <field name="description">GST</field>
         <field name="amount">0.050000</field>
         <field name="type">percent</field>
@@ -164,7 +164,7 @@
 
     <record id="pst_sk_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 - 5%</field>
         <field name="description">PST</field>
         <field name="amount">0.050000</field>
         <field name="type">percent</field>
@@ -182,7 +182,7 @@
 
     <record id="hst12_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">HST (12%)</field>
+        <field name="name">HST - 12%</field>
         <field name="description">HST12</field>
         <field name="amount">0.120000</field>
         <field name="type">percent</field>
@@ -196,7 +196,7 @@
 
     <record id="hst13_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">HST (13%)</field>
+        <field name="name">HST - 13%</field>
         <field name="description">HST13</field>
         <field name="amount">0.130000</field>
         <field name="type">percent</field>
@@ -210,7 +210,7 @@
 
     <record id="hst135_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="name">HST - 13.5%</field>
         <field name="description">HST135</field>
         <field name="amount">0.135000</field>
         <field name="type">percent</field>
@@ -224,7 +224,7 @@
 
     <record id="hst15_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">HST (15%)</field>
+        <field name="name">HST - 15%</field>
         <field name="description">HST15</field>
         <field name="amount">0.150000</field>
         <field name="type">percent</field>
@@ -240,7 +240,7 @@
 
     <record id="gst_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">GST (5%)</field>
+        <field name="name">GST - 5%</field>
         <field name="description">GST</field>
         <field name="amount">0.050000</field>
         <field name="type">percent</field>

=== modified file 'l10n_ca/account_tax_fr.xml'
--- l10n_ca/account_tax_fr.xml	2011-01-14 10:14:44 +0000
+++ l10n_ca/account_tax_fr.xml	2011-10-07 21:50:34 +0000
@@ -15,7 +15,7 @@
 
     <record id="tpstvp_mb_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="name">TPS - 5% (MB)</field>
         <field name="description">TPS</field>
         <field name="amount">0.050000</field>
         <field name="type">percent</field>
@@ -32,7 +32,7 @@
 
     <record id="tvp_mb_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 - 7%</field>
         <field name="description">TVP</field>
         <field name="amount">0.700000</field>
         <field name="type">percent</field>
@@ -59,7 +59,7 @@
 
     <record id="tpstvp_pe_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="name">TPS - 5% (PE)</field>
         <field name="description">TPS</field>
         <field name="amount">0.050000</field>
         <field name="type">percent</field>
@@ -76,7 +76,7 @@
 
     <record id="tvp_pe_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 - 10%</field>
         <field name="description">TVP</field>
         <field name="amount">0.100000</field>
         <field name="type">percent</field>
@@ -103,7 +103,7 @@
 
     <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="name">TPS - 5% (QC)</field>
         <field name="description">TPS</field>
         <field name="amount">0.050000</field>
         <field name="type">percent</field>
@@ -120,7 +120,7 @@
 
     <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="name">TVQ - 8.5%</field>
         <field name="description">TVQ</field>
         <field name="amount">0.085000</field>
         <field name="type">percent</field>
@@ -147,7 +147,7 @@
 
     <record id="tpstvp_sk_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="name">TPS - 5% (SK)</field>
         <field name="description">TPS</field>
         <field name="amount">0.050000</field>
         <field name="type">percent</field>
@@ -164,7 +164,7 @@
 
     <record id="tvp_sk_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">TVP (5%)</field>
+        <field name="name">TVP - 5% (SK)</field>
         <field name="description">TVP</field>
         <field name="amount">0.050000</field>
         <field name="type">percent</field>
@@ -182,7 +182,7 @@
 
     <record id="tvh12_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">TVH (12%)</field>
+        <field name="name">TVH - 12%</field>
         <field name="description">TVH12</field>
         <field name="amount">0.120000</field>
         <field name="type">percent</field>
@@ -196,7 +196,7 @@
 
     <record id="tvh13_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">TVH (13%)</field>
+        <field name="name">TVH - 13%</field>
         <field name="description">TVH13</field>
         <field name="amount">0.130000</field>
         <field name="type">percent</field>
@@ -210,7 +210,7 @@
 
     <record id="tvh135_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="name">TVH - 13.5%</field>
         <field name="description">TVH135</field>
         <field name="amount">0.135000</field>
         <field name="type">percent</field>
@@ -224,7 +224,7 @@
 
     <record id="tvh15_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">TVH (15%)</field>
+        <field name="name">TVH - 15%</field>
         <field name="description">TVH15</field>
         <field name="amount">0.150000</field>
         <field name="type">percent</field>
@@ -240,7 +240,7 @@
 
     <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="name">TPS - 5%</field>
         <field name="description">TPS</field>
         <field name="amount">0.050000</field>
         <field name="type">percent</field>

Follow ups

  Thread Previous • Date Previous • • Thread Next