[MERGE] forward port branch saas-12.4 up to 98a55917a60

2 files changed, 30 insertions, 86 deletions

diff --git a/addons/l10n_nl/data/account_tax_template.xml b/addons/l10n_nl/data/account_tax_template.xml
index e56f1914288..db153988ede 100644
--- a/addons/l10n_nl/data/account_tax_template.xml
+++ b/addons/l10n_nl/data/account_tax_template.xml
@@ -21,7 +21,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('vat_payable_0'),
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -33,7 +32,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('vat_payable_0'),
                 }),
             ]"/>
         </record>
@@ -200,7 +198,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('vat_payable_0_d'),
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -212,7 +209,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('vat_payable_0_d'),
                 }),
             ]"/>
         </record>
@@ -759,7 +755,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('vat_payable_v'),
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -771,7 +766,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('vat_payable_v'),
                 }),
             ]"/>
         </record>
@@ -800,7 +794,7 @@
                     'factor_percent': -100,
                     'repartition_type': 'tax',
                     'account_id': ref('vat_payable_v'),
-                    'minus_report_line_ids': [ref('tax_report_rub_btw_5b')],
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_5b')],
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -819,7 +813,7 @@
                     'factor_percent': -100,
                     'repartition_type': 'tax',
                     'account_id': ref('vat_payable_v'),
-                    'plus_report_line_ids': [ref('tax_report_rub_btw_5b')],
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_5b')],
                 }),
             ]"/>
         </record>
@@ -844,7 +838,7 @@
                     'factor_percent': -100,
                     'repartition_type': 'tax',
                     'account_id': ref('vat_payable_l_eu'),
-                    'minus_report_line_ids': [ref('tax_report_rub_btw_4b')],
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_4b')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
@@ -863,7 +857,7 @@
                     'factor_percent': -100,
                     'repartition_type': 'tax',
                     'account_id': ref('vat_payable_l_eu'),
-                    'plus_report_line_ids': [ref('tax_report_rub_btw_4b')],
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_4b')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
@@ -892,7 +886,7 @@
                     'factor_percent': -100,
                     'repartition_type': 'tax',
                     'account_id': ref('vat_payable_l_eu'),
-                    'minus_report_line_ids': [ref('tax_report_rub_btw_4b')],
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_4b')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
@@ -911,7 +905,7 @@
                     'factor_percent': -100,
                     'repartition_type': 'tax',
                     'account_id': ref('vat_payable_l_eu'),
-                    'plus_report_line_ids': [ref('tax_report_rub_btw_4b')],
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_4b')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
@@ -940,7 +934,7 @@
                     'factor_percent': -100,
                     'repartition_type': 'tax',
                     'account_id': ref('vat_payable_h_eu'),
-                    'minus_report_line_ids': [ref('tax_report_rub_btw_4b')],
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_4b')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
@@ -959,7 +953,7 @@
                     'factor_percent': -100,
                     'repartition_type': 'tax',
                     'account_id': ref('vat_payable_h_eu'),
-                    'plus_report_line_ids': [ref('tax_report_rub_btw_4b')],
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_4b')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
@@ -987,14 +981,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('vat_payable_h_eu'),
-                    'minus_report_line_ids': [ref('tax_report_rub_btw_4b')],
-                }),
-                (0,0, {
-                    'factor_percent': 100,
-                    'repartition_type': 'tax',
-                    'account_id': ref('vat_refund_h_eu'),
-                    'plus_report_line_ids': [ref('tax_report_rub_btw_5b')],
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -1006,14 +992,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('vat_payable_h_eu'),
-                    'plus_report_line_ids': [ref('tax_report_rub_btw_4b')],
-                }),
-                (0,0, {
-                    'factor_percent': 100,
-                    'repartition_type': 'tax',
-                    'account_id': ref('vat_refund_h_eu'),
-                    'minus_report_line_ids': [ref('tax_report_rub_btw_5b')],
                 }),
             ]"/>
         </record>
@@ -1036,7 +1014,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('vat_payable_0_eu'),
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -1048,7 +1025,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('vat_payable_0_eu'),
                 }),
             ]"/>
         </record>
@@ -1070,7 +1046,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('vat_payable_0_eu'),
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -1082,7 +1057,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('vat_payable_0_eu'),
                 }),
             ]"/>
         </record>
@@ -1104,7 +1078,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('vat_payable_0_eu'),
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -1116,7 +1089,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('vat_payable_0_eu'),
                 }),
             ]"/>
         </record>
@@ -1140,7 +1112,7 @@
                     'factor_percent': -100,
                     'repartition_type': 'tax',
                     'account_id': ref('vat_payable_l_d_eu'),
-                    'minus_report_line_ids': [ref('tax_report_rub_btw_4b')],
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_4b')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
@@ -1159,7 +1131,7 @@
                     'factor_percent': -100,
                     'repartition_type': 'tax',
                     'account_id': ref('vat_payable_l_d_eu'),
-                    'plus_report_line_ids': [ref('tax_report_rub_btw_4b')],
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_4b')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
@@ -1188,7 +1160,7 @@
                     'factor_percent': -100,
                     'repartition_type': 'tax',
                     'account_id': ref('vat_payable_l_d_eu'),
-                    'minus_report_line_ids': [ref('tax_report_rub_btw_4b')],
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_4b')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
@@ -1207,7 +1179,7 @@
                     'factor_percent': -100,
                     'repartition_type': 'tax',
                     'account_id': ref('vat_payable_l_d_eu'),
