Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/trunk-bug-917213-mdi into lp:openobject-addons

  1. trunk-bug-917213-mdi
  2. Merge into trunk
Proposed by DJ Patel (OpenERP)
Status: Merged
Merged at revision: 6462
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-bug-917213-mdi
Merge into: lp:openobject-addons
Diff against target: 372 lines (+225/-0)
2 files modified
l10n_fr/fr_pcg_taxes_demo.xml (+135/-0)
l10n_fr/fr_tax_demo.xml (+90/-0)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-bug-917213-mdi
Reviewer Review Type Date Requested Status
Raphael Collet (OpenERP) (community) Approve
Numérigraphe (community) non-expert Approve
DJ Patel (OpenERP) (community) Needs Resubmitting
Review via email: mp+89880@code.launchpad.net

Description of the change

Hello Sir,

I have fix the issue: https://bugs.launchpad.net/openobject-addons/+bug/917213 "New VAT rate in France".

Thanks and Regards,

Divyesh Makwana(MDI)

To post a comment you must log in.
Revision history for this message
Numérigraphe (numerigraphe) wrote :

I humbly suggest you don't change the "description" of existing taxes, as that may complicate things for users - think of invoices printed with the old tax description for example, or accountants who use the description as a shortcut.
Lionel

review: Needs Fixing
Revision history for this message
Raphael Collet (OpenERP) (rco-openerp) wrote :

I second Lionel's remark. Please revert the changes in the fields "description" of existing data.

review: Needs Fixing
Revision history for this message
DJ Patel (OpenERP) (mdi-openerp) wrote :

Hello Sir,

I revert the changes in the fields "description" of existing data.

Thanks,
Divyesh

review: Needs Resubmitting
Revision history for this message
Numérigraphe (numerigraphe) wrote :

I think it's OK, though i'm no accounting expert.

review: Approve (non-expert)
Revision history for this message
Raphael Collet (OpenERP) (rco-openerp) wrote :

