diff --git a/l10n_fr_intrastat_product/__manifest__.py b/l10n_fr_intrastat_product/__manifest__.py
index dd5bf0acc..1dd1d095b 100644
--- a/l10n_fr_intrastat_product/__manifest__.py
+++ b/l10n_fr_intrastat_product/__manifest__.py
@@ -4,7 +4,7 @@
 
 {
     "name": "EMEBI",
-    "version": "17.0.1.0.0",
+    "version": "18.0.1.0.0",
     "category": "Localisation/Report Intrastat",
     "license": "AGPL-3",
     "summary": "EMEBI (ex-DEB) for France",
diff --git a/l10n_fr_intrastat_product/data/intrastat_product_reminder.xml b/l10n_fr_intrastat_product/data/intrastat_product_reminder.xml
index 8603ed14a..d0059e71f 100644
--- a/l10n_fr_intrastat_product/data/intrastat_product_reminder.xml
+++ b/l10n_fr_intrastat_product/data/intrastat_product_reminder.xml
@@ -12,7 +12,6 @@
             <field name="user_id" ref="base.user_root" />
             <field name="interval_number">1</field>
             <field name="interval_type">months</field>
-            <field name="numbercall">-1</field>
             <field
                 name="model_id"
                 ref="intrastat_product.model_intrastat_product_declaration"
diff --git a/l10n_fr_intrastat_product/models/__init__.py b/l10n_fr_intrastat_product/models/__init__.py
index 669b7cb45..dcac5169c 100644
--- a/l10n_fr_intrastat_product/models/__init__.py
+++ b/l10n_fr_intrastat_product/models/__init__.py
@@ -1,5 +1,6 @@
 from . import intrastat_fr_regime
 from . import intrastat_unit
-from . import stock
+from . import stock_warehouse
+from . import stock_location
 from . import res_company
 from . import intrastat_product_declaration
diff --git a/l10n_fr_intrastat_product/models/stock_location.py b/l10n_fr_intrastat_product/models/stock_location.py
new file mode 100644
index 000000000..93a22d043
--- /dev/null
+++ b/l10n_fr_intrastat_product/models/stock_location.py
@@ -0,0 +1,18 @@
+# Copyright 2010-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).
+
+from odoo import models
+
+
+class StockLocation(models.Model):
+    _inherit = "stock.location"
+
+    def _get_fr_department(self):
+        self.ensure_one()
+        warehouse = self.env["stock.warehouse"].search(
+            [("lot_stock_id", "parent_of", self.id)], limit=1
+        )
+        if warehouse:
+            return warehouse._get_fr_department()
+        return None
diff --git a/l10n_fr_intrastat_product/models/stock.py b/l10n_fr_intrastat_product/models/stock_warehouse.py
similarity index 61%
rename from l10n_fr_intrastat_product/models/stock.py
rename to l10n_fr_intrastat_product/models/stock_warehouse.py
index 5502b0f8c..d26dcdb76 100644
--- a/l10n_fr_intrastat_product/models/stock.py
+++ b/l10n_fr_intrastat_product/models/stock_warehouse.py
@@ -14,16 +14,3 @@ def _get_fr_department(self):
         if not self.partner_id:
             raise UserError(_("Missing partner on warehouse '%s'.") % self.display_name)
         return self.partner_id.country_department_id
-
-
-class StockLocation(models.Model):
-    _inherit = "stock.location"
-
-    def _get_fr_department(self):
-        self.ensure_one()
-        warehouse = self.env["stock.warehouse"].search(
-            [("lot_stock_id", "parent_of", self.ids)], limit=1
-        )
-        if warehouse:
-            return warehouse._get_fr_department()
-        return None
diff --git a/l10n_fr_intrastat_product/views/intrastat_fr_regime.xml b/l10n_fr_intrastat_product/views/intrastat_fr_regime.xml
index ab0638ba2..171a9bec6 100644
--- a/l10n_fr_intrastat_product/views/intrastat_fr_regime.xml
+++ b/l10n_fr_intrastat_product/views/intrastat_fr_regime.xml
@@ -40,8 +40,8 @@
     <record id="intrastat_fr_regime_tree" model="ir.ui.view">
         <field name="model">intrastat.fr.regime</field>
         <field name="arch" type="xml">
-            <tree>
-                <field name="code" />
+            <list>
+                <field name="code" decoration-bf="1" />
                 <field name="name" />
                 <field name="is_fiscal_only" optional="show" />
                 <field name="fiscal_value_multiplier" optional="show" />
@@ -52,7 +52,7 @@
                     decoration-warning="declaration_type == 'dispatches'"
                     widget="badge"
                 />
-            </tree>
+            </list>
         </field>
     </record>
 
@@ -96,7 +96,7 @@
     <record id="intrastat_fr_regime_action" model="ir.actions.act_window">
         <field name="name">Regime Codes</field>
         <field name="res_model">intrastat.fr.regime</field>
-        <field name="view_mode">tree,form</field>
+        <field name="view_mode">list,form</field>
     </record>
 
     <menuitem
diff --git a/l10n_fr_intrastat_product/views/intrastat_product_declaration.xml b/l10n_fr_intrastat_product/views/intrastat_product_declaration.xml
index 686af87e6..ca956c230 100644
--- a/l10n_fr_intrastat_product/views/intrastat_product_declaration.xml
+++ b/l10n_fr_intrastat_product/views/intrastat_product_declaration.xml
@@ -91,7 +91,7 @@
     >
         <field name="name">EMEBI</field>
         <field name="res_model">intrastat.product.declaration</field>
-        <field name="view_mode">tree,form,graph,pivot</field>
+        <field name="view_mode">list,form,graph,pivot</field>
     </record>
     <menuitem
         id="l10n_fr_intrastat_product_declaration_menu"