-                    'plus_report_line_ids': [ref('tax_report_rub_btw_4b')],
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_4b')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
@@ -1236,7 +1208,7 @@
                     'factor_percent': -100,
                     'repartition_type': 'tax',
                     'account_id': ref('vat_payable_h_d_eu'),
-                    'minus_report_line_ids': [ref('tax_report_rub_btw_4b')],
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_4b')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
@@ -1255,7 +1227,7 @@
                     'factor_percent': -100,
                     'repartition_type': 'tax',
                     'account_id': ref('vat_payable_h_d_eu'),
-                    'plus_report_line_ids': [ref('tax_report_rub_btw_4b')],
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_4b')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
@@ -1283,14 +1255,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('vat_payable_h_d_eu'),
-                    'minus_report_line_ids': [ref('tax_report_rub_btw_4b')],
-                }),
-                (0,0, {
-                    'factor_percent': 100,
-                    'repartition_type': 'tax',
-                    'account_id': ref('vat_refund_h_d_eu'),
-                    'plus_report_line_ids': [ref('tax_report_rub_btw_5b')],
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -1302,14 +1266,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('vat_payable_h_d_eu'),
-                    'plus_report_line_ids': [ref('tax_report_rub_btw_4b')],
-                }),
-                (0,0, {
-                    'factor_percent': 100,
-                    'repartition_type': 'tax',
-                    'account_id': ref('vat_refund_h_d_eu'),
-                    'minus_report_line_ids': [ref('tax_report_rub_btw_5b')],
                 }),
             ]"/>
         </record>
@@ -1335,7 +1291,7 @@
                     'factor_percent': -100,
                     'repartition_type': 'tax',
                     'account_id': ref('vat_payable_l_non_eu'),
-                    'minus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_4a')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
@@ -1354,7 +1310,7 @@
                     'factor_percent': -100,
                     'repartition_type': 'tax',
                     'account_id': ref('vat_payable_l_non_eu'),
-                    'plus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_4a')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
@@ -1383,7 +1339,7 @@
                     'factor_percent': -100,
                     'repartition_type': 'tax',
                     'account_id': ref('vat_payable_l_non_eu'),
-                    'minus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_4a')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
@@ -1402,7 +1358,7 @@
                     'factor_percent': -100,
                     'repartition_type': 'tax',
                     'account_id': ref('vat_payable_l_non_eu'),
-                    'plus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_4a')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
@@ -1431,7 +1387,7 @@
                     'factor_percent': -100,
                     'repartition_type': 'tax',
                     'account_id': ref('vat_payable_h_non_eu'),
-                    'minus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_4a')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
@@ -1450,7 +1406,7 @@
                     'factor_percent': -100,
                     'repartition_type': 'tax',
                     'account_id': ref('vat_payable_h_non_eu'),
-                    'plus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_4a')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
@@ -1479,7 +1435,7 @@
                     'factor_percent': -100,
                     'repartition_type': 'tax',
                     'account_id': ref('vat_payable_h_non_eu'),
-                    'minus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_4a')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
@@ -1498,7 +1454,7 @@
                     'factor_percent': -100,
                     'repartition_type': 'tax',
                     'account_id': ref('vat_payable_h_non_eu'),
-                    'plus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_4a')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
@@ -1527,7 +1483,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('vat_payable_0_non_eu'),
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -1539,7 +1494,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('vat_payable_0_non_eu'),
                 }),
             ]"/>
         </record>
@@ -1561,7 +1515,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('vat_payable_0_non_eu'),
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -1573,7 +1526,6 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('vat_payable_0_non_eu'),
                 }),
             ]"/>
         </record>
@@ -1597,7 +1549,7 @@
                     'factor_percent': -100,
                     'repartition_type': 'tax',
                     'account_id': ref('vat_payable_l_d_non_eu'),
-                    'minus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_4a')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
@@ -1616,7 +1568,7 @@
                     'factor_percent': -100,
                     'repartition_type': 'tax',
                     'account_id': ref('vat_payable_l_d_non_eu'),
-                    'plus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_4a')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
@@ -1645,7 +1597,7 @@
                     'factor_percent': -100,
                     'repartition_type': 'tax',
                     'account_id': ref('vat_payable_l_d_non_eu'),
-                    'minus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_4a')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
@@ -1664,7 +1616,7 @@
                     'factor_percent': -100,
                     'repartition_type': 'tax',
                     'account_id': ref('vat_payable_l_d_non_eu'),
-                    'plus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_4a')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
@@ -1693,7 +1645,7 @@
                     'factor_percent': -100,
                     'repartition_type': 'tax',
                     'account_id': ref('vat_payable_h_d_non_eu'),
-                    'minus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_4a')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
@@ -1712,7 +1664,7 @@
                     'factor_percent': -100,
                     'repartition_type': 'tax',
                     'account_id': ref('vat_payable_h_d_non_eu'),
-                    'plus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_4a')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
@@ -1741,7 +1693,7 @@
                     'factor_percent': -100,
                     'repartition_type': 'tax',
                     'account_id': ref('vat_payable_h_d_non_eu'),
-                    'minus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+                    'plus_report_line_ids': [ref('tax_report_rub_btw_4a')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
@@ -1760,7 +1712,7 @@
                     'factor_percent': -100,
                     'repartition_type': 'tax',
                     'account_id': ref('vat_payable_h_d_non_eu'),
-                    'plus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+                    'minus_report_line_ids': [ref('tax_report_rub_btw_4a')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
diff --git a/addons/l10n_nl/migrations/9.0.2.0/post-migrate_tags_on_taxes.py b/addons/l10n_nl/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
deleted file mode 100644
index 404cdd185d4..00000000000
--- a/addons/l10n_nl/migrations/9.0.2.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)