Merge lp:~savoirfairelinux-openerp/openobject-addons/l10n_ca-cc-and-amortization into lp:openobject-addons/7.0

Proposed by Marc Cassuto (SFL)
Status: Needs review
Proposed branch: lp:~savoirfairelinux-openerp/openobject-addons/l10n_ca-cc-and-amortization
Merge into: lp:openobject-addons/7.0
Diff against target: 514 lines (+382/-1)
5 files modified
l10n_ca/AUTHORS.txt (+4/-0)
l10n_ca/__openerp__.py (+3/-1)
l10n_ca/account_chart_en.xml (+177/-0)
l10n_ca/account_chart_fr.xml (+177/-0)
l10n_ca/l10n_ca.xml (+21/-0)
To merge this branch: bzr merge lp:~savoirfairelinux-openerp/openobject-addons/l10n_ca-cc-and-amortization
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+189606@code.launchpad.net

Description of the change

[ADD] add credit card stuff and all accounts related to amortization

To post a comment you must log in.

Unmerged revisions

9508. By Marc Cassuto (SFL)

[ADD] add credit card stuff and all accounts related to amortization

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'l10n_ca/AUTHORS.txt'
2--- l10n_ca/AUTHORS.txt 1970-01-01 00:00:00 +0000
3+++ l10n_ca/AUTHORS.txt 2013-10-07 13:53:31 +0000
4@@ -0,0 +1,4 @@
5+Maxime Chambreuil <maxime.chambreuil@savoirfairelinux.com>
6+Pierre Lamarche <pierre.lamarche@savoirfairelinux.com>
7+Marc Cassuto <marc.cassuto@savoirfairelinux.com>
8+Savoir-faire Linux <contact@savoirfairelinux.com>
9
10=== modified file 'l10n_ca/__openerp__.py'
11--- l10n_ca/__openerp__.py 2013-06-22 03:56:58 +0000
12+++ l10n_ca/__openerp__.py 2013-10-07 13:53:31 +0000
13@@ -58,6 +58,7 @@
14 'base_iban',
15 'base_vat',
16 'account_chart',
17+ 'l10n_ca_toponyms',
18 'account_anglo_saxon'
19 ],
20 'data': [
21@@ -71,7 +72,8 @@
22 'account_chart_template_fr.xml',
23 'account_tax_fr.xml',
24 'fiscal_templates_fr.xml',
25- 'l10n_ca_wizard.xml'
26+ 'l10n_ca_wizard.xml',
27+ 'l10n_ca.xml'
28 ],
29 'demo': [],
30 'installable': True,
31
32=== modified file 'l10n_ca/account_chart_en.xml'
33--- l10n_ca/account_chart_en.xml 2013-07-17 12:57:45 +0000
34+++ l10n_ca/account_chart_en.xml 2013-10-07 13:53:31 +0000
35@@ -37,6 +37,22 @@
36 <field name="name">CASH</field>
37 </record>
38
39+ <record id="chart111098_en" model="account.account.template">
40+ <field name="code">111098</field>
41+ <field name="parent_id" ref="chart111_en"/>
42+ <field name="type">liquidity</field>
43+ <field name="user_type" ref="account.data_account_type_bank"/>
44+ <field name="name">Outstanding customer checks</field>
45+ </record>
46+
47+ <record id="chart111099_en" model="account.account.template">
48+ <field name="code">111099</field>
49+ <field name="parent_id" ref="chart111_en"/>
50+ <field name="type">liquidity</field>
51+ <field name="user_type" ref="account.data_account_type_bank"/>
52+ <field name="name">Oustanding supplier checks</field>
53+ </record>
54+
55 <record id="chart112_en" model="account.account.template">
56 <field name="code">112</field>
57 <field name="parent_id" ref="chart11_en"/>
58@@ -203,6 +219,54 @@
59 <field name="name">TANGIBLE ASSETS</field>
60 </record>
61
62+ <record id="chart15201_en" model="account.account.template">
63+ <field name="code">15201</field>
64+ <field name="parent_id" ref="chart152_en"/>
65+ <field name="type">other</field>
66+ <field name="user_type" ref="account.data_account_type_asset"/>
67+ <field name="name">Land</field>
68+ </record>
69+
70+ <record id="chart15202_en" model="account.account.template">
71+ <field name="code">15202</field>
72+ <field name="parent_id" ref="chart152_en"/>
73+ <field name="type">other</field>
74+ <field name="user_type" ref="account.data_account_type_asset"/>
75+ <field name="name">Buildings</field>
76+ </record>
77+
78+ <record id="chart15203_en" model="account.account.template">
79+ <field name="code">15203</field>
80+ <field name="parent_id" ref="chart152_en"/>
81+ <field name="type">other</field>
82+ <field name="user_type" ref="account.data_account_type_asset"/>
83+ <field name="name">Motor Vehicles</field>
84+ </record>
85+
86+ <record id="chart15204_en" model="account.account.template">
87+ <field name="code">15204</field>
88+ <field name="parent_id" ref="chart152_en"/>
89+ <field name="type">other</field>
90+ <field name="user_type" ref="account.data_account_type_asset"/>
91+ <field name="name">Computer Equipment and Software</field>
92+ </record>
93+
94+ <record id="chart15205_en" model="account.account.template">
95+ <field name="code">15205</field>
96+ <field name="parent_id" ref="chart152_en"/>
97+ <field name="type">other</field>
98+ <field name="user_type" ref="account.data_account_type_asset"/>
99+ <field name="name">Furniture and Fixtures</field>
100+ </record>
101+
102+ <record id="chart15206_en" model="account.account.template">
103+ <field name="code">15206</field>
104+ <field name="parent_id" ref="chart152_en"/>
105+ <field name="type">other</field>
106+ <field name="user_type" ref="account.data_account_type_asset"/>
107+ <field name="name">Leasehold Improvements</field>
108+ </record>
109+
110 <record id="chart1527_en" model="account.account.template">
111 <field name="code">1527</field>
112 <field name="parent_id" ref="chart152_en"/>
113@@ -211,6 +275,46 @@
114 <field name="name">ACCUMULATED DEPRECIATIONS</field>
115 </record>
116
117+ <record id="chart15272_en" model="account.account.template">
118+ <field name="code">15272</field>
119+ <field name="parent_id" ref="chart1527_en"/>
120+ <field name="type">other</field>
121+ <field name="user_type" ref="account.data_account_type_asset"/>
122+ <field name="name">Acc. Deprec. Buildings</field>
123+ </record>
124+
125+ <record id="chart15273_en" model="account.account.template">
126+ <field name="code">15273</field>
127+ <field name="parent_id" ref="chart1527_en"/>
128+ <field name="type">other</field>
129+ <field name="user_type" ref="account.data_account_type_asset"/>
130+ <field name="name">Acc. Deprec. Motor Vehicles</field>
131+ </record>
132+
133+ <record id="chart15274_en" model="account.account.template">
134+ <field name="code">15274</field>
135+ <field name="parent_id" ref="chart1527_en"/>
136+ <field name="type">other</field>
137+ <field name="user_type" ref="account.data_account_type_asset"/>
138+ <field name="name">Acc. Deprec. Computer Equipment And Software</field>
139+ </record>
140+
141+ <record id="chart15275_en" model="account.account.template">
142+ <field name="code">15275</field>
143+ <field name="parent_id" ref="chart1527_en"/>
144+ <field name="type">other</field>
145+ <field name="user_type" ref="account.data_account_type_asset"/>
146+ <field name="name">Acc. Deprec. Furniture and Fixtures</field>
147+ </record>
148+
149+ <record id="chart15276_en" model="account.account.template">
150+ <field name="code">15276</field>
151+ <field name="parent_id" ref="chart1527_en"/>
152+ <field name="type">other</field>
153+ <field name="user_type" ref="account.data_account_type_asset"/>
154+ <field name="name">Acc. Deprec. Leasehold Improvements</field>
155+ </record>
156+
157 <record id="chart153_en" model="account.account.template">
158 <field name="code">153</field>
159 <field name="parent_id" ref="chart15_en"/>
160@@ -270,6 +374,15 @@
161 <field name="name">OTHER ACCOUNTS PAYABLES</field>
162 </record>
163
164+ <record id="chart2121_en" model="account.account.template">
165+ <field name="code">2121</field>
166+ <field name="parent_id" ref="chart212_en"/>
167+ <field name="type">payable</field>
168+ <field name="user_type" ref="account.data_account_type_payable"/>
169+ <field name="reconcile" eval="True"/>
170+ <field name="name">Credit Card Account</field>
171+ </record>
172+
173 <record id="chart213_en" model="account.account.template">
174 <field name="code">213</field>
175 <field name="parent_id" ref="chart21_en"/>
176@@ -679,6 +792,14 @@
177 <field name="name">OTHER NON-OPERATING INCOMES</field>
178 </record>
179
180+ <record id="chart4291_en" model="account.account.template">
181+ <field name="code">4291</field>
182+ <field name="parent_id" ref="chart429_en"/>
183+ <field name="type">other</field>
184+ <field name="user_type" ref="account.data_account_type_income"/>
185+ <field name="name">Exchange Rate Gain</field>
186+ </record>
187+
188 <!-- EXPENSES -->
189
190 <record id="chart5_en" model="account.account.template">
191@@ -856,6 +977,54 @@
192 <field name="name">OTHER OPERATING EXPENSES</field>
193 </record>
194
195+ <record id="chart5191_en" model="account.account.template">
196+ <field name="code">5191</field>
197+ <field name="parent_id" ref="chart519_en"/>
198+ <field name="type">view</field>
199+ <field name="user_type" ref="account.data_account_type_view"/>
200+ <field name="name">DEPRECIATIONS</field>
201+ </record>
202+
203+ <record id="chart51912_en" model="account.account.template">
204+ <field name="code">51912</field>
205+ <field name="parent_id" ref="chart5191_en"/>
206+ <field name="type">other</field>
207+ <field name="user_type" ref="account.data_account_type_asset"/>
208+ <field name="name">Depreciation Buildings</field>
209+ </record>
210+
211+ <record id="chart51913_en" model="account.account.template">
212+ <field name="code">51913</field>
213+ <field name="parent_id" ref="chart5191_en"/>
214+ <field name="type">other</field>
215+ <field name="user_type" ref="account.data_account_type_asset"/>
216+ <field name="name">Depreciation Motor Vehicles</field>
217+ </record>
218+
219+ <record id="chart51914_en" model="account.account.template">
220+ <field name="code">51914</field>
221+ <field name="parent_id" ref="chart5191_en"/>
222+ <field name="type">other</field>
223+ <field name="user_type" ref="account.data_account_type_asset"/>
224+ <field name="name">Depreciation Computer Equipment And Software</field>
225+ </record>
226+
227+ <record id="chart51915_en" model="account.account.template">
228+ <field name="code">51915</field>
229+ <field name="parent_id" ref="chart5191_en"/>
230+ <field name="type">other</field>
231+ <field name="user_type" ref="account.data_account_type_asset"/>
232+ <field name="name">Depreciation Furniture and Fixtures</field>
233+ </record>
234+
235+ <record id="chart51916_en" model="account.account.template">
236+ <field name="code">51916</field>
237+ <field name="parent_id" ref="chart5191_en"/>
238+ <field name="type">other</field>
239+ <field name="user_type" ref="account.data_account_type_asset"/>
240+ <field name="name">Depreciation Leasehold Improvements</field>
241+ </record>
242+
243 <record id="chart55_en" model="account.account.template">
244 <field name="code">55</field>
245 <field name="parent_id" ref="chart5_en"/>
246@@ -880,5 +1049,13 @@
247 <field name="name">OTHER NON-OPERATING EXPENSES</field>
248 </record>
249
250+ <record id="chart5591_en" model="account.account.template">
251+ <field name="code">5591</field>
252+ <field name="parent_id" ref="chart559_en"/>
253+ <field name="type">other</field>
254+ <field name="user_type" ref="account.data_account_type_expense"/>
255+ <field name="name">Exchange Rate Loss</field>
256+ </record>
257+
258 </data>
259 </openerp>
260
261=== modified file 'l10n_ca/account_chart_fr.xml'
262--- l10n_ca/account_chart_fr.xml 2013-07-17 12:57:45 +0000
263+++ l10n_ca/account_chart_fr.xml 2013-10-07 13:53:31 +0000
264@@ -36,6 +36,22 @@
265 <field name="name">ENCAISSE</field>
266 </record>
267
268+ <record id="chart111098_fr" model="account.account.template">
269+ <field name="code">111098</field>
270+ <field name="parent_id" ref="chart111_fr"/>
271+ <field name="type">liquidity</field>
272+ <field name="user_type" ref="account.data_account_type_bank"/>
273+ <field name="name">Chèques reçus en circulation</field>
274+ </record>
275+
276+ <record id="chart111099_fr" model="account.account.template">
277+ <field name="code">111099</field>
278+ <field name="parent_id" ref="chart111_fr"/>
279+ <field name="type">liquidity</field>
280+ <field name="user_type" ref="account.data_account_type_bank"/>
281+ <field name="name">Chèques émis en circulation</field>
282+ </record>
283+
284 <record id="chart112_fr" model="account.account.template">
285 <field name="code">112</field>
286 <field name="parent_id" ref="chart11_fr"/>
287@@ -202,6 +218,54 @@
288 <field name="name">IMMOBILISATIONS CORPORELLES</field>
289 </record>
290
291+ <record id="chart15201_fr" model="account.account.template">
292+ <field name="code">15201</field>
293+ <field name="parent_id" ref="chart152_fr"/>
294+ <field name="type">other</field>
295+ <field name="user_type" ref="account.data_account_type_asset"/>
296+ <field name="name">Terrains</field>
297+ </record>
298+
299+ <record id="chart15202_fr" model="account.account.template">
300+ <field name="code">15202</field>
301+ <field name="parent_id" ref="chart152_fr"/>
302+ <field name="type">other</field>
303+ <field name="user_type" ref="account.data_account_type_asset"/>
304+ <field name="name">Bâtiments</field>
305+ </record>
306+
307+ <record id="chart15203_fr" model="account.account.template">
308+ <field name="code">15203</field>
309+ <field name="parent_id" ref="chart152_fr"/>
310+ <field name="type">other</field>
311+ <field name="user_type" ref="account.data_account_type_asset"/>
312+ <field name="name">Véhicules automobiles</field>
313+ </record>
314+
315+ <record id="chart15204_fr" model="account.account.template">
316+ <field name="code">15204</field>
317+ <field name="parent_id" ref="chart152_fr"/>
318+ <field name="type">other</field>
319+ <field name="user_type" ref="account.data_account_type_asset"/>
320+ <field name="name">Matériel informatique/logiciels</field>
321+ </record>
322+
323+ <record id="chart15205_fr" model="account.account.template">
324+ <field name="code">15205</field>
325+ <field name="parent_id" ref="chart152_fr"/>
326+ <field name="type">other</field>
327+ <field name="user_type" ref="account.data_account_type_asset"/>
328+ <field name="name">Meubles et accessoires</field>
329+ </record>
330+
331+ <record id="chart15206_fr" model="account.account.template">
332+ <field name="code">15206</field>
333+ <field name="parent_id" ref="chart152_fr"/>
334+ <field name="type">other</field>
335+ <field name="user_type" ref="account.data_account_type_asset"/>
336+ <field name="name">Améliorations locatives</field>
337+ </record>
338+
339 <record id="chart1527_fr" model="account.account.template">
340 <field name="code">1527</field>
341 <field name="parent_id" ref="chart152_fr"/>
342@@ -210,6 +274,46 @@
343 <field name="name">AMORTISSEMENTS CUMULÉS</field>
344 </record>
345
346+ <record id="chart15272_fr" model="account.account.template">
347+ <field name="code">15272</field>
348+ <field name="parent_id" ref="chart1527_fr"/>
349+ <field name="type">other</field>
350+ <field name="user_type" ref="account.data_account_type_asset"/>
351+ <field name="name">Amort. Cumul. Bâtiments</field>
352+ </record>
353+
354+ <record id="chart15273_fr" model="account.account.template">
355+ <field name="code">15273</field>
356+ <field name="parent_id" ref="chart1527_fr"/>
357+ <field name="type">other</field>
358+ <field name="user_type" ref="account.data_account_type_asset"/>
359+ <field name="name">Amort. Cumul. Véhicules automobiles</field>
360+ </record>
361+
362+ <record id="chart15274_fr" model="account.account.template">
363+ <field name="code">15274</field>
364+ <field name="parent_id" ref="chart1527_fr"/>
365+ <field name="type">other</field>
366+ <field name="user_type" ref="account.data_account_type_asset"/>
367+ <field name="name">Amort. Cumul. Matériel informatique/logiciels</field>
368+ </record>
369+
370+ <record id="chart15275_fr" model="account.account.template">
371+ <field name="code">15275</field>
372+ <field name="parent_id" ref="chart1527_fr"/>
373+ <field name="type">other</field>
374+ <field name="user_type" ref="account.data_account_type_asset"/>
375+ <field name="name">Amort. Cumul. Meubles et accessoires</field>
376+ </record>
377+
378+ <record id="chart15276_fr" model="account.account.template">
379+ <field name="code">15276</field>
380+ <field name="parent_id" ref="chart1527_fr"/>
381+ <field name="type">other</field>
382+ <field name="user_type" ref="account.data_account_type_asset"/>
383+ <field name="name">Amort. Cumul. Améliorations locatives</field>
384+ </record>
385+
386 <record id="chart153_fr" model="account.account.template">
387 <field name="code">153</field>
388 <field name="parent_id" ref="chart15_fr"/>
389@@ -269,6 +373,15 @@
390 <field name="name">AUTRES COMPTES CRÉDITEURS</field>
391 </record>
392
393+ <record id="chart2121_fr" model="account.account.template">
394+ <field name="code">2121</field>
395+ <field name="parent_id" ref="chart212_fr"/>
396+ <field name="type">payable</field>
397+ <field name="user_type" ref="account.data_account_type_payable"/>
398+ <field name="reconcile" eval="True"/>
399+ <field name="name">Carte de credit</field>
400+ </record>
401+
402 <record id="chart213_fr" model="account.account.template">
403 <field name="code">213</field>
404 <field name="parent_id" ref="chart21_fr"/>
405@@ -686,6 +799,14 @@
406 <field name="name">AUTRES PRODUITS NON LIÉS À L'EXPLOITATION</field>
407 </record>
408
409+ <record id="chart4291_fr" model="account.account.template">
410+ <field name="code">4291</field>
411+ <field name="parent_id" ref="chart429_fr"/>
412+ <field name="type">other</field>
413+ <field name="user_type" ref="account.data_account_type_income"/>
414+ <field name="name">Gain de taux de change</field>
415+ </record>
416+
417 <!-- CHARGES -->
418
419 <record id="chart5_fr" model="account.account.template">
420@@ -864,6 +985,54 @@
421 <field name="name">AUTRES FRAIS D'EXPLOITATION</field>
422 </record>
423
424+ <record id="chart5191_fr" model="account.account.template">
425+ <field name="code">5191</field>
426+ <field name="parent_id" ref="chart519_fr"/>
427+ <field name="type">view</field>
428+ <field name="user_type" ref="account.data_account_type_view"/>
429+ <field name="name">DOTATIONS AUX AMORTISSEMENTS</field>
430+ </record>
431+
432+ <record id="chart51912_fr" model="account.account.template">
433+ <field name="code">51912</field>
434+ <field name="parent_id" ref="chart5191_fr"/>
435+ <field name="type">other</field>
436+ <field name="user_type" ref="account.data_account_type_asset"/>
437+ <field name="name">Dotations Amort. Bâtiments</field>
438+ </record>
439+
440+ <record id="chart51913_fr" model="account.account.template">
441+ <field name="code">51913</field>
442+ <field name="parent_id" ref="chart5191_fr"/>
443+ <field name="type">other</field>
444+ <field name="user_type" ref="account.data_account_type_asset"/>
445+ <field name="name">Dotations Amort. Véhicules automobiles</field>
446+ </record>
447+
448+ <record id="chart51914_fr" model="account.account.template">
449+ <field name="code">51914</field>
450+ <field name="parent_id" ref="chart5191_fr"/>
451+ <field name="type">other</field>
452+ <field name="user_type" ref="account.data_account_type_asset"/>
453+ <field name="name">Dotations Amort. Matériel informatique/logiciels</field>
454+ </record>
455+
456+ <record id="chart51915_fr" model="account.account.template">
457+ <field name="code">51915</field>
458+ <field name="parent_id" ref="chart5191_fr"/>
459+ <field name="type">other</field>
460+ <field name="user_type" ref="account.data_account_type_asset"/>
461+ <field name="name">Dotations Amort. Meubles et accessoires</field>
462+ </record>
463+
464+ <record id="chart51916_fr" model="account.account.template">
465+ <field name="code">51916</field>
466+ <field name="parent_id" ref="chart5191_fr"/>
467+ <field name="type">other</field>
468+ <field name="user_type" ref="account.data_account_type_asset"/>
469+ <field name="name">Dotations Amort. Améliorations locatives</field>
470+ </record>
471+
472 <record id="chart52_fr" model="account.account.template">
473 <field name="code">52</field>
474 <field name="parent_id" ref="chart5_fr"/>
475@@ -888,5 +1057,13 @@
476 <field name="name">AUTRES FRAIS NON LIÉS À L'EXPLOITATION</field>
477 </record>
478
479+ <record id="chart5291_fr" model="account.account.template">
480+ <field name="code">5291</field>
481+ <field name="parent_id" ref="chart529_fr"/>
482+ <field name="type">other</field>
483+ <field name="user_type" ref="account.data_account_type_expense"/>
484+ <field name="name">Perte de taux de change</field>
485+ </record>
486+
487 </data>
488 </openerp>
489
490=== added file 'l10n_ca/l10n_ca.xml'
491--- l10n_ca/l10n_ca.xml 1970-01-01 00:00:00 +0000
492+++ l10n_ca/l10n_ca.xml 2013-10-07 13:53:31 +0000
493@@ -0,0 +1,21 @@
494+<?xml version="1.0" encoding="utf-8"?>
495+<openerp>
496+ <data noupdate="1">
497+
498+ <record id="sequence_credit_card_journal_en" model="ir.sequence">
499+ <field name="name">Credit Card Journal</field>
500+ <field eval="3" name="padding"/>
501+ <field name="prefix">CCJ/%(year)s/</field>
502+ </record>
503+
504+ <record id="l10nca_credit_card_journal_en" model="account.journal">
505+ <field name="name">Credit Card Journal</field>
506+ <field name="code">CCJ</field>
507+ <field name="type">bank</field>
508+ <field name="sequence_id" ref="sequence_credit_card_journal_en"/>
509+ <field name="user_id" ref="base.user_root"/>
510+ </record>
511+
512+ </data>
513+</openerp>
514+