[BOT] post-merge updates

README.md

@@ -24,7 +24,7 @@ addon | version | maintainers | summary
 [base_external_dbsource](base_external_dbsource/) | 17.0.1.0.0 |  | External Database Sources
 [base_external_dbsource_sqlite](base_external_dbsource_sqlite/) | 17.0.1.0.0 | [![anddago78](https://github.com/anddago78.png?size=30px)](https://github.com/anddago78) | External Database Source - SQLite
 [base_global_discount](base_global_discount/) | 17.0.1.0.0 |  | Base Global Discount
-[base_user_role](base_user_role/) | 17.0.1.1.1 | [![sebalix](https://github.com/sebalix.png?size=30px)](https://github.com/sebalix) [![jcdrubay](https://github.com/jcdrubay.png?size=30px)](https://github.com/jcdrubay) [![novawish](https://github.com/novawish.png?size=30px)](https://github.com/novawish) | User roles
+[base_user_role](base_user_role/) | 17.0.1.1.2 | [![sebalix](https://github.com/sebalix.png?size=30px)](https://github.com/sebalix) [![jcdrubay](https://github.com/jcdrubay.png?size=30px)](https://github.com/jcdrubay) [![novawish](https://github.com/novawish.png?size=30px)](https://github.com/novawish) | User roles
 [base_user_role_company](base_user_role_company/) | 17.0.1.1.1 |  | User roles by company
 [base_user_role_history](base_user_role_history/) | 17.0.1.0.0 | [![ThomasBinsfeld](https://github.com/ThomasBinsfeld.png?size=30px)](https://github.com/ThomasBinsfeld) | This module allows to track the changes on users roles.
 

base_user_role/README.rst

@@ -7,7 +7,7 @@ User roles
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:520f0004fbbd2497fb88fee2dec11dae6962894d4084b704724ff2fe695a5f30
+   !! source digest: sha256:cdf6b5e7e65781049c7c413effea6fc0d4f371b1fdd1f6384dd911ea9aae76a6
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png
@@ -37,13 +37,12 @@ time, juggling with many technical groups. For this purpose, this module
 will help you to:
 
    - define functional roles by aggregating low-level groups,
-   -  set user accounts with the predefined roles (roles are
+   - set user accounts with the predefined roles (roles are cumulative),
-      cumulative),
    - update groups of all relevant user accounts (all at once),
    - ensure that user accounts will have the groups defined in their
-      roles (nothing more, nothing less). In other words, you can not
+     roles (nothing more, nothing less). In other words, you can not set
-      set groups manually on a user as long as there is roles configured
+     groups manually on a user as long as there is roles configured on
-      on it,
+     it,
    - activate/deactivate roles depending on the date (useful to plan
      holidays, etc)
    - get a quick overview of roles and the related user accounts.

base_user_role/__manifest__.py

@@ -4,7 +4,7 @@
 
 {
     "name": "User roles",
-    "version": "17.0.1.1.1",
+    "version": "17.0.1.1.2",
     "category": "Tools",
     "author": "ABF OSIELL, Odoo Community Association (OCA)",
     "license": "LGPL-3",

base_user_role/static/description/index.html

@@ -367,7 +367,7 @@ ul.auto-toc {
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:520f0004fbbd2497fb88fee2dec11dae6962894d4084b704724ff2fe695a5f30
+!! source digest: sha256:cdf6b5e7e65781049c7c413effea6fc0d4f371b1fdd1f6384dd911ea9aae76a6
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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-backend/tree/17.0/base_user_role"><img alt="OCA/server-backend" src="https://img.shields.io/badge/github-OCA%2Fserver--backend-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/server-backend-17-0/server-backend-17-0-base_user_role"><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-backend&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 was written to extend the standard functionality regarding
@@ -379,13 +379,12 @@ will help you to:</p>
 <blockquote>
 <ul class="simple">
 <li>define functional roles by aggregating low-level groups,</li>
-<li>set user accounts with the predefined roles (roles are
+<li>set user accounts with the predefined roles (roles are cumulative),</li>
-cumulative),</li>
 <li>update groups of all relevant user accounts (all at once),</li>
 <li>ensure that user accounts will have the groups defined in their
-roles (nothing more, nothing less). In other words, you can not
+roles (nothing more, nothing less). In other words, you can not set
-set groups manually on a user as long as there is roles configured
+groups manually on a user as long as there is roles configured on
-on it,</li>
+it,</li>
 <li>activate/deactivate roles depending on the date (useful to plan
 holidays, etc)</li>
 <li>get a quick overview of roles and the related user accounts.</li>