Skip to content

Syncing from upstream OCA/web (17.0) #1688

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bt-admin merged 3 commits into from
Feb 27, 2026
Merged

Syncing from upstream OCA/web (17.0) #1688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0a8520c
[FIX] web_company_color: avoid overriding navbar dropdown items
cyrilfassiau Feb 20, 2026
5e2eb4a
Merge PR #3443 into 17.0
OCA-git-bot Feb 26, 2026
f6cb96b
[BOT] post-merge updates
OCA-git-bot Feb 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ addon | version | maintainers | summary
--- | --- | --- | ---
[web_calendar_slot_duration](web_calendar_slot_duration/) | 17.0.1.0.0 | <a href='https://github.com/Yajo'><img src='https://github.com/Yajo.png' width='32' height='32' style='border-radius:50%;' alt='Yajo'/></a> | Customizable calendar slot durations
[web_chatter_position](web_chatter_position/) | 17.0.1.0.1 | <a href='https://github.com/trisdoan'><img src='https://github.com/trisdoan.png' width='32' height='32' style='border-radius:50%;' alt='trisdoan'/></a> | Add an option to change the chatter position
[web_company_color](web_company_color/) | 17.0.1.2.1 | | Web Company Color
[web_company_color](web_company_color/) | 17.0.1.2.2 | | Web Company Color
[web_dialog_size](web_dialog_size/) | 17.0.1.0.1 | | A module that lets the user expand a dialog box to the full screen width.
[web_editor_class_selector](web_editor_class_selector/) | 17.0.1.1.0 | | Web editor class selector
[web_environment_ribbon](web_environment_ribbon/) | 17.0.1.0.3 | | Web Environment Ribbon
Expand Down
2 changes: 1 addition & 1 deletion web_company_color/README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Web Company Color
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:62405140d3524aab7dbf2ccc711a250068653d1e28d977b22e804b8c4a387de5
!! source digest: sha256:a57b2e6dab71d71dd429d0b11f37098d23c221438f79d8435c5a312230c9e3a6
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
Expand Down
2 changes: 1 addition & 1 deletion web_company_color/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{
"name": "Web Company Color",
"category": "web",
"version": "17.0.1.2.1",
"version": "17.0.1.2.2",
"author": "Alexandre Díaz, Odoo Community Association (OCA)",
"website": "https://github.com/OCA/web",
"depends": ["web", "base_sparse_field"],
Expand Down
6 changes: 3 additions & 3 deletions web_company_color/models/res_company.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,9 @@ class ResCompany(models.Model):
background-color: %(color_navbar_bg_hover)s !important;
}
}
.dropdown-item{
color: %(color_submenu_text)s !important;
}
.o_main_navbar .dropdown-menu .dropdown-item:not(.o_menu_brand, .o_nav_entry) {
color: %(color_submenu_text)s !important;
}
"""

company_colors = fields.Serialized()
Expand Down
2 changes: 1 addition & 1 deletion web_company_color/static/description/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ <h1>Web Company Color</h1>
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:62405140d3524aab7dbf2ccc711a250068653d1e28d977b22e804b8c4a387de5
!! source digest: sha256:a57b2e6dab71d71dd429d0b11f37098d23c221438f79d8435c5a312230c9e3a6
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<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/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/web/tree/17.0/web_company_color"><img alt="OCA/web" src="https://img.shields.io/badge/github-OCA%2Fweb-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/web-17-0/web-17-0-web_company_color"><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/web&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 change navbar colors based in the company logo colors.</p>
Expand Down