[FIX] l10n_*: fix taxes repartition so that 12.3 matches what is defined in 12.2

[IMP] l10n_*: don't define accounts or tags on tax repartition line templates anymore for 0% taxes

[FIX] account: remove old function used to migrate the former tax model, incompatible with the new one

1 files changed, 16 insertions, 28 deletions

diff --git a/addons/l10n_ae/data/account_tax_template_data.xml b/addons/l10n_ae/data/account_tax_template_data.xml
index 5614c43941f..f95b45efa0e 100644
--- a/addons/l10n_ae/data/account_tax_template_data.xml
+++ b/addons/l10n_ae/data/account_tax_template_data.xml
@@ -262,7 +262,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('uae_account_3785'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -274,7 +273,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('uae_account_3785'),
             }),
         ]"/>
     </record>
@@ -295,7 +293,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('uae_account_3785'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -307,7 +304,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('uae_account_3785'),
             }),
         ]"/>
     </record>
@@ -402,7 +398,7 @@
                 'factor_percent': -100,
                 'repartition_type': 'tax',
                 'account_id': ref('uae_account_3726'),
-                'plus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
+                'minus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
             }),
             (0,0, {
                 'factor_percent': 100,
@@ -421,7 +417,7 @@
                 'factor_percent': -100,
                 'repartition_type': 'tax',
                 'account_id': ref('uae_account_3726'),
-                'minus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
+                'plus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
             }),
             (0,0, {
                 'factor_percent': 100,
@@ -448,7 +444,7 @@
                 'factor_percent': -100,
                 'repartition_type': 'tax',
                 'account_id': ref('uae_account_3726'),
-                'plus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
+                'minus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
             }),
             (0,0, {
                 'factor_percent': 100,
@@ -467,7 +463,7 @@
                 'factor_percent': -100,
                 'repartition_type': 'tax',
                 'account_id': ref('uae_account_3726'),
-                'minus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
+                'plus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
             }),
             (0,0, {
                 'factor_percent': 100,
@@ -494,7 +490,7 @@
                 'factor_percent': -100,
                 'repartition_type': 'tax',
                 'account_id': ref('uae_account_3726'),
-                'plus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
+                'minus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
             }),
             (0,0, {
                 'factor_percent': 100,
@@ -513,7 +509,7 @@
                 'factor_percent': -100,
                 'repartition_type': 'tax',
                 'account_id': ref('uae_account_3726'),
-                'minus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
+                'plus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
             }),
             (0,0, {
                 'factor_percent': 100,
@@ -540,7 +536,7 @@
                 'factor_percent': -100,
                 'repartition_type': 'tax',
                 'account_id': ref('uae_account_3726'),
-                'plus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
+                'minus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
             }),
             (0,0, {
                 'factor_percent': 100,
@@ -559,7 +555,7 @@
                 'factor_percent': -100,
                 'repartition_type': 'tax',
                 'account_id': ref('uae_account_3726'),
-                'minus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
+                'plus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
             }),
             (0,0, {
                 'factor_percent': 100,
@@ -586,7 +582,7 @@
                 'factor_percent': -100,
                 'repartition_type': 'tax',
                 'account_id': ref('uae_account_3726'),
-                'plus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
+                'minus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
             }),
             (0,0, {
                 'factor_percent': 100,
@@ -605,7 +601,7 @@
                 'factor_percent': -100,
                 'repartition_type': 'tax',
                 'account_id': ref('uae_account_3726'),
-                'minus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
+                'plus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
             }),
             (0,0, {
                 'factor_percent': 100,
@@ -632,7 +628,7 @@
                 'factor_percent': -100,
                 'repartition_type': 'tax',
                 'account_id': ref('uae_account_3726'),
-                'plus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
+                'minus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
             }),
             (0,0, {
                 'factor_percent': 100,
@@ -651,7 +647,7 @@
                 'factor_percent': -100,
                 'repartition_type': 'tax',
                 'account_id': ref('uae_account_3726'),
-                'minus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
+                'plus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
             }),
             (0,0, {
                 'factor_percent': 100,
@@ -747,8 +743,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('uae_account_3726'),
-                'minus_report_line_ids': [ref('tax_report_line_exempt_supplies_vat')],
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -759,8 +753,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('uae_account_3726'),
-                'plus_report_line_ids': [ref('tax_report_line_exempt_supplies_vat')],
             }),
         ]"/>
     </record>
@@ -780,8 +772,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('uae_account_3726'),
-                'minus_report_line_ids': [ref('tax_report_line_zero_rated_supplies_vat')],
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -792,8 +782,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('uae_account_3726'),
-                'plus_report_line_ids': [ref('tax_report_line_zero_rated_supplies_vat')],
             }),
         ]"/>
     </record>
@@ -852,7 +840,7 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
-                'minus_report_line_ids': [ref('tax_report_line_expense_supplies_reverse_base'),ref('tax_report_line_standard_rated_expense_base')],
+                'plus_report_line_ids': [ref('tax_report_line_expense_supplies_reverse_base'),ref('tax_report_line_standard_rated_expense_base')],
             }),
             (0,0, {
                 'factor_percent': -100,
@@ -864,14 +852,14 @@
                 'factor_percent': 100,
                 'repartition_type': 'tax',
                 'account_id': ref('uae_account_3726'),
-                'minus_report_line_ids': [ref('tax_report_line_standard_rated_expense_vat')],
+                'plus_report_line_ids': [ref('tax_report_line_standard_rated_expense_vat')],
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
-                'plus_report_line_ids': [ref('tax_report_line_expense_supplies_reverse_base'),ref('tax_report_line_standard_rated_expense_base')],
+                'minus_report_line_ids': [ref('tax_report_line_expense_supplies_reverse_base'),ref('tax_report_line_standard_rated_expense_base')],
             }),
             (0,0, {
                 'factor_percent': -100,
@@ -883,7 +871,7 @@
                 'factor_percent': 100,
                 'repartition_type': 'tax',
                 'account_id': ref('uae_account_3726'),
-                'plus_report_line_ids': [ref('tax_report_line_standard_rated_expense_vat')],
+                'minus_report_line_ids': [ref('tax_report_line_standard_rated_expense_vat')],
             }),
         ]"/>
     </record>