[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

3 files changed, 26 insertions, 32 deletions

diff --git a/addons/l10n_th/data/account_tax_report_data.xml b/addons/l10n_th/data/account_tax_report_data.xml
index 4977a0d8da6..66ce5a979b1 100644
--- a/addons/l10n_th/data/account_tax_report_data.xml
+++ b/addons/l10n_th/data/account_tax_report_data.xml
@@ -25,7 +25,7 @@
 
     <record id="tax_report_tp_wht_per_service" model="account.tax.report.line">
         <field name="name">Personal Withholding Tax (Service)</field>
-        <field name="tag_name">Personal Withholding Tax (Service)</field>
+        <field name="tag_name">Personal Withholding Tax (Service) (to be paid)</field>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="tax_report_tp_wht_per"/>
         <field name="country_id" ref="base.th"/>
@@ -48,7 +48,7 @@
 
     <record id="tax_report_tp_wht_cmp_service" model="account.tax.report.line">
         <field name="name">Company Withholding Tax (Service)</field>
-        <field name="tag_name">Company Withholding Tax (Service)</field>
+        <field name="tag_name">Company Withholding Tax (Service) (to be paid)</field>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="tax_report_tp_wht_cmp"/>
         <field name="country_id" ref="base.th"/>
@@ -56,7 +56,7 @@
 
     <record id="tax_report_tp_wht_cmp_other" model="account.tax.report.line">
         <field name="name">Company Withholding Tax (Other)</field>
-        <field name="tag_name">Company Withholding Tax (Other)</field>
+        <field name="tag_name">Company Withholding Tax (Other) (to be paid)</field>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="tax_report_tp_wht_cmp"/>
         <field name="country_id" ref="base.th"/>
@@ -72,7 +72,7 @@
 
     <record id="tax_report_tp_vat_out" model="account.tax.report.line">
         <field name="name">Output VAT</field>
-        <field name="tag_name">Output VAT</field>
+        <field name="tag_name">Output VAT (to be paid)</field>
         <field name="code">tax_th_PP30_5</field>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="tax_report_tp_vat"/>
@@ -81,7 +81,7 @@
 
     <record id="tax_report_tp_vat_in" model="account.tax.report.line">
         <field name="name">Input VAT</field>
-        <field name="tag_name">Input VAT</field>
+        <field name="tag_name">Input VAT (to be paid)</field>
         <field name="code">tax_th_PP30_7</field>
         <field name="sequence" eval="4"/>
         <field name="parent_id" ref="tax_report_tp_vat"/>
@@ -111,7 +111,7 @@
 
     <record id="tax_report_ta_wht_per_service" model="account.tax.report.line">
         <field name="name">Personal Withholding Tax (Service)</field>
-        <field name="tag_name">Personal Withholding Tax (Service)</field>
+        <field name="tag_name">Personal Withholding Tax (Service) (taxable)</field>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="tax_report_ta_wht_per"/>
         <field name="country_id" ref="base.th"/>
@@ -133,7 +133,7 @@
 
     <record id="tax_report_ta_wht_cmp_service" model="account.tax.report.line">
         <field name="name">Company Withholding Tax (Service)</field>
-        <field name="tag_name">Company Withholding Tax (Service)</field>
+        <field name="tag_name">Company Withholding Tax (Service) (taxable)</field>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="tax_report_ta_wht_cmp"/>
         <field name="country_id" ref="base.th"/>
@@ -141,7 +141,7 @@
 
     <record id="tax_report_ta_wht_cmp_other" model="account.tax.report.line">
         <field name="name">Company Withholding Tax (Other)</field>
-        <field name="tag_name">Company Withholding Tax (Other)</field>
+        <field name="tag_name">Company Withholding Tax (Other) (taxable)</field>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="tax_report_ta_wht_cmp"/>
         <field name="country_id" ref="base.th"/>
@@ -156,7 +156,7 @@
 
     <record id="tax_report_ta_vat_out" model="account.tax.report.line">
         <field name="name">Output VAT</field>
-        <field name="tag_name">Output VAT</field>
+        <field name="tag_name">Output VAT (taxable)</field>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="tax_report_ta_vat"/>
         <field name="country_id" ref="base.th"/>
@@ -164,7 +164,7 @@
 
     <record id="tax_report_ta_vat_in" model="account.tax.report.line">
         <field name="name">Input VAT</field>
-        <field name="tag_name">Input VAT</field>
+        <field name="tag_name">Input VAT (taxable)</field>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="tax_report_ta_vat"/>
         <field name="country_id" ref="base.th"/>
diff --git a/addons/l10n_th/data/account_tax_template_data.xml b/addons/l10n_th/data/account_tax_template_data.xml
index 67c3ba846e3..a3b4b2727ba 100644
--- a/addons/l10n_th/data/account_tax_template_data.xml
+++ b/addons/l10n_th/data/account_tax_template_data.xml
@@ -88,7 +88,7 @@
                 'factor_percent': 100,
                 'repartition_type': 'tax',
                 'account_id': ref('a_wht'),
-                'plus_report_line_ids': [ref('tax_report_tp_wht_cmp_other')],
+                'minus_report_line_ids': [ref('tax_report_tp_wht_cmp_other')],
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -101,7 +101,7 @@
                 'factor_percent': 100,
                 'repartition_type': 'tax',
                 'account_id': ref('a_wht'),
-                'minus_report_line_ids': [ref('tax_report_tp_wht_cmp_other')],
+                'plus_report_line_ids': [ref('tax_report_tp_wht_cmp_other')],
             }),
         ]"/>
     </record>
