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

Proposed by Jonatan Cloutier
Status: Needs review
Proposed branch: lp:~savoirfairelinux-openerp/openobject-addons/fix_l10n_ca
Merge into: lp:openobject-addons/6.1
Diff against target: 356 lines (+38/-46)
5 files modified
l10n_ca/__openerp__.py (+2/-2)
l10n_ca/account_tax_en.xml (+12/-16)
l10n_ca/account_tax_fr.xml (+12/-16)
l10n_ca/fiscal_templates_en.xml (+6/-6)
l10n_ca/fiscal_templates_fr.xml (+6/-6)
To merge this branch: bzr merge lp:~savoirfairelinux-openerp/openobject-addons/fix_l10n_ca
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+163014@code.launchpad.net

This proposal supersedes a proposal from 2013-02-27.

Description of the change

Change are all in for the l10n_ca localisation:
Fix tax calculation for Manitoba, Saskatchewan and Quebec.
Change fiscal position label to have common element between French and English translation.

To post a comment you must log in.

Unmerged revisions

7155. By Jonatan Cloutier

Merge from trunk

7154. By Jonatan Cloutier

fix quebec, canada tax calculation

7153. By Jonatan Cloutier

fix quebec taxes calculations

7152. By Jonatan Cloutier

fix SK and MB tax calculation

7151. By Jonatan Cloutier

