[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, 12 insertions, 42 deletions

diff --git a/addons/l10n_hr/data/account_tax_report_data.xml b/addons/l10n_hr/data/account_tax_report_data.xml
index 7d79e11fee6..282f7003b38 100644
--- a/addons/l10n_hr/data/account_tax_report_data.xml
+++ b/addons/l10n_hr/data/account_tax_report_data.xml
@@ -121,7 +121,7 @@
 
     <record id="account_tax_report_line_izdani_10" model="account.tax.report.line">
         <field name="name">II.1 Izdani računi po stopi 10%</field>
-        <field name="tag_name">II.1 Izdani računi po stopi 10%</field>
+        <field name="tag_name">II.1 Izdani računi po stopi 10% (osnovica)</field>
         <field name="code">izdani_10</field>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_oporezive"/>
@@ -137,7 +137,7 @@
 
     <record id="account_tax_report_line_izdani_25" model="account.tax.report.line">
         <field name="name">II.3 Izdani računi po stopi 25%</field>
-        <field name="tag_name">II.3 Izdani računi po stopi 25%</field>
+        <field name="tag_name">II.3 Izdani računi po stopi 25% (osnovica)</field>
         <field name="code">izdani_25</field>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="account_tax_report_line_oporezive"/>
@@ -168,7 +168,7 @@
 
     <record id="account_tax_report_line_pretporez_10" model="account.tax.report.line">
         <field name="name">III.1. Pretporez 10%</field>
-        <field name="tag_name">III.1. Pretporez 10%</field>
+        <field name="tag_name">III.1. Pretporez 10% (osnovica)</field>
         <field name="code">pretporez_10</field>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_obracunani"/>
@@ -211,7 +211,7 @@
 
     <record id="account_tax_report_line_placeni_uvozu" model="account.tax.report.line">
         <field name="name">III.4. Plaćeni PP pri uvozu</field>
-        <field name="tag_name">III.4. Plaćeni PP pri uvozu</field>
+        <field name="tag_name">III.4. Plaćeni PP pri uvozu (osnovica)</field>
         <field name="code">placeni_uvozu</field>
         <field name="sequence" eval="4"/>
         <field name="parent_id" ref="account_tax_report_line_obracunani"/>
@@ -220,7 +220,7 @@
 
     <record id="account_tax_report_line_placeni_usluge_10" model="account.tax.report.line">
         <field name="name">III.5. Plaćeni PP na ino usluge 10%</field>
-        <field name="tag_name">III.5. Plaćeni PP na ino usluge 10%</field>
+        <field name="tag_name">III.5. Plaćeni PP na ino usluge 10% (osnovica)</field>
         <field name="code">placeni_usluge_10</field>
         <field name="sequence" eval="5"/>
         <field name="parent_id" ref="account_tax_report_line_obracunani"/>
@@ -237,7 +237,7 @@
 
     <record id="account_tax_report_line_placeni_usluge_25" model="account.tax.report.line">
         <field name="name">III.7. Plaćeni PP na ino usluge 25%</field>
-        <field name="tag_name">III.7. Plaćeni PP na ino usluge 25%</field>
+        <field name="tag_name">III.7. Plaćeni PP na ino usluge 25% (osnovica)</field>
         <field name="code">placeni_usluge_25</field>
         <field name="sequence" eval="7"/>
         <field name="parent_id" ref="account_tax_report_line_obracunani"/>
@@ -283,7 +283,7 @@
 
     <record id="account_tax_report_line_izdani_racuni" model="account.tax.report.line">
         <field name="name">II.1 Izdani računi po stopi 10%</field>
-        <field name="tag_name">II.1 Izdani računi po stopi 10%</field>
+        <field name="tag_name">II.1 Izdani računi po stopi 10% (porez)</field>
         <field name="code">izdani_racuni</field>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_oporezive_isporuke"/>
@@ -299,7 +299,7 @@
 
     <record id="account_tax_report_line_izdani_racuni_25" model="account.tax.report.line">
         <field name="name">II.3 Izdani računi po stopi 25%</field>
-        <field name="tag_name">II.3 Izdani računi po stopi 25%</field>
+        <field name="tag_name">II.3 Izdani računi po stopi 25% (porez)</field>
         <field name="code">izdani_racuni_25</field>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="account_tax_report_line_oporezive_isporuke"/>
@@ -322,7 +322,7 @@
 
     <record id="account_tax_report_line_pretporez_10_tax" model="account.tax.report.line">
         <field name="name">III.1. Pretporez 10%</field>
-        <field name="tag_name">III.1. Pretporez 10%</field>
+        <field name="tag_name">III.1. Pretporez 10% (porez)</field>
         <field name="code">pretporez_10_tax</field>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_line_obracunani_pretporez"/>
@@ -347,7 +347,7 @@
 
     <record id="account_tax_report_line_placeni_uvozu_tax" model="account.tax.report.line">
         <field name="name">III.4. Plaćeni PP pri uvozu</field>
-        <field name="tag_name">III.4. Plaćeni PP pri uvozu</field>
+        <field name="tag_name">III.4. Plaćeni PP pri uvozu (porez)</field>
         <field name="code">placeni_uvozu_tax</field>
         <field name="sequence" eval="4"/>
         <field name="parent_id" ref="account_tax_report_line_obracunani_pretporez"/>
@@ -356,7 +356,7 @@
 
     <record id="account_tax_report_line_placeni_usluge_10_tax" model="account.tax.report.line">
         <field name="name">III.5. Plaćeni PP na ino usluge 10%</field>
-        <field name="tag_name">III.5. Plaćeni PP na ino usluge 10%</field>
+        <field name="tag_name">III.5. Plaćeni PP na ino usluge 10% (porez)</field>
         <field name="code">placeni_usluge_10_tax</field>
         <field name="sequence" eval="5"/>
         <field name="parent_id" ref="account_tax_report_line_obracunani_pretporez"/>
@@ -372,7 +372,7 @@
 
     <record id="account_tax_report_line_placeni_usluge_25_tax" model="account.tax.report.line">
         <field name="name">III.7. Plaćeni PP na ino usluge 25%</field>
-        <field name="tag_name">III.7. Plaćeni PP na ino usluge 25%</field>
+        <field name="tag_name">III.7. Plaćeni PP na ino usluge 25% (porez)</field>
         <field name="code">placeni_usluge_25_ta</field>
         <field name="sequence" eval="7"/>
         <field name="parent_id" ref="account_tax_report_line_obracunani_pretporez"/>
diff --git a/addons/l10n_hr/data/account_tax_template_data.xml b/addons/l10n_hr/data/account_tax_template_data.xml
index a3d8ce3f29c..242cae42c05 100644
--- a/addons/l10n_hr/data/account_tax_template_data.xml
+++ b/addons/l10n_hr/data/account_tax_template_data.xml
@@ -131,7 +131,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('kp_rrif4199'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -143,7 +142,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('kp_rrif4199'),
             }),
         ]"/>
     </record>
