Merge pull request #110 from OCA/17.0

Fork Sync Branch 17.0-dev
BTLzdravtech · Jan 16, 2025 · 5df7fd1 · 5df7fd1
2 parents c0f66b1 + 0fe0548
commit 5df7fd1
Show file tree

Hide file tree

Showing 16 changed files with 85 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ addon | version | maintainers | summary
 --- | --- | --- | ---
 [web_calendar_slot_duration](web_calendar_slot_duration/) | 17.0.1.0.0 | [![Yajo](https://github.com/Yajo.png?size=30px)](https://github.com/Yajo) | Customizable calendar slot durations
 [web_chatter_position](web_chatter_position/) | 17.0.1.0.1 | [![trisdoan](https://github.com/trisdoan.png?size=30px)](https://github.com/trisdoan) | Add an option to change the chatter position
-[web_company_color](web_company_color/) | 17.0.1.0.0 |  | Web Company Color
+[web_company_color](web_company_color/) | 17.0.1.1.0 |  | Web Company Color
 [web_dialog_size](web_dialog_size/) | 17.0.1.0.0 |  | 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.0.0 |  | Web editor class selector
 [web_environment_ribbon](web_environment_ribbon/) | 17.0.1.0.2 |  | Web Environment Ribbon

diff --git a/web_company_color/README.rst b/web_company_color/README.rst
@@ -7,7 +7,7 @@ Web Company Color
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:d3127248cefbf2ea4da8c6e1569a1a9129edd5e5d7eb612c8d805bacb56a5ab0
+   !! source digest: sha256:c8d110574cede11b7a20f163ff86b8b15f92b252204b5f4fea36e1c89ce4384f
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

diff --git a/web_company_color/__manifest__.py b/web_company_color/__manifest__.py
@@ -5,7 +5,7 @@
 {
     "name": "Web Company Color",
     "category": "web",
-    "version": "17.0.1.0.0",
+    "version": "17.0.1.1.0",
     "author": "Alexandre Díaz, Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/web",
     "depends": ["web", "base_sparse_field"],

diff --git a/web_company_color/i18n/ca.po b/web_company_color/i18n/ca.po
@@ -99,3 +99,8 @@ msgstr ""
 #: model:ir.model.fields,field_description:web_company_color.field_res_company__scss_modif_timestamp
 msgid "SCSS Modif. Timestamp"
 msgstr ""
+
+#. module: web_company_color
+#: model:ir.model.fields,field_description:web_company_color.field_res_company__color_submenu_text
+msgid "Submenu Text Color"
+msgstr ""
diff --git a/web_company_color/i18n/de.po b/web_company_color/i18n/de.po
@@ -104,6 +104,11 @@ msgstr "Qweb"
 msgid "SCSS Modif. Timestamp"
 msgstr ""
 
+#. module: web_company_color
+#: model:ir.model.fields,field_description:web_company_color.field_res_company__color_submenu_text
+msgid "Submenu Text Color"
+msgstr ""
+
 #~ msgid "Navbar Colors"
 #~ msgstr "Navbar-Farben"
 

diff --git a/web_company_color/i18n/es.po b/web_company_color/i18n/es.po
@@ -104,6 +104,11 @@ msgstr "Qweb"
 msgid "SCSS Modif. Timestamp"
 msgstr "SCSS Modif. Marca de tiempo"
 
+#. module: web_company_color
+#: model:ir.model.fields,field_description:web_company_color.field_res_company__color_submenu_text
+msgid "Submenu Text Color"
+msgstr ""
+
 #~ msgid "Navbar Colors"
 #~ msgstr "Colores de la barra de navegación"
 

diff --git a/web_company_color/i18n/fr.po b/web_company_color/i18n/fr.po
@@ -103,3 +103,8 @@ msgstr "Qweb"
 #: model:ir.model.fields,field_description:web_company_color.field_res_company__scss_modif_timestamp
 msgid "SCSS Modif. Timestamp"
 msgstr "Heure de modification du SCSS"
+
+#. module: web_company_color
+#: model:ir.model.fields,field_description:web_company_color.field_res_company__color_submenu_text
+msgid "Submenu Text Color"
+msgstr ""
diff --git a/web_company_color/i18n/hr.po b/web_company_color/i18n/hr.po
@@ -101,6 +101,11 @@ msgstr ""
 msgid "SCSS Modif. Timestamp"
 msgstr "SCSS Modif. Vremenski žig"
 
+#. module: web_company_color
+#: model:ir.model.fields,field_description:web_company_color.field_res_company__color_submenu_text
+msgid "Submenu Text Color"
+msgstr ""
+
 #~ msgid "Navbar Colors"
 #~ msgstr "Boje navigacijske trake"
 

diff --git a/web_company_color/i18n/it.po b/web_company_color/i18n/it.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 13.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2023-11-27 11:33+0000\n"
+"PO-Revision-Date: 2025-01-10 14:06+0000\n"
 "Last-Translator: mymage <[email protected]>\n"
 "Language-Team: none\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.17\n"
+"X-Generator: Weblate 5.6.2\n"
 
 #. module: web_company_color
 #: model_terms:ir.ui.view,arch_db:web_company_color.view_company_form
@@ -103,6 +103,11 @@ msgstr "Qweb"
 msgid "SCSS Modif. Timestamp"
 msgstr "Timestamp modifica SCSS"
 
+#. module: web_company_color
+#: model:ir.model.fields,field_description:web_company_color.field_res_company__color_submenu_text
+msgid "Submenu Text Color"
+msgstr "Colore testo sub menu"
+
 #~ msgid "Navbar Colors"
 #~ msgstr "Colori Barra Navigazione"
 

diff --git a/web_company_color/i18n/nl.po b/web_company_color/i18n/nl.po
@@ -104,6 +104,11 @@ msgstr "Qweb"
 msgid "SCSS Modif. Timestamp"
 msgstr ""
 
+#. module: web_company_color
+#: model:ir.model.fields,field_description:web_company_color.field_res_company__color_submenu_text
+msgid "Submenu Text Color"
+msgstr ""
+
 #~ msgid "Navbar Colors"
 #~ msgstr "Navigatiebalk Kleuren"
 

diff --git a/web_company_color/i18n/pt.po b/web_company_color/i18n/pt.po
@@ -102,3 +102,8 @@ msgstr "QWeb"
 #: model:ir.model.fields,field_description:web_company_color.field_res_company__scss_modif_timestamp
 msgid "SCSS Modif. Timestamp"
 msgstr "SCSS Modif. Timestamp"
+
+#. module: web_company_color
+#: model:ir.model.fields,field_description:web_company_color.field_res_company__color_submenu_text
+msgid "Submenu Text Color"
+msgstr ""
diff --git a/web_company_color/i18n/web_company_color.pot b/web_company_color/i18n/web_company_color.pot
@@ -95,3 +95,8 @@ msgstr ""
 #: model:ir.model.fields,field_description:web_company_color.field_res_company__scss_modif_timestamp
 msgid "SCSS Modif. Timestamp"
 msgstr ""
+
+#. module: web_company_color
+#: model:ir.model.fields,field_description:web_company_color.field_res_company__color_submenu_text
+msgid "Submenu Text Color"
+msgstr ""
diff --git a/web_company_color/i18n/zh_CN.po b/web_company_color/i18n/zh_CN.po
@@ -100,6 +100,11 @@ msgstr "Qweb"
 msgid "SCSS Modif. Timestamp"
 msgstr "SCSS修改时间戳"
 
+#. module: web_company_color
+#: model:ir.model.fields,field_description:web_company_color.field_res_company__color_submenu_text
+msgid "Submenu Text Color"
+msgstr ""
+
 #~ msgid "Navbar Colors"
 #~ msgstr "导航栏颜色"
 

diff --git a/web_company_color/models/ir_qweb.py b/web_company_color/models/ir_qweb.py
@@ -30,6 +30,30 @@ def _generate_asset_links_cache(
             res += [asset.get_company_color_asset_node()]
         return res
 
+    def _generate_asset_links(
+        self,
+        bundle,
+        css=True,
+        js=True,
+        debug_assets=False,
+        assets_params=None,
+        rtl=False,
+    ):
+        res = super()._generate_asset_links(
+            bundle,
+            css=css,
+            js=js,
+            debug_assets=debug_assets,
+            assets_params=assets_params,
+            rtl=rtl,
+        )
+        if bundle == "web_company_color.company_color_assets":
+            asset = AssetsBundleCompanyColor(
+                bundle, [], env=self.env, css=True, js=True
+            )
+            res += [asset.get_company_color_asset_node()]
+        return res
+
     def _get_asset_content(self, bundle, assets_params=None):
         """Handle 'special' web_company_color bundle"""
         if bundle == "web_company_color.company_color_assets":

diff --git a/web_company_color/models/res_company.py b/web_company_color/models/res_company.py
@@ -120,6 +120,9 @@ class ResCompany(models.Model):
                 background-color: %(color_navbar_bg_hover)s !important;
             }
         }
+        .dropdown-item{
+            color: %(color_submenu_text)s !important;
+        }
     """
 
     company_colors = fields.Serialized()
@@ -137,6 +140,7 @@ class ResCompany(models.Model):
     color_link_text_hover = fields.Char(
         "Link Text Color Hover", sparse="company_colors"
     )
+    color_submenu_text = fields.Char("Submenu Text Color", sparse="company_colors")
     scss_modif_timestamp = fields.Char("SCSS Modif. Timestamp")
 
     @api.model_create_multi
@@ -213,6 +217,7 @@ def _scss_get_sanitized_values(self):
                 "color_link_text": values.get("color_link_text") or "#71639e",
                 "color_link_text_hover": values.get("color_link_text_hover")
                 or "darken(#71639e, 10%)",
+                "color_submenu_text": values.get("color_link_text") or "#374151",
             }
         )
         return values

diff --git a/web_company_color/static/description/index.html b/web_company_color/static/description/index.html
@@ -367,7 +367,7 @@ <h1 class="title">Web Company Color</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:d3127248cefbf2ea4da8c6e1569a1a9129edd5e5d7eb612c8d805bacb56a5ab0
+!! source digest: sha256:c8d110574cede11b7a20f163ff86b8b15f92b252204b5f4fea36e1c89ce4384f
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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/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>