Odoo Addons (MOVED TO GITHUB)

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

  1. l10n_fr_trunk_improved_nv
  2. Merge into trunk
Proposed by Vincent Renaville@camptocamp
Status: Rejected
Rejected by: Cedric Snauwaert (OpenERP)
Proposed branch: lp:~camptocamp/openobject-addons/l10n_fr_trunk_improved_nv
Merge into: lp:openobject-addons
Diff against target: 558 lines (+63/-96)
2 files modified
l10n_fr/fr_tax.xml (+63/-83)
l10n_fr/plan_comptable_general.xml (+0/-13)
To merge this branch: bzr merge lp:~camptocamp/openobject-addons/l10n_fr_trunk_improved_nv
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+139718@code.launchpad.net

This proposal supersedes a proposal from 2012-12-07.

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.
Revision history for this message
Cedric Snauwaert (OpenERP) (csn-openerp) wrote :

hello, this proposal is the same as the following which has been merged in trunk :

https://code.launchpad.net/~c2c/openobject-addons/l10n_fr_account_tax_sequence/+merge/140380

Thus I'm rejecting this proposal.

Thanks,
Cédric

Unmerged revisions

8173. By Vincent Renaville@camptocamp

[FIX] l10n_fr : shorten taxe codes due to new invoices layout, reverse VAT correction, remove reconcile=true on vat accounts, remamed some taxes to match legal terms

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

Subscribers

People subscribed via source and target branches

to all changes: