Skip to content

Commit 259e270

Browse files
committed
[FIX] l10n_au: don't duplicate tax repartit° lines when upgrade
We don't duplicate the tax repartition lines when upgrading the account module Steps: - Create a company with l10n_au installed - Upgrade account module - Create a second company - Try to link it with Australian accounting -> ValidationError: Invoice and credit note repartition should each contain exactly one line for the base. We remove the records before creating them again, like we do in l10n_be/data/account_tax_template_data.xml opw-2862296 closes odoo#92873 Signed-off-by: Florian Gilbert (flg) <[email protected]>
1 parent 043a780 commit 259e270

File tree

1 file changed

+30
-30
lines changed

1 file changed

+30
-30
lines changed

addons/l10n_au/data/account_tax_template_data.xml

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<field name="amount">10.0</field>
1212
<field name="price_include" eval="0"/>
1313
<field name="tax_group_id" ref="tax_group_gst_10"/>
14-
<field name="invoice_repartition_line_ids" eval="[
14+
<field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
1515
(0,0, {
1616
'factor_percent': 100,
1717
'repartition_type': 'base',
@@ -25,7 +25,7 @@
2525
'minus_report_line_ids': [ref('account_tax_report_gstrpt_comparison_gl')],
2626
}),
2727
]"/>
28-
<field name="refund_repartition_line_ids" eval="[
28+
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
2929
(0,0, {
3030
'factor_percent': 100,
3131
'repartition_type': 'base',
@@ -50,7 +50,7 @@
5050
<field name="amount">10.0</field>
5151
<field name="price_include" eval="1"/>
5252
<field name="tax_group_id" ref="tax_group_gst_10"/>
53-
<field name="invoice_repartition_line_ids" eval="[
53+
<field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
5454
(0,0, {
5555
'factor_percent': 100,
5656
'repartition_type': 'base',
@@ -64,7 +64,7 @@
6464
'minus_report_line_ids': [ref('account_tax_report_gstrpt_comparison_gl')],
6565
}),
6666
]"/>
67-
<field name="refund_repartition_line_ids" eval="[
67+
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
6868
(0,0, {
6969
'factor_percent': 100,
7070
'repartition_type': 'base',
@@ -89,7 +89,7 @@
8989
<field name="amount">0</field>
9090
<field name="price_include" eval="0"/>
9191
<field name="tax_group_id" ref="tax_group_gst_0"/>
92-
<field name="invoice_repartition_line_ids" eval="[
92+
<field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
9393
(0,0, {
9494
'factor_percent': 100,
9595
'repartition_type': 'base',
@@ -100,7 +100,7 @@
100100
'repartition_type': 'tax',
101101
}),
102102
]"/>
103-
<field name="refund_repartition_line_ids" eval="[
103+
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
104104
(0,0, {
105105
'factor_percent': 100,
106106
'repartition_type': 'base',
@@ -122,7 +122,7 @@
122122
<field name="amount">0</field>
123123
<field name="price_include" eval="0"/>
124124
<field name="tax_group_id" ref="tax_group_gst_0"/>
125-
<field name="invoice_repartition_line_ids" eval="[
125+
<field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
126126
(0,0, {
127127
'factor_percent': 100,
128128
'repartition_type': 'base',
@@ -133,7 +133,7 @@
133133
'repartition_type': 'tax',
134134
}),
135135
]"/>
136-
<field name="refund_repartition_line_ids" eval="[
136+
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
137137
(0,0, {
138138
'factor_percent': 100,
139139
'repartition_type': 'base',
@@ -155,7 +155,7 @@
155155
<field name="amount">0</field>
156156
<field name="price_include" eval="0"/>
157157
<field name="tax_group_id" ref="tax_group_gst_0"/>
158-
<field name="invoice_repartition_line_ids" eval="[
158+
<field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
159159
(0,0, {
160160
'factor_percent': 100,
161161
'repartition_type': 'base',
@@ -166,7 +166,7 @@
166166
'repartition_type': 'tax',
167167
}),
168168
]"/>
169-
<field name="refund_repartition_line_ids" eval="[
169+
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
170170
(0,0, {
171171
'factor_percent': 100,
172172
'repartition_type': 'base',
@@ -188,7 +188,7 @@
188188
<field name="amount">10.0</field>
189189
<field name="price_include" eval="0"/>
190190
<field name="tax_group_id" ref="tax_group_gst_10"/>
191-
<field name="invoice_repartition_line_ids" eval="[
191+
<field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
192192
(0,0, {
193193
'factor_percent': 100,
194194
'repartition_type': 'base',
@@ -202,7 +202,7 @@
202202
'minus_report_line_ids': [ref('account_tax_report_gstrpt_comparison_gl')],
203203
}),
204204
]"/>
205-
<field name="refund_repartition_line_ids" eval="[
205+
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
206206
(0,0, {
207207
'factor_percent': 100,
208208
'repartition_type': 'base',
@@ -227,7 +227,7 @@
227227
<field name="amount">10.0</field>
228228
<field name="price_include" eval="0"/>
229229
<field name="tax_group_id" ref="tax_group_gst_10"/>
230-
<field name="invoice_repartition_line_ids" eval="[
230+
<field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
231231
(0,0, {
232232
'factor_percent': 100,
233233
'repartition_type': 'base',
@@ -240,7 +240,7 @@
240240
'plus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_comparison_gl')],
241241
}),
242242
]"/>
243-
<field name="refund_repartition_line_ids" eval="[
243+
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
244244
(0,0, {
245245
'factor_percent': 100,
246246
'repartition_type': 'base',
@@ -264,7 +264,7 @@
264264
<field name="amount">10.0</field>
265265
<field name="price_include" eval="1"/>
266266
<field name="tax_group_id" ref="tax_group_gst_10"/>
267-
<field name="invoice_repartition_line_ids" eval="[
267+
<field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
268268
(0,0, {
269269
'factor_percent': 100,
270270
'repartition_type': 'base',
@@ -277,7 +277,7 @@
277277
'plus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_comparison_gl')],
278278
}),
279279
]"/>
280-
<field name="refund_repartition_line_ids" eval="[
280+
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
281281
(0,0, {
282282
'factor_percent': 100,
283283
'repartition_type': 'base',
@@ -301,7 +301,7 @@
301301
<field name="amount">10.0</field>
302302
<field name="price_include" eval="0"/>
303303
<field name="tax_group_id" ref="tax_group_gst_10"/>
304-
<field name="invoice_repartition_line_ids" eval="[
304+
<field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
305305
(0,0, {
306306
'factor_percent': 100,
307307
'repartition_type': 'base',
@@ -314,7 +314,7 @@
314314
'plus_report_line_ids': [ref('account_tax_report_gstrpt_g10'), ref('account_tax_report_gstrpt_comparison_gl')],
315315
}),
316316
]"/>
317-
<field name="refund_repartition_line_ids" eval="[
317+
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
318318
(0,0, {
319319
'factor_percent': 100,
320320
'repartition_type': 'base',
@@ -338,7 +338,7 @@
338338
<field name="amount">0</field>
339339
<field name="price_include" eval="0"/>
340340
<field name="tax_group_id" ref="tax_group_gst_0"/>
341-
<field name="invoice_repartition_line_ids" eval="[
341+
<field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
342342
(0,0, {
343343
'factor_percent': 100,
344344
'repartition_type': 'base',
@@ -349,7 +349,7 @@
349349
'repartition_type': 'tax',
350350
}),
351351
]"/>
352-
<field name="refund_repartition_line_ids" eval="[
352+
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
353353
(0,0, {
354354
'factor_percent': 100,
355355
'repartition_type': 'base',
@@ -371,7 +371,7 @@
371371
<field name="amount">0</field>
372372
<field name="price_include" eval="0"/>
373373
<field name="tax_group_id" ref="tax_group_gst_0"/>
374-
<field name="invoice_repartition_line_ids" eval="[
374+
<field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
375375
(0,0, {
376376
'factor_percent': 100,
377377
'repartition_type': 'base',
@@ -382,7 +382,7 @@
382382
'repartition_type': 'tax',
383383
}),
384384
]"/>
385-
<field name="refund_repartition_line_ids" eval="[
385+
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
386386
(0,0, {
387387
'factor_percent': 100,
388388
'repartition_type': 'base',
@@ -404,7 +404,7 @@
404404
<field name="amount">10.0</field>
405405
<field name="price_include" eval="0"/>
406406
<field name="tax_group_id" ref="tax_group_gst_10"/>
407-
<field name="invoice_repartition_line_ids" eval="[
407+
<field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
408408
(0,0, {
409409
'factor_percent': 100,
410410
'repartition_type': 'base',
@@ -416,7 +416,7 @@
416416
'plus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_g13')],
417417
}),
418418
]"/>
419-
<field name="refund_repartition_line_ids" eval="[
419+
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
420420
(0,0, {
421421
'factor_percent': 100,
422422
'repartition_type': 'base',
@@ -439,7 +439,7 @@
439439
<field name="amount">10.0</field>
440440
<field name="price_include" eval="0"/>
441441
<field name="tax_group_id" ref="tax_group_gst_10"/>
442-
<field name="invoice_repartition_line_ids" eval="[
442+
<field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
443443
(0,0, {
444444
'factor_percent': 100,
445445
'repartition_type': 'base',
@@ -451,7 +451,7 @@
451451
'plus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_g15')],
452452
}),
453453
]"/>
454-
<field name="refund_repartition_line_ids" eval="[
454+
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
455455
(0,0, {
456456
'factor_percent': 100,
457457
'repartition_type': 'base',
@@ -483,7 +483,7 @@
483483
-->
484484
<field name="price_include" eval="1"/>
485485
<field name="tax_group_id" ref="tax_group_gst_100000000"/>
486-
<field name="invoice_repartition_line_ids" eval="[
486+
<field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
487487
(0,0, {
488488
'factor_percent': 100,
489489
'repartition_type': 'base',
@@ -495,7 +495,7 @@
495495
'plus_report_line_ids': [ref('account_tax_report_gstrpt_gstonly'), ref('account_tax_report_gstrpt_comparison_gl')],
496496
}),
497497
]"/>
498-
<field name="refund_repartition_line_ids" eval="[
498+
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
499499
(0,0, {
500500
'factor_percent': 100,
501501
'repartition_type': 'base',
@@ -518,7 +518,7 @@
518518
<field name="amount">10.0</field>
519519
<field name="price_include" eval="0"/>
520520
<field name="tax_group_id" ref="tax_group_gst_10"/>
521-
<field name="invoice_repartition_line_ids" eval="[
521+
<field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
522522
(0,0, {
523523
'factor_percent': 100,
524524
'repartition_type': 'base',
@@ -531,7 +531,7 @@
531531
'plus_report_line_ids': [ref('account_tax_report_gstrpt_g18'), ref('account_tax_report_gstrpt_comparison_gl')],
532532
}),
533533
]"/>
534-
<field name="refund_repartition_line_ids" eval="[
534+
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
535535
(0,0, {
536536
'factor_percent': 100,
537537
'repartition_type': 'base',

0 commit comments

Comments
 (0)