From adf0f9e020f2d4dfe6de6af4c16a20f606560b4a Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Fri, 28 Feb 2025 10:38:54 +0000 Subject: [PATCH] [BOT] post-merge updates --- README.md | 1 + base_user_role_company/README.rst | 34 +++++++++---------- .../static/description/index.html | 10 +++--- setup/_metapackage/pyproject.toml | 3 +- 4 files changed, 25 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index ee0d244b1..96c60c59e 100644 --- a/README.md +++ b/README.md @@ -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) diff --git a/base_user_role_company/README.rst b/base_user_role_company/README.rst index 184839e31..b96b2d626 100644 --- a/base_user_role_company/README.rst +++ b/base_user_role_company/README.rst @@ -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 @@ -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 =========== @@ -105,17 +105,17 @@ Contributors `Open Source Integrators `__ - - Daniel Reis - - Chandresh Thakkar - - Urvisha Desai + - Daniel Reis + - Chandresh Thakkar + - Urvisha Desai `WeSolved `__ - - Robin Conjour + - Robin Conjour `Dynapps `__ - - Bert Van Groenendael + - Bert Van Groenendael Maintainers ----------- diff --git a/base_user_role_company/static/description/index.html b/base_user_role_company/static/description/index.html index 836d5dc80..b239da977 100644 --- a/base_user_role_company/static/description/index.html +++ b/base_user_role_company/static/description/index.html @@ -367,7 +367,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 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->

Beta License: AGPL-3 OCA/server-backend Translate me on Weblate Try me on Runboat

Enable User Roles depending on the Companies selected.

@@ -415,10 +415,10 @@

Usage

  • 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 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.
    diff --git a/setup/_metapackage/pyproject.toml b/setup/_metapackage/pyproject.toml index dec664923..1f13d54e0 100644 --- a/setup/_metapackage/pyproject.toml +++ b/setup/_metapackage/pyproject.toml @@ -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",