Odoo Addons (MOVED TO GITHUB)

Merge lp:~savoirfairelinux-openerp/openobject-addons/6.1-bug-1095382 into lp:openobject-addons/6.1

  1. 6.1-bug-1095382
  2. Merge into 6.1
Proposed by Virgil Dupras
Status: Merged
Merged at revision: 7226
Proposed branch: lp:~savoirfairelinux-openerp/openobject-addons/6.1-bug-1095382
Merge into: lp:openobject-addons/6.1
Diff against target: 148 lines (+25/-25)
2 files modified
l10n_ca/__openerp__.py (+1/-1)
l10n_ca/account_tax_en.xml (+24/-24)
To merge this branch: bzr merge lp:~savoirfairelinux-openerp/openobject-addons/6.1-bug-1095382
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+145439@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'l10n_ca/__openerp__.py'
2--- l10n_ca/__openerp__.py 2012-06-09 14:41:32 +0000
3+++ l10n_ca/__openerp__.py 2013-01-29 17:03:20 +0000
4@@ -20,7 +20,7 @@
5 ##############################################################################
6 {
7 "name" : "Canada - Accounting",
8- "version" : "1.0",
9+ "version" : "1.1",
10 "author" : "Savoir-faire Linux",
11 "website" : "http://www.savoirfairelinux.com",
12 "category" : "Localization/Account Charts",
13
14=== modified file 'l10n_ca/account_tax_en.xml'
15--- l10n_ca/account_tax_en.xml 2012-06-09 14:41:32 +0000
16+++ l10n_ca/account_tax_en.xml 2013-01-29 17:03:20 +0000
17@@ -102,8 +102,8 @@
18
19 <record id="gsttvq_sale_en" model="account.tax.template">
20 <field name="chart_template_id" ref="ca_en_chart_template_en"/>
21- <field name="name">GST + TVQ for sales</field>
22- <field name="description">GSTTVQ_SALE</field>
23+ <field name="name">GST + QST for sales</field>
24+ <field name="description">GSTQST_SALE</field>
25 <field name="type_tax_use">sale</field>
26 <field name="amount">1</field>
27 <field name="child_depend">1</field>
28@@ -130,8 +130,8 @@
29
30 <record id="tvq_sale_en" model="account.tax.template">
31 <field name="chart_template_id" ref="ca_en_chart_template_en"/>
32- <field name="name">TVQ for sales - 9.5%</field>
33- <field name="description">TVQ</field>
34+ <field name="name">QST for sales - 9.5%</field>
35+ <field name="description">QST</field>
36 <field name="type_tax_use">sale</field>
37 <field name="amount">0.095000</field>
38 <field name="type">percent</field>
39@@ -196,8 +196,8 @@
40
41 <record id="hst12_sale_en" model="account.tax.template">
42 <field name="chart_template_id" ref="ca_en_chart_template_en"/>
43- <field name="name">TVH for sales - 12%</field>
44- <field name="description">TVH12_SALE</field>
45+ <field name="name">HST for sales - 12%</field>
46+ <field name="description">HST12_SALE</field>
47 <field name="type_tax_use">sale</field>
48 <field name="amount">0.120000</field>
49 <field name="type">percent</field>
50@@ -211,8 +211,8 @@
51
52 <record id="hst13_sale_en" model="account.tax.template">
53 <field name="chart_template_id" ref="ca_en_chart_template_en"/>
54- <field name="name">TVH for sales - 13%</field>
55- <field name="description">TVH13_SALE</field>
56+ <field name="name">HST for sales - 13%</field>
57+ <field name="description">HST13_SALE</field>
58 <field name="type_tax_use">sale</field>
59 <field name="amount">0.130000</field>
60 <field name="type">percent</field>
61@@ -226,8 +226,8 @@
62
63 <record id="hst135_sale_en" model="account.tax.template">
64 <field name="chart_template_id" ref="ca_en_chart_template_en"/>
65- <field name="name">TVH for sales - 13.5%</field>
66- <field name="description">TVH135_SALE</field>
67+ <field name="name">HST for sales - 13.5%</field>
68+ <field name="description">HST135_SALE</field>
69 <field name="type_tax_use">sale</field>
70 <field name="amount">0.135000</field>
71 <field name="type">percent</field>
72@@ -241,8 +241,8 @@
73
74 <record id="hst15_sale_en" model="account.tax.template">
75 <field name="chart_template_id" ref="ca_en_chart_template_en"/>
76- <field name="name">TVH for sales - 15%</field>
77- <field name="description">TVH15_SALE</field>
78+ <field name="name">HST for sales - 15%</field>
79+ <field name="description">HST15_SALE</field>
80 <field name="type_tax_use">sale</field>
81 <field name="amount">0.150000</field>
82 <field name="type">percent</field>
83@@ -372,8 +372,8 @@
84
85 <record id="gsttvq_purc_en" model="account.tax.template">
86 <field name="chart_template_id" ref="ca_en_chart_template_en"/>
87- <field name="name">GST + TVQ for purchases</field>
88- <field name="description">GSTTVQ_PURC</field>
89+ <field name="name">GST + QST for purchases</field>
90+ <field name="description">GSTQST_PURC</field>
91 <field name="type_tax_use">purchase</field>
92 <field name="amount">1</field>
93 <field name="child_depend">1</field>
94@@ -400,8 +400,8 @@
95
96 <record id="tvq_purc_en" model="account.tax.template">
97 <field name="chart_template_id" ref="ca_en_chart_template_en"/>
98- <field name="name">TVQ for purchases - 9.5%</field>
99- <field name="description">TVQ</field>
100+ <field name="name">QST for purchases - 9.5%</field>
101+ <field name="description">QST</field>
102 <field name="type_tax_use">purchase</field>
103 <field name="amount">0.095000</field>
104 <field name="type">percent</field>
105@@ -466,8 +466,8 @@
106
107 <record id="hst12_purc_en" model="account.tax.template">
108 <field name="chart_template_id" ref="ca_en_chart_template_en"/>
109- <field name="name">TVH for purchases - 12%</field>
110- <field name="description">TVH12_PURC</field>
111+ <field name="name">HST for purchases - 12%</field>
112+ <field name="description">HST12_PURC</field>
113 <field name="type_tax_use">purchase</field>
114 <field name="amount">0.120000</field>
115 <field name="type">percent</field>
116@@ -481,8 +481,8 @@
117
118 <record id="hst13_purc_en" model="account.tax.template">
119 <field name="chart_template_id" ref="ca_en_chart_template_en"/>
120- <field name="name">TVH for purchases - 13%</field>
121- <field name="description">TVH13_PURC</field>
122+ <field name="name">HST for purchases - 13%</field>
123+ <field name="description">HST13_PURC</field>
124 <field name="type_tax_use">purchase</field>
125 <field name="amount">0.130000</field>
126 <field name="type">percent</field>
127@@ -496,8 +496,8 @@
128
129 <record id="hst135_purc_en" model="account.tax.template">
130 <field name="chart_template_id" ref="ca_en_chart_template_en"/>
131- <field name="name">TVH for purchases - 13.5%</field>
132- <field name="description">TVH135_PURC</field>
133+ <field name="name">HST for purchases - 13.5%</field>
134+ <field name="description">HST135_PURC</field>
135 <field name="type_tax_use">purchase</field>
136 <field name="amount">0.135000</field>
137 <field name="type">percent</field>
138@@ -511,8 +511,8 @@
139
140 <record id="hst15_purc_en" model="account.tax.template">
141 <field name="chart_template_id" ref="ca_en_chart_template_en"/>
142- <field name="name">TVH for purchases - 15%</field>
143- <field name="description">TVH15_PURC</field>
144+ <field name="name">HST for purchases - 15%</field>
145+ <field name="description">HST15_PURC</field>
146 <field name="type_tax_use">purchase</field>
147 <field name="amount">0.150000</field>
148 <field name="type">percent</field>