From 333c22edd9eee246214259be587e10b8202f40a0 Mon Sep 17 00:00:00 2001
From: Olivier Colson <oco@odoo.com>
Date: Mon, 15 Jul 2019 08:19:08 +0000
Subject: [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
---
 addons/l10n_sg/data/account_tax_data.xml           | 22 ----------------------
 .../9.0.2.0/post-migrate_tags_on_taxes.py          |  6 ------
 2 files changed, 28 deletions(-)
 delete mode 100644 addons/l10n_sg/migrations/9.0.2.0/post-migrate_tags_on_taxes.py

(limited to 'addons/l10n_sg')

diff --git a/addons/l10n_sg/data/account_tax_data.xml b/addons/l10n_sg/data/account_tax_data.xml
index e6eda67eee5..706697d870c 100644
--- a/addons/l10n_sg/data/account_tax_data.xml
+++ b/addons/l10n_sg/data/account_tax_data.xml
@@ -20,7 +20,6 @@
                     (0,0, {
                         'factor_percent': 100,
                         'repartition_type': 'tax',
-                        'account_id': ref('account_account_791'),
                     }),
                 ]"/>
             <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -32,7 +31,6 @@
                     (0,0, {
                         'factor_percent': 100,
                         'repartition_type': 'tax',
-                        'account_id': ref('account_account_791'),
                     }),
                 ]"/>
         </record>
@@ -92,7 +90,6 @@
                     (0,0, {
                         'factor_percent': 100,
                         'repartition_type': 'tax',
-                        'account_id': ref('account_account_793'),
                     }),
                 ]"/>
             <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -104,7 +101,6 @@
                     (0,0, {
                         'factor_percent': 100,
                         'repartition_type': 'tax',
-                        'account_id': ref('account_account_793'),
                     }),
                 ]"/>
         </record>
@@ -126,7 +122,6 @@
                     (0,0, {
                         'factor_percent': 100,
                         'repartition_type': 'tax',
-                        'account_id': ref('account_account_794'),
                     }),
                 ]"/>
             <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -137,7 +132,6 @@
                     (0,0, {
                         'factor_percent': 100,
                         'repartition_type': 'tax',
-                        'account_id': ref('account_account_794'),
                     }),
                 ]"/>
         </record>
@@ -160,7 +154,6 @@
                     (0,0, {
                         'factor_percent': 100,
                         'repartition_type': 'tax',
-                        'account_id': ref('account_account_795'),
                     }),
                 ]"/>
             <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -172,7 +165,6 @@
                     (0,0, {
                         'factor_percent': 100,
                         'repartition_type': 'tax',
-                        'account_id': ref('account_account_795'),
                     }),
                 ]"/>
         </record>
@@ -232,7 +224,6 @@
                     (0,0, {
                         'factor_percent': 100,
                         'repartition_type': 'tax',
-                        'account_id': ref('account_account_797'),
                     }),
                 ]"/>
             <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -244,7 +235,6 @@
                     (0,0, {
                         'factor_percent': 100,
                         'repartition_type': 'tax',
-                        'account_id': ref('account_account_797'),
                     }),
                 ]"/>
         </record>
@@ -523,7 +513,6 @@
                     (0,0, {
                         'factor_percent': 100,
                         'repartition_type': 'tax',
-                        'account_id': ref('account_account_744'),
                     }),
                 ]"/>
             <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -534,7 +523,6 @@
                     (0,0, {
                         'factor_percent': 100,
                         'repartition_type': 'tax',
-                        'account_id': ref('account_account_744'),
                     }),
                 ]"/>
         </record>
@@ -557,8 +545,6 @@
                     (0,0, {
                         'factor_percent': 100,
                         'repartition_type': 'tax',
-                        'account_id': ref('account_account_745'),
-                        'plus_report_line_ids': [ref('account_tax_report_line_inp_tax_refund_claim')],
                     }),
                 ]"/>
             <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -570,8 +556,6 @@
                     (0,0, {
                         'factor_percent': 100,
                         'repartition_type': 'tax',
-                        'account_id': ref('account_account_745'),
-                        'minus_report_line_ids': [ref('account_tax_report_line_inp_tax_refund_claim')],
                     }),
                 ]"/>
         </record>
@@ -593,7 +577,6 @@
                     (0,0, {
                         'factor_percent': 100,
                         'repartition_type': 'tax',
-                        'account_id': ref('account_account_746'),
                     }),
                 ]"/>
             <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -604,7 +587,6 @@
                     (0,0, {
                         'factor_percent': 100,
                         'repartition_type': 'tax',
-                        'account_id': ref('account_account_746'),
                     }),
                 ]"/>
         </record>
@@ -626,7 +608,6 @@
                     (0,0, {
                         'factor_percent': 100,
                         'repartition_type': 'tax',
-                        'account_id': ref('account_account_747'),
                     }),
                 ]"/>
             <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -637,7 +618,6 @@
                     (0,0, {
                         'factor_percent': 100,
                         'repartition_type': 'tax',
-                        'account_id': ref('account_account_747'),
                     }),
                 ]"/>
         </record>
@@ -660,7 +640,6 @@
                     (0,0, {
                         'factor_percent': 100,
                         'repartition_type': 'tax',
-                        'account_id': ref('account_account_748'),
                     }),
                 ]"/>
             <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -672,7 +651,6 @@
                     (0,0, {
                         'factor_percent': 100,
                         'repartition_type': 'tax',
-                        'account_id': ref('account_account_748'),
                     }),
                 ]"/>
         </record>
diff --git a/addons/l10n_sg/migrations/9.0.2.0/post-migrate_tags_on_taxes.py b/addons/l10n_sg/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
deleted file mode 100644
index fa56fd00dfa..00000000000
--- a/addons/l10n_sg/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)
-- 
cgit v1.2.3