[BOT] post-merge updates

StefanRijnhart · May 28, 2024 · 311fe7e · 311fe7e
1 parent 7bd2ba5
commit 311fe7e
Show file tree

Hide file tree

Showing 4 changed files with 67 additions and 28 deletions.
diff --git a/README.md b/README.md
@@ -57,7 +57,7 @@ addon | version | maintainers | summary
 [jsonifier](jsonifier/) | 16.0.0.0.1 |  | JSON-ify data for all models
 [module_analysis](module_analysis/) | 16.0.1.0.1 | [![legalsylvain](https://github.com/legalsylvain.png?size=30px)](https://github.com/legalsylvain) | Add analysis tools regarding installed modules to know which installed modules comes from Odoo Core, OCA, or are custom modules
 [module_auto_update](module_auto_update/) | 16.0.1.0.2 |  | Automatically update Odoo modules
-[module_change_auto_install](module_change_auto_install/) | 16.0.1.0.1 | [![legalsylvain](https://github.com/legalsylvain.png?size=30px)](https://github.com/legalsylvain) | Customize auto installables modules by configuration
+[module_change_auto_install](module_change_auto_install/) | 16.0.1.0.2 | [![legalsylvain](https://github.com/legalsylvain.png?size=30px)](https://github.com/legalsylvain) | Customize auto installables modules by configuration
 [onchange_helper](onchange_helper/) | 16.0.1.0.0 |  | Technical module that ease execution of onchange in Python code
 [rpc_helper](rpc_helper/) | 16.0.1.0.0 | [![simahawk](https://github.com/simahawk.png?size=30px)](https://github.com/simahawk) | Helpers for disabling RPC calls
 [scheduler_error_mailer](scheduler_error_mailer/) | 16.0.1.0.0 |  | Scheduler Error Mailer

diff --git a/module_change_auto_install/README.rst b/module_change_auto_install/README.rst
@@ -7,7 +7,7 @@ Change auto installable modules
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:a94b2d6389517ce49645d155eedbd1061a3b5e67dd1c6fbcf3bd8aa7b1c1d792
+   !! source digest: sha256:803c0e63b0a4fd39047840304e38f292dc26531ff41d17fc433439c1034f8dd7
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
@@ -55,7 +55,7 @@ Installation
 You don't have to install this module. To make the features working :
 
 * make the module ``module_change_auto_install`` available in your addons path
-* update your ``odoo.cfg`` following  the "Configure" section
+* either update your ``odoo.cfg`` or set the environment variables following the "Configure" section
 
 Configuration
 =============
@@ -66,15 +66,20 @@ Configuration
 
 * (optional) Add a new entry ``modules_auto_install_disabled`` to mark
   a list of modules as NOT auto installable.
+  The environment variable ``ODOO_MODULES_AUTO_INSTALL_DISABLED`` can also be set.
 
 * (optional) Add a new entry ``modules_auto_install_enabled`` to mark
   a list of modules as auto installable. This feature can be usefull for companies
   that are hosting a lot of Odoo instances for many customers, and want some modules
   to be always installed.
+  The environment variable ``ODOO_MODULES_AUTO_INSTALL_ENABLED`` can also be set.
+
+The values in the configuration file takes precedence over the environment variable
+values.
 
 **Typical Settings**
 
-.. code-block:: shell
+.. code-block:: cfg
 
     server_wide_modules = web,module_change_auto_install
 
@@ -89,6 +94,13 @@ Configuration
         disable_odoo_online,
         account_usability
 
+When using environment variables, the same configuration is:
+
+.. code-block:: shell
+
+   export ODOO_MODULES_AUTO_INSTALL_DISABLED=partner_autocomplete,iap,mail_bot
+   export ODOO_MODULES_AUTO_INSTALL_ENABLED=web_responsive:web,base_technical_features,disable_odoo_online,account_usability
+
 Run your instance and check logs. Modules that has been altered should be present in your log, at the load of your instance:
 
 .. code-block:: shell
@@ -102,7 +114,7 @@ Run your instance and check logs. Modules that has been altered should be presen
 
 if your ``odoo.cfg`` file contains the following configuration:
 
-.. code-block:: shell
+.. code-block:: cfg
 
     modules_auto_install_enabled =
         account_usability,
@@ -120,6 +132,13 @@ The behaviour will be the following:
 
 * ``point_of_sale`` module will be installed as soon as ``sale`` and ``purchase`` module are installed.
 
+When using environment variables, the same configuration is:
+
+.. code-block:: shell
+
+   export ODOO_MODULES_AUTO_INSTALL_ENABLED=account_usability,web_responsive:web,base_technical_features:,point_of_sale:sale/purchase
+
+
 Development
 ===========
 
@@ -150,6 +169,9 @@ Contributors
 ~~~~~~~~~~~~
 
 * Sylvain LE GAL <https://twitter.com/legalsylvain>
+* XCG Consulting, part of `Orbeet <https://orbeet.io/>`__:
+
+  * Vincent Hatakeyama <[email protected]>
 
 Maintainers
 ~~~~~~~~~~~

diff --git a/module_change_auto_install/__manifest__.py b/module_change_auto_install/__manifest__.py
@@ -5,7 +5,7 @@
 {
     "name": "Change auto installable modules",
     "summary": "Customize auto installables modules by configuration",
-    "version": "16.0.1.0.1",
+    "version": "16.0.1.0.2",
     "category": "Tools",
     "maintainers": ["legalsylvain"],
     "author": "GRAP, Odoo Community Association (OCA)",

diff --git a/module_change_auto_install/static/description/index.html b/module_change_auto_install/static/description/index.html
@@ -366,7 +366,7 @@ <h1 class="title">Change auto installable modules</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:a94b2d6389517ce49645d155eedbd1061a3b5e67dd1c6fbcf3bd8aa7b1c1d792
+!! source digest: sha256:803c0e63b0a4fd39047840304e38f292dc26531ff41d17fc433439c1034f8dd7
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.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-tools/tree/16.0/module_change_auto_install"><img alt="OCA/server-tools" src="https://img.shields.io/badge/github-OCA%2Fserver--tools-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/server-tools-16-0/server-tools-16-0-module_change_auto_install"><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-tools&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>In odoo, by default some modules are marked as auto installable
@@ -403,7 +403,7 @@ <h1><a class="toc-backref" href="#toc-entry-1">Installation</a></h1>
 <p>You don’t have to install this module. To make the features working :</p>
 <ul class="simple">
 <li>make the module <tt class="docutils literal">module_change_auto_install</tt> available in your addons path</li>
-<li>update your <tt class="docutils literal">odoo.cfg</tt> following  the “Configure” section</li>
+<li>either update your <tt class="docutils literal">odoo.cfg</tt> or set the environment variables following the “Configure” section</li>
 </ul>
 </div>
 <div class="section" id="configuration">
@@ -412,26 +412,35 @@ <h1><a class="toc-backref" href="#toc-entry-2">Configuration</a></h1>
 <li>Edit your <tt class="docutils literal">odoo.cfg</tt> configuration file:</li>
 <li>Add the module <tt class="docutils literal">module_change_auto_install</tt> in the <tt class="docutils literal">server_wide_modules</tt> list.</li>
 <li>(optional) Add a new entry <tt class="docutils literal">modules_auto_install_disabled</tt> to mark
-a list of modules as NOT auto installable.</li>
+a list of modules as NOT auto installable.
+The environment variable <tt class="docutils literal">ODOO_MODULES_AUTO_INSTALL_DISABLED</tt> can also be set.</li>
 <li>(optional) Add a new entry <tt class="docutils literal">modules_auto_install_enabled</tt> to mark
 a list of modules as auto installable. This feature can be usefull for companies
 that are hosting a lot of Odoo instances for many customers, and want some modules
-to be always installed.</li>
+to be always installed.
+The environment variable <tt class="docutils literal">ODOO_MODULES_AUTO_INSTALL_ENABLED</tt> can also be set.</li>
 </ul>
+<p>The values in the configuration file takes precedence over the environment variable
+values.</p>
 <p><strong>Typical Settings</strong></p>
+<pre class="code cfg literal-block">
+<span class="na">server_wide_modules</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s">web,module_change_auto_install</span><span class="w">
+
+</span><span class="na">modules_auto_install_disabled</span><span class="w"> </span><span class="o">=</span><span class="w">
+    </span><span class="na">partner_autocomplete,</span><span class="w">
+    </span><span class="na">iap,</span><span class="w">
+    </span><span class="na">mail_bot</span><span class="w">
+
+</span><span class="na">modules_auto_install_enabled</span><span class="w"> </span><span class="o">=</span><span class="w">
+    </span><span class="na">web_responsive</span><span class="o">:</span><span class="s">web,</span><span class="w">
+    </span><span class="na">base_technical_features,</span><span class="w">
+    </span><span class="na">disable_odoo_online,</span><span class="w">
+    </span><span class="na">account_usability</span>
+</pre>
+<p>When using environment variables, the same configuration is:</p>
 <pre class="code shell literal-block">
-<span class="nv">server_wide_modules</span><span class="w"> </span><span class="o">=</span><span class="w"> </span>web,module_change_auto_install<span class="w">
-
-</span><span class="nv">modules_auto_install_disabled</span><span class="w"> </span><span class="o">=</span><span class="w">
-    </span>partner_autocomplete,<span class="w">
-    </span>iap,<span class="w">
-    </span>mail_bot<span class="w">
-
-</span><span class="nv">modules_auto_install_enabled</span><span class="w"> </span><span class="o">=</span><span class="w">
-    </span>web_responsive:web,<span class="w">
-    </span>base_technical_features,<span class="w">
-    </span>disable_odoo_online,<span class="w">
-    </span>account_usability
+<span class="nb">export</span><span class="w"> </span><span class="nv">ODOO_MODULES_AUTO_INSTALL_DISABLED</span><span class="o">=</span>partner_autocomplete,iap,mail_bot<span class="w">
+</span><span class="nb">export</span><span class="w"> </span><span class="nv">ODOO_MODULES_AUTO_INSTALL_ENABLED</span><span class="o">=</span>web_responsive:web,base_technical_features,disable_odoo_online,account_usability
 </pre>
 <p>Run your instance and check logs. Modules that has been altered should be present in your log, at the load of your instance:</p>
 <pre class="code shell literal-block">
@@ -442,12 +451,12 @@ <h1><a class="toc-backref" href="#toc-entry-2">Configuration</a></h1>
 </pre>
 <p><strong>Advanced Configuration Possibilities</strong></p>
 <p>if your <tt class="docutils literal">odoo.cfg</tt> file contains the following configuration:</p>
-<pre class="code shell literal-block">
-<span class="nv">modules_auto_install_enabled</span><span class="w"> </span><span class="o">=</span><span class="w">
-    </span>account_usability,<span class="w">
-    </span>web_responsive:web,<span class="w">
-    </span>base_technical_features:,<span class="w">
-    </span>point_of_sale:sale/purchase
+<pre class="code cfg literal-block">
+<span class="na">modules_auto_install_enabled</span><span class="w"> </span><span class="o">=</span><span class="w">
+    </span><span class="na">account_usability,</span><span class="w">
+    </span><span class="na">web_responsive</span><span class="o">:</span><span class="s">web,</span><span class="w">
+    </span><span class="na">base_technical_features</span><span class="o">:</span><span class="s">,</span><span class="w">
+    </span><span class="na">point_of_sale</span><span class="o">:</span><span class="s">sale/purchase</span>
 </pre>
 <p>The behaviour will be the following:</p>
 <ul class="simple">
@@ -456,6 +465,10 @@ <h1><a class="toc-backref" href="#toc-entry-2">Configuration</a></h1>
 <li><tt class="docutils literal">base_technical_features</tt> will be ALWAYS installed</li>
 <li><tt class="docutils literal">point_of_sale</tt> module will be installed as soon as <tt class="docutils literal">sale</tt> and <tt class="docutils literal">purchase</tt> module are installed.</li>
 </ul>
+<p>When using environment variables, the same configuration is:</p>
+<pre class="code shell literal-block">
+<span class="nb">export</span><span class="w"> </span><span class="nv">ODOO_MODULES_AUTO_INSTALL_ENABLED</span><span class="o">=</span>account_usability,web_responsive:web,base_technical_features:,point_of_sale:sale/purchase
+</pre>
 </div>
 <div class="section" id="development">
 <h1><a class="toc-backref" href="#toc-entry-3">Development</a></h1>
@@ -484,6 +497,10 @@ <h2><a class="toc-backref" href="#toc-entry-6">Authors</a></h2>
 <h2><a class="toc-backref" href="#toc-entry-7">Contributors</a></h2>
 <ul class="simple">
 <li>Sylvain LE GAL &lt;<a class="reference external" href="https://twitter.com/legalsylvain">https://twitter.com/legalsylvain</a>&gt;</li>
+<li>XCG Consulting, part of <a class="reference external" href="https://orbeet.io/">Orbeet</a>:<ul>
+<li>Vincent Hatakeyama &lt;<a class="reference external" href="mailto:vincent.hatakeyama&#64;xcg-consulting.fr">vincent.hatakeyama&#64;xcg-consulting.fr</a>&gt;</li>
+</ul>
+</li>
 </ul>
 </div>
 <div class="section" id="maintainers">