savoirfairelinux-openerp team mailing list archive

[Virgil Dupras <hsoft@xxxxxxxxxxxxx>]

Virgil Dupras has proposed merging lp:~savoirfairelinux-openerp/openobject-addons/6.1-bug-1095382 into lp:openobject-addons/6.1.

Requested reviews:
  OpenERP Core Team (openerp)
Related bugs:
  Bug #1095382 in OpenERP Addons: "French spelling in account_tax_en.xml"
  https://bugs.launchpad.net/openobject-addons/+bug/1095382

For more details, see:
https://code.launchpad.net/~savoirfairelinux-openerp/openobject-addons/6.1-bug-1095382/+merge/145439
-- 
https://code.launchpad.net/~savoirfairelinux-openerp/openobject-addons/6.1-bug-1095382/+merge/145439
Your team Savoir-faire Linux' OpenERP is subscribed to branch lp:~savoirfairelinux-openerp/openobject-addons/6.1-bug-1095382.

=== modified file 'l10n_ca/__openerp__.py'
--- l10n_ca/__openerp__.py	2012-06-09 14:41:32 +0000
+++ l10n_ca/__openerp__.py	2013-01-29 17:03:20 +0000
@@ -20,7 +20,7 @@
 ##############################################################################
 {
     "name" : "Canada - Accounting",
-    "version" : "1.0",
+    "version" : "1.1",
     "author" : "Savoir-faire Linux",
     "website" : "http://www.savoirfairelinux.com";,
     "category" : "Localization/Account Charts",

=== modified file 'l10n_ca/account_tax_en.xml'
--- l10n_ca/account_tax_en.xml	2012-06-09 14:41:32 +0000
+++ l10n_ca/account_tax_en.xml	2013-01-29 17:03:20 +0000
@@ -102,8 +102,8 @@
 
     <record id="gsttvq_sale_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">GST + TVQ for sales</field>
-        <field name="description">GSTTVQ_SALE</field>
+        <field name="name">GST + QST for sales</field>
+        <field name="description">GSTQST_SALE</field>
         <field name="type_tax_use">sale</field>
         <field name="amount">1</field>
         <field name="child_depend">1</field>
@@ -130,8 +130,8 @@
 
     <record id="tvq_sale_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">TVQ for sales - 9.5%</field>
-        <field name="description">TVQ</field>
+        <field name="name">QST for sales - 9.5%</field>
+        <field name="description">QST</field>
         <field name="type_tax_use">sale</field>
         <field name="amount">0.095000</field>
         <field name="type">percent</field>
@@ -196,8 +196,8 @@
 
     <record id="hst12_sale_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">TVH for sales - 12%</field>
-        <field name="description">TVH12_SALE</field>
+        <field name="name">HST for sales - 12%</field>
+        <field name="description">HST12_SALE</field>
         <field name="type_tax_use">sale</field>
         <field name="amount">0.120000</field>
         <field name="type">percent</field>
@@ -211,8 +211,8 @@
 
     <record id="hst13_sale_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">TVH for sales - 13%</field>
-        <field name="description">TVH13_SALE</field>
+        <field name="name">HST for sales - 13%</field>
+        <field name="description">HST13_SALE</field>
         <field name="type_tax_use">sale</field>
         <field name="amount">0.130000</field>
         <field name="type">percent</field>
@@ -226,8 +226,8 @@
 
     <record id="hst135_sale_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">TVH for sales - 13.5%</field>
-        <field name="description">TVH135_SALE</field>
+        <field name="name">HST for sales - 13.5%</field>
+        <field name="description">HST135_SALE</field>
         <field name="type_tax_use">sale</field>
         <field name="amount">0.135000</field>
         <field name="type">percent</field>
@@ -241,8 +241,8 @@
 
     <record id="hst15_sale_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">TVH for sales - 15%</field>
-        <field name="description">TVH15_SALE</field>
+        <field name="name">HST for sales - 15%</field>
+        <field name="description">HST15_SALE</field>
         <field name="type_tax_use">sale</field>
         <field name="amount">0.150000</field>
         <field name="type">percent</field>
@@ -372,8 +372,8 @@
 
     <record id="gsttvq_purc_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">GST + TVQ for purchases</field>
-        <field name="description">GSTTVQ_PURC</field>
+        <field name="name">GST + QST for purchases</field>
+        <field name="description">GSTQST_PURC</field>
         <field name="type_tax_use">purchase</field>
         <field name="amount">1</field>
         <field name="child_depend">1</field>
@@ -400,8 +400,8 @@
 
     <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="name">QST for purchases - 9.5%</field>
+        <field name="description">QST</field>
         <field name="type_tax_use">purchase</field>
         <field name="amount">0.095000</field>
         <field name="type">percent</field>
@@ -466,8 +466,8 @@
 
     <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="name">HST for purchases - 12%</field>
+        <field name="description">HST12_PURC</field>
         <field name="type_tax_use">purchase</field>
         <field name="amount">0.120000</field>
         <field name="type">percent</field>
@@ -481,8 +481,8 @@
 
     <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="name">HST for purchases - 13%</field>
+        <field name="description">HST13_PURC</field>
         <field name="type_tax_use">purchase</field>
         <field name="amount">0.130000</field>
         <field name="type">percent</field>
@@ -496,8 +496,8 @@
 
     <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="name">HST for purchases - 13.5%</field>
+        <field name="description">HST135_PURC</field>
         <field name="type_tax_use">purchase</field>
         <field name="amount">0.135000</field>
         <field name="type">percent</field>
@@ -511,8 +511,8 @@
 
     <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="name">HST for purchases - 15%</field>
+        <field name="description">HST15_PURC</field>
         <field name="type_tax_use">purchase</field>
         <field name="amount">0.150000</field>
         <field name="type">percent</field>