diff --git a/.oca/oca-port/blacklist/server_environment.json b/.oca/oca-port/blacklist/server_environment.json
new file mode 100644
index 000000000..dd9fecca9
--- /dev/null
+++ b/.oca/oca-port/blacklist/server_environment.json
@@ -0,0 +1,6 @@
+{
+  "pull_requests": {
+    "OCA/server-env#176": "(auto) Nothing to port from PR #176",
+    "OCA/server-env#190": "(auto) Nothing to port from PR #190"
+  }
+}
diff --git a/README.md b/README.md
index a0f237bb9..f9c72889c 100644
--- a/README.md
+++ b/README.md
@@ -24,8 +24,8 @@ addon | version | maintainers | summary
 [data_encryption](data_encryption/) | 18.0.1.0.0 | <a href='https://github.com/florian-dacosta'><img src='https://github.com/florian-dacosta.png' width='32' height='32' style='border-radius:50%;' alt='florian-dacosta'/></a> | Store accounts and credentials encrypted by environment
 [mail_environment](mail_environment/) | 18.0.1.0.1 |  | Configure mail servers with server_environment_files
 [mail_environment_google_gmail](mail_environment_google_gmail/) | 18.0.1.0.0 | <a href='https://github.com/ivantodorovich'><img src='https://github.com/ivantodorovich.png' width='32' height='32' style='border-radius:50%;' alt='ivantodorovich'/></a> | Configure Gmail mail servers with server_environment_files
-[server_environment](server_environment/) | 18.0.1.0.4 |  | move some configurations out of the database
-[server_environment_data_encryption](server_environment_data_encryption/) | 18.0.1.0.0 | <a href='https://github.com/florian-dacosta'><img src='https://github.com/florian-dacosta.png' width='32' height='32' style='border-radius:50%;' alt='florian-dacosta'/></a> | Server Environment Data Encryption
+[server_environment](server_environment/) | 18.0.1.0.6 |  | move some configurations out of the database
+[server_environment_data_encryption](server_environment_data_encryption/) | 18.0.1.0.1 | <a href='https://github.com/florian-dacosta'><img src='https://github.com/florian-dacosta.png' width='32' height='32' style='border-radius:50%;' alt='florian-dacosta'/></a> | Server Environment Data Encryption
 [server_environment_ir_config_parameter](server_environment_ir_config_parameter/) | 18.0.1.0.0 |  | Override System Parameters from server environment file
 
 [//]: # (end addons)
diff --git a/server_environment/README.rst b/server_environment/README.rst
index abcfbcfef..8cd88cc74 100644
--- a/server_environment/README.rst
+++ b/server_environment/README.rst
@@ -11,7 +11,7 @@ server configuration environment files
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:39cd61c3a9621d0b7ee7a346adf45f4a2c90e80e6a61e18f182386c6fc90fd19
+   !! source digest: sha256:4f9939b8b6cbb66e583bc8d6bde01be8551db8309fbb6ce18dc7ce65da46a5ec
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png
@@ -40,7 +40,7 @@ are stored in the ``server_environment_files`` companion module.
 
 The ``server_environment_files`` module is optional, the values can be
 set using an environment variable with a fallback on default values in
-the database.
+the database. you will be able to overwrite some odoo options.
 
 The configuration read from the files are visible under the
 Configuration menu. If you are not in the 'dev' environment you will not
@@ -106,6 +106,13 @@ example:
   can override or extend default values;
 - you can override or extend values in the main configuration file of
   your instance;
+- In some platforms (like odoo.sh where production config file is copied
+  to staging) it can be useful to overwrite options written in the
+  ``[options]`` section. You must allow the override by adding
+  ``server_environment_allow_overwrite_options_section = True`` to the
+  former ``odoo.cfg`` config file or through the environment variable:
+  ``export SERVER_ENVIRONMENT_ALLOW_OVERWRITE_OPTIONS_SECTION=True`` (if
+  both are set config file takes precedence).
 
 Environment variable
 --------------------
diff --git a/server_environment/__manifest__.py b/server_environment/__manifest__.py
index d7b058184..f4fff19db 100644
--- a/server_environment/__manifest__.py
+++ b/server_environment/__manifest__.py
@@ -4,7 +4,7 @@
 
 {
     "name": "server configuration environment files",
-    "version": "18.0.1.0.4",
+    "version": "18.0.1.0.6",
     "depends": ["base", "base_sparse_field"],
     "author": "Camptocamp,Odoo Community Association (OCA)",
     "summary": "move some configurations out of the database",
diff --git a/server_environment/i18n/am.po b/server_environment/i18n/am.po
index 5aab3fad8..9a7a41eab 100644
--- a/server_environment/i18n/am.po
+++ b/server_environment/i18n/am.po
@@ -405,6 +405,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/ar.po b/server_environment/i18n/ar.po
index 8f73bb9f1..c3ce4a5af 100644
--- a/server_environment/i18n/ar.po
+++ b/server_environment/i18n/ar.po
@@ -406,6 +406,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/bg.po b/server_environment/i18n/bg.po
index d40367a08..4081f467d 100644
--- a/server_environment/i18n/bg.po
+++ b/server_environment/i18n/bg.po
@@ -405,6 +405,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/bs.po b/server_environment/i18n/bs.po
index 78f1b76ba..5af2b6329 100644
--- a/server_environment/i18n/bs.po
+++ b/server_environment/i18n/bs.po
@@ -406,6 +406,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/ca.po b/server_environment/i18n/ca.po
index 5760a6e05..9b9351fde 100644
--- a/server_environment/i18n/ca.po
+++ b/server_environment/i18n/ca.po
@@ -405,6 +405,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/cs.po b/server_environment/i18n/cs.po
index e321c5a3d..d17e4a1c1 100644
--- a/server_environment/i18n/cs.po
+++ b/server_environment/i18n/cs.po
@@ -405,6 +405,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/da.po b/server_environment/i18n/da.po
index 2a9174a5a..d17ad2c7b 100644
--- a/server_environment/i18n/da.po
+++ b/server_environment/i18n/da.po
@@ -405,6 +405,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/de.po b/server_environment/i18n/de.po
index 98a206422..204220584 100644
--- a/server_environment/i18n/de.po
+++ b/server_environment/i18n/de.po
@@ -408,6 +408,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/el_GR.po b/server_environment/i18n/el_GR.po
index 74d43833c..2641fa15d 100644
--- a/server_environment/i18n/el_GR.po
+++ b/server_environment/i18n/el_GR.po
@@ -405,6 +405,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/en_GB.po b/server_environment/i18n/en_GB.po
index b6a912091..4870a18f0 100644
--- a/server_environment/i18n/en_GB.po
+++ b/server_environment/i18n/en_GB.po
@@ -11,8 +11,8 @@ msgstr ""
 "POT-Creation-Date: 2017-05-01 10:39+0000\n"
 "PO-Revision-Date: 2017-05-01 10:39+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: English (United Kingdom) (https://www.transifex.com/oca/"
-"teams/23907/en_GB/)\n"
+"Language-Team: English (United Kingdom) (https://www.transifex.com/oca/teams/"
+"23907/en_GB/)\n"
 "Language: en_GB\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -406,6 +406,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/es.po b/server_environment/i18n/es.po
index 301914f73..f80473164 100644
--- a/server_environment/i18n/es.po
+++ b/server_environment/i18n/es.po
@@ -408,6 +408,11 @@ msgstr "odoo | server_wide_modules"
 msgid "odoo | shell_interface"
 msgstr "odoo | shell_interface"
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/es_AR.po b/server_environment/i18n/es_AR.po
index 0669e294c..45dd19ceb 100644
--- a/server_environment/i18n/es_AR.po
+++ b/server_environment/i18n/es_AR.po
@@ -11,8 +11,8 @@ msgstr ""
 "POT-Creation-Date: 2017-05-01 10:39+0000\n"
 "PO-Revision-Date: 2017-05-01 10:39+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Spanish (Argentina) (https://www.transifex.com/oca/"
-"teams/23907/es_AR/)\n"
+"Language-Team: Spanish (Argentina) (https://www.transifex.com/oca/teams/"
+"23907/es_AR/)\n"
 "Language: es_AR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -406,6 +406,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/es_CL.po b/server_environment/i18n/es_CL.po
index d8f530d42..f9a86555a 100644
--- a/server_environment/i18n/es_CL.po
+++ b/server_environment/i18n/es_CL.po
@@ -406,6 +406,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/es_CO.po b/server_environment/i18n/es_CO.po
index 1d06011a8..d2122ad59 100644
--- a/server_environment/i18n/es_CO.po
+++ b/server_environment/i18n/es_CO.po
@@ -406,6 +406,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/es_CR.po b/server_environment/i18n/es_CR.po
index 8cb6601f5..2eb673efa 100644
--- a/server_environment/i18n/es_CR.po
+++ b/server_environment/i18n/es_CR.po
@@ -11,8 +11,8 @@ msgstr ""
 "POT-Creation-Date: 2017-05-01 10:39+0000\n"
 "PO-Revision-Date: 2017-05-01 10:39+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Spanish (Costa Rica) (https://www.transifex.com/oca/"
-"teams/23907/es_CR/)\n"
+"Language-Team: Spanish (Costa Rica) (https://www.transifex.com/oca/teams/"
+"23907/es_CR/)\n"
 "Language: es_CR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -406,6 +406,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/es_DO.po b/server_environment/i18n/es_DO.po
index beb914b91..31b81c567 100644
--- a/server_environment/i18n/es_DO.po
+++ b/server_environment/i18n/es_DO.po
@@ -406,6 +406,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/es_EC.po b/server_environment/i18n/es_EC.po
index a680ac0a8..23254061c 100644
--- a/server_environment/i18n/es_EC.po
+++ b/server_environment/i18n/es_EC.po
@@ -406,6 +406,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/es_ES.po b/server_environment/i18n/es_ES.po
index e65a20170..afaffe41a 100644
--- a/server_environment/i18n/es_ES.po
+++ b/server_environment/i18n/es_ES.po
@@ -406,6 +406,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/es_MX.po b/server_environment/i18n/es_MX.po
index 17e80c2ee..fdeecbb22 100644
--- a/server_environment/i18n/es_MX.po
+++ b/server_environment/i18n/es_MX.po
@@ -406,6 +406,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/es_PE.po b/server_environment/i18n/es_PE.po
index 7d5e6edf4..e89c96d99 100644
--- a/server_environment/i18n/es_PE.po
+++ b/server_environment/i18n/es_PE.po
@@ -406,6 +406,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/es_PY.po b/server_environment/i18n/es_PY.po
index 6eef8bd0f..47b33be22 100644
--- a/server_environment/i18n/es_PY.po
+++ b/server_environment/i18n/es_PY.po
@@ -406,6 +406,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/es_VE.po b/server_environment/i18n/es_VE.po
index da5fa54b0..16395439c 100644
--- a/server_environment/i18n/es_VE.po
+++ b/server_environment/i18n/es_VE.po
@@ -11,8 +11,8 @@ msgstr ""
 "POT-Creation-Date: 2017-05-01 10:39+0000\n"
 "PO-Revision-Date: 2017-05-01 10:39+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Spanish (Venezuela) (https://www.transifex.com/oca/"
-"teams/23907/es_VE/)\n"
+"Language-Team: Spanish (Venezuela) (https://www.transifex.com/oca/teams/"
+"23907/es_VE/)\n"
 "Language: es_VE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -406,6 +406,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/et.po b/server_environment/i18n/et.po
index d82ff9e0f..63dbe6fe4 100644
--- a/server_environment/i18n/et.po
+++ b/server_environment/i18n/et.po
@@ -405,6 +405,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/eu.po b/server_environment/i18n/eu.po
index 304308d08..e966ce850 100644
--- a/server_environment/i18n/eu.po
+++ b/server_environment/i18n/eu.po
@@ -405,6 +405,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/fa.po b/server_environment/i18n/fa.po
index 3cf5b5ba3..0a8b173dc 100644
--- a/server_environment/i18n/fa.po
+++ b/server_environment/i18n/fa.po
@@ -405,6 +405,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/fi.po b/server_environment/i18n/fi.po
index a9e137b7e..61cf91543 100644
--- a/server_environment/i18n/fi.po
+++ b/server_environment/i18n/fi.po
@@ -405,6 +405,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/fr.po b/server_environment/i18n/fr.po
index 19feae39a..55310670b 100644
--- a/server_environment/i18n/fr.po
+++ b/server_environment/i18n/fr.po
@@ -407,6 +407,11 @@ msgstr "odoo | server_wide_modules"
 msgid "odoo | shell_interface"
 msgstr "odoo | shell_interface"
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/fr_CA.po b/server_environment/i18n/fr_CA.po
index 3da847761..1d6df9cbe 100644
--- a/server_environment/i18n/fr_CA.po
+++ b/server_environment/i18n/fr_CA.po
@@ -406,6 +406,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/fr_CH.po b/server_environment/i18n/fr_CH.po
index d542f8a96..78c91ca18 100644
--- a/server_environment/i18n/fr_CH.po
+++ b/server_environment/i18n/fr_CH.po
@@ -11,8 +11,8 @@ msgstr ""
 "POT-Creation-Date: 2017-05-01 10:39+0000\n"
 "PO-Revision-Date: 2017-05-01 10:39+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: French (Switzerland) (https://www.transifex.com/oca/"
-"teams/23907/fr_CH/)\n"
+"Language-Team: French (Switzerland) (https://www.transifex.com/oca/teams/"
+"23907/fr_CH/)\n"
 "Language: fr_CH\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -406,6 +406,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/gl.po b/server_environment/i18n/gl.po
index 4476e7814..0b4a6cb2d 100644
--- a/server_environment/i18n/gl.po
+++ b/server_environment/i18n/gl.po
@@ -405,6 +405,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/gl_ES.po b/server_environment/i18n/gl_ES.po
index 561f5208d..449fd7449 100644
--- a/server_environment/i18n/gl_ES.po
+++ b/server_environment/i18n/gl_ES.po
@@ -406,6 +406,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/he.po b/server_environment/i18n/he.po
index 7180a67df..15ff3f5f5 100644
--- a/server_environment/i18n/he.po
+++ b/server_environment/i18n/he.po
@@ -405,6 +405,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/hr.po b/server_environment/i18n/hr.po
index 0a181e6db..a3fb47541 100644
--- a/server_environment/i18n/hr.po
+++ b/server_environment/i18n/hr.po
@@ -406,6 +406,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/hr_HR.po b/server_environment/i18n/hr_HR.po
index 9dbe11b67..040d4d9af 100644
--- a/server_environment/i18n/hr_HR.po
+++ b/server_environment/i18n/hr_HR.po
@@ -406,6 +406,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/hu.po b/server_environment/i18n/hu.po
index e77069521..8ecdc9ac5 100644
--- a/server_environment/i18n/hu.po
+++ b/server_environment/i18n/hu.po
@@ -405,6 +405,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/id.po b/server_environment/i18n/id.po
index 4d40db531..afb3f8ea6 100644
--- a/server_environment/i18n/id.po
+++ b/server_environment/i18n/id.po
@@ -405,6 +405,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/it.po b/server_environment/i18n/it.po
index ec3a00c18..ee44f88bb 100644
--- a/server_environment/i18n/it.po
+++ b/server_environment/i18n/it.po
@@ -406,6 +406,11 @@ msgstr "odoo | server_wide_modules"
 msgid "odoo | shell_interface"
 msgstr "odoo | shell_interface"
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/ja.po b/server_environment/i18n/ja.po
index 1048b15e8..d0fc2b6f9 100644
--- a/server_environment/i18n/ja.po
+++ b/server_environment/i18n/ja.po
@@ -405,6 +405,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/ko.po b/server_environment/i18n/ko.po
index 7f1f5befb..e3f4d2aa6 100644
--- a/server_environment/i18n/ko.po
+++ b/server_environment/i18n/ko.po
@@ -405,6 +405,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/lt.po b/server_environment/i18n/lt.po
index 1663dcb90..d5c36709c 100644
--- a/server_environment/i18n/lt.po
+++ b/server_environment/i18n/lt.po
@@ -406,6 +406,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/lt_LT.po b/server_environment/i18n/lt_LT.po
index d311fb2a4..a59944281 100644
--- a/server_environment/i18n/lt_LT.po
+++ b/server_environment/i18n/lt_LT.po
@@ -11,8 +11,8 @@ msgstr ""
 "POT-Creation-Date: 2017-05-01 10:39+0000\n"
 "PO-Revision-Date: 2017-05-01 10:39+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Lithuanian (Lithuania) (https://www.transifex.com/oca/"
-"teams/23907/lt_LT/)\n"
+"Language-Team: Lithuanian (Lithuania) (https://www.transifex.com/oca/teams/"
+"23907/lt_LT/)\n"
 "Language: lt_LT\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -407,6 +407,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/lv.po b/server_environment/i18n/lv.po
index 2f6f0df6d..23b18af6a 100644
--- a/server_environment/i18n/lv.po
+++ b/server_environment/i18n/lv.po
@@ -406,6 +406,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/mk.po b/server_environment/i18n/mk.po
index bdf72c19d..420ca32e8 100644
--- a/server_environment/i18n/mk.po
+++ b/server_environment/i18n/mk.po
@@ -405,6 +405,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/mn.po b/server_environment/i18n/mn.po
index 2dedb8a4f..3c53c7f6c 100644
--- a/server_environment/i18n/mn.po
+++ b/server_environment/i18n/mn.po
@@ -405,6 +405,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/nb.po b/server_environment/i18n/nb.po
index 17874f43f..7aa2a89f7 100644
--- a/server_environment/i18n/nb.po
+++ b/server_environment/i18n/nb.po
@@ -406,6 +406,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/nb_NO.po b/server_environment/i18n/nb_NO.po
index 3bec9dff8..e5ce9315e 100644
--- a/server_environment/i18n/nb_NO.po
+++ b/server_environment/i18n/nb_NO.po
@@ -406,6 +406,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/nl.po b/server_environment/i18n/nl.po
index 4cb39b536..17f6ddeeb 100644
--- a/server_environment/i18n/nl.po
+++ b/server_environment/i18n/nl.po
@@ -405,6 +405,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/nl_BE.po b/server_environment/i18n/nl_BE.po
index 97e6d6d29..676fec7b9 100644
--- a/server_environment/i18n/nl_BE.po
+++ b/server_environment/i18n/nl_BE.po
@@ -406,6 +406,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/nl_NL.po b/server_environment/i18n/nl_NL.po
index cebe0c03c..8b841399c 100644
--- a/server_environment/i18n/nl_NL.po
+++ b/server_environment/i18n/nl_NL.po
@@ -11,8 +11,8 @@ msgstr ""
 "POT-Creation-Date: 2017-06-22 01:12+0000\n"
 "PO-Revision-Date: 2017-06-22 01:12+0000\n"
 "Last-Translator: Peter Hageman <hageman.p@gmail.com>, 2017\n"
-"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/"
-"teams/23907/nl_NL/)\n"
+"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/teams/"
+"23907/nl_NL/)\n"
 "Language: nl_NL\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -406,6 +406,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/pl.po b/server_environment/i18n/pl.po
index 1b2bb7ee6..38c5e855d 100644
--- a/server_environment/i18n/pl.po
+++ b/server_environment/i18n/pl.po
@@ -407,6 +407,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/pt.po b/server_environment/i18n/pt.po
index 8ae04ef8d..6f7dd1e82 100644
--- a/server_environment/i18n/pt.po
+++ b/server_environment/i18n/pt.po
@@ -405,6 +405,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/pt_BR.po b/server_environment/i18n/pt_BR.po
index 87ffb4c2c..d8aef7750 100644
--- a/server_environment/i18n/pt_BR.po
+++ b/server_environment/i18n/pt_BR.po
@@ -425,6 +425,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/pt_PT.po b/server_environment/i18n/pt_PT.po
index 9865d9edd..41bc9992f 100644
--- a/server_environment/i18n/pt_PT.po
+++ b/server_environment/i18n/pt_PT.po
@@ -11,8 +11,8 @@ msgstr ""
 "POT-Creation-Date: 2017-05-01 10:39+0000\n"
 "PO-Revision-Date: 2017-05-01 10:39+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Portuguese (Portugal) (https://www.transifex.com/oca/"
-"teams/23907/pt_PT/)\n"
+"Language-Team: Portuguese (Portugal) (https://www.transifex.com/oca/teams/"
+"23907/pt_PT/)\n"
 "Language: pt_PT\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -406,6 +406,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/ro.po b/server_environment/i18n/ro.po
index 6b6701961..462062980 100644
--- a/server_environment/i18n/ro.po
+++ b/server_environment/i18n/ro.po
@@ -406,6 +406,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/ru.po b/server_environment/i18n/ru.po
index be4f43887..7612362f7 100644
--- a/server_environment/i18n/ru.po
+++ b/server_environment/i18n/ru.po
@@ -407,6 +407,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/server_environment.pot b/server_environment/i18n/server_environment.pot
index 83ff855f3..8812b9f76 100644
--- a/server_environment/i18n/server_environment.pot
+++ b/server_environment/i18n/server_environment.pot
@@ -400,6 +400,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/sk.po b/server_environment/i18n/sk.po
index 6a2f0f4c1..4f126bbd4 100644
--- a/server_environment/i18n/sk.po
+++ b/server_environment/i18n/sk.po
@@ -405,6 +405,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/sl.po b/server_environment/i18n/sl.po
index 7b787a767..62a1bd092 100644
--- a/server_environment/i18n/sl.po
+++ b/server_environment/i18n/sl.po
@@ -409,6 +409,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/sr.po b/server_environment/i18n/sr.po
index f537e5c48..ebbd64441 100644
--- a/server_environment/i18n/sr.po
+++ b/server_environment/i18n/sr.po
@@ -406,6 +406,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/sr@latin.po b/server_environment/i18n/sr@latin.po
index e3d1f97cd..afa57d279 100644
--- a/server_environment/i18n/sr@latin.po
+++ b/server_environment/i18n/sr@latin.po
@@ -407,6 +407,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/sv.po b/server_environment/i18n/sv.po
index adb8f43f5..68ca8f3e6 100644
--- a/server_environment/i18n/sv.po
+++ b/server_environment/i18n/sv.po
@@ -406,6 +406,11 @@ msgstr "odoo | server_wide_modules"
 msgid "odoo | shell_interface"
 msgstr "odoo | shell_interface"
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/th.po b/server_environment/i18n/th.po
index 74f9b4c22..13ee29085 100644
--- a/server_environment/i18n/th.po
+++ b/server_environment/i18n/th.po
@@ -405,6 +405,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/tr.po b/server_environment/i18n/tr.po
index d3b5a0b32..7745b4d5c 100644
--- a/server_environment/i18n/tr.po
+++ b/server_environment/i18n/tr.po
@@ -405,6 +405,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/tr_TR.po b/server_environment/i18n/tr_TR.po
index cc1057cdb..fb223d35a 100644
--- a/server_environment/i18n/tr_TR.po
+++ b/server_environment/i18n/tr_TR.po
@@ -406,6 +406,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/uk.po b/server_environment/i18n/uk.po
index 0df927778..fdef1fe73 100644
--- a/server_environment/i18n/uk.po
+++ b/server_environment/i18n/uk.po
@@ -406,6 +406,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/vi.po b/server_environment/i18n/vi.po
index c9f98c19a..ad0f89465 100644
--- a/server_environment/i18n/vi.po
+++ b/server_environment/i18n/vi.po
@@ -405,6 +405,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/vi_VN.po b/server_environment/i18n/vi_VN.po
index 97637a0e9..d9d026227 100644
--- a/server_environment/i18n/vi_VN.po
+++ b/server_environment/i18n/vi_VN.po
@@ -11,8 +11,8 @@ msgstr ""
 "POT-Creation-Date: 2017-05-01 10:39+0000\n"
 "PO-Revision-Date: 2017-05-01 10:39+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/oca/"
-"teams/23907/vi_VN/)\n"
+"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/oca/teams/"
+"23907/vi_VN/)\n"
 "Language: vi_VN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -406,6 +406,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/zh_CN.po b/server_environment/i18n/zh_CN.po
index 11cf3375f..f55d41f03 100644
--- a/server_environment/i18n/zh_CN.po
+++ b/server_environment/i18n/zh_CN.po
@@ -409,6 +409,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/i18n/zh_TW.po b/server_environment/i18n/zh_TW.po
index 72cee36b7..fc7bcd195 100644
--- a/server_environment/i18n/zh_TW.po
+++ b/server_environment/i18n/zh_TW.po
@@ -406,6 +406,11 @@ msgstr ""
 msgid "odoo | shell_interface"
 msgstr ""
 
+#. module: server_environment
+#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_skip_auto_install
+msgid "odoo | skip_auto_install"
+msgstr ""
+
 #. module: server_environment
 #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password
 msgid "odoo | smtp_password"
diff --git a/server_environment/models/server_env_mixin.py b/server_environment/models/server_env_mixin.py
index d13a503e3..65f0d029a 100644
--- a/server_environment/models/server_env_mixin.py
+++ b/server_environment/models/server_env_mixin.py
@@ -7,6 +7,7 @@
 from lxml import etree
 
 from odoo import api, fields, models
+from odoo.tools import mute_logger
 
 from odoo.addons.base_sparse_field.models.fields import Serialized
 
@@ -356,7 +357,9 @@ def _server_env_transform_field_to_read_from_env(self, field):
         inverse_method = _partialmethod(
             type(self)._inverse_server_env, field.name, __name__=inverse_method_name
         )
-        setattr(type(self), inverse_method_name, inverse_method)
+        # Mute message related to new safeguard (PR odoo/odoo#247151)
+        with mute_logger("odoo.tests.common"):
+            setattr(type(self), inverse_method_name, inverse_method)
         field.inverse = inverse_method_name
         field.store = False
         field.required = False
diff --git a/server_environment/readme/CONFIGURE.md b/server_environment/readme/CONFIGURE.md
index 76260f2b5..7b119560f 100644
--- a/server_environment/readme/CONFIGURE.md
+++ b/server_environment/readme/CONFIGURE.md
@@ -29,6 +29,13 @@ addon. The `server_environment_files_sample` can be used as an example:
   can override or extend default values;
 - you can override or extend values in the main configuration file of
   your instance;
+- In some platforms (like odoo.sh where production config file is copied to staging)
+  it can be useful to overwrite options written in the `[options]` section. You must
+  allow the override by adding `server_environment_allow_overwrite_options_section = True`
+  to the former `odoo.cfg` config file or through the environment variable:
+  `export SERVER_ENVIRONMENT_ALLOW_OVERWRITE_OPTIONS_SECTION=True` (if both are set
+  config file takes precedence).
+
 
 ## Environment variable
 
diff --git a/server_environment/readme/DESCRIPTION.md b/server_environment/readme/DESCRIPTION.md
index f08c22d44..fec8649e7 100644
--- a/server_environment/readme/DESCRIPTION.md
+++ b/server_environment/readme/DESCRIPTION.md
@@ -5,8 +5,8 @@ configuration file, and the values for the various possible environments
 are stored in the `server_environment_files` companion module.
 
 The `server_environment_files` module is optional, the values can be set
-using an environment variable with a fallback on default values in the
-database.
+using an environment variable with a fallback on default values in the database. you
+will be able to overwrite some odoo options.
 
 The configuration read from the files are visible under the
 Configuration menu. If you are not in the 'dev' environment you will not
diff --git a/server_environment/server_env.py b/server_environment/server_env.py
index 9f2208c2a..e1194d165 100644
--- a/server_environment/server_env.py
+++ b/server_environment/server_env.py
@@ -10,6 +10,7 @@
 from lxml import etree
 
 from odoo import api, fields, models
+from odoo.tools import mute_logger
 from odoo.tools.config import config as system_base_config
 
 from odoo.addons.base_sparse_field.models.fields import Serialized
@@ -107,6 +108,19 @@ def _listconf(env_path):
     return files
 
 
+def _update_odoo_config_options(config_p):
+    allow_overwrite = system_base_config.get(
+        "server_environment_allow_overwrite_options_section",
+        os.environ.get("SERVER_ENVIRONMENT_ALLOW_OVERWRITE_OPTIONS_SECTION"),
+    )
+    if isinstance(allow_overwrite, str) and allow_overwrite:
+        allow_overwrite = _boolean_states.get(allow_overwrite.lower(), False)
+    if allow_overwrite and config_p.has_section("options"):
+        system_base_config.options.update(
+            {k: v for k, v in config_p["options"].items()}
+        )
+
+
 def _load_config_from_server_env_files(config_p):
     default = os.path.join(_dir, "default")
     running_env = os.path.join(_dir, system_base_config["running_env"])
@@ -119,6 +133,7 @@ def _load_config_from_server_env_files(config_p):
         config_p.read(conf_files)
     except Exception as e:
         raise Exception(f'Cannot read config files "{conf_files}":  {e}') from e
+    _update_odoo_config_options(config_p)
 
 
 def _load_config_from_rcfile(config_p):
@@ -212,11 +227,9 @@ def _add_columns(cls):
                 sparse="config",
                 readonly=True,
             )
-            setattr(
-                ServerConfiguration,
-                col_name,
-                tmp_field,
-            )
+            # Mute message related to new safeguard (PR odoo/odoo#247151)
+            with mute_logger("odoo.tests.common"):
+                setattr(ServerConfiguration, col_name, tmp_field)
             tmp_field.name = col_name
             ServerConfiguration._field_definitions.append(tmp_field)
             cls._conf_defaults[col_name] = value
diff --git a/server_environment/static/description/index.html b/server_environment/static/description/index.html
index dfb4a71bd..27b282c3c 100644
--- a/server_environment/static/description/index.html
+++ b/server_environment/static/description/index.html
@@ -372,7 +372,7 @@ <h1>server configuration environment files</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:39cd61c3a9621d0b7ee7a346adf45f4a2c90e80e6a61e18f182386c6fc90fd19
+!! source digest: sha256:4f9939b8b6cbb66e583bc8d6bde01be8551db8309fbb6ce18dc7ce65da46a5ec
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/lgpl-3.0-standalone.html"><img alt="License: LGPL-3" src="https://img.shields.io/badge/license-LGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/server-env/tree/18.0/server_environment"><img alt="OCA/server-env" src="https://img.shields.io/badge/github-OCA%2Fserver--env-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/server-env-18-0/server-env-18-0-server_environment"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/server-env&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module provides a way to define an environment in the main Odoo
@@ -382,7 +382,7 @@ <h1>server configuration environment files</h1>
 are stored in the <tt class="docutils literal">server_environment_files</tt> companion module.</p>
 <p>The <tt class="docutils literal">server_environment_files</tt> module is optional, the values can be
 set using an environment variable with a fallback on default values in
-the database.</p>
+the database. you will be able to overwrite some odoo options.</p>
 <p>The configuration read from the files are visible under the
 Configuration menu. If you are not in the ‘dev’ environment you will not
 be able to see the values contained in the defined secret keys (by
@@ -452,6 +452,13 @@ <h3><a class="toc-backref" href="#toc-entry-3">server_environment_files</a></h3>
 can override or extend default values;</li>
 <li>you can override or extend values in the main configuration file of
 your instance;</li>
+<li>In some platforms (like odoo.sh where production config file is copied
+to staging) it can be useful to overwrite options written in the
+<tt class="docutils literal">[options]</tt> section. You must allow the override by adding
+<tt class="docutils literal">server_environment_allow_overwrite_options_section = True</tt> to the
+former <tt class="docutils literal">odoo.cfg</tt> config file or through the environment variable:
+<tt class="docutils literal">export SERVER_ENVIRONMENT_ALLOW_OVERWRITE_OPTIONS_SECTION=True</tt> (if
+both are set config file takes precedence).</li>
 </ul>
 </div>
 <div class="section" id="environment-variable">
diff --git a/server_environment/tests/common.py b/server_environment/tests/common.py
index 69eb34a4d..91d279c1d 100644
--- a/server_environment/tests/common.py
+++ b/server_environment/tests/common.py
@@ -48,6 +48,7 @@ def load_config(
         serv_config_class=server_env_mixin,
     ):
         original_serv_config = serv_config_class.serv_config
+        original_fields = dir(server_env.ServerConfiguration)
         try:
             with (
                 self.set_config_dir(config_dir),
@@ -61,3 +62,7 @@ def load_config(
         finally:
             serv_config_class.serv_config = original_serv_config
             server_env.serv_config = original_serv_config
+            for attr, fld in vars(server_env.ServerConfiguration).items():
+                if attr not in original_fields:
+                    server_env.ServerConfiguration._field_definitions.remove(fld)
+                    delattr(self.env["server.config"].__class__, attr)
diff --git a/server_environment/tests/test_server_environment.py b/server_environment/tests/test_server_environment.py
index 9f605942a..822d4a7e0 100644
--- a/server_environment/tests/test_server_environment.py
+++ b/server_environment/tests/test_server_environment.py
@@ -82,9 +82,67 @@ def test_default_hidden_password(self):
             model = self.env["server.config"]
             model._add_columns()
             self.env.registry.setup_models(self.env.cr)
-        defaults = self._test_default(hidden_pwd=True)
+            defaults = self._test_default(hidden_pwd=True)
 
-        self.assertIn("odoo_I_admin_passwd", defaults)
-        self.assertIn("odoo_I_db_password", defaults)
-        self.assertIn("odoo_I_smtp_password", defaults)
-        self.assertIn("outgoing_mail_provider_promail_I_smtp_pass", defaults)
+            self.assertIn("odoo_I_admin_passwd", defaults)
+            self.assertIn("odoo_I_db_password", defaults)
+            self.assertIn("odoo_I_smtp_password", defaults)
+            self.assertIn("outgoing_mail_provider_promail_I_smtp_pass", defaults)
+
+    @patch.dict(os.environ, {"SERVER_ENVIRONMENT_ALLOW_OVERWRITE_OPTIONS_SECTION": "0"})
+    @patch.dict(
+        odoo_config.options,
+        {
+            "running_env": "testing",
+            "server_environment_allow_overwrite_options_section": True,
+            "odoo_test_option": "fake odoo config",
+        },
+    )
+    def test_server_environment_allow_overwrite_options_section(self):
+        with self.set_config_dir("testfiles"):
+            server_env._load_config()
+            self.assertEqual(
+                odoo_config["odoo_test_option"], "Set in config file for testing env"
+            )
+
+    @patch.dict(os.environ, {"SERVER_ENVIRONMENT_ALLOW_OVERWRITE_OPTIONS_SECTION": "1"})
+    @patch.dict(
+        odoo_config.options,
+        {
+            "running_env": "testing",
+            "server_environment_allow_overwrite_options_section": False,
+            "odoo_test_option": "fake odoo config",
+        },
+    )
+    def test_server_environment_disabled_overwrite_options_section(self):
+        with self.set_config_dir("testfiles"):
+            server_env._load_config()
+            self.assertEqual(odoo_config["odoo_test_option"], "fake odoo config")
+
+    @patch.dict(os.environ, {"SERVER_ENVIRONMENT_ALLOW_OVERWRITE_OPTIONS_SECTION": "1"})
+    @patch.dict(
+        odoo_config.options,
+        {
+            "running_env": "testing",
+            "odoo_test_option": "fake odoo config",
+        },
+    )
+    def test_server_environment_allow_overwrite_options_section_by_env(self):
+        with self.set_config_dir("testfiles"):
+            server_env._load_config()
+            self.assertEqual(
+                odoo_config["odoo_test_option"], "Set in config file for testing env"
+            )
+
+    @patch.dict(os.environ, {"SERVER_ENVIRONMENT_ALLOW_OVERWRITE_OPTIONS_SECTION": "0"})
+    @patch.dict(
+        odoo_config.options,
+        {
+            "running_env": "testing",
+            "odoo_test_option": "fake odoo config",
+        },
+    )
+    def test_server_environment_disabled_overwrite_options_section_by_env(self):
+        with self.set_config_dir("testfiles"):
+            server_env._load_config()
+            self.assertEqual(odoo_config["odoo_test_option"], "fake odoo config")
diff --git a/server_environment/tests/testfiles/testing/base.conf b/server_environment/tests/testfiles/testing/base.conf
index 544e95b26..46da78487 100644
--- a/server_environment/tests/testfiles/testing/base.conf
+++ b/server_environment/tests/testfiles/testing/base.conf
@@ -1,2 +1,5 @@
+[options]
+odoo_test_option = Set in config file for testing env
+
 [external_service.ftp]
 user = testing
diff --git a/server_environment_data_encryption/README.rst b/server_environment_data_encryption/README.rst
index f72a363d5..e535790da 100644
--- a/server_environment_data_encryption/README.rst
+++ b/server_environment_data_encryption/README.rst
@@ -1,3 +1,7 @@
+.. image:: https://odoo-community.org/readme-banner-image
+   :target: https://odoo-community.org/get-involved?utm_source=readme
+   :alt: Odoo Community Association
+
 ==================================
 Server Environment Data Encryption
 ==================================
@@ -7,13 +11,13 @@ Server Environment Data Encryption
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:d332eb4ca40eb79923ed865b069723db1c2f7be0946a840d9e1cd3197939915e
+   !! source digest: sha256:6635dd814ef5245e1d665f4b110d009ebee19843111d06a3d7cf602ce98ca184
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png
     :target: https://odoo-community.org/page/development-status
     :alt: Production/Stable
-.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+.. |badge2| image:: https://img.shields.io/badge/license-AGPL--3-blue.png
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fserver--env-lightgray.png?logo=github
diff --git a/server_environment_data_encryption/__manifest__.py b/server_environment_data_encryption/__manifest__.py
index 91c5f3ebc..1e3df2a7a 100644
--- a/server_environment_data_encryption/__manifest__.py
+++ b/server_environment_data_encryption/__manifest__.py
@@ -1,7 +1,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 {
     "name": "Server Environment Data Encryption",
-    "version": "18.0.1.0.0",
+    "version": "18.0.1.0.1",
     "development_status": "Production/Stable",
     "maintainers": ["florian-dacosta"],
     "category": "Tools",
diff --git a/server_environment_data_encryption/static/description/index.html b/server_environment_data_encryption/static/description/index.html
index 6b94c403e..42b1ecd69 100644
--- a/server_environment_data_encryption/static/description/index.html
+++ b/server_environment_data_encryption/static/description/index.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
-<title>Server Environment Data Encryption</title>
+<title>README.rst</title>
 <style type="text/css">
 
 /*
@@ -360,16 +360,21 @@
 </style>
 </head>
 <body>
-<div class="document" id="server-environment-data-encryption">
-<h1 class="title">Server Environment Data Encryption</h1>
+<div class="document">
 
+
+<a class="reference external image-reference" href="https://odoo-community.org/get-involved?utm_source=readme">
+<img alt="Odoo Community Association" src="https://odoo-community.org/readme-banner-image" />
+</a>
+<div class="section" id="server-environment-data-encryption">
+<h1>Server Environment Data Encryption</h1>
 <!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:d332eb4ca40eb79923ed865b069723db1c2f7be0946a840d9e1cd3197939915e
+!! source digest: sha256:6635dd814ef5245e1d665f4b110d009ebee19843111d06a3d7cf602ce98ca184
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/server-env/tree/18.0/server_environment_data_encryption"><img alt="OCA/server-env" src="https://img.shields.io/badge/github-OCA%2Fserver--env-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/server-env-18-0/server-env-18-0-server_environment_data_encryption"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/server-env&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/server-env/tree/18.0/server_environment_data_encryption"><img alt="OCA/server-env" src="https://img.shields.io/badge/github-OCA%2Fserver--env-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/server-env-18-0/server-env-18-0-server_environment_data_encryption"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/server-env&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module changes a little the behavior of server_environment modules.
 When Odoo does not find the value of the field in the configuration
 file, it will fallback on a Odoo encrypted field instead. Also it allows
@@ -389,7 +394,7 @@ <h1 class="title">Server Environment Data Encryption</h1>
 </ul>
 </div>
 <div class="section" id="configuration">
-<h1><a class="toc-backref" href="#toc-entry-1">Configuration</a></h1>
+<h2><a class="toc-backref" href="#toc-entry-1">Configuration</a></h2>
 <p>In order to use this module properly, each environment should have their
 own encryption key and the production environment should have the keys
 of all environments.</p>
@@ -415,7 +420,7 @@ <h1><a class="toc-backref" href="#toc-entry-1">Configuration</a></h1>
 </pre>
 </div>
 <div class="section" id="bug-tracker">
-<h1><a class="toc-backref" href="#toc-entry-2">Bug Tracker</a></h1>
+<h2><a class="toc-backref" href="#toc-entry-2">Bug Tracker</a></h2>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/server-env/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
@@ -423,15 +428,15 @@ <h1><a class="toc-backref" href="#toc-entry-2">Bug Tracker</a></h1>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
-<h1><a class="toc-backref" href="#toc-entry-3">Credits</a></h1>
+<h2><a class="toc-backref" href="#toc-entry-3">Credits</a></h2>
 <div class="section" id="authors">
-<h2><a class="toc-backref" href="#toc-entry-4">Authors</a></h2>
+<h3><a class="toc-backref" href="#toc-entry-4">Authors</a></h3>
 <ul class="simple">
 <li>Akretion</li>
 </ul>
 </div>
 <div class="section" id="contributors">
-<h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
+<h3><a class="toc-backref" href="#toc-entry-5">Contributors</a></h3>
 <ul class="simple">
 <li>Florian da Costa &lt;<a class="reference external" href="mailto:florian.dacosta&#64;akretion.com">florian.dacosta&#64;akretion.com</a>&gt;</li>
 <li>Sébastien Beau &lt;<a class="reference external" href="mailto:sebastien.beau&#64;akretion.com">sebastien.beau&#64;akretion.com</a>&gt;</li>
@@ -439,7 +444,7 @@ <h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
 </ul>
 </div>
 <div class="section" id="maintainers">
-<h2><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h2>
+<h3><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h3>
 <p>This module is maintained by the OCA.</p>
 <a class="reference external image-reference" href="https://odoo-community.org">
 <img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
@@ -454,5 +459,6 @@ <h2><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h2>
 </div>
 </div>
 </div>
+</div>
 </body>
 </html>
diff --git a/server_environment_data_encryption/tests/test_server_environment_data_encrypt.py b/server_environment_data_encryption/tests/test_server_environment_data_encrypt.py
index b4f530d76..71e6043ff 100644
--- a/server_environment_data_encryption/tests/test_server_environment_data_encrypt.py
+++ b/server_environment_data_encryption/tests/test_server_environment_data_encrypt.py
@@ -14,18 +14,27 @@ def setUpClass(cls):
         super().setUpClass()
         cls.loader = FakeModelLoader(cls.env, cls.__module__)
         cls.loader.backup_registry()
+        cls._origin_fields = {}
+        for model in "res.partner", "res.users":
+            cls._origin_fields[model] = set(dir(cls.env[model].__class__))
 
+    def setUp(self):
+        super().setUp()
         # The fake class is imported here !! After the backup_registry
         from .models import FakePartner
 
-        cls.loader.update_registry((FakePartner,))
-        cls.set_new_key_env("prod")
-        cls.set_new_key_env("preprod")
+        self.loader.update_registry((FakePartner,))
+        self.addCleanup(self.loader.restore_registry)
+        self.addCleanup(self.remove_mixin_fields)
+        self.set_new_key_env("prod")
+        self.set_new_key_env("preprod")
 
-    @classmethod
-    def tearDownClass(cls):
-        cls.loader.restore_registry()
-        super().tearDownClass()
+    def remove_mixin_fields(self):
+        # E.g: server_env_defaults, _inverse_server_env_city
+        for model in "res.partner", "res.users":
+            extra = set(self.env[model].__class__.__dict__) - self._origin_fields[model]
+            for attr in extra:
+                delattr(self.env[model].__class__, attr)
 
     def test_env_dependent_value(self):
         partner = self.env["res.partner"].create(