Add common pattern to fiscal_template

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-05-08 17:09:42 +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@@ -43,7 +43,7 @@
14 'account_chart_template_fr.xml',
15 'account_tax_fr.xml',
16 'fiscal_templates_fr.xml',
17- 'l10n_ca_wizard.xml',
18+ 'l10n_ca_wizard.xml'
19 ],
20 "demo_xml" : [],
21 "installable" : True,
22
23=== modified file 'l10n_ca/account_tax_en.xml'
24--- l10n_ca/account_tax_en.xml 2012-06-09 14:41:32 +0000
25+++ l10n_ca/account_tax_en.xml 2013-05-08 17:09:42 +0000
26@@ -12,7 +12,6 @@
27 <field name="description">GSTPST_MB_SALE</field>
28 <field name="type_tax_use">sale</field>
29 <field name="amount">1</field>
30- <field name="child_depend">1</field>
31 <field name="type">percent</field>
32 </record>
33
34@@ -39,7 +38,7 @@
35 <field name="name">PST for sales - 7%</field>
36 <field name="description">PST</field>
37 <field name="type_tax_use">sale</field>
38- <field name="amount">0.700000</field>
39+ <field name="amount">0.070000</field>
40 <field name="type">percent</field>
41 <field name="sequence">2</field>
42 <field name="account_collected_id" ref="chart2122_en"/>
43@@ -105,8 +104,8 @@
44 <field name="name">GST + TVQ for sales</field>
45 <field name="description">GSTTVQ_SALE</field>
46 <field name="type_tax_use">sale</field>
47+ <field name="child_depend">1</field>
48 <field name="amount">1</field>
49- <field name="child_depend">1</field>
50 <field name="type">percent</field>
51 </record>
52
53@@ -118,7 +117,6 @@
54 <field name="amount">0.050000</field>
55 <field name="type">percent</field>
56 <field name="sequence">1</field>
57- <field name="include_base_amount" eval="True"/>
58 <field name="account_collected_id" ref="chart2121_en"/>
59 <field name="account_paid_id" ref="chart2121_en"/>
60 <field name="base_code_id" ref="vat_code_base_receivable_gst_en"/>
61@@ -130,11 +128,12 @@
62
63 <record id="tvq_sale_en" model="account.tax.template">
64 <field name="chart_template_id" ref="ca_en_chart_template_en"/>
65- <field name="name">TVQ for sales - 9.5%</field>
66+ <field name="name">TVQ for sales - 9.975%</field>
67 <field name="description">TVQ</field>
68 <field name="type_tax_use">sale</field>
69- <field name="amount">0.095000</field>
70- <field name="type">percent</field>
71+ <field name="python_compute">result = price_unit * 0.09975</field>
72+ <field name="python_compute_inv">result = price_unit * 0.09975</field>
73+ <field name="type">code</field>
74 <field name="sequence">2</field>
75 <field name="account_collected_id" ref="chart2122_en"/>
76 <field name="account_paid_id" ref="chart2122_en"/>
77@@ -153,7 +152,6 @@
78 <field name="description">GSTPST_SK_SALE</field>
79 <field name="type_tax_use">sale</field>
80 <field name="amount">1</field>
81- <field name="child_depend">1</field>
82 <field name="type">percent</field>
83 </record>
84
85@@ -282,7 +280,6 @@
86 <field name="description">GSTPST_MB_PURC</field>
87 <field name="type_tax_use">purchase</field>
88 <field name="amount">1</field>
89- <field name="child_depend">1</field>
90 <field name="type">percent</field>
91 </record>
92
93@@ -309,7 +306,7 @@
94 <field name="name">PST for purchases - 7%</field>
95 <field name="description">PST</field>
96 <field name="type_tax_use">purchase</field>
97- <field name="amount">0.700000</field>
98+ <field name="amount">0.070000</field>
99 <field name="type">percent</field>
100 <field name="sequence">2</field>
101 <field name="account_collected_id" ref="chart1182_en"/>
102@@ -375,8 +372,8 @@
103 <field name="name">GST + TVQ for purchases</field>
104 <field name="description">GSTTVQ_PURC</field>
105 <field name="type_tax_use">purchase</field>
106+ <field name="child_depend">1</field>
107 <field name="amount">1</field>
108- <field name="child_depend">1</field>
109 <field name="type">percent</field>
110 </record>
111
112@@ -388,7 +385,6 @@
113 <field name="amount">0.050000</field>
114 <field name="type">percent</field>
115 <field name="sequence">1</field>
116- <field name="include_base_amount" eval="True"/>
117 <field name="account_collected_id" ref="chart1181_en"/>
118 <field name="account_paid_id" ref="chart1181_en"/>
119 <field name="base_code_id" ref="vat_code_base_payable_gst_en"/>
120@@ -400,11 +396,12 @@
121
122 <record id="tvq_purc_en" model="account.tax.template">
123 <field name="chart_template_id" ref="ca_en_chart_template_en"/>
124- <field name="name">TVQ for purchases - 9.5%</field>
125+ <field name="name">TVQ for purchases - 9.975%</field>
126 <field name="description">TVQ</field>
127 <field name="type_tax_use">purchase</field>
128- <field name="amount">0.095000</field>
129- <field name="type">percent</field>
130+ <field name="python_compute">result = price_unit * 0.09975</field>
131+ <field name="python_compute_inv">result = price_unit * 0.09975</field>
132+ <field name="type">code</field>
133 <field name="sequence">2</field>
134 <field name="account_collected_id" ref="chart1182_en"/>
135 <field name="account_paid_id" ref="chart1182_en"/>
136@@ -423,7 +420,6 @@
137 <field name="description">GSTPST_SK_PURC</field>
138 <field name="type_tax_use">purchase</field>
139 <field name="amount">1</field>
140- <field name="child_depend">1</field>
141 <field name="type">percent</field>
142 </record>
143
144
145=== modified file 'l10n_ca/account_tax_fr.xml'
146--- l10n_ca/account_tax_fr.xml 2012-06-09 14:41:32 +0000
147+++ l10n_ca/account_tax_fr.xml 2013-05-08 17:09:42 +0000
148@@ -12,7 +12,6 @@
149 <field name="description">TPSTVP_MB_SALE</field>
150 <field name="type_tax_use">sale</field>
151 <field name="amount">1</field>
152- <field name="child_depend">1</field>
153 <field name="type">percent</field>
154 </record>
155
156@@ -39,7 +38,7 @@
157 <field name="name">TVP sur les ventes - 7%</field>
158 <field name="description">TVP</field>
159 <field name="type_tax_use">sale</field>
160- <field name="amount">0.700000</field>
161+ <field name="amount">0.070000</field>
162 <field name="type">percent</field>
163 <field name="sequence">2</field>
164 <field name="account_collected_id" ref="chart2132_fr"/>
165@@ -105,8 +104,8 @@
166 <field name="name">TPS + TVQ sur les ventes</field>
167 <field name="description">TPSTVQ_SALE</field>
168 <field name="type_tax_use">sale</field>
169+ <field name="child_depend">1</field>
170 <field name="amount">1</field>
171- <field name="child_depend">1</field>
172 <field name="type">percent</field>
173 </record>
174
175@@ -118,7 +117,6 @@
176 <field name="amount">0.050000</field>
177 <field name="type">percent</field>
178 <field name="sequence">1</field>
179- <field name="include_base_amount" eval="True"/>
180 <field name="account_collected_id" ref="chart2131_fr"/>
181 <field name="account_paid_id" ref="chart2131_fr"/>
182 <field name="base_code_id" ref="vat_code_base_receivable_tps_fr"/>
183@@ -130,11 +128,12 @@
184
185 <record id="tvq_sale_fr" model="account.tax.template">
186 <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
187- <field name="name">TVQ sur les ventes - 9.5%</field>
188+ <field name="name">TVQ sur les ventes - 9.975%</field>
189 <field name="description">TVQ</field>
190 <field name="type_tax_use">sale</field>
191- <field name="amount">0.095000</field>
192- <field name="type">percent</field>
193+ <field name="python_compute">result = price_unit * 0.09975</field>
194+ <field name="python_compute_inv">result = price_unit * 0.09975</field>
195+ <field name="type">code</field>
196 <field name="sequence">2</field>
197 <field name="account_collected_id" ref="chart2132_fr"/>
198 <field name="account_paid_id" ref="chart2132_fr"/>
199@@ -153,7 +152,6 @@
200 <field name="description">TPSTVP_SK_SALE</field>
201 <field name="type_tax_use">sale</field>
202 <field name="amount">1</field>
203- <field name="child_depend">1</field>
204 <field name="type">percent</field>
205 </record>
206
207@@ -282,7 +280,6 @@
208 <field name="description">TPSTVP_MB_PURC</field>
209 <field name="type_tax_use">purchase</field>
210 <field name="amount">1</field>
211- <field name="child_depend">1</field>
212 <field name="type">percent</field>
213 </record>
214
215@@ -309,7 +306,7 @@
216 <field name="name">TVP sur les achats - 7%</field>
217 <field name="description">TVP</field>
218 <field name="type_tax_use">purchase</field>
219- <field name="amount">0.700000</field>
220+ <field name="amount">0.070000</field>
221 <field name="type">percent</field>
222 <field name="sequence">2</field>
223 <field name="account_collected_id" ref="chart1182_fr"/>
224@@ -375,8 +372,8 @@
225 <field name="name">TPS + TVQ sur les achats</field>
226 <field name="description">TPSTVQ_PURC</field>
227 <field name="type_tax_use">purchase</field>
228+ <field name="child_depend">1</field>
229 <field name="amount">1</field>
230- <field name="child_depend">1</field>
231 <field name="type">percent</field>
232 </record>
233
234@@ -388,7 +385,6 @@
235 <field name="amount">0.050000</field>
236 <field name="type">percent</field>
237 <field name="sequence">1</field>
238- <field name="include_base_amount" eval="True"/>
239 <field name="account_collected_id" ref="chart1181_fr"/>
240 <field name="account_paid_id" ref="chart1181_fr"/>
241 <field name="base_code_id" ref="vat_code_base_payable_tps_fr"/>
242@@ -400,11 +396,12 @@
243
244 <record id="tvq_purc_fr" model="account.tax.template">
245 <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
246- <field name="name">TVQ sur les achats - 9.5%</field>
247+ <field name="name">TVQ sur les achats - 9.975%</field>
248 <field name="description">TVQ</field>
249 <field name="type_tax_use">purchase</field>
250- <field name="amount">0.095000</field>
251- <field name="type">percent</field>
252+ <field name="python_compute">result = price_unit * 0.09975</field>
253+ <field name="python_compute_inv">result = price_unit * 0.09975</field>
254+ <field name="type">code</field>
255 <field name="sequence">2</field>
256 <field name="account_collected_id" ref="chart1182_fr"/>
257 <field name="account_paid_id" ref="chart1182_fr"/>
258@@ -423,7 +420,6 @@
259 <field name="description">TPSTVP_SK_PURC</field>
260 <field name="type_tax_use">purchase</field>
261 <field name="amount">1</field>
262- <field name="child_depend">1</field>
263 <field name="type">percent</field>
264 </record>
265
266
267=== modified file 'l10n_ca/fiscal_templates_en.xml'
268--- l10n_ca/fiscal_templates_en.xml 2012-06-09 14:41:32 +0000
269+++ l10n_ca/fiscal_templates_en.xml 2013-05-08 17:09:42 +0000
270@@ -5,17 +5,17 @@
271 <!-- Fiscal Position Templates -->
272
273 <record id="fiscal_position_template_1_en" model="account.fiscal.position.template">
274- <field name="name">Provincial Regime</field>
275+ <field name="name">Provincial Regime (PROV)</field>
276 <field name="chart_template_id" ref="ca_en_chart_template_en"/>
277 </record>
278
279 <record id="fiscal_position_template_21_en" model="account.fiscal.position.template">
280- <field name="name">Harmonized Provinces Regime (12%)</field>
281+ <field name="name">Harmonized Provinces Regime (12%) (BC)</field>
282 <field name="chart_template_id" ref="ca_en_chart_template_en"/>
283 </record>
284
285 <record id="fiscal_position_template_22_en" model="account.fiscal.position.template">
286- <field name="name">Harmonized Provinces Regime (13%)</field>
287+ <field name="name">Harmonized Provinces Regime (13%) (ON, NB, NL)</field>
288 <field name="chart_template_id" ref="ca_en_chart_template_en"/>
289 </record>
290
291@@ -25,17 +25,17 @@
292 </record>
293
294 <record id="fiscal_position_template_24_en" model="account.fiscal.position.template">
295- <field name="name">Harmonized Provinces Regime (15%)</field>
296+ <field name="name">Harmonized Provinces Regime (15%) (NS)</field>
297 <field name="chart_template_id" ref="ca_en_chart_template_en"/>
298 </record>
299
300 <record id="fiscal_position_template_3_en" model="account.fiscal.position.template">
301- <field name="name">Non-Harmonized Provinces Regime</field>
302+ <field name="name">Non-Harmonized Provinces Regime (AB, MB, SK, PE, NT, NU, YT)</field>
303 <field name="chart_template_id" ref="ca_en_chart_template_en"/>
304 </record>
305
306 <record id="fiscal_position_template_4_en" model="account.fiscal.position.template">
307- <field name="name">International Regime</field>
308+ <field name="name">International Regime (INTL)</field>
309 <field name="chart_template_id" ref="ca_en_chart_template_en"/>
310 </record>
311
312
313=== modified file 'l10n_ca/fiscal_templates_fr.xml'
314--- l10n_ca/fiscal_templates_fr.xml 2012-06-09 14:41:32 +0000
315+++ l10n_ca/fiscal_templates_fr.xml 2013-05-08 17:09:42 +0000
316@@ -5,17 +5,17 @@
317 <!-- Fiscal Position Templates -->
318
319 <record id="fiscal_position_template_1_fr" model="account.fiscal.position.template">
320- <field name="name">Régime Provincial</field>
321+ <field name="name">Régime Provincial (PROV)</field>
322 <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
323 </record>
324
325 <record id="fiscal_position_template_21_fr" model="account.fiscal.position.template">
326- <field name="name">Régime Provinces Harmonisées (12%)</field>
327+ <field name="name">Régime Provinces Harmonisées (12%) (BC)</field>
328 <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
329 </record>
330
331 <record id="fiscal_position_template_22_fr" model="account.fiscal.position.template">
332- <field name="name">Régime Provinces Harmonisées (13%)</field>
333+ <field name="name">Régime Provinces Harmonisées (13%) (ON, NB, NL)</field>
334 <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
335 </record>
336
337@@ -25,17 +25,17 @@
338 </record>
339
340 <record id="fiscal_position_template_24_fr" model="account.fiscal.position.template">
341- <field name="name">Régime Provinces Harmonisées (15%)</field>
342+ <field name="name">Régime Provinces Harmonisées (15%) (NS)</field>
343 <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
344 </record>
345
346 <record id="fiscal_position_template_3_fr" model="account.fiscal.position.template">
347- <field name="name">Régime Provinces Non-Harmonisées</field>
348+ <field name="name">Régime Provinces Non-Harmonisées (AB, MB, SK, PE, NT, NU, YT)</field>
349 <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
350 </record>
351
352 <record id="fiscal_position_template_4_fr" model="account.fiscal.position.template">
353- <field name="name">Régime International</field>
354+ <field name="name">Régime International (INTL)</field>
355 <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
356 </record>
357