Thanks,
Raphael

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'l10n_fr/fr_pcg_taxes_demo.xml'
2--- l10n_fr/fr_pcg_taxes_demo.xml 2012-01-16 15:37:35 +0000
3+++ l10n_fr/fr_pcg_taxes_demo.xml 2012-01-31 09:28:30 +0000
4@@ -33,6 +33,12 @@
5 <field name="parent_id" ref="tax_col_ht"/>
6 <field name="sign">1.00</field>
7 </record>
8+ <record model="account.tax.code.template" id="tax_col_70_ht">
9+ <field name="name">Base H.T. 7.0%</field>
10+ <field name="code">TVA collectée à 7.0% (Base H.T.)</field>
11+ <field name="parent_id" ref="tax_col_ht"/>
12+ <field name="sign">1.00</field>
13+ </record>
14 <record model="account.tax.code.template" id="tax_col_55_ht">
15 <field name="name">Base H.T. 5.5%</field>
16 <field name="code">TVA collectée à 5.5% (Base H.T.)</field>
17@@ -64,6 +70,12 @@
18 <field name="parent_id" ref="tax_col"/>
19 <field name="sign">1.00</field>
20 </record>
21+ <record model="account.tax.code.template" id="tax_col_70">
22+ <field name="name">TVA 7.0%</field>
23+ <field name="code">TVA collectée à 7.0%</field>
24+ <field name="parent_id" ref="tax_col"/>
25+ <field name="sign">1.00</field>
26+ </record>
27 <record model="account.tax.code.template" id="tax_col_55">
28 <field name="name">TVA 5.5%</field>
29 <field name="code">TVA collectée à 5.5%</field>
30@@ -97,6 +109,12 @@
31 <field name="parent_id" ref="tax_acq_ht"/>
32 <field name="sign">1.00</field>
33 </record>
34+ <record model="account.tax.code.template" id="tax_acq_70_ht">
35+ <field name="name">Base H.T. 7.0%</field>
36+ <field name="code">TVA acquittée à 7.0% (Base H.T.)</field>
37+ <field name="parent_id" ref="tax_acq_ht"/>
38+ <field name="sign">1.00</field>
39+ </record>
40 <record model="account.tax.code.template" id="tax_acq_55_ht">
41 <field name="name">Base H.T. 5.5%</field>
42 <field name="code">TVA acquittée à 5.5% (Base H.T.)</field>
43@@ -128,6 +146,12 @@
44 <field name="parent_id" ref="tax_acq"/>
45 <field name="sign">1.00</field>
46 </record>
47+ <record model="account.tax.code.template" id="tax_acq_70">
48+ <field name="name">TVA 7.0%</field>
49+ <field name="code">TVA acquittée à 7.0%</field>
50+ <field name="parent_id" ref="tax_acq"/>
51+ <field name="sign">1.00</field>
52+ </record>
53 <record model="account.tax.code.template" id="tax_acq_55">
54 <field name="name">TVA 5.5%</field>
55 <field name="code">TVA acquittée à 5.5%</field>
56@@ -161,6 +185,12 @@
57 <field name="parent_id" ref="tax_imm_ht"/>
58 <field name="sign">1.00</field>
59 </record>
60+ <record model="account.tax.code.template" id="tax_imm_70_ht">
61+ <field name="name">Base H.T. 7.0%</field>
62+ <field name="code">TVA acquittée sur immobilisations à 7.0% (Base H.T.)</field>
63+ <field name="parent_id" ref="tax_imm_ht"/>
64+ <field name="sign">1.00</field>
65+ </record>
66 <record model="account.tax.code.template" id="tax_imm_55_ht">
67 <field name="name">Base H.T. 5.5%</field>
68 <field name="code">TVA acquittée sur immobilisations à 5.5% (Base H.T.)</field>
69@@ -193,6 +223,12 @@
70 <field name="parent_id" ref="tax_imm"/>
71 <field name="sign">1.00</field>
72 </record>
73+ <record model="account.tax.code.template" id="tax_imm_70">
74+ <field name="name">TVA 7.0%</field>
75+ <field name="code">TVA acquittée sur immobilisations à 7.0%</field>
76+ <field name="parent_id" ref="tax_imm"/>
77+ <field name="sign">1.00</field>
78+ </record>
79 <record model="account.tax.code.template" id="tax_imm_55">
80 <field name="name">TVA 5.5%</field>
81 <field name="code">TVA acquittée sur immobilisations à 5.5%</field>
82@@ -224,6 +260,12 @@
83 <field name="parent_id" ref="tax_intra_ht"/>
84 <field name="sign">1.00</field>
85 </record>
86+ <record model="account.tax.code.template" id="tax_intra_70_ht">
87+ <field name="name">Base H.T. 7.0%</field>
88+ <field name="code">TVA due intracommunautaire 7.0% (Base H.T.)</field>
89+ <field name="parent_id" ref="tax_intra_ht"/>
90+ <field name="sign">1.00</field>
91+ </record>
92 <record model="account.tax.code.template" id="tax_intra_55_ht">
93 <field name="name">Base H.T. 5.5%</field>
94 <field name="code">TVA due intracommunautaire 5.5% (Base H.T.)</field>
95@@ -255,6 +297,12 @@
96 <field name="parent_id" ref="tax_intra"/>
97 <field name="sign">1.00</field>
98 </record>
99+ <record model="account.tax.code.template" id="tax_intra_70">
100+ <field name="name">TVA 7.0%</field>
101+ <field name="code">TVA due intracommunautaire 7.0%</field>
102+ <field name="parent_id" ref="tax_intra"/>
103+ <field name="sign">1.00</field>
104+ </record>
105 <record model="account.tax.code.template" id="tax_intra_55">
106 <field name="name">TVA 5.5%</field>
107 <field name="code">TVA due intracommunautaire 5.5%</field>
108@@ -287,6 +335,12 @@
109 <field name="parent_id" ref="tax_intra_acq_ht"/>
110 <field name="sign">1.00</field>
111 </record>
112+ <record model="account.tax.code.template" id="tax_intra_acq_70_ht">
113+ <field name="name">Base H.T. 7.0%</field>
114+ <field name="code">TVA déductible intracommunautaire 7.0% (Base H.T.)</field>
115+ <field name="parent_id" ref="tax_intra_acq_ht"/>
116+ <field name="sign">1.00</field>
117+ </record>
118 <record model="account.tax.code.template" id="tax_intra_acq_55_ht">
119 <field name="name">Base H.T. 5.5%</field>
120 <field name="code">TVA déductible intracommunautaire 5.5% (Base H.T.)</field>
121@@ -318,6 +372,12 @@
122 <field name="parent_id" ref="tax_intra_acq"/>
123 <field name="sign">1.00</field>
124 </record>
125+ <record model="account.tax.code.template" id="tax_intra_acq_70">
126+ <field name="name">TVA 7.0%</field>
127+ <field name="code">TVA déductible intracommunautaire 7.0%</field>
128+ <field name="parent_id" ref="tax_intra_acq"/>
129+ <field name="sign">1.00</field>
130+ </record>
131 <record model="account.tax.code.template" id="tax_intra_acq_55">
132 <field name="name">TVA 5.5%</field>
133 <field name="code">TVA déductible intracommunautaire 5.5%</field>
134@@ -402,6 +462,21 @@
135 <field name="ref_tax_code_id" ref="tax_col_85"/>
136 <field name="ref_tax_sign" eval="-1"/>
137 </record>
138+
139+ <record model="account.tax.template" id="tva_specifique_1">
140+ <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
141+
142+ <field name="name">TVA collectée (vente) 7,0%</field>
143+ <field name="amount" eval="0.07"/>
144+ <field name="type">percent</field>
145+ <field name="base_code_id" ref="tax_col_70_ht"/>
146+ <field name="tax_code_id" ref="tax_col_70"/>
147+
148+ <field name="ref_base_code_id" ref="tax_col_70_ht"/>
149+ <field name="ref_base_sign" eval="-1"/>
150+ <field name="ref_tax_code_id" ref="tax_col_70"/>
151+ <field name="ref_tax_sign" eval="-1"/>
152+ </record>
153
154 <record model="account.tax.template" id="tva_reduite">
155 <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
156@@ -463,6 +538,21 @@
157 <field name="ref_tax_sign" eval="-1"/>
158 </record>
159
160+ <record model="account.tax.template" id="tva_acq_specifique_1">
161+ <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
162+
163+ <field name="name">TVA acquittée (achat) 7,0%</field>
164+ <field name="amount" eval="0.07"/>
165+ <field name="type">percent</field>
166+ <field name="base_code_id" ref="tax_acq_70_ht"/>
167+ <field name="tax_code_id" ref="tax_acq_70"/>
168+
169+ <field name="ref_base_code_id" ref="tax_acq_70_ht"/>
170+ <field name="ref_base_sign" eval="-1"/>
171+ <field name="ref_tax_code_id" ref="tax_acq_70"/>
172+ <field name="ref_tax_sign" eval="-1"/>
173+ </record>
174+
175 <record model="account.tax.template" id="tva_acq_reduite">
176 <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
177
178@@ -523,6 +613,21 @@
179 <field name="ref_tax_sign" eval="-1"/>
180 </record>
181
182+ <record model="account.tax.template" id="tva_imm_specifique_1">
183+ <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
184+
185+ <field name="name">TVA immobilisation (achat) 7,0%</field>
186+ <field name="amount" eval="0.07"/>
187+ <field name="type">percent</field>
188+ <field name="base_code_id" ref="tax_imm_70_ht"/>
189+ <field name="tax_code_id" ref="tax_imm_70"/>
190+
191+ <field name="ref_base_code_id" ref="tax_imm_70_ht"/>
192+ <field name="ref_base_sign" eval="-1"/>
193+ <field name="ref_tax_code_id" ref="tax_imm_70"/>
194+ <field name="ref_tax_sign" eval="-1"/>
195+ </record>
196+
197 <record model="account.tax.template" id="tva_imm_reduite">
198 <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
199
200@@ -583,6 +688,21 @@
201 <field name="ref_tax_sign" eval="-1"/>
202 </record>
203
204+ <record model="account.tax.template" id="tva_intra_specifique_1">
205+ <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
206+
207+ <field name="name">TVA due intracommunautaire 7,0%</field>
208+ <field name="amount" eval="-0.07"/>
209+ <field name="type">percent</field>
210+ <field name="base_code_id" ref="tax_intra_70_ht"/>
211+ <field name="tax_code_id" ref="tax_intra_70"/>
212+
213+ <field name="ref_base_code_id" ref="tax_intra_70_ht"/>
214+ <field name="ref_base_sign" eval="-1"/>
215+ <field name="ref_tax_code_id" ref="tax_intra_70"/>
216+ <field name="ref_tax_sign" eval="-1"/>
217+ </record>
218+
219 <record model="account.tax.template" id="tva_intra_reduite">
220 <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
221
222@@ -643,6 +763,21 @@
223 <field name="ref_tax_sign" eval="-1"/>
224 </record>
225
226+ <record model="account.tax.template" id="tva_acq_intra_specifique_1">
227+ <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
228+
229+ <field name="name">TVA déductible intracommunautaire 7,0%</field>
230+ <field name="amount" eval="0.07"/>
231+ <field name="type">percent</field>
232+ <field name="base_code_id" ref="tax_intra_acq_70_ht"/>
233+ <field name="tax_code_id" ref="tax_intra_acq_70"/>
234+
235+ <field name="ref_base_code_id" ref="tax_intra_acq_70_ht"/>
236+ <field name="ref_base_sign" eval="-1"/>
237+ <field name="ref_tax_code_id" ref="tax_intra_acq_70"/>
238+ <field name="ref_tax_sign" eval="-1"/>
239+ </record>
240+
241 <record model="account.tax.template" id="tva_acq_intra_reduite">
242 <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
243
244
245=== modified file 'l10n_fr/fr_tax_demo.xml'
246--- l10n_fr/fr_tax_demo.xml 2011-07-19 10:20:42 +0000
247+++ l10n_fr/fr_tax_demo.xml 2012-01-31 09:28:30 +0000
248@@ -45,6 +45,24 @@
249 <field name="type_tax_use">sale</field>
250 </record>
251
252+ <record model="account.tax.template" id="tva_specifique_1">
253+ <field name="name">TVA collectée (vente) 7,0%</field>
254+ <field name="description">24</field>
255+ <field name="amount" eval="0.07"/>
256+ <field name="type">percent</field>
257+ <field name="base_code_id" ref="tax_col_70_ht"/>
258+ <field name="tax_code_id" ref="tax_col_70"/>
259+
260+ <field name="account_collected_id" ref="pcg_445713"/>
261+ <field name="account_paid_id" ref="pcg_44571"/>
262+
263+ <field name="ref_base_code_id" ref="tax_col_70_ht"/>
264+ <field name="ref_base_sign" eval="-1"/>
265+ <field name="ref_tax_code_id" ref="tax_col_70"/>
266+ <field name="ref_tax_sign" eval="-1"/>
267+ <field name="type_tax_use">sale</field>
268+ </record>
269+
270 <record model="account.tax.template" id="tva_reduite">
271 <field name="name">TVA collectée (vente) 5,5%</field>
272 <field name="description">3</field>
273@@ -119,6 +137,24 @@
274 <field name="type_tax_use">purchase</field>
275 </record>
276
277+ <record model="account.tax.template" id="tva_acq_specifique_1">
278+ <field name="name">TVA acquittée (achat) 7,0%</field>
279+ <field name="description">25</field>
280+ <field name="amount" eval="0.07"/>
281+ <field name="type">percent</field>
282+ <field name="base_code_id" ref="tax_acq_70_ht"/>
283+ <field name="tax_code_id" ref="tax_acq_70"/>
284+
285+ <field name="account_collected_id" ref="pcg_44566"/>
286+ <field name="account_paid_id" ref="pcg_44566"/>
287+
288+ <field name="ref_base_code_id" ref="tax_acq_70_ht"/>
289+ <field name="ref_base_sign" eval="-1"/>
290+ <field name="ref_tax_code_id" ref="tax_acq_70"/>
291+ <field name="ref_tax_sign" eval="-1"/>
292+ <field name="type_tax_use">purchase</field>
293+ </record>
294+
295 <record model="account.tax.template" id="tva_acq_reduite">
296 <field name="name">TVA acquittée (achat) 5,5%</field>
297 <field name="description">7</field>
298@@ -193,6 +229,24 @@
299 <field name="type_tax_use">purchase</field>
300 </record>
301
302+ <record model="account.tax.template" id="tva_imm_specifique_1">
303+ <field name="name">TVA immobilisation (achat) 7,0%</field>
304+ <field name="description">26</field>
305+ <field name="amount" eval="0.07"/>
306+ <field name="type">percent</field>
307+ <field name="base_code_id" ref="tax_imm_70_ht"/>
308+ <field name="tax_code_id" ref="tax_imm_70"/>
309+
310+ <field name="account_collected_id" ref="pcg_44562"/>
311+ <field name="account_paid_id" ref="pcg_44562"/>
312+
313+ <field name="ref_base_code_id" ref="tax_imm_70_ht"/>
314+ <field name="ref_base_sign" eval="-1"/>
315+ <field name="ref_tax_code_id" ref="tax_imm_70"/>
316+ <field name="ref_tax_sign" eval="-1"/>
317+ <field name="type_tax_use">purchase</field>
318+ </record>
319+
320 <record model="account.tax.template" id="tva_imm_reduite">
321 <field name="name">TVA immobilisation (achat) 5,5%</field>
322 <field name="description">11</field>
323@@ -267,6 +321,24 @@
324 <field name="type_tax_use">sale</field>
325 </record>
326
327+ <record model="account.tax.template" id="tva_intra_specifique_1">
328+ <field name="name">TVA due intracommunautaire 7,0%</field>
329+ <field name="description">27</field>
330+ <field name="amount" eval="-0.07"/>
331+ <field name="type">percent</field>
332+ <field name="base_code_id" ref="tax_intra_70_ht"/>
333+ <field name="tax_code_id" ref="tax_intra_70"/>
334+
335+ <field name="account_collected_id" ref="pcg_445203"/>
336+ <field name="account_paid_id" ref="pcg_4452"/>
337+
338+ <field name="ref_base_code_id" ref="tax_intra_70_ht"/>
339+ <field name="ref_base_sign" eval="-1"/>
340+ <field name="ref_tax_code_id" ref="tax_intra_70"/>
341+ <field name="ref_tax_sign" eval="-1"/>
342+ <field name="type_tax_use">sale</field>
343+ </record>
344+
345 <record model="account.tax.template" id="tva_intra_reduite">
346 <field name="name">TVA due intracommunautaire 5,5%</field>
347 <field name="description">15</field>
348@@ -341,6 +413,24 @@
349 <field name="type_tax_use">purchase</field>
350 </record>
351
352+ <record model="account.tax.template" id="tva_acq_intra_specifique_1">
353+ <field name="name">TVA déductible intracommunautaire 7,0%</field>
354+ <field name="description">28</field>
355+ <field name="amount" eval="0.07"/>
356+ <field name="type">percent</field>
357+ <field name="base_code_id" ref="tax_intra_acq_70_ht"/>
358+ <field name="tax_code_id" ref="tax_intra_acq_70"/>
359+
360+ <field name="account_collected_id" ref="pcg_445662"/>
361+ <field name="account_paid_id" ref="pcg_445662"/>
362+
363+ <field name="ref_base_code_id" ref="tax_intra_acq_70_ht"/>
364+ <field name="ref_base_sign" eval="-1"/>
365+ <field name="ref_tax_code_id" ref="tax_intra_acq_70"/>
366+ <field name="ref_tax_sign" eval="-1"/>
367+ <field name="type_tax_use">purchase</field>
368+ </record>
369+
370 <record model="account.tax.template" id="tva_acq_intra_reduite">
371 <field name="name">TVA déductible intracommunautaire 5,5%</field>
372 <field name="description">19</field>

Subscribers

People subscribed via source and target branches

to all changes: