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

Status: Needs review
Proposed branch: lp:~savoirfairelinux-openerp/openobject-addons/6.1_l10n_ca_hr_payroll
Merge into: lp:openobject-addons/6.1
Diff against target: 943 lines (+510/-111)
6 files modified
l10n_ca/__openerp__.py (+8/-1)
l10n_ca/account_chart_en.xml (+233/-42)
l10n_ca/account_chart_fr.xml (+207/-39)
l10n_ca/account_chart_template_en.xml (+17/-2)
l10n_ca/account_chart_template_fr.xml (+19/-1)
l10n_ca/account_tax_en.xml (+26/-26)
To merge this branch: bzr merge lp:~savoirfairelinux-openerp/openobject-addons/6.1_l10n_ca_hr_payroll
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+137634@code.launchpad.net

Description of the change

[IMP] Charts with payroll accounts

To post a comment you must log in.

Unmerged revisions

7049. By Maxime Chambreuil (http://www.savoirfairelinux.com)

[IMP] Update chart of accounts for payroll

7048. By Maxime Chambreuil (http://www.savoirfairelinux.com)

[IMP] Sync account code between the 2 charts for the payroll rules
[ADD] Liability accounts for QPIP.

7047. By Maxime Chambreuil (http://www.savoirfairelinux.com)

[FIX] account types

7046. By Maxime Chambreuil (http://www.savoirfairelinux.com)

[FIX] Fix the chart templates and try to set the default accounts for RT inventory

7045. By Maxime Chambreuil (http://www.savoirfairelinux.com)

[ADD] accounts for real time inventory

7044. By Maxime Chambreuil (http://www.savoirfairelinux.com)

[FIX] account_chart_template_en.xml

7043. By Maxime Chambreuil (http://www.savoirfairelinux.com)

[ADD] account_anglo_saxon dependency for RT inventory

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 2012-12-03 17:13:34 +0000
4@@ -30,7 +30,14 @@
5
6 Canadian accounting charts and localizations.
7 """,
8- "depends" : ['base', 'account', 'base_iban', 'base_vat', 'account_chart'],
9+ "depends" : [
10+ 'base',
11+ 'account',
12+ 'base_iban',
13+ 'base_vat',
14+ 'account_chart',
15+ 'account_anglo_saxon'
16+ ],
17 "init_xml" : [],
18 "update_xml" : [
19 'account_chart_en.xml',
20
21=== modified file 'l10n_ca/account_chart_en.xml'
22--- l10n_ca/account_chart_en.xml 2012-06-09 14:41:32 +0000
23+++ l10n_ca/account_chart_en.xml 2012-12-03 17:13:34 +0000
24@@ -37,14 +37,6 @@
25 <field name="name">CASH</field>
26 </record>
27
28- <record id="chart1111_en" model="account.account.template">
29- <field name="code">1111</field>
30- <field name="parent_id" ref="chart111_en"/>
31- <field name="type">liquidity</field>
32- <field name="user_type" ref="account.data_account_type_bank"/>
33- <field name="name">Checking Account</field>
34- </record>
35-
36 <record id="chart112_en" model="account.account.template">
37 <field name="code">112</field>
38 <field name="parent_id" ref="chart11_en"/>
39@@ -69,6 +61,22 @@
40 <field name="name">STOCKS</field>
41 </record>
42
43+ <record id="chart1141_en" model="account.account.template">
44+ <field name="code">1141</field>
45+ <field name="parent_id" ref="chart114_en"/>
46+ <field name="type">other</field>
47+ <field name="user_type" ref="account.data_account_type_asset"/>
48+ <field name="name">Stock In Hand</field>
49+ </record>
50+
51+ <record id="chart1145_en" model="account.account.template">
52+ <field name="code">1145</field>
53+ <field name="parent_id" ref="chart114_en"/>
54+ <field name="type">other</field>
55+ <field name="user_type" ref="account.data_account_type_asset"/>
56+ <field name="name">Stock Delivered But Not Billed</field>
57+ </record>
58+
59 <record id="chart115_en" model="account.account.template">
60 <field name="code">115</field>
61 <field name="parent_id" ref="chart11_en"/>
62@@ -228,49 +236,217 @@
63 <field name="name">Suppliers Account</field>
64 </record>
65
66- <record id="chart212_en" model="account.account.template">
67- <field name="code">212</field>
68+ <record id="chart212_en" model="account.account.template">
69+ <field name="code">212</field>
70+ <field name="parent_id" ref="chart21_en"/>
71+ <field name="type">view</field>
72+ <field name="user_type" ref="account.data_account_type_view"/>
73+ <field name="name">OTHER ACCOUNTS PAYABLES</field>
74+ </record>
75+
76+ <record id="chart213_en" model="account.account.template">
77+ <field name="code">213</field>
78 <field name="parent_id" ref="chart21_en"/>
79 <field name="type">view</field>
80 <field name="user_type" ref="account.data_account_type_view"/>
81 <field name="name">TAXES PAYABLES</field>
82 </record>
83
84- <record id="chart2121_en" model="account.account.template">
85- <field name="code">2121</field>
86- <field name="parent_id" ref="chart212_en"/>
87+ <record id="chart2131_en" model="account.account.template">
88+ <field name="code">2131</field>
89+ <field name="parent_id" ref="chart213_en"/>
90 <field name="type">other</field>
91 <field name="user_type" ref="account.data_account_type_payable"/>
92 <field name="reconcile" eval="True"/>
93 <field name="name">GST to pay</field>
94 </record>
95
96- <record id="chart2122_en" model="account.account.template">
97- <field name="code">2122</field>
98- <field name="parent_id" ref="chart212_en"/>
99+ <record id="chart2132_en" model="account.account.template">
100+ <field name="code">2132</field>
101+ <field name="parent_id" ref="chart213_en"/>
102 <field name="type">other</field>
103 <field name="user_type" ref="account.data_account_type_payable"/>
104 <field name="reconcile" eval="True"/>
105 <field name="name">PST/QST to pay</field>
106 </record>
107
108- <record id="chart2123_en" model="account.account.template">
109- <field name="code">2123</field>
110- <field name="parent_id" ref="chart212_en"/>
111+ <record id="chart2133_en" model="account.account.template">
112+ <field name="code">2133</field>
113+ <field name="parent_id" ref="chart213_en"/>
114 <field name="type">other</field>
115 <field name="user_type" ref="account.data_account_type_payable"/>
116 <field name="reconcile" eval="True"/>
117 <field name="name">HST to pay</field>
118 </record>
119
120- <record id="chart213_en" model="account.account.template">
121- <field name="code">213</field>
122+ <record id="chart214_en" model="account.account.template">
123+ <field name="code">214</field>
124+ <field name="parent_id" ref="chart21_en"/>
125+ <field name="type">view</field>
126+ <field name="user_type" ref="account.data_account_type_view"/>
127+ <field name="name">LABOUR TAXES TO PAY</field>
128+ </record>
129+
130+ <record id="chart2141_en" model="account.account.template">
131+ <field name="code">2141</field>
132+ <field name="parent_id" ref="chart214_en"/>
133+ <field name="type">view</field>
134+ <field name="user_type" ref="account.data_account_type_view"/>
135+ <field name="name">CANADIAN REVENU AGENCY</field>
136+ </record>
137+
138+ <record id="chart21411_en" model="account.account.template">
139+ <field name="code">21411</field>
140+ <field name="parent_id" ref="chart2141_en"/>
141+ <field name="type">view</field>
142+ <field name="user_type" ref="account.data_account_type_view"/>
143+ <field name="name">Employment Insurance to pay</field>
144+ </record>
145+
146+ <record id="chart214111_en" model="account.account.template">
147+ <field name="code">214111</field>
148+ <field name="parent_id" ref="chart21411_en"/>
149+ <field name="type">other</field>
150+ <field name="user_type" ref="account.data_account_type_liability"/>
151+ <field name="name">EI - Employees Contribution</field>
152+ </record>
153+
154+ <record id="chart214112_en" model="account.account.template">
155+ <field name="code">214112</field>
156+ <field name="parent_id" ref="chart21411_en"/>
157+ <field name="type">other</field>
158+ <field name="user_type" ref="account.data_account_type_liability"/>
159+ <field name="name">EI - Employer Contribution</field>
160+ </record>
161+
162+ <record id="chart21412_en" model="account.account.template">
163+ <field name="code">21412</field>
164+ <field name="parent_id" ref="chart2141_en"/>
165+ <field name="type">other</field>
166+ <field name="user_type" ref="account.data_account_type_liability"/>
167+ <field name="name">Federal Income Tax</field>
168+ </record>
169+
170+ <record id="chart2142_en" model="account.account.template">
171+ <field name="code">2142</field>
172+ <field name="parent_id" ref="chart214_en"/>
173+ <field name="type">view</field>
174+ <field name="user_type" ref="account.data_account_type_view"/>
175+ <field name="name">REVENU QUÉBEC</field>
176+ </record>
177+
178+ <record id="chart21421_en" model="account.account.template">
179+ <field name="code">21421</field>
180+ <field name="parent_id" ref="chart2142_en"/>
181+ <field name="type">other</field>
182+ <field name="user_type" ref="account.data_account_type_liability"/>
183+ <field name="name">Health Services Fund to pay</field>
184+ </record>
185+
186+ <record id="chart21422_en" model="account.account.template">
187+ <field name="code">21422</field>
188+ <field name="parent_id" ref="chart2142_en"/>
189+ <field name="type">view</field>
190+ <field name="user_type" ref="account.data_account_type_view"/>
191+ <field name="name">ANNUITIES TO PAY</field>
192+ </record>
193+
194+ <record id="chart214221_en" model="account.account.template">
195+ <field name="code">214221</field>
196+ <field name="parent_id" ref="chart21422_en"/>
197+ <field name="type">other</field>
198+ <field name="user_type" ref="account.data_account_type_liability"/>
199+ <field name="name">Annuities - Employees Contribution</field>
200+ </record>
201+
202+ <record id="chart214222_en" model="account.account.template">
203+ <field name="code">214222</field>
204+ <field name="parent_id" ref="chart21422_en"/>
205+ <field name="type">other</field>
206+ <field name="user_type" ref="account.data_account_type_liability"/>
207+ <field name="name">Annuities - Employer Contribution</field>
208+ </record>
209+
210+ <record id="chart21423_en" model="account.account.template">
211+ <field name="code">21423</field>
212+ <field name="parent_id" ref="chart2142_en"/>
213+ <field name="type">view</field>
214+ <field name="user_type" ref="account.data_account_type_view"/>
215+ <field name="name">PARENTAL INSURANCE PLAN TO PAY</field>
216+ </record>
217+
218+ <record id="chart214231_en" model="account.account.template">
219+ <field name="code">214231</field>
220+ <field name="parent_id" ref="chart21423_en"/>
221+ <field name="type">other</field>
222+ <field name="user_type" ref="account.data_account_type_liability"/>
223+ <field name="name">PAP - Employee Contribution</field>
224+ </record>
225+
226+ <record id="chart214232_en" model="account.account.template">
227+ <field name="code">214232</field>
228+ <field name="parent_id" ref="chart21423_en"/>
229+ <field name="type">other</field>
230+ <field name="user_type" ref="account.data_account_type_liability"/>
231+ <field name="name">PAP - Employer Contribution</field>
232+ </record>
233+
234+ <record id="chart21424_en" model="account.account.template">
235+ <field name="code">21424</field>
236+ <field name="parent_id" ref="chart2142_en"/>
237+ <field name="type">other</field>
238+ <field name="user_type" ref="account.data_account_type_liability"/>
239+ <field name="name">Labour Health and Safety to pay</field>
240+ </record>
241+
242+ <record id="chart21425_en" model="account.account.template">
243+ <field name="code">21425</field>
244+ <field name="parent_id" ref="chart2142_en"/>
245+ <field name="type">other</field>
246+ <field name="user_type" ref="account.data_account_type_liability"/>
247+ <field name="name">Labour Standards to pay</field>
248+ </record>
249+
250+ <record id="chart21426_en" model="account.account.template">
251+ <field name="code">21426</field>
252+ <field name="parent_id" ref="chart2142_en"/>
253+ <field name="type">other</field>
254+ <field name="user_type" ref="account.data_account_type_liability"/>
255+ <field name="name">Provincial Income Tax</field>
256+ </record>
257+
258+ <record id="chart215_en" model="account.account.template">
259+ <field name="code">215</field>
260 <field name="parent_id" ref="chart21_en"/>
261 <field name="type">view</field>
262 <field name="user_type" ref="account.data_account_type_view"/>
263 <field name="name">CURRENT FINANCIAL DEBTS</field>
264 </record>
265
266+ <record id="chart216_en" model="account.account.template">
267+ <field name="code">216</field>
268+ <field name="parent_id" ref="chart21_en"/>
269+ <field name="type">view</field>
270+ <field name="user_type" ref="account.data_account_type_view"/>
271+ <field name="name">LIABILITIES ASSETS HELD FOR TRANSFER</field>
272+ </record>
273+
274+ <record id="chart217_en" model="account.account.template">
275+ <field name="code">217</field>
276+ <field name="parent_id" ref="chart21_en"/>
277+ <field name="type">view</field>
278+ <field name="user_type" ref="account.data_account_type_view"/>
279+ <field name="name">STOCK LIABILITIES</field>
280+ </record>
281+
282+ <record id="chart2171_en" model="account.account.template">
283+ <field name="code">2171</field>
284+ <field name="parent_id" ref="chart216_en"/>
285+ <field name="type">other</field>
286+ <field name="user_type" ref="account.data_account_type_liability"/>
287+ <field name="name">Stock Received But Not Billed</field>
288+ </record>
289+
290 <record id="chart25_en" model="account.account.template">
291 <field name="code">25</field>
292 <field name="parent_id" ref="chart2_en"/>
293@@ -295,8 +471,8 @@
294 <field name="name">PROVISIONS FOR PENSIONS AND OTHER POST-EMPLOYMENT ADVANTAGES</field>
295 </record>
296
297- <record id="chart253_en" model="account.account.template">
298- <field name="code">253</field>
299+ <record id="chart254_en" model="account.account.template">
300+ <field name="code">254</field>
301 <field name="parent_id" ref="chart25_en"/>
302 <field name="type">view</field>
303 <field name="user_type" ref="account.data_account_type_view"/>
304@@ -435,8 +611,8 @@
305 <field name="name">NON-OPERATING INCOMES</field>
306 </record>
307
308- <record id="chart421_en" model="account.account.template">
309- <field name="code">421</field>
310+ <record id="chart425_en" model="account.account.template">
311+ <field name="code">425</field>
312 <field name="parent_id" ref="chart42_en"/>
313 <field name="type">view</field>
314 <field name="user_type" ref="account.data_account_type_view"/>
315@@ -517,70 +693,85 @@
316 <field name="name">LABOUR EXPENSES</field>
317 </record>
318
319- <record id="chart5121_en" model="account.account.template">
320- <field name="code">5121</field>
321+ <record id="chart51201_en" model="account.account.template">
322+ <field name="code">51201</field>
323 <field name="parent_id" ref="chart512_en"/>
324 <field name="type">other</field>
325 <field name="user_type" ref="account.data_account_type_expense"/>
326 <field name="name">Salaries, wages and commissions</field>
327 </record>
328
329- <record id="chart5122_en" model="account.account.template">
330- <field name="code">5122</field>
331+ <record id="chart51202_en" model="account.account.template">
332+ <field name="code">51202</field>
333 <field name="parent_id" ref="chart512_en"/>
334 <field name="type">other</field>
335 <field name="user_type" ref="account.data_account_type_expense"/>
336 <field name="name">Holidays</field>
337 </record>
338
339- <record id="chart5123_en" model="account.account.template">
340- <field name="code">5123</field>
341+ <record id="chart51203_en" model="account.account.template">
342+ <field name="code">51203</field>
343 <field name="parent_id" ref="chart512_en"/>
344 <field name="type">other</field>
345 <field name="user_type" ref="account.data_account_type_expense"/>
346 <field name="name">Employment Insurance</field>
347 </record>
348
349- <record id="chart5124_en" model="account.account.template">
350- <field name="code">5124</field>
351+ <record id="chart51204_en" model="account.account.template">
352+ <field name="code">51204</field>
353 <field name="parent_id" ref="chart512_en"/>
354 <field name="type">other</field>
355 <field name="user_type" ref="account.data_account_type_expense"/>
356 <field name="name">Health Services Fund</field>
357 </record>
358
359- <record id="chart5125_en" model="account.account.template">
360- <field name="code">5125</field>
361+ <record id="chart51205_en" model="account.account.template">
362+ <field name="code">51205</field>
363 <field name="parent_id" ref="chart512_en"/>
364 <field name="type">other</field>
365 <field name="user_type" ref="account.data_account_type_expense"/>
366 <field name="name">Annuities</field>
367 </record>
368
369- <record id="chart5126_en" model="account.account.template">
370- <field name="code">5126</field>
371+ <record id="chart51206_en" model="account.account.template">
372+ <field name="code">51206</field>
373 <field name="parent_id" ref="chart512_en"/>
374 <field name="type">other</field>
375 <field name="user_type" ref="account.data_account_type_expense"/>
376 <field name="name">Parental Insurance</field>
377 </record>
378
379- <record id="chart5127_en" model="account.account.template">
380- <field name="code">5127</field>
381+ <record id="chart51207_en" model="account.account.template">
382+ <field name="code">51207</field>
383 <field name="parent_id" ref="chart512_en"/>
384 <field name="type">other</field>
385 <field name="user_type" ref="account.data_account_type_expense"/>
386 <field name="name">Labour Health and Safety</field>
387 </record>
388
389- <record id="chart5128_en" model="account.account.template">
390- <field name="code">5128</field>
391+ <record id="chart51208_en" model="account.account.template">
392+ <field name="code">51208</field>
393 <field name="parent_id" ref="chart512_en"/>
394 <field name="type">other</field>
395 <field name="user_type" ref="account.data_account_type_expense"/>
396 <field name="name">Labour Standards</field>
397 </record>
398
399+ <record id="chart51209_en" model="account.account.template">
400+ <field name="code">51209</field>
401+ <field name="parent_id" ref="chart512_en"/>
402+ <field name="type">other</field>
403+ <field name="user_type" ref="account.data_account_type_expense"/>
404+ <field name="name">Federal Income Tax</field>
405+ </record>
406+
407+ <record id="chart51210_en" model="account.account.template">
408+ <field name="code">51210</field>
409+ <field name="parent_id" ref="chart512_en"/>
410+ <field name="type">other</field>
411+ <field name="user_type" ref="account.data_account_type_expense"/>
412+ <field name="name">Provincial Income Tax</field>
413+ </record>
414 <record id="chart513_en" model="account.account.template">
415 <field name="code">513</field>
416 <field name="parent_id" ref="chart51_en"/>
417@@ -626,7 +817,7 @@
418 <field name="parent_id" ref="chart55_en"/>
419 <field name="type">view</field>
420 <field name="user_type" ref="account.data_account_type_view"/>
421- <field name="name">INTEREST EXPENSES</field>
422+ <field name="name">INTERESTS EXPENSES</field>
423 </record>
424
425 <record id="chart559_en" model="account.account.template">
426
427=== modified file 'l10n_ca/account_chart_fr.xml'
428--- l10n_ca/account_chart_fr.xml 2012-06-09 14:41:32 +0000
429+++ l10n_ca/account_chart_fr.xml 2012-12-03 17:13:34 +0000
430@@ -36,22 +36,6 @@
431 <field name="name">ENCAISSE</field>
432 </record>
433
434- <record id="chart1111_fr" model="account.account.template">
435- <field name="code">1111</field>
436- <field name="parent_id" ref="chart111_fr"/>
437- <field name="type">liquidity</field>
438- <field name="user_type" ref="account.data_account_type_bank"/>
439- <field name="name">Compte chèque</field>
440- </record>
441-
442- <record id="chart1112_fr" model="account.account.template">
443- <field name="code">1112</field>
444- <field name="parent_id" ref="chart111_fr"/>
445- <field name="type">liquidity</field>
446- <field name="user_type" ref="account.data_account_type_cash"/>
447- <field name="name">Petite caisse</field>
448- </record>
449-
450 <record id="chart112_fr" model="account.account.template">
451 <field name="code">112</field>
452 <field name="parent_id" ref="chart11_fr"/>
453@@ -76,6 +60,22 @@
454 <field name="name">STOCKS</field>
455 </record>
456
457+ <record id="chart1141_fr" model="account.account.template">
458+ <field name="code">1141</field>
459+ <field name="parent_id" ref="chart114_fr"/>
460+ <field name="type">other</field>
461+ <field name="user_type" ref="account.data_account_type_asset"/>
462+ <field name="name">Stock</field>
463+ </record>
464+
465+ <record id="chart1145_fr" model="account.account.template">
466+ <field name="code">1145</field>
467+ <field name="parent_id" ref="chart114_fr"/>
468+ <field name="type">other</field>
469+ <field name="user_type" ref="account.data_account_type_asset"/>
470+ <field name="name">Stock expédié non-facturé</field>
471+ </record>
472+
473 <record id="chart115_fr" model="account.account.template">
474 <field name="code">115</field>
475 <field name="parent_id" ref="chart11_fr"/>
476@@ -278,22 +278,174 @@
477 <field name="name">TVH à payer</field>
478 </record>
479
480- <record id="chart214_fr" model="account.account.template">
481- <field name="code">214</field>
482- <field name="parent_id" ref="chart21_fr"/>
483- <field name="type">view</field>
484- <field name="user_type" ref="account.data_account_type_view"/>
485- <field name="name">DETTES FINANCIÈRES COURANTES</field>
486- </record>
487+ <record id="chart214_fr" model="account.account.template">
488+ <field name="code">214</field>
489+ <field name="parent_id" ref="chart21_fr"/>
490+ <field name="type">view</field>
491+ <field name="user_type" ref="account.data_account_type_view"/>
492+ <field name="name">IMPÔTS LIÉS AUX SALAIRES À PAYER</field>
493+ </record>
494+
495+ <record id="chart2141_fr" model="account.account.template">
496+ <field name="code">2141</field>
497+ <field name="parent_id" ref="chart214_fr"/>
498+ <field name="type">view</field>
499+ <field name="user_type" ref="account.data_account_type_view"/>
500+ <field name="name">AGENCE DU REVENU DU CANADA</field>
501+ </record>
502+
503+ <record id="chart21411_fr" model="account.account.template">
504+ <field name="code">21411</field>
505+ <field name="parent_id" ref="chart2141_fr"/>
506+ <field name="type">view</field>
507+ <field name="user_type" ref="account.data_account_type_view"/>
508+ <field name="name">ASSURANCE EMPLOI À PAYER</field>
509+ </record>
510+
511+ <record id="chart214111_fr" model="account.account.template">
512+ <field name="code">214111</field>
513+ <field name="parent_id" ref="chart21411_fr"/>
514+ <field name="type">other</field>
515+ <field name="user_type" ref="account.data_account_type_liability"/>
516+ <field name="name">AE - Contribution des employés</field>
517+ </record>
518+
519+ <record id="chart214112_fr" model="account.account.template">
520+ <field name="code">214112</field>
521+ <field name="parent_id" ref="chart21411_fr"/>
522+ <field name="type">other</field>
523+ <field name="user_type" ref="account.data_account_type_liability"/>
524+ <field name="name">AE - Contribution de l'employeur</field>
525+ </record>
526+
527+ <record id="chart21412_fr" model="account.account.template">
528+ <field name="code">21412</field>
529+ <field name="parent_id" ref="chart2141_fr"/>
530+ <field name="type">other</field>
531+ <field name="user_type" ref="account.data_account_type_liability"/>
532+ <field name="name">Impôt fédéral sur les revenus</field>
533+ </record>
534+
535+ <record id="chart2142_fr" model="account.account.template">
536+ <field name="code">2142</field>
537+ <field name="parent_id" ref="chart214_fr"/>
538+ <field name="type">view</field>
539+ <field name="user_type" ref="account.data_account_type_view"/>
540+ <field name="name">REVENU QUÉBEC</field>
541+ </record>
542+
543+ <record id="chart21421_fr" model="account.account.template">
544+ <field name="code">21421</field>
545+ <field name="parent_id" ref="chart2142_fr"/>
546+ <field name="type">other</field>
547+ <field name="user_type" ref="account.data_account_type_liability"/>
548+ <field name="name">Fond des Services de Santé à payer</field>
549+ </record>
550+
551+ <record id="chart21422_fr" model="account.account.template">
552+ <field name="code">21422</field>
553+ <field name="parent_id" ref="chart2142_fr"/>
554+ <field name="type">view</field>
555+ <field name="user_type" ref="account.data_account_type_view"/>
556+ <field name="name">RENTES À PAYER</field>
557+ </record>
558+
559+ <record id="chart214221_fr" model="account.account.template">
560+ <field name="code">214221</field>
561+ <field name="parent_id" ref="chart21422_fr"/>
562+ <field name="type">other</field>
563+ <field name="user_type" ref="account.data_account_type_liability"/>
564+ <field name="name">Rentes - Contribution des employés</field>
565+ </record>
566+
567+ <record id="chart214222_fr" model="account.account.template">
568+ <field name="code">214222</field>
569+ <field name="parent_id" ref="chart21422_fr"/>
570+ <field name="type">other</field>
571+ <field name="user_type" ref="account.data_account_type_liability"/>
572+ <field name="name">Rentes - Contribution de l'employeur</field>
573+ </record>
574+
575+ <record id="chart21423_fr" model="account.account.template">
576+ <field name="code">21423</field>
577+ <field name="parent_id" ref="chart2142_fr"/>
578+ <field name="type">view</field>
579+ <field name="user_type" ref="account.data_account_type_view"/>
580+ <field name="name">ASSURANCE PARENTALE À PAYER</field>
581+ </record>
582+
583+ <record id="chart214231_fr" model="account.account.template">
584+ <field name="code">214231</field>
585+ <field name="parent_id" ref="chart21423_fr"/>
586+ <field name="type">other</field>
587+ <field name="user_type" ref="account.data_account_type_liability"/>
588+ <field name="name">AP - Contribution des employés</field>
589+ </record>
590+
591+ <record id="chart214232_fr" model="account.account.template">
592+ <field name="code">214232</field>
593+ <field name="parent_id" ref="chart21423_fr"/>
594+ <field name="type">other</field>
595+ <field name="user_type" ref="account.data_account_type_liability"/>
596+ <field name="name">AP - Contribution de l'employeur</field>
597+ </record>
598+
599+ <record id="chart21424_fr" model="account.account.template">
600+ <field name="code">21424</field>
601+ <field name="parent_id" ref="chart2142_fr"/>
602+ <field name="type">other</field>
603+ <field name="user_type" ref="account.data_account_type_liability"/>
604+ <field name="name">Santé et Sécurité au Travail à payer</field>
605+ </record>
606+
607+ <record id="chart21425_fr" model="account.account.template">
608+ <field name="code">21425</field>
609+ <field name="parent_id" ref="chart2142_fr"/>
610+ <field name="type">other</field>
611+ <field name="user_type" ref="account.data_account_type_liability"/>
612+ <field name="name">Normes du Travail à payer</field>
613+ </record>
614+
615+ <record id="chart21426_fr" model="account.account.template">
616+ <field name="code">21426</field>
617+ <field name="parent_id" ref="chart2142_fr"/>
618+ <field name="type">other</field>
619+ <field name="user_type" ref="account.data_account_type_liability"/>
620+ <field name="name">Impôt provincial sur les revenus</field>
621+ </record>
622
623 <record id="chart215_fr" model="account.account.template">
624 <field name="code">215</field>
625 <field name="parent_id" ref="chart21_fr"/>
626 <field name="type">view</field>
627 <field name="user_type" ref="account.data_account_type_view"/>
628+ <field name="name">DETTES FINANCIÈRES COURANTES</field>
629+ </record>
630+
631+ <record id="chart216_fr" model="account.account.template">
632+ <field name="code">216</field>
633+ <field name="parent_id" ref="chart21_fr"/>
634+ <field name="type">view</field>
635+ <field name="user_type" ref="account.data_account_type_view"/>
636 <field name="name">PASSIFS LIÉS AUX ACTIFS DÉTENUS EN VUE DE LEUR CESSION</field>
637 </record>
638
639+ <record id="chart217_fr" model="account.account.template">
640+ <field name="code">217</field>
641+ <field name="parent_id" ref="chart21_fr"/>
642+ <field name="type">view</field>
643+ <field name="user_type" ref="account.data_account_type_view"/>
644+ <field name="name">PASSIFS DE STOCK</field>
645+ </record>
646+
647+ <record id="chart2171_fr" model="account.account.template">
648+ <field name="code">2171</field>
649+ <field name="parent_id" ref="chart217_fr"/>
650+ <field name="type">other</field>
651+ <field name="user_type" ref="account.data_account_type_liability"/>
652+ <field name="name">Stock reçu non facturé</field>
653+ </record>
654+
655 <record id="chart25_fr" model="account.account.template">
656 <field name="code">25</field>
657 <field name="parent_id" ref="chart2_fr"/>
658@@ -318,21 +470,21 @@
659 <field name="name">PROVISIONS POUR RETRAITES ET AUTRES AVANTAGES POSTÉRIEURS À L'EMPLOI</field>
660 </record>
661
662- <record id="chart253_fr" model="account.account.template">
663- <field name="code">253</field>
664- <field name="parent_id" ref="chart25_fr"/>
665- <field name="type">view</field>
666- <field name="user_type" ref="account.data_account_type_view"/>
667- <field name="name">IMPÔTS DIFFÉRÉS</field>
668- </record>
669-
670- <record id="chart254_fr" model="account.account.template">
671- <field name="code">254</field>
672- <field name="parent_id" ref="chart25_fr"/>
673- <field name="type">view</field>
674- <field name="user_type" ref="account.data_account_type_view"/>
675- <field name="name">AUTRES PASSIFS NON-COURANTS</field>
676- </record>
677+ <record id="chart253_fr" model="account.account.template">
678+ <field name="code">253</field>
679+ <field name="parent_id" ref="chart25_fr"/>
680+ <field name="type">view</field>
681+ <field name="user_type" ref="account.data_account_type_view"/>
682+ <field name="name">IMPÔTS DIFFÉRÉS</field>
683+ </record>
684+
685+ <record id="chart254_fr" model="account.account.template">
686+ <field name="code">254</field>
687+ <field name="parent_id" ref="chart25_fr"/>
688+ <field name="type">view</field>
689+ <field name="user_type" ref="account.data_account_type_view"/>
690+ <field name="name">AUTRES PASSIFS NON-COURANTS</field>
691+ </record>
692
693 <!-- CAPITAUX PROPRES -->
694
695@@ -593,7 +745,7 @@
696 <field name="parent_id" ref="chart512_fr"/>
697 <field name="type">other</field>
698 <field name="user_type" ref="account.data_account_type_expense"/>
699- <field name="name">Assurance parental</field>
700+ <field name="name">Assurance parentale</field>
701 </record>
702
703 <record id="chart51207_fr" model="account.account.template">
704@@ -612,6 +764,22 @@
705 <field name="name">Normes du travail</field>
706 </record>
707
708+ <record id="chart51209_fr" model="account.account.template">
709+ <field name="code">51209</field>
710+ <field name="parent_id" ref="chart512_fr"/>
711+ <field name="type">other</field>
712+ <field name="user_type" ref="account.data_account_type_expense"/>
713+ <field name="name">Impôt fédéral</field>
714+ </record>
715+
716+ <record id="chart51210_fr" model="account.account.template">
717+ <field name="code">51210</field>
718+ <field name="parent_id" ref="chart512_fr"/>
719+ <field name="type">other</field>
720+ <field name="user_type" ref="account.data_account_type_expense"/>
721+ <field name="name">Impôt provincial</field>
722+ </record>
723+
724 <record id="chart513_fr" model="account.account.template">
725 <field name="code">513</field>
726 <field name="parent_id" ref="chart51_fr"/>
727
728=== modified file 'l10n_ca/account_chart_template_en.xml'
729--- l10n_ca/account_chart_template_en.xml 2011-10-27 16:30:34 +0000
730+++ l10n_ca/account_chart_template_en.xml 2012-12-03 17:13:34 +0000
731@@ -8,12 +8,27 @@
732 <field name="name">Canada - Chart of Accounts for english-speaking provinces</field>
733 <field name="account_root_id" ref="chart0_en"/>
734 <field name="tax_code_root_id" ref="vat_code_tax_en"/>
735- <field name="bank_account_view_id" ref="chart1111_en"/>
736+ <field name="bank_account_view_id" ref="chart111_en"/>
737 <field name="property_account_receivable" ref="chart1151_en"/>
738 <field name="property_account_payable" ref="chart2111_en"/>
739 <field name="property_account_income_categ" ref="chart411_en"/>
740- <field name="property_account_expense_categ" ref="chart511_en"/>
741+ <field name="property_account_expense_categ" ref="chart5111_en"/>
742+ </record>
743+
744+ <record id="stock.property_stock_account_input_categ" model="ir.property">
745+ <field eval="'account.account,'+str(ref('chart2171_en'))" model="account.account" name="value"/>
746 </record>
747
748+ <record id="stock.property_stock_account_output_categ" model="ir.property">
749+ <field eval="'account.account,'+str(ref('chart1145_en'))" model="account.account" name="value"/>
750+ </record>
751+
752+ <record id="property_stock_valuation_account_id_en" model="ir.property">
753+ <field name="name">property_stock_valuation_account_id</field>
754+ <field name="fields_id" search="[('model','=','product.category'),('name','=','property_stock_valuation_account_id')]"/>
755+ <field name="company_id" ref="base.main_company"/>
756+ <field eval="'account.account,'+str(ref('chart1141_en'))" model="account.account" name="value"/>
757+ </record>
758+
759 </data>
760 </openerp>
761
762=== modified file 'l10n_ca/account_chart_template_fr.xml'
763--- l10n_ca/account_chart_template_fr.xml 2011-10-26 22:24:15 +0000
764+++ l10n_ca/account_chart_template_fr.xml 2012-12-03 17:13:34 +0000
765@@ -7,12 +7,30 @@
766 <field name="name">Canada - Plan comptable pour les provinces francophones</field>
767 <field name="account_root_id" ref="chart0_fr"/>
768 <field name="tax_code_root_id" ref="vat_code_tax_fr"/>
769- <field name="bank_account_view_id" ref="chart1111_fr"/>
770+ <field name="bank_account_view_id" ref="chart111_fr"/>
771 <field name="property_account_receivable" ref="chart1151_fr"/>
772 <field name="property_account_payable" ref="chart2111_fr"/>
773 <field name="property_account_income_categ" ref="chart411_fr"/>
774 <field name="property_account_expense_categ" ref="chart5111_fr"/>
775 </record>
776
777+ <record id="stock.property_stock_account_input_categ" model="ir.property">
778+ <field eval="'account.account,'+str(ref('chart2171_fr'))" model="account.account" name="value"/>
779+ <field eval="'product.category,'+str(ref('product.cat0'))" model="product.category" name="res_id"/>
780+ </record>
781+
782+ <record id="stock.property_stock_account_output_categ" model="ir.property">
783+ <field eval="'account.account,'+str(ref('chart1145_fr'))" model="account.account" name="value"/>
784+ <field eval="'product.category,'+str(ref('product.cat0'))" model="product.category" name="res_id"/>
785+ </record>
786+
787+ <record id="property_stock_valuation_account_id" model="ir.property">
788+ <field name="name">property_stock_valuation_account_id</field>
789+ <field name="fields_id" search="[('model','=','product.category'),('name','=','property_stock_valuation_account_id')]"/>
790+ <field name="company_id" ref="base.main_company"/>
791+ <field eval="'account.account,'+str(ref('chart1141_fr'))" model="account.account" name="value"/>
792+ <field eval="'product.category,'+str(ref('product.cat0'))" model="product.category" name="res_id"/>
793+ </record>
794+
795 </data>
796 </openerp>
797
798=== modified file 'l10n_ca/account_tax_en.xml'
799--- l10n_ca/account_tax_en.xml 2012-06-09 14:41:32 +0000
800+++ l10n_ca/account_tax_en.xml 2012-12-03 17:13:34 +0000
801@@ -25,8 +25,8 @@
802 <field name="type">percent</field>
803 <field name="sequence">1</field>
804 <field name="include_base_amount" eval="True"/>
805- <field name="account_collected_id" ref="chart2121_en"/>
806- <field name="account_paid_id" ref="chart2121_en"/>
807+ <field name="account_collected_id" ref="chart2131_en"/>
808+ <field name="account_paid_id" ref="chart2131_en"/>
809 <field name="base_code_id" ref="vat_code_base_receivable_gst_en"/>
810 <field name="tax_code_id" ref="vat_code_payable_gst_en"/>
811 <field name="ref_base_code_id" ref="vat_code_base_receivable_gst_en"/>
812@@ -42,8 +42,8 @@
813 <field name="amount">0.700000</field>
814 <field name="type">percent</field>
815 <field name="sequence">2</field>
816- <field name="account_collected_id" ref="chart2122_en"/>
817- <field name="account_paid_id" ref="chart2122_en"/>
818+ <field name="account_collected_id" ref="chart2132_en"/>
819+ <field name="account_paid_id" ref="chart2132_en"/>
820 <field name="base_code_id" ref="vat_code_base_receivable_pst_en"/>
821 <field name="tax_code_id" ref="vat_code_payable_pst_en"/>
822 <field name="ref_base_code_id" ref="vat_code_base_receivable_pst_en"/>
823@@ -72,8 +72,8 @@
824 <field name="type">percent</field>
825 <field name="sequence">1</field>
826 <field name="include_base_amount" eval="True"/>
827- <field name="account_collected_id" ref="chart2121_en"/>
828- <field name="account_paid_id" ref="chart2121_en"/>
829+ <field name="account_collected_id" ref="chart2131_en"/>
830+ <field name="account_paid_id" ref="chart2131_en"/>
831 <field name="base_code_id" ref="vat_code_base_receivable_gst_en"/>
832 <field name="tax_code_id" ref="vat_code_payable_gst_en"/>
833 <field name="ref_base_code_id" ref="vat_code_base_receivable_gst_en"/>
834@@ -89,8 +89,8 @@
835 <field name="amount">0.100000</field>
836 <field name="type">percent</field>
837 <field name="sequence">2</field>
838- <field name="account_collected_id" ref="chart2122_en"/>
839- <field name="account_paid_id" ref="chart2122_en"/>
840+ <field name="account_collected_id" ref="chart2132_en"/>
841+ <field name="account_paid_id" ref="chart2132_en"/>
842 <field name="base_code_id" ref="vat_code_base_receivable_pst_en"/>
843 <field name="tax_code_id" ref="vat_code_payable_pst_en"/>
844 <field name="ref_base_code_id" ref="vat_code_base_receivable_pst_en"/>
845@@ -119,8 +119,8 @@
846 <field name="type">percent</field>
847 <field name="sequence">1</field>
848 <field name="include_base_amount" eval="True"/>
849- <field name="account_collected_id" ref="chart2121_en"/>
850- <field name="account_paid_id" ref="chart2121_en"/>
851+ <field name="account_collected_id" ref="chart2131_en"/>
852+ <field name="account_paid_id" ref="chart2131_en"/>
853 <field name="base_code_id" ref="vat_code_base_receivable_gst_en"/>
854 <field name="tax_code_id" ref="vat_code_payable_gst_en"/>
855 <field name="ref_base_code_id" ref="vat_code_base_receivable_gst_en"/>
856@@ -136,8 +136,8 @@
857 <field name="amount">0.095000</field>
858 <field name="type">percent</field>
859 <field name="sequence">2</field>
860- <field name="account_collected_id" ref="chart2122_en"/>
861- <field name="account_paid_id" ref="chart2122_en"/>
862+ <field name="account_collected_id" ref="chart2132_en"/>
863+ <field name="account_paid_id" ref="chart2132_en"/>
864 <field name="base_code_id" ref="vat_code_base_receivable_pst_en"/>
865 <field name="tax_code_id" ref="vat_code_payable_pst_en"/>
866 <field name="ref_base_code_id" ref="vat_code_base_receivable_pst_en"/>
867@@ -166,8 +166,8 @@
868 <field name="type">percent</field>
869 <field name="sequence">1</field>
870 <field name="include_base_amount" eval="True"/>
871- <field name="account_collected_id" ref="chart2121_en"/>
872- <field name="account_paid_id" ref="chart2121_en"/>
873+ <field name="account_collected_id" ref="chart2131_en"/>
874+ <field name="account_paid_id" ref="chart2131_en"/>
875 <field name="base_code_id" ref="vat_code_base_receivable_gst_en"/>
876 <field name="tax_code_id" ref="vat_code_payable_gst_en"/>
877 <field name="ref_base_code_id" ref="vat_code_base_receivable_gst_en"/>
878@@ -183,8 +183,8 @@
879 <field name="amount">0.050000</field>
880 <field name="type">percent</field>
881 <field name="sequence">2</field>
882- <field name="account_collected_id" ref="chart2122_en"/>
883- <field name="account_paid_id" ref="chart2122_en"/>
884+ <field name="account_collected_id" ref="chart2132_en"/>
885+ <field name="account_paid_id" ref="chart2132_en"/>
886 <field name="base_code_id" ref="vat_code_base_receivable_pst_en"/>
887 <field name="tax_code_id" ref="vat_code_payable_pst_en"/>
888 <field name="ref_base_code_id" ref="vat_code_base_receivable_pst_en"/>
889@@ -201,8 +201,8 @@
890 <field name="type_tax_use">sale</field>
891 <field name="amount">0.120000</field>
892 <field name="type">percent</field>
893- <field name="account_collected_id" ref="chart2123_en"/>
894- <field name="account_paid_id" ref="chart2123_en"/>
895+ <field name="account_collected_id" ref="chart2133_en"/>
896+ <field name="account_paid_id" ref="chart2133_en"/>
897 <field name="base_code_id" ref="vat_code_base_receivable_hst_en"/>
898 <field name="tax_code_id" ref="vat_code_payable_hst_en"/>
899 <field name="ref_base_code_id" ref="vat_code_base_receivable_hst_en"/>
900@@ -216,8 +216,8 @@
901 <field name="type_tax_use">sale</field>
902 <field name="amount">0.130000</field>
903 <field name="type">percent</field>
904- <field name="account_collected_id" ref="chart2123_en"/>
905- <field name="account_paid_id" ref="chart2123_en"/>
906+ <field name="account_collected_id" ref="chart2133_en"/>
907+ <field name="account_paid_id" ref="chart2133_en"/>
908 <field name="base_code_id" ref="vat_code_base_receivable_hst_en"/>
909 <field name="tax_code_id" ref="vat_code_payable_hst_en"/>
910 <field name="ref_base_code_id" ref="vat_code_base_receivable_hst_en"/>
911@@ -231,8 +231,8 @@
912 <field name="type_tax_use">sale</field>
913 <field name="amount">0.135000</field>
914 <field name="type">percent</field>
915- <field name="account_collected_id" ref="chart2123_en"/>
916- <field name="account_paid_id" ref="chart2123_en"/>
917+ <field name="account_collected_id" ref="chart2133_en"/>
918+ <field name="account_paid_id" ref="chart2133_en"/>
919 <field name="base_code_id" ref="vat_code_base_receivable_hst_en"/>
920 <field name="tax_code_id" ref="vat_code_payable_hst_en"/>
921 <field name="ref_base_code_id" ref="vat_code_base_receivable_hst_en"/>
922@@ -246,8 +246,8 @@
923 <field name="type_tax_use">sale</field>
924 <field name="amount">0.150000</field>
925 <field name="type">percent</field>
926- <field name="account_collected_id" ref="chart2123_en"/>
927- <field name="account_paid_id" ref="chart2123_en"/>
928+ <field name="account_collected_id" ref="chart2133_en"/>
929+ <field name="account_paid_id" ref="chart2133_en"/>
930 <field name="base_code_id" ref="vat_code_base_receivable_hst_en"/>
931 <field name="tax_code_id" ref="vat_code_payable_hst_en"/>
932 <field name="ref_base_code_id" ref="vat_code_base_receivable_hst_en"/>
933@@ -263,8 +263,8 @@
934 <field name="type_tax_use">sale</field>
935 <field name="amount">0.050000</field>
936 <field name="type">percent</field>
937- <field name="account_collected_id" ref="chart2121_en"/>
938- <field name="account_paid_id" ref="chart2121_en"/>
939+ <field name="account_collected_id" ref="chart2131_en"/>
940+ <field name="account_paid_id" ref="chart2131_en"/>
941 <field name="base_code_id" ref="vat_code_base_receivable_gst_en"/>
942 <field name="tax_code_id" ref="vat_code_payable_gst_en"/>
943 <field name="ref_base_code_id" ref="vat_code_base_receivable_gst_en"/>