Skip to content

Commit

Permalink
[BOT] post-merge updates
Browse files Browse the repository at this point in the history
  • Loading branch information
OCA-git-bot committed Feb 28, 2025
1 parent 1b50029 commit adf0f9e
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 23 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ Available addons
addon | version | maintainers | summary
--- | --- | --- | ---
[base_user_role](base_user_role/) | 18.0.1.0.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_company](base_user_role_company/) | 18.0.1.0.0 | | User roles by company

[//]: # (end addons)

Expand Down
34 changes: 17 additions & 17 deletions base_user_role_company/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ User roles by company
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:3b8bc6ff8f0969332ac9de6043d82b9d25601b8efd62d8546e6a7c661e91036d
!! source digest: sha256:1aa712436ef7a83928100a1e88d3c598d69a61f61d9a93405cb66fff6c445daa
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
Expand Down Expand Up @@ -66,21 +66,21 @@ to all active companies will be activated.

For example:

- A "SALES PERSON" and a "SALES MANAGER" roles are created.
- A "SALES PERSON" and a "SALES MANAGER" roles are created.

- A user is assigned to the roles:
- A user is assigned to the roles:

- "SALES PERSON", with no specific company assigned (meaning all)
- "SALES MANAGER" only to "My Company (Chicago)"
- "SALES PERSON", with no specific company assigned (meaning all)
- "SALES MANAGER" only to "My Company (Chicago)"

- When selecting active companies from the UI widget:
- When selecting active companies from the UI widget:

- If only "My Company (San Francisco)" is active, "SALES PERSON"
will be active.
- If only "My Company (Chicago)" is active, "SALES PERSON" and
"SALES MANAGER" will be active.
- If both "My Company (San Francisco)" and "My Company (Chicago)" is
active, "SALES PERSON" will be active.
- If only "My Company (San Francisco)" is active, "SALES PERSON" will
be active.
- If only "My Company (Chicago)" is active, "SALES PERSON" and "SALES
MANAGER" will be active.
- If both "My Company (San Francisco)" and "My Company (Chicago)" is
active, "SALES PERSON" will be active.

Bug Tracker
===========
Expand All @@ -105,17 +105,17 @@ Contributors

`Open Source Integrators <http://opensourceintegrators.com>`__

- Daniel Reis <[email protected]>
- Chandresh Thakkar <[email protected]>
- Urvisha Desai <[email protected]>
- Daniel Reis <[email protected]>
- Chandresh Thakkar <[email protected]>
- Urvisha Desai <[email protected]>

`WeSolved <http://wesolved.com>`__

- Robin Conjour <[email protected]>
- Robin Conjour <[email protected]>

`Dynapps <http://dynapps.eu>`__

- Bert Van Groenendael <[email protected]>
- Bert Van Groenendael <[email protected]>

Maintainers
-----------
Expand Down
10 changes: 5 additions & 5 deletions base_user_role_company/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ <h1 class="title">User roles by company</h1>
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:3b8bc6ff8f0969332ac9de6043d82b9d25601b8efd62d8546e6a7c661e91036d
!! source digest: sha256:1aa712436ef7a83928100a1e88d3c598d69a61f61d9a93405cb66fff6c445daa
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<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-backend/tree/18.0/base_user_role_company"><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-18-0/server-backend-18-0-base_user_role_company"><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=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
<p>Enable User Roles depending on the Companies selected.</p>
Expand Down Expand Up @@ -415,10 +415,10 @@ <h1><a class="toc-backref" href="#toc-entry-2">Usage</a></h1>
</ul>
</li>
<li>When selecting active companies from the UI widget:<ul>
<li>If only “My Company (San Francisco)” is active, “SALES PERSON”
will be active.</li>
<li>If only “My Company (Chicago)” is active, “SALES PERSON” and
“SALES MANAGER” will be active.</li>
<li>If only “My Company (San Francisco)” is active, “SALES PERSON” will
be active.</li>
<li>If only “My Company (Chicago)” is active, “SALES PERSON” and “SALES
MANAGER” will be active.</li>
<li>If both “My Company (San Francisco)” and “My Company (Chicago)” is
active, “SALES PERSON” will be active.</li>
</ul>
Expand Down
3 changes: 2 additions & 1 deletion setup/_metapackage/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
[project]
name = "odoo-addons-oca-server-backend"
version = "18.0.20241127.0"
version = "18.0.20250228.0"
dependencies = [
"odoo-addon-base_user_role==18.0.*",
"odoo-addon-base_user_role_company==18.0.*",
]
classifiers=[
"Programming Language :: Python",
Expand Down

0 comments on commit adf0f9e

Please sign in to comment.