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

4 files changed, 16 insertions, 32 deletions

diff --git a/addons/l10n_fr/data/account_tax_data.xml b/addons/l10n_fr/data/account_tax_data.xml
index a32488d9c33..f8938c2f145 100644
--- a/addons/l10n_fr/data/account_tax_data.xml
+++ b/addons/l10n_fr/data/account_tax_data.xml
@@ -985,13 +985,13 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
-                'minus_report_line_ids': [ref('l10n_fr.tax_report_base_coll_5_5')],
+                'plus_report_line_ids': [ref('l10n_fr.tax_report_base_acq_5_5')],
             }),
 
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'minus_report_line_ids': [ref('l10n_fr.tax_report_tva_coll_5_5')],
+                'plus_report_line_ids': [ref('l10n_fr.tax_report_tva_acq_5_5')],
                 'account_id': ref('pcg_44566'),
             }),
         ]"/>
@@ -999,13 +999,13 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
-                'plus_report_line_ids': [ref('l10n_fr.tax_report_base_coll_5_5')],
+                'minus_report_line_ids': [ref('l10n_fr.tax_report_base_acq_5_5')],
             }),
 
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'plus_report_line_ids': [ref('l10n_fr.tax_report_tva_coll_5_5')],
+                'minus_report_line_ids': [ref('l10n_fr.tax_report_tva_acq_5_5')],
                 'account_id': ref('pcg_44566'),
             }),
         ]"/>
@@ -1270,7 +1270,7 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'minus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_20')],
+                'plus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_20')],
                 'account_id': ref('pcg_445201'),
             }),
         ]"/>
@@ -1284,7 +1284,7 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'plus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_20')],
+                'minus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_20')],
                 'account_id': ref('pcg_445201'),
             }),
         ]"/>
@@ -1309,7 +1309,7 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'minus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_8_5')],
+                'plus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_8_5')],
                 'account_id': ref('pcg_445203'),
             }),
         ]"/>
@@ -1323,7 +1323,7 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'plus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_8_5')],
+                'minus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_8_5')],
                 'account_id': ref('pcg_445203'),
             }),
         ]"/>
@@ -1348,7 +1348,7 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'minus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_10')],
+                'plus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_10')],
                 'account_id': ref('pcg_445202'),
             }),
         ]"/>
@@ -1362,7 +1362,7 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'plus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_10')],
+                'minus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_10')],
                 'account_id': ref('pcg_445202'),
             }),
         ]"/>
@@ -1387,7 +1387,7 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'minus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_5_5')],
+                'plus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_5_5')],
                 'account_id': ref('pcg_445203'),
             }),
         ]"/>
@@ -1401,7 +1401,7 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'plus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_5_5')],
+                'minus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_5_5')],
                 'account_id': ref('pcg_445203'),
             }),
         ]"/>
@@ -1426,7 +1426,7 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'minus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_2_1')],
+                'plus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_2_1')],
                 'account_id': ref('pcg_445203'),
             }),
         ]"/>
@@ -1440,7 +1440,7 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'plus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_2_1')],
+                'minus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_2_1')],
                 'account_id': ref('pcg_445203'),
             }),
         ]"/>
@@ -1734,7 +1734,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_445201'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -1747,7 +1746,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_445201'),
             }),
         ]"/>
     </record>
@@ -1771,7 +1769,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_445663'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -1784,7 +1781,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_445663'),
             }),
         ]"/>
     </record>
diff --git a/addons/l10n_fr/data/tax_report_data.xml b/addons/l10n_fr/data/tax_report_data.xml
index 71363f0b6cb..bf10b7c3a2f 100644
--- a/addons/l10n_fr/data/tax_report_data.xml
+++ b/addons/l10n_fr/data/tax_report_data.xml
@@ -569,8 +569,8 @@
         </record>
 
         <record id="tax_report_base_ded_intra_20" model="account.tax.report.line">
-            <field name="name">Base H.T. 20%</field>
-            <field name="tag_name">Base déductible intracom. 20%</field>
+            <field name="name">Base H.T. 20.0%</field>
+            <field name="tag_name">Base déductible intracom. 20.0%</field>
             <field name="country_id" ref="base.fr"/>
             <field name="parent_id" ref="tax_report_base_ded_intra"/>
             <field name="sequence">1</field>
diff --git a/addons/l10n_fr/migrations/2.0/post-migrate_tags_on_taxes.py b/addons/l10n_fr/migrations/2.0/post-migrate_tags_on_taxes.py
deleted file mode 100644
index 44367687c8f..00000000000
--- a/addons/l10n_fr/migrations/2.0/post-migrate_tags_on_taxes.py
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- coding: utf-8 -*-
-from odoo.addons.account.models.chart_template import migrate_tags_on_taxes
-
-def migrate(cr, version):
-    migrate_tags_on_taxes(cr, None)
diff --git a/addons/l10n_fr/migrations/9.0.1.1/post-migrate_tags_on_taxes.py b/addons/l10n_fr/migrations/9.0.1.1/post-migrate_tags_on_taxes.py
deleted file mode 100644
index 6f933404f1d..00000000000
--- a/addons/l10n_fr/migrations/9.0.1.1/post-migrate_tags_on_taxes.py
+++ /dev/null
@@ -1,7 +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)
-