Odoo Addons (MOVED TO GITHUB)

Merge lp:~camptocamp/openobject-addons/l10n_fr_trunk_improved into lp:openobject-addons

  1. l10n_fr_trunk_improved
  2. Merge into trunk
Proposed by Vincent Renaville@camptocamp
Status: Superseded
Proposed branch: lp:~camptocamp/openobject-addons/l10n_fr_trunk_improved
Merge into: lp:openobject-addons
Diff against target: 573 lines (+68/-101)
2 files modified
l10n_fr/fr_tax.xml (+68/-88)
l10n_fr/plan_comptable_general.xml (+0/-13)
To merge this branch: bzr merge lp:~camptocamp/openobject-addons/l10n_fr_trunk_improved
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+138765@code.launchpad.net

This proposal has been superseded by a proposal from 2012-12-13.

Description of the change

shorten taxes codes due to new invoices layout, reverse VAT correction, remove reconcile=true on vat accounts, renamed some taxes to match legal terms

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_fr/fr_tax.xml'
2--- l10n_fr/fr_tax.xml 2012-11-29 22:26:45 +0000
3+++ l10n_fr/fr_tax.xml 2012-12-07 16:06:33 +0000
4@@ -11,7 +11,7 @@
5 <record model="account.tax.template" id="tva_normale">
6 <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
7 <field name="name">TVA collectée (vente) 19,6%</field>
8- <field name="description">TVA-VT-19.6</field>
9+ <field name="description">19.6</field>
10 <field name="amount" eval="0.196"/>
11 <field name="type">percent</field>
12 <field name="base_code_id" ref="tax_col_196_ht"/>
13@@ -33,7 +33,7 @@
14 <record model="account.tax.template" id="tva_specifique">
15 <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
16 <field name="name">TVA collectée (vente) 8,5%</field>
17- <field name="description">TVA-VT-8.5</field>
18+ <field name="description">8.5</field>
19 <field name="amount" eval="0.085"/>
20 <field name="type">percent</field>
21 <field name="base_code_id" ref="tax_col_85_ht"/>
22@@ -55,7 +55,7 @@
23 <record model="account.tax.template" id="tva_specifique_1">
24 <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
25 <field name="name">TVA collectée (vente) 7,0%</field>
26- <field name="description">TVA-VT-7.0</field>
27+ <field name="description">7.0</field>
28 <field name="amount" eval="0.07"/>
29 <field name="type">percent</field>
30 <field name="base_code_id" ref="tax_col_70_ht"/>
31@@ -77,7 +77,7 @@
32 <record model="account.tax.template" id="tva_reduite">
33 <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
34 <field name="name">TVA collectée (vente) 5,5%</field>
35- <field name="description">TVA-VT-5.5</field>
36+ <field name="description">5.5</field>
37 <field name="amount" eval="0.055"/>
38 <field name="type">percent</field>
39 <field name="base_code_id" ref="tax_col_55_ht"/>
40@@ -99,7 +99,7 @@
41 <record model="account.tax.template" id="tva_super_reduite">
42 <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
43 <field name="name">TVA collectée (vente) 2,1%</field>
44- <field name="description">TVA-VT-2.1</field>
45+ <field name="description">2.1</field>
46 <field name="amount" eval="0.021"/>
47 <field name="type">percent</field>
48 <field name="base_code_id" ref="tax_col_21_ht"/>
49@@ -122,8 +122,8 @@
50 <!-- ACHATS Tax excluded from price -->
51 <record model="account.tax.template" id="tva_acq_normale">
52 <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
53- <field name="name">TVA acquittée (achat) 19,6%</field>
54- <field name="description">TVA-HA-19.6</field>
55+ <field name="name">TVA déductible (achat) 19,6%</field>
56+ <field name="description">ACH-19.6</field>
57 <field name="amount" eval="0.196"/>
58 <field name="type">percent</field>
59 <field name="base_code_id" ref="tax_acq_196_ht"/>
60@@ -144,8 +144,8 @@
61
62 <record model="account.tax.template" id="tva_acq_specifique">
63 <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
64- <field name="name">TVA acquittée (achat) 8,5%</field>
65- <field name="description">TVA-HA-8.5</field>
66+ <field name="name">TVA déductible (achat) 8,5%</field>
67+ <field name="description">ACH-8.5</field>
68 <field name="amount" eval="0.085"/>
69 <field name="type">percent</field>
70 <field name="base_code_id" ref="tax_acq_85_ht"/>
71@@ -166,8 +166,8 @@
72
73 <record model="account.tax.template" id="tva_acq_specifique_1">
74 <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
75- <field name="name">TVA acquittée (achat) 7,0%</field>
76- <field name="description">TVA-HA-7.0</field>
77+ <field name="name">TVA déductible (achat) 7,0%</field>
78+ <field name="description">ACH-7.0</field>
79 <field name="amount" eval="0.07"/>
80 <field name="type">percent</field>
81 <field name="base_code_id" ref="tax_acq_70_ht"/>
82@@ -188,8 +188,8 @@
83
84 <record model="account.tax.template" id="tva_acq_reduite">
85 <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
86- <field name="name">TVA acquittée (achat) 5,5%</field>
87- <field name="description">TVA-HA-5.5</field>
88+ <field name="name">TVA déductible (achat) 5,5%</field>
89+ <field name="description">ACH-5.5</field>
90 <field name="amount" eval="0.055"/>
91 <field name="type">percent</field>
92 <field name="base_code_id" ref="tax_acq_55_ht"/>
93@@ -210,8 +210,8 @@
94
95 <record model="account.tax.template" id="tva_acq_super_reduite">
96 <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
97- <field name="name">TVA acquittée (achat) 2,1%</field>
98- <field name="description">TVA-HA-2.1</field>
99+ <field name="name">TVA déductible (achat) 2,1%</field>
100+ <field name="description">ACH-2.1</field>
101 <field name="amount" eval="0.021"/>
102 <field name="type">percent</field>
103 <field name="base_code_id" ref="tax_acq_21_ht"/>
104@@ -232,10 +232,10 @@
105
106
107 <!-- ACHATS Tax included in price -->
108- <record model="account.tax.template" id="tva_acq_normale_inclue">
109+ <record model="account.tax.template" id="tva_acq_normale_TTC">
110 <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
111- <field name="name">TVA acquittée (achat) 19,6% inclue</field>
112- <field name="description">TVA-HA-19.6-inclue</field>
113+ <field name="name">TVA déductible (achat) 19,6% TTC</field>
114+ <field name="description">ACH-19.6-TTC</field>
115 <field name="price_include" eval="1"/>
116 <field name="amount" eval="0.196"/>
117 <field name="type">percent</field>
118@@ -255,10 +255,10 @@
119 <field name="type_tax_use">purchase</field>
120 </record>
121
122- <record model="account.tax.template" id="tva_acq_specifique_inclue">
123+ <record model="account.tax.template" id="tva_acq_specifique_TTC">
124 <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
125- <field name="name">TVA acquittée (achat) 8,5% inclue</field>
126- <field name="description">TVA-HA-8.5-inclue</field>
127+ <field name="name">TVA déductible (achat) 8,5% TTC</field>
128+ <field name="description">ACH-8.5-TTC</field>
129 <field name="price_include" eval="1"/>
130 <field name="amount" eval="0.085"/>
131 <field name="type">percent</field>
132@@ -278,10 +278,10 @@
133 <field name="type_tax_use">purchase</field>
134 </record>
135
136- <record model="account.tax.template" id="tva_acq_specifique_1_inclue">
137+ <record model="account.tax.template" id="tva_acq_specifique_1_TTC">
138 <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
139- <field name="name">TVA acquittée (achat) 7,0% inclue</field>
140- <field name="description">TVA-HA-7.0-inclue</field>
141+ <field name="name">TVA déductible (achat) 7,0% TTC</field>
142+ <field name="description">ACH-7.0-TTC</field>
143 <field name="price_include" eval="1"/>
144 <field name="amount" eval="0.07"/>
145 <field name="type">percent</field>
146@@ -301,10 +301,10 @@
147 <field name="type_tax_use">purchase</field>
148 </record>
149
150- <record model="account.tax.template" id="tva_acq_reduite_inclue">
151+ <record model="account.tax.template" id="tva_acq_reduite_TTC">
152 <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
153- <field name="name">TVA acquittée (achat) 5,5% inclue</field>
154- <field name="description">TVA-HA-5.5-inclue</field>
155+ <field name="name">TVA déductible (achat) 5,5% TTC</field>
156+ <field name="description">ACH-5.5-TTC</field>
157 <field name="price_include" eval="1"/>
158 <field name="amount" eval="0.055"/>
159 <field name="type">percent</field>
160@@ -324,10 +324,10 @@
161 <field name="type_tax_use">purchase</field>
162 </record>
163
164- <record model="account.tax.template" id="tva_acq_super_reduite_inclue">
165+ <record model="account.tax.template" id="tva_acq_super_reduite_TTC">
166 <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
167- <field name="name">TVA acquittée (achat) 2,1% inclue</field>
168- <field name="description">TVA-HA-2.1-inclue</field>
169+ <field name="name">TVA déductible (achat) 2,1% TTC</field>
170+ <field name="description">ACH-2.1-TTC</field>
171 <field name="price_include" eval="1"/>
172 <field name="amount" eval="0.021"/>
173 <field name="type">percent</field>
174@@ -349,11 +349,11 @@
175
176
177
178-<!-- IMMOBILISATIONS (achats) -->
179+<!-- ImmoBILISATIONS (achats) -->
180 <record model="account.tax.template" id="tva_imm_normale">
181 <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
182- <field name="name">TVA immobilisation (achat) 19,6%</field>
183- <field name="description">TVA-immo-19.6</field>
184+ <field name="name">TVA déd./immobilisation (achat) 19,6%</field>
185+ <field name="description">IMMO-19.6</field>
186 <field name="amount" eval="0.196"/>
187 <field name="type">percent</field>
188 <field name="base_code_id" ref="tax_imm_196_ht"/>
189@@ -374,8 +374,8 @@
190
191 <record model="account.tax.template" id="tva_imm_specifique">
192 <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
193- <field name="name">TVA immobilisation (achat) 8,5%</field>
194- <field name="description">TVA-immo-8.5</field>
195+ <field name="name">TVA déd./immobilisation (achat) 8,5%</field>
196+ <field name="description">IMMO-8.5</field>
197 <field name="amount" eval="0.085"/>
198 <field name="type">percent</field>
199 <field name="base_code_id" ref="tax_imm_85_ht"/>
200@@ -396,8 +396,8 @@
201
202 <record model="account.tax.template" id="tva_imm_specifique_1">
203 <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
204- <field name="name">TVA immobilisation (achat) 7,0%</field>
205- <field name="description">TVA-immo-7.0</field>
206+ <field name="name">TVA déd./immobilisation (achat) 7,0%</field>
207+ <field name="description">IMMO-7.0</field>
208 <field name="amount" eval="0.07"/>
209 <field name="type">percent</field>
210 <field name="base_code_id" ref="tax_imm_70_ht"/>
211@@ -418,8 +418,8 @@
212
213 <record model="account.tax.template" id="tva_imm_reduite">
214 <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
215- <field name="name">TVA immobilisation (achat) 5,5%</field>
216- <field name="description">TVA-immo-5.5</field>
217+ <field name="name">TVA déd./immobilisation (achat) 5,5%</field>
218+ <field name="description">IMMO-5.5</field>
219 <field name="amount" eval="0.055"/>
220 <field name="type">percent</field>
221 <field name="base_code_id" ref="tax_imm_55_ht"/>
222@@ -440,8 +440,8 @@
223
224 <record model="account.tax.template" id="tva_imm_super_reduite">
225 <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
226- <field name="name">TVA immobilisation (achat) 2,1%</field>
227- <field name="description">TVA-immo-2.1</field>
228+ <field name="name">TVA déd./immobilisation (achat) 2,1%</field>
229+ <field name="description">IMMO-2.1</field>
230 <field name="amount" eval="0.021"/>
231 <field name="type">percent</field>
232 <field name="base_code_id" ref="tax_imm_21_ht"/>
233@@ -464,8 +464,8 @@
234 <!-- VENTES INTRACOMMUNAUTAIRE -->
235 <record model="account.tax.template" id="tva_intra_normale">
236 <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
237- <field name="name">TVA due intracommunautaire (achat) 19,6%</field> <!-- ventes -->
238- <field name="description">TVA-HA_UE_due-19.6</field>
239+ <field name="name">TVA due s/ acq. intracommunautaire (achat) 19,6%</field> <!-- ventes -->
240+ <field name="description">ACH_UE_due-19.6</field>
241 <field name="amount" eval="-0.196"/>
242 <field name="type">percent</field>
243 <field name="base_code_id" ref="tax_intra_196_ht"/>
244@@ -486,8 +486,8 @@
245
246 <record model="account.tax.template" id="tva_intra_specifique">
247 <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
248- <field name="name">TVA due intracommunautaire (achat) 8,5%</field>
249- <field name="description">TVA-HA_UE_due-8.5</field>
250+ <field name="name">TVA due s/ acq. intracommunautaire (achat) 8,5%</field>
251+ <field name="description">ACH_UE_due-8.5</field>
252 <field name="amount" eval="-0.085"/>
253 <field name="type">percent</field>
254 <field name="base_code_id" ref="tax_intra_85_ht"/>
255@@ -508,8 +508,8 @@
256
257 <record model="account.tax.template" id="tva_intra_specifique_1">
258 <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
259- <field name="name">TVA due intracommunautaire (achat) 7,0%</field>
260- <field name="description">TVA-HA_UE_due-7.0</field>
261+ <field name="name">TVA due s/ acq. intracommunautaire (achat) 7,0%</field>
262+ <field name="description">ACH_UE_due-7.0</field>
263 <field name="amount" eval="-0.07"/>
264 <field name="type">percent</field>
265 <field name="base_code_id" ref="tax_intra_70_ht"/>
266@@ -530,8 +530,8 @@
267
268 <record model="account.tax.template" id="tva_intra_reduite">
269 <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
270- <field name="name">TVA due intracommunautaire (achat) 5,5%</field>
271- <field name="description">TVA-HA_UE_due-5.5</field>
272+ <field name="name">TVA due s/ acq. intracommunautaire (achat) 5,5%</field>
273+ <field name="description">ACH_UE_due-5.5</field>
274 <field name="amount" eval="-0.055"/>
275 <field name="type">percent</field>
276 <field name="base_code_id" ref="tax_intra_55_ht"/>
277@@ -552,8 +552,8 @@
278
279 <record model="account.tax.template" id="tva_intra_super_reduite">
280 <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
281- <field name="name">TVA due intracommunautaire (achat) 2,1%</field>
282- <field name="description">TVA-HA_UE_due-2.1</field>
283+ <field name="name">TVA due s/ acq. intracommunautaire (achat) 2,1%</field>
284+ <field name="description">ACH_UE_due-2.1</field>
285 <field name="amount" eval="-0.021"/>
286 <field name="type">percent</field>
287 <field name="base_code_id" ref="tax_intra_21_ht"/>
288@@ -576,20 +576,16 @@
289 <!-- ACHATS INTRACOMMUNAUTAIRE -->
290 <record model="account.tax.template" id="tva_acq_intra_normale">
291 <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
292- <field name="name">TVA déductible intracommunautaire (achat) 19,6%</field>
293- <field name="description">TVA-HA_UE_déduc-19.6</field>
294+ <field name="name">TVA déd. s/ acq. intracommunautaire (achat) 19,6%</field>
295+ <field name="description">ACH_UE_ded.-19.6</field>
296 <field name="amount" eval="0.196"/>
297 <field name="type">percent</field>
298- <field name="base_code_id" ref="tax_intra_acq_196_ht"/>
299- <field name="base_sign" eval="-1"/>
300 <field name="tax_code_id" ref="tax_intra_acq_196"/>
301 <field name="tax_sign" eval="-1"/>
302
303 <field name="account_collected_id" ref="pcg_445662"/>
304 <field name="account_paid_id" ref="pcg_445662"/>
305
306- <field name="ref_base_code_id" ref="tax_intra_acq_196_ht"/>
307- <field name="ref_base_sign" eval="1"/>
308 <field name="ref_tax_code_id" ref="tax_intra_acq_196"/>
309 <field name="ref_tax_sign" eval="1"/>
310 <field name="sequence" eval="10"/>
311@@ -598,20 +594,16 @@
312
313 <record model="account.tax.template" id="tva_acq_intra_specifique">
314 <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
315- <field name="name">TVA déductible intracommunautaire (achat) 8,5%</field>
316- <field name="description">TVA-HA_UE_déduc-8.5</field>
317+ <field name="name">TVA déd. s/ acq. intracommunautaire (achat) 8,5%</field>
318+ <field name="description">ACH_UE_ded.-8.5</field>
319 <field name="amount" eval="0.085"/>
320 <field name="type">percent</field>
321- <field name="base_code_id" ref="tax_intra_acq_85_ht"/>
322- <field name="base_sign" eval="-1"/>
323 <field name="tax_code_id" ref="tax_intra_acq_85"/>
324 <field name="tax_sign" eval="-1"/>
325
326 <field name="account_collected_id" ref="pcg_445662"/>
327 <field name="account_paid_id" ref="pcg_445662"/>
328
329- <field name="ref_base_code_id" ref="tax_intra_acq_85_ht"/>
330- <field name="ref_base_sign" eval="1"/>
331 <field name="ref_tax_code_id" ref="tax_intra_acq_85"/>
332 <field name="ref_tax_sign" eval="1"/>
333 <field name="sequence" eval="10"/>
334@@ -620,20 +612,16 @@
335
336 <record model="account.tax.template" id="tva_acq_intra_specifique_1">
337 <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
338- <field name="name">TVA déductible intracommunautaire (achat) 7,0%</field>
339- <field name="description">TVA-HA_UE_déduc-7.0</field>
340+ <field name="name">TVA déd. s/ acq. intracommunautaire (achat) 7,0%</field>
341+ <field name="description">ACH_UE_ded.-7.0</field>
342 <field name="amount" eval="0.07"/>
343 <field name="type">percent</field>
344- <field name="base_code_id" ref="tax_intra_acq_70_ht"/>
345- <field name="base_sign" eval="-1"/>
346 <field name="tax_code_id" ref="tax_intra_acq_70"/>
347 <field name="tax_sign" eval="-1"/>
348
349 <field name="account_collected_id" ref="pcg_445662"/>
350 <field name="account_paid_id" ref="pcg_445662"/>
351
352- <field name="ref_base_code_id" ref="tax_intra_acq_70_ht"/>
353- <field name="ref_base_sign" eval="1"/>
354 <field name="ref_tax_code_id" ref="tax_intra_acq_70"/>
355 <field name="ref_tax_sign" eval="1"/>
356 <field name="sequence" eval="10"/>
357@@ -642,20 +630,16 @@
358
359 <record model="account.tax.template" id="tva_acq_intra_reduite">
360 <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
361- <field name="name">TVA déductible intracommunautaire (achat) 5,5%</field>
362- <field name="description">TVA-HA_UE_déduc-5.5</field>
363+ <field name="name">TVA déd. s/ acq. intracommunautaire (achat) 5,5%</field>
364+ <field name="description">ACH_UE_ded.-5.5</field>
365 <field name="amount" eval="0.055"/>
366 <field name="type">percent</field>
367- <field name="base_code_id" ref="tax_intra_acq_55_ht"/>
368- <field name="base_sign" eval="-1"/>
369 <field name="tax_code_id" ref="tax_intra_acq_55"/>
370 <field name="tax_sign" eval="-1"/>
371
372 <field name="account_collected_id" ref="pcg_445662"/>
373 <field name="account_paid_id" ref="pcg_445662"/>
374
375- <field name="ref_base_code_id" ref="tax_intra_acq_55_ht"/>
376- <field name="ref_base_sign" eval="1"/>
377 <field name="ref_tax_code_id" ref="tax_intra_acq_55"/>
378 <field name="ref_tax_sign" eval="1"/>
379 <field name="sequence" eval="10"/>
380@@ -664,20 +648,16 @@
381
382 <record model="account.tax.template" id="tva_acq_intra_super_reduite">
383 <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
384- <field name="name">TVA déductible intracommunautaire (achat) 2,1%</field>
385- <field name="description">TVA-HA_UE_déduc-2.1</field>
386+ <field name="name">TVA déd. s/ acq. intracommunautaire (achat) 2,1%</field>
387+ <field name="description">ACH_UE_ded.-2.1</field>
388 <field name="amount" eval="0.021"/>
389 <field name="type">percent</field>
390- <field name="base_code_id" ref="tax_intra_acq_21_ht"/>
391- <field name="base_sign" eval="-1"/>
392 <field name="tax_code_id" ref="tax_intra_acq_21"/>
393 <field name="tax_sign" eval="-1"/>
394
395 <field name="account_collected_id" ref="pcg_445662"/>
396 <field name="account_paid_id" ref="pcg_445662"/>
397
398- <field name="ref_base_code_id" ref="tax_intra_acq_21_ht"/>
399- <field name="ref_base_sign" eval="1"/>
400 <field name="ref_tax_code_id" ref="tax_intra_acq_21"/>
401 <field name="ref_tax_sign" eval="1"/>
402 <field name="sequence" eval="10"/>
403@@ -689,7 +669,7 @@
404 <record model="account.tax.template" id="tva_0">
405 <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
406 <field name="name">TVA 0% autres opérations non imposables (vente)</field>
407- <field name="description">TVA-VT-autre-0</field>
408+ <field name="description">EXO-0</field>
409 <field name="amount" eval="0.00"/>
410 <field name="type">percent</field>
411 <field name="base_code_id" ref="tax_misc_0_ht"/>
412@@ -707,7 +687,7 @@
413 <record model="account.tax.template" id="tva_export_0">
414 <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
415 <field name="name">TVA 0% export (vente)</field>
416- <field name="description">TVA-export-0</field>
417+ <field name="description">EXPORT-0</field>
418 <field name="amount" eval="0.00"/>
419 <field name="type">percent</field>
420 <field name="base_code_id" ref="tax_export_0_ht"/>
421@@ -725,7 +705,7 @@
422 <record model="account.tax.template" id="tva_intra_0">
423 <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
424 <field name="name">TVA 0% livraisons intracommunautaires (vente)</field>
425- <field name="description">TVA-VT-UE-0</field>
426+ <field name="description">UE-0</field>
427 <field name="amount" eval="0.00"/>
428 <field name="type">percent</field>
429 <field name="base_code_id" ref="tax_intra_0_ht"/>
430@@ -743,7 +723,7 @@
431 <record model="account.tax.template" id="tva_import_0">
432 <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
433 <field name="name">TVA 0% import (achat)</field>
434- <field name="description">TVA-import-0</field>
435+ <field name="description">IMPORT-0</field>
436 <field name="amount" eval="0.00"/>
437 <field name="type">percent</field>
438 <field name="base_code_id" ref="tax_import_0_ht"/>
439@@ -796,7 +776,7 @@
440 </record>
441
442 <record id="pcg_60221" model="account.account.template">
443- <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
444+ <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
445 </record>
446
447 <record id="pcg_60222" model="account.account.template">
448@@ -880,7 +860,7 @@
449 </record>
450
451 <record id="pcg_6071" model="account.account.template">
452- <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
453+ <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
454 </record>
455
456 <record id="pcg_6072" model="account.account.template">
457@@ -1056,7 +1036,7 @@
458 </record>
459
460 <record id="pcg_6248" model="account.account.template">
461- <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
462+ <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
463 </record>
464
465
466
467=== modified file 'l10n_fr/plan_comptable_general.xml'
468--- l10n_fr/plan_comptable_general.xml 2012-11-29 22:26:45 +0000
469+++ l10n_fr/plan_comptable_general.xml 2012-12-07 16:06:33 +0000
470@@ -3581,7 +3581,6 @@
471 <field name="type">view</field>
472 <field name="user_type" ref="account.data_account_type_view"/>
473 <field name="parent_id" ref="pcg_445"/>
474- <field name="reconcile" eval="True"/>
475 </record>
476
477 <record id="pcg_445201" model="account.account.template">
478@@ -3590,7 +3589,6 @@
479 <field name="type">other</field>
480 <field name="user_type" ref="account.data_account_type_liability"/>
481 <field name="parent_id" ref="pcg_4452"/>
482- <field name="reconcile" eval="True"/>
483 </record>
484
485 <record id="pcg_445202" model="account.account.template">
486@@ -3599,7 +3597,6 @@
487 <field name="type">other</field>
488 <field name="user_type" ref="account.data_account_type_liability"/>
489 <field name="parent_id" ref="pcg_4452"/>
490- <field name="reconcile" eval="True"/>
491 </record>
492
493 <record id="pcg_445203" model="account.account.template">
494@@ -3608,7 +3605,6 @@
495 <field name="type">other</field>
496 <field name="user_type" ref="account.data_account_type_liability"/>
497 <field name="parent_id" ref="pcg_4452"/>
498- <field name="reconcile" eval="True"/>
499 </record>
500
501 <record id="pcg_4455" model="account.account.template">
502@@ -3644,7 +3640,6 @@
503 <field name="type">view</field>
504 <field name="user_type" ref="account.data_account_type_view"/>
505 <field name="parent_id" ref="pcg_445"/>
506- <field name="reconcile" eval="True"/>
507 </record>
508
509 <record id="pcg_44562" model="account.account.template">
510@@ -3653,7 +3648,6 @@
511 <field name="type">other</field>
512 <field name="user_type" ref="account.data_account_type_asset"/>
513 <field name="parent_id" ref="pcg_4456"/>
514- <field name="reconcile" eval="True"/>
515 </record>
516
517 <record id="pcg_44563" model="account.account.template">
518@@ -3671,7 +3665,6 @@
519 <field name="type">other</field>
520 <field name="user_type" ref="account.data_account_type_asset"/>
521 <field name="parent_id" ref="pcg_4456"/>
522- <field name="reconcile" eval="True"/>
523 </record>
524
525 <record id="pcg_445662" model="account.account.template">
526@@ -3680,7 +3673,6 @@
527 <field name="type">other</field>
528 <field name="user_type" ref="account.data_account_type_asset"/>
529 <field name="parent_id" ref="pcg_4456"/>
530- <field name="reconcile" eval="True"/>
531 </record>
532
533 <record id="pcg_44567" model="account.account.template">
534@@ -3717,7 +3709,6 @@
535 <field name="type">view</field>
536 <field name="user_type" ref="account.data_account_type_view"/>
537 <field name="parent_id" ref="pcg_4457"/>
538- <field name="reconcile" eval="True"/>
539 </record>
540
541 <record id="pcg_445711" model="account.account.template">
542@@ -3726,7 +3717,6 @@
543 <field name="type">other</field>
544 <field name="user_type" ref="account.data_account_type_liability"/>
545 <field name="parent_id" ref="pcg_44571"/>
546- <field name="reconcile" eval="True"/>
547 </record>
548
549 <record id="pcg_445712" model="account.account.template">
550@@ -3735,7 +3725,6 @@
551 <field name="type">other</field>
552 <field name="user_type" ref="account.data_account_type_liability"/>
553 <field name="parent_id" ref="pcg_44571"/>
554- <field name="reconcile" eval="True"/>
555 </record>
556
557 <record id="pcg_445713" model="account.account.template">
558@@ -3744,7 +3733,6 @@
559 <field name="type">other</field>
560 <field name="user_type" ref="account.data_account_type_liability"/>
561 <field name="parent_id" ref="pcg_44571"/>
562- <field name="reconcile" eval="True"/>
563 </record>
564
565 <record id="pcg_44578" model="account.account.template">
566@@ -3762,7 +3750,6 @@
567 <field name="type">view</field>
568 <field name="user_type" ref="account.data_account_type_view"/>
569 <field name="parent_id" ref="pcg_445"/>
570- <field name="reconcile" eval="True"/>
571 </record>
572
573 <record id="pcg_44581" model="account.account.template">

Subscribers

People subscribed via source and target branches

to all changes: