[BOT] post-merge updates

README.md

@@ -24,7 +24,7 @@ addon | version | maintainers | summary
 [data_encryption](data_encryption/) | 17.0.1.0.0 |  | Store accounts and credentials encrypted by environment
 [mail_environment](mail_environment/) | 17.0.1.0.0 |  | Configure mail servers with server_environment_files
 [mail_environment_office365](mail_environment_office365/) | 17.0.1.0.0 |  | Configure Office365 parameters with environment variables via server_environment
-[server_environment](server_environment/) | 17.0.1.1.0 |  | move some configurations out of the database
+[server_environment](server_environment/) | 17.0.1.1.1 |  | move some configurations out of the database
 [server_environment_ir_config_parameter](server_environment_ir_config_parameter/) | 17.0.1.0.0 |  | Override System Parameters from server environment file
 
 [//]: # (end addons)

server_environment/README.rst

@@ -7,7 +7,7 @@ server configuration environment files
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:261183b349b7fa17e4c205c3cda8bf4b06e629c65d04ad4b7bfd105901c60da9
+   !! source digest: sha256:5a03403d3a1e6a6175f5a97b3eb36057c0961b1e0dd0fc0f3574af4215eedf32
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png
@@ -96,12 +96,12 @@ You can edit the settings you need in the ``server_environment_files``
 addon. The ``server_environment_files_sample`` can be used as an
 example:
 
--  values common to all / most environments can be stored in the
-   ``default/`` directory using the .ini file syntax;
--  each environment you need to define is stored in its own directory
-   and can override or extend default values;
--  you can override or extend values in the main configuration file of
-   your instance;
+- values common to all / most environments can be stored in the
+  ``default/`` directory using the .ini file syntax;
+- each environment you need to define is stored in its own directory and
+  can override or extend default values;
+- you can override or extend values in the main configuration file of
+  your instance;
 
 Environment variable
 --------------------
@@ -211,13 +211,13 @@ If you want to have a technical name to reference:
 Known issues / Roadmap
 ======================
 
--  it is not possible to set the environment from the command line. A
-   configuration file must be used.
--  the module does not allow to set low level attributes such as
-   database server, etc.
--  server.env.techname.mixin's tech_name field could leverage the new
-   option for computable / writable fields and get rid of some onchange
-   / read / write code.
+- it is not possible to set the environment from the command line. A
+  configuration file must be used.
+- the module does not allow to set low level attributes such as database
+  server, etc.
+- server.env.techname.mixin's tech_name field could leverage the new
+  option for computable / writable fields and get rid of some onchange /
+  read / write code.
 
 Bug Tracker
 ===========
@@ -240,18 +240,18 @@ Authors
 Contributors
 ------------
 
--  Florent Xicluna (Wingo) <[email protected]>
--  Nicolas Bessi <[email protected]>
--  Alexandre Fayolle <[email protected]>
--  Daniel Reis <[email protected]>
--  Holger Brunn <[email protected]>
--  Leonardo Pistone <[email protected]>
--  Adrien Peiffer <[email protected]>
--  Thierry Ducrest <[email protected]>
--  Guewen Baconnier <[email protected]>
--  Thomas Binfeld <[email protected]>
--  Stéphane Bidoul <[email protected]>
--  Simone Orsi <[email protected]>
+- Florent Xicluna (Wingo) <[email protected]>
+- Nicolas Bessi <[email protected]>
+- Alexandre Fayolle <[email protected]>
+- Daniel Reis <[email protected]>
+- Holger Brunn <[email protected]>
+- Leonardo Pistone <[email protected]>
+- Adrien Peiffer <[email protected]>
+- Thierry Ducrest <[email protected]>
+- Guewen Baconnier <[email protected]>
+- Thomas Binfeld <[email protected]>
+- Stéphane Bidoul <[email protected]>
+- Simone Orsi <[email protected]>
 
 Maintainers
 -----------

server_environment/__manifest__.py

@@ -4,7 +4,7 @@
 
 {
     "name": "server configuration environment files",
-    "version": "17.0.1.1.0",
+    "version": "17.0.1.1.1",
     "depends": ["base", "base_sparse_field"],
     "author": "Camptocamp,Odoo Community Association (OCA)",
     "summary": "move some configurations out of the database",

server_environment/static/description/index.html

@@ -367,7 +367,7 @@ <h1 class="title">server configuration environment files</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:261183b349b7fa17e4c205c3cda8bf4b06e629c65d04ad4b7bfd105901c60da9
+!! source digest: sha256:5a03403d3a1e6a6175f5a97b3eb36057c0961b1e0dd0fc0f3574af4215eedf32
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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/licence-LGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/server-env/tree/17.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-17-0/server-env-17-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=17.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
@@ -443,8 +443,8 @@ <h2><a class="toc-backref" href="#toc-entry-3">server_environment_files</a></h2>
 <ul class="simple">
 <li>values common to all / most environments can be stored in the
 <tt class="docutils literal">default/</tt> directory using the .ini file syntax;</li>
-<li>each environment you need to define is stored in its own directory
-and can override or extend default values;</li>
+<li>each environment you need to define is stored in its own directory and
+can override or extend default values;</li>
 <li>you can override or extend values in the main configuration file of
 your instance;</li>
 </ul>
@@ -543,11 +543,11 @@ <h1><a class="toc-backref" href="#toc-entry-8">Known issues / Roadmap</a></h1>
 <ul class="simple">
 <li>it is not possible to set the environment from the command line. A
 configuration file must be used.</li>
-<li>the module does not allow to set low level attributes such as
-database server, etc.</li>
+<li>the module does not allow to set low level attributes such as database
+server, etc.</li>
 <li>server.env.techname.mixin’s tech_name field could leverage the new
-option for computable / writable fields and get rid of some onchange
-/ read / write code.</li>
+option for computable / writable fields and get rid of some onchange /
+read / write code.</li>
 </ul>
 </div>
 <div class="section" id="bug-tracker">