@@ -240,7 +238,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('kp_rrif4199'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -252,7 +249,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('kp_rrif4199'),
             }),
         ]"/>
     </record>
@@ -349,7 +345,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('kp_rrif4199'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -361,7 +356,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('kp_rrif4199'),
             }),
         ]"/>
     </record>
@@ -384,7 +378,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('kp_rrif4199'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -396,7 +389,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('kp_rrif4199'),
             }),
         ]"/>
     </record>
@@ -419,7 +411,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('kp_rrif4199'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -431,7 +422,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('kp_rrif4199'),
             }),
         ]"/>
     </record>
@@ -454,7 +444,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('kp_rrif4199'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -466,7 +455,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('kp_rrif4199'),
             }),
         ]"/>
     </record>
@@ -489,7 +477,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('kp_rrif4199'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -501,7 +488,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('kp_rrif4199'),
             }),
         ]"/>
     </record>
@@ -524,7 +510,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('kp_rrif4199'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -536,7 +521,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('kp_rrif4199'),
             }),
         ]"/>
     </record>
@@ -666,7 +650,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('kp_rrif4199'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -678,7 +661,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('kp_rrif4199'),
             }),
         ]"/>
     </record>
@@ -736,7 +718,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('kp_rrif4199'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -748,7 +729,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('kp_rrif4199'),
             }),
         ]"/>
     </record>
@@ -845,7 +825,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('kp_rrif4199'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -857,7 +836,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('kp_rrif4199'),
             }),
         ]"/>
     </record>
diff --git a/addons/l10n_hr/migrations/9.0.13.0/post-migrate_tags_on_taxes.py b/addons/l10n_hr/migrations/9.0.13.0/post-migrate_tags_on_taxes.py
deleted file mode 100644
index 404cdd185d4..00000000000
--- a/addons/l10n_hr/migrations/9.0.13.0/post-migrate_tags_on_taxes.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import odoo
-
-def migrate(cr, version):
-    registry = odoo.registry(cr.dbname)
-    from odoo.addons.account.models.chart_template import migrate_tags_on_taxes
-    migrate_tags_on_taxes(cr, registry)