diff --git a/l10n_fr_intrastat_product/__manifest__.py b/l10n_fr_intrastat_product/__manifest__.py
index 9b3b65138..dd5bf0acc 100644
--- a/l10n_fr_intrastat_product/__manifest__.py
+++ b/l10n_fr_intrastat_product/__manifest__.py
@@ -4,7 +4,7 @@
 
 {
     "name": "EMEBI",
-    "version": "16.0.1.3.0",
+    "version": "17.0.1.0.0",
     "category": "Localisation/Report Intrastat",
     "license": "AGPL-3",
     "summary": "EMEBI (ex-DEB) for France",
@@ -18,7 +18,6 @@
     ],
     "data": [
         "security/ir.model.access.csv",
-        "data/account_fiscal_position_template.xml",
         "data/intrastat_fr_regime.xml",
         "views/intrastat_product_declaration.xml",
         "views/intrastat_fr_regime.xml",
diff --git a/l10n_fr_intrastat_product/data/account_fiscal_position_template.xml b/l10n_fr_intrastat_product/data/account_fiscal_position_template.xml
deleted file mode 100644
index 2f31e0896..000000000
--- a/l10n_fr_intrastat_product/data/account_fiscal_position_template.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!--
-  Copyright 2020-2023 Akretion France
-  @author: Alexis de Lattre <alexis.delattre@akretion.com>
-  License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
--->
-<odoo>
-    <record
-        id="l10n_fr.fiscal_position_template_intraeub2b"
-        model="account.fiscal.position.template"
-    >
-        <field name="intrastat">b2b</field>
-    </record>
-    <record
-        id="l10n_fr.fiscal_position_template_intraeub2c"
-        model="account.fiscal.position.template"
-    >
-        <field name="intrastat">b2c</field>
-    </record>
-</odoo>
diff --git a/l10n_fr_intrastat_product/migrations/14.0.1.0.0/pre-migration.py b/l10n_fr_intrastat_product/migrations/14.0.1.0.0/pre-migration.py
deleted file mode 100644
index cc47d4ffe..000000000
--- a/l10n_fr_intrastat_product/migrations/14.0.1.0.0/pre-migration.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2022 Akretion France (http://www.akretion.com/)
-# @author: Alexis de Lattre <alexis.delattre@akretion.com>
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-
-def migrate(cr, version):
-    if not version:
-        return
-
-    cr.execute(
-        'ALTER TABLE "l10n_fr_intrastat_product_declaration" RENAME "type" '
-        'TO "declaration_type"'
-    )
diff --git a/l10n_fr_intrastat_product/models/intrastat_fr_regime.py b/l10n_fr_intrastat_product/models/intrastat_fr_regime.py
index 8fca1dd76..799a5d6b7 100644
--- a/l10n_fr_intrastat_product/models/intrastat_fr_regime.py
+++ b/l10n_fr_intrastat_product/models/intrastat_fr_regime.py
@@ -36,9 +36,6 @@ class IntrastatFrRegime(models.Model):
     ]
 
     @api.depends("code", "name")
-    def name_get(self):
-        res = []
+    def _compute_display_name(self):
         for rec in self:
-            name = "%s. %s" % (rec.code, rec.name)
-            res.append((rec.id, name))
-        return res
+            rec.display_name = f"{rec.code}. {rec.name}"
diff --git a/l10n_fr_intrastat_product/post_install.py b/l10n_fr_intrastat_product/post_install.py
index c71f304b9..c412ab9a7 100644
--- a/l10n_fr_intrastat_product/post_install.py
+++ b/l10n_fr_intrastat_product/post_install.py
@@ -4,13 +4,10 @@
 
 import logging
 
-from odoo import SUPERUSER_ID, api
-
 logger = logging.getLogger(__name__)
 
 
-def set_fr_company_intrastat(cr, registry):
-    env = api.Environment(cr, SUPERUSER_ID, {})
+def set_fr_company_intrastat(env):
     imdo = env["ir.model.data"]
     afpo = env["account.fiscal.position"]
     fr_id = env.ref("base.fr").id
diff --git a/l10n_fr_intrastat_product/views/intrastat_fr_regime.xml b/l10n_fr_intrastat_product/views/intrastat_fr_regime.xml
index ebbeb526d..d11305c57 100644
--- a/l10n_fr_intrastat_product/views/intrastat_fr_regime.xml
+++ b/l10n_fr_intrastat_product/views/intrastat_fr_regime.xml
@@ -15,7 +15,7 @@
                         name="web_ribbon"
                         title="Archived"
                         bg_color="bg-danger"
-                        attrs="{'invisible': [('active', '=', True)]}"
+                        invisible="active"
                     />
             <div class="oe_title">
                 <label for="name" />
diff --git a/l10n_fr_intrastat_product/views/intrastat_product_declaration.xml b/l10n_fr_intrastat_product/views/intrastat_product_declaration.xml
index 97c83b2af..dcf05aadf 100644
--- a/l10n_fr_intrastat_product/views/intrastat_product_declaration.xml
+++ b/l10n_fr_intrastat_product/views/intrastat_product_declaration.xml
@@ -15,13 +15,14 @@
             <field name="transaction_id" position="before">
                 <field
                     name="fr_regime_id"
-                    attrs="{'invisible': [('company_country_code', '!=', 'FR')], 'required': [('company_country_code', '=', 'FR')]}"
+                    invisible="company_country_code != 'FR'"
+                    required="company_country_code == 'FR'"
                 />
             </field>
             <field name="vat" position="attributes">
                     <attribute
-                    name="attrs"
-                >{'invisible': [('declaration_type', '=', 'arrivals'), ('company_country_code', '=', 'FR')]}</attribute>
+                    name="invisible"
+                >declaration_type == 'arrivals' and company_country_code == 'FR'</attribute>
             </field>
         </field>
     </record>
@@ -35,13 +36,13 @@
             <field name="transaction_code" position="before">
                 <field
                     name="fr_regime_code"
-                    attrs="{'column_invisible': [('parent.company_country_code', '!=', 'FR')]}"
+                    column_invisible="parent.company_country_code != 'FR'"
                 />
             </field>
             <field name="vat" position="attributes">
                     <attribute
-                    name="attrs"
-                >{'column_invisible': [('parent.declaration_type', '=', 'arrivals'), ('parent.company_country_code', '=', 'FR')]}</attribute>
+                    name="column_invisible"
+                >parent.declaration_type == 'arrivals' and parent.company_country_code == 'FR'</attribute>
             </field>
         </field>
 </record>
@@ -53,15 +54,12 @@
         />
         <field name="arch" type="xml">
             <field name="transaction_id" position="before">
-                <field
-                    name="fr_regime_id"
-                    attrs="{'invisible': [('company_country_code', '!=', 'FR')]}"
-                />
+                <field name="fr_regime_id" invisible="company_country_code != 'FR'" />
             </field>
             <field name="vat" position="attributes">
                 <attribute
-                    name="attrs"
-                >{'invisible': [('declaration_type', '=', 'arrivals'), ('company_country_code', '=', 'FR')]}</attribute>
+                    name="invisible"
+                >declaration_type == 'arrivals' and company_country_code == 'FR'</attribute>
             </field>
         </field>
     </record>
@@ -77,13 +75,13 @@
             <field name="transaction_code" position="before">
                 <field
                     name="fr_regime_code"
-                    attrs="{'column_invisible': [('parent.company_country_code', '!=', 'FR')]}"
+                    column_invisible="parent.company_country_code != 'FR'"
                 />
             </field>
             <field name="vat" position="attributes">
                 <attribute
-                    name="attrs"
-                >{'column_invisible': [('parent.declaration_type', '=', 'arrivals'), ('parent.company_country_code', '=', 'FR')]}</attribute>
+                    name="column_invisible"
+                >parent.declaration_type == 'arrivals' and parent.company_country_code == 'FR'</attribute>
             </field>
         </field>
     </record>
diff --git a/l10n_fr_intrastat_product/views/res_config_settings.xml b/l10n_fr_intrastat_product/views/res_config_settings.xml
index 1bb4afa10..646a97c20 100644
--- a/l10n_fr_intrastat_product/views/res_config_settings.xml
+++ b/l10n_fr_intrastat_product/views/res_config_settings.xml
@@ -7,15 +7,22 @@
         <field name="model">res.config.settings</field>
         <field name="inherit_id" ref="intrastat_product.view_res_config_settings" />
         <field name="arch" type="xml">
-            <div id="intrastat-settings" position="inside">
-                <div class="o_setting_left_pane" />
-                <div class="o_setting_right_pane">
-                    <div class="row">
-                        <label for="fr_intrastat_accreditation" class="col-md-5" />
-                        <field name="fr_intrastat_accreditation" />
+            <xpath expr="//setting[@id='intrastat-accessory_costs']" position="after">
+                <setting
+                    id="intrastat-fr_intrastat_accreditation"
+                    invisible="country_code != 'FR'"
+                >
+                    <div class="content-group">
+                        <div class="row mt16">
+                            <label
+                                for="fr_intrastat_accreditation"
+                                class="col-lg-5 o_light_label"
+                            />
+                            <field name="fr_intrastat_accreditation" />
+                        </div>
                     </div>
-                </div>
-            </div>
+                </setting>
+            </xpath>
         </field>
     </record>
 </odoo>