@@ -123,7 +123,7 @@
                 'factor_percent': 100,
                 'repartition_type': 'tax',
                 'account_id': ref('a_wht'),
-                'plus_report_line_ids': [ref('tax_report_tp_wht_cmp_other')],
+                'minus_report_line_ids': [ref('tax_report_tp_wht_cmp_other')],
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -136,7 +136,7 @@
                 'factor_percent': 100,
                 'repartition_type': 'tax',
                 'account_id': ref('a_wht'),
-                'minus_report_line_ids': [ref('tax_report_tp_wht_cmp_other')],
+                'plus_report_line_ids': [ref('tax_report_tp_wht_cmp_other')],
             }),
         ]"/>
     </record>
@@ -158,7 +158,7 @@
                 'factor_percent': 100,
                 'repartition_type': 'tax',
                 'account_id': ref('a_wht'),
-                'plus_report_line_ids': [ref('tax_report_tp_wht_cmp_service')],
+                'minus_report_line_ids': [ref('tax_report_tp_wht_cmp_service')],
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -171,7 +171,7 @@
                 'factor_percent': 100,
                 'repartition_type': 'tax',
                 'account_id': ref('a_wht'),
-                'minus_report_line_ids': [ref('tax_report_tp_wht_cmp_service')],
+                'plus_report_line_ids': [ref('tax_report_tp_wht_cmp_service')],
             }),
         ]"/>
     </record>
@@ -193,7 +193,7 @@
                 'factor_percent': 100,
                 'repartition_type': 'tax',
                 'account_id': ref('a_wht'),
-                'plus_report_line_ids': [ref('tax_report_tp_wht_cmp_other')],
+                'minus_report_line_ids': [ref('tax_report_tp_wht_cmp_other')],
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -206,7 +206,7 @@
                 'factor_percent': 100,
                 'repartition_type': 'tax',
                 'account_id': ref('a_wht'),
-                'minus_report_line_ids': [ref('tax_report_tp_wht_cmp_other')],
+                'plus_report_line_ids': [ref('tax_report_tp_wht_cmp_other')],
             }),
         ]"/>
     </record>
@@ -228,7 +228,7 @@
                 'factor_percent': 100,
                 'repartition_type': 'tax',
                 'account_id': ref('a_wht'),
-                'plus_report_line_ids': [ref('tax_report_tp_wht_per_other')],
+                'minus_report_line_ids': [ref('tax_report_tp_wht_per_other')],
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -241,7 +241,7 @@
                 'factor_percent': 100,
                 'repartition_type': 'tax',
                 'account_id': ref('a_wht'),
-                'minus_report_line_ids': [ref('tax_report_tp_wht_per_other')],
+                'plus_report_line_ids': [ref('tax_report_tp_wht_per_other')],
             }),
         ]"/>
     </record>
@@ -263,7 +263,7 @@
                 'factor_percent': 100,
                 'repartition_type': 'tax',
                 'account_id': ref('a_wht'),
-                'plus_report_line_ids': [ref('tax_report_tp_wht_per_other')],
+                'minus_report_line_ids': [ref('tax_report_tp_wht_per_other')],
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -276,7 +276,7 @@
                 'factor_percent': 100,
                 'repartition_type': 'tax',
                 'account_id': ref('a_wht'),
-                'minus_report_line_ids': [ref('tax_report_tp_wht_per_other')],
+                'plus_report_line_ids': [ref('tax_report_tp_wht_per_other')],
             }),
         ]"/>
     </record>
@@ -298,7 +298,7 @@
                 'factor_percent': 100,
                 'repartition_type': 'tax',
                 'account_id': ref('a_wht'),
-                'plus_report_line_ids': [ref('tax_report_tp_wht_per_service')],
+                'minus_report_line_ids': [ref('tax_report_tp_wht_per_service')],
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -311,7 +311,7 @@
                 'factor_percent': 100,
                 'repartition_type': 'tax',
                 'account_id': ref('a_wht'),
-                'minus_report_line_ids': [ref('tax_report_tp_wht_per_service')],
+                'plus_report_line_ids': [ref('tax_report_tp_wht_per_service')],
             }),
         ]"/>
     </record>
@@ -333,7 +333,7 @@
                 'factor_percent': 100,
                 'repartition_type': 'tax',
                 'account_id': ref('a_wht'),
-                'plus_report_line_ids': [ref('tax_report_tp_wht_per_other')],
+                'minus_report_line_ids': [ref('tax_report_tp_wht_per_other')],
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -346,7 +346,7 @@
                 'factor_percent': 100,
                 'repartition_type': 'tax',
                 'account_id': ref('a_wht'),
-                'minus_report_line_ids': [ref('tax_report_tp_wht_per_other')],
+                'plus_report_line_ids': [ref('tax_report_tp_wht_per_other')],
             }),
         ]"/>
     </record>
diff --git a/addons/l10n_th/migrations/9.0.2.0/post-migrate_tags_on_taxes.py b/addons/l10n_th/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
deleted file mode 100644
index fa56fd00dfa..00000000000
--- a/addons/l10n_th/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from openerp.modules.registry import RegistryManager
-
-def migrate(cr, version):
-    registry = RegistryManager.get(cr.dbname)
-    from openerp.addons.account.models.chart_template import migrate_tags_on_taxes
-    migrate_tags_on_taxes(cr, registry)