[MIG] brand: Migration to 18.0

OCA · Jan 17, 2025 · 1cdf97f · 1cdf97f
1 parent 933c31e
commit 1cdf97f
Show file tree

Hide file tree

Showing 10 changed files with 109 additions and 74 deletions.
diff --git a/brand/README.rst b/brand/README.rst
@@ -17,13 +17,13 @@ Brand
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fbrand-lightgray.png?logo=github
-    :target: https://github.com/OCA/brand/tree/17.0/brand
+    :target: https://github.com/OCA/brand/tree/18.0/brand
     :alt: OCA/brand
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/brand-17-0/brand-17-0-brand
+    :target: https://translation.odoo-community.org/projects/brand-18-0/brand-18-0-brand
     :alt: Translate me on Weblate
 .. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
-    :target: https://runboat.odoo-community.org/builds?repo=OCA/brand&target_branch=17.0
+    :target: https://runboat.odoo-community.org/builds?repo=OCA/brand&target_branch=18.0
     :alt: Try me on Runboat
 
 |badge1| |badge2| |badge3| |badge4| |badge5|
@@ -65,7 +65,7 @@ To make a branded object, you need to:
    it's required or not.
 
 You can refer to the
-`account_brand <https://github.com/OCA/brand/blob/12.0/account_brand>`__.
+`account_brand <https://github.com/OCA/brand/blob/18.0/account_brand>`__.
 for more details.
 
 Bug Tracker
@@ -74,7 +74,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/brand/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
-`feedback <https://github.com/OCA/brand/issues/new?body=module:%20brand%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/brand/issues/new?body=module:%20brand%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
 
@@ -122,6 +122,6 @@ Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
 
 |maintainer-sbejaoui| 
 
-This module is part of the `OCA/brand <https://github.com/OCA/brand/tree/17.0/brand>`_ project on GitHub.
+This module is part of the `OCA/brand <https://github.com/OCA/brand/tree/18.0/brand>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/brand/__manifest__.py b/brand/__manifest__.py
@@ -7,7 +7,7 @@
         This is a base addon for brand modules. It adds the brand object and
         its menu and define an abstract model to be inherited from branded
         objects""",
-    "version": "17.0.1.1.1",
+    "version": "18.0.1.0.0",
     "license": "AGPL-3",
     "author": "Odoo Community Association (OCA), ACSONE SA/NV",
     "website": "https://github.com/OCA/brand",

diff --git a/brand/models/res_brand_mixin.py b/brand/models/res_brand_mixin.py
@@ -53,8 +53,8 @@ def _onchange_brand_id(self):
     def _get_view(self, view_id=None, view_type="form", **options):
         """set visibility and requirement rules"""
         arch, view = super()._get_view(view_id, view_type, **options)
-        if self.env["res.brand"].check_access_rights("read", raise_exception=False):
-            if view.type in ["form", "tree"]:
+        if self.env["res.brand"].check_access("read"):
+            if view.type in ["form", "list"]:
                 brand_node = next(
                     iter(
                         arch.xpath(

diff --git a/brand/readme/USAGE.md b/brand/readme/USAGE.md
@@ -23,5 +23,5 @@ To make a branded object, you need to:
     it's required or not.
 
 You can refer to the
-[account_brand](https://github.com/OCA/brand/blob/12.0/account_brand).
+[account_brand](https://github.com/OCA/brand/blob/18.0/account_brand).
 for more details.
diff --git a/brand/static/description/index.html b/brand/static/description/index.html
@@ -8,10 +8,11 @@
 
 /*
 :Author: David Goodger ([email protected])
-:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
 :Copyright: This stylesheet has been placed in the public domain.
 
 Default cascading style sheet for the HTML output of Docutils.
+Despite the name, some widely supported CSS2 features are used.
 
 See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
 customize this style sheet.
@@ -274,7 +275,7 @@
   margin-left: 2em ;
   margin-right: 2em }
 
-pre.code .ln { color: grey; } /* line numbers */
+pre.code .ln { color: gray; } /* line numbers */
 pre.code, code { background-color: #eeeeee }
 pre.code .comment, code .comment { color: #5C6576 }
 pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
@@ -300,7 +301,7 @@
 span.pre {
   white-space: pre }
 
-span.problematic {
+span.problematic, pre.problematic {
   color: red }
 
 span.section-subtitle {
@@ -368,7 +369,7 @@ <h1 class="title">Brand</h1>
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! source digest: sha256:dfca48afbbc980c86b0e1659f2fac237d7f98779ff9d9ad686ead39dc20dfadc
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<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/brand/tree/17.0/brand"><img alt="OCA/brand" src="https://img.shields.io/badge/github-OCA%2Fbrand-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/brand-17-0/brand-17-0-brand"><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/brand&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><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/brand/tree/18.0/brand"><img alt="OCA/brand" src="https://img.shields.io/badge/github-OCA%2Fbrand-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/brand-18-0/brand-18-0-brand"><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/brand&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>This is a base addon for brand modules. It adds the brand object and its
 menu and define an abstract model to be inherited from branded objects.</p>
 <p><strong>Table of contents</strong></p>
@@ -413,15 +414,15 @@ <h1><a class="toc-backref" href="#toc-entry-1">Usage</a></h1>
 </li>
 </ol>
 <p>You can refer to the
-<a class="reference external" href="https://github.com/OCA/brand/blob/12.0/account_brand">account_brand</a>.
+<a class="reference external" href="https://github.com/OCA/brand/blob/18.0/account_brand">account_brand</a>.
 for more details.</p>
 </div>
 <div class="section" id="bug-tracker">
 <h1><a class="toc-backref" href="#toc-entry-2">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/brand/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/OCA/brand/issues/new?body=module:%20brand%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<a class="reference external" href="https://github.com/OCA/brand/issues/new?body=module:%20brand%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
@@ -452,13 +453,15 @@ <h2><a class="toc-backref" href="#toc-entry-6">Other credits</a></h2>
 <div class="section" id="maintainers">
 <h2><a class="toc-backref" href="#toc-entry-7">Maintainers</a></h2>
 <p>This module is maintained by the OCA.</p>
-<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
+<a class="reference external image-reference" href="https://odoo-community.org">
+<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
+</a>
 <p>OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.</p>
 <p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainer</a>:</p>
 <p><a class="reference external image-reference" href="https://github.com/sbejaoui"><img alt="sbejaoui" src="https://github.com/sbejaoui.png?size=40px" /></a></p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/brand/tree/17.0/brand">OCA/brand</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/brand/tree/18.0/brand">OCA/brand</a> project on GitHub.</p>
 <p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
 </div>
 </div>

diff --git a/brand/tests/__init__.py b/brand/tests/__init__.py
@@ -0,0 +1,3 @@
+from . import test_brand
+from . import test_brand_mixin
+from . import common
diff --git a/brand/tests/common.py b/brand/tests/common.py
@@ -0,0 +1,22 @@
+from odoo.tests.common import TransactionCase
+
+
+class CommonCase(TransactionCase):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.env = cls.env(context=dict(cls.env.context, tracking_disable=True))
+        cls.brand_model = cls.env["res.brand"]
+        cls.company_model = cls.env["res.company"]
+        cls.partner_model = cls.env["res.partner"]
+
+        cls.company_no_brand = cls.company_model.create({"name": "No Brand Company"})
+        cls.company_optional_brand = cls.company_model.create(
+            {"name": "Optional Brand Company", "brand_use_level": "optional"}
+        )
+        cls.company_required_brand = cls.company_model.create(
+            {"name": "Required Brand Company", "brand_use_level": "required"}
+        )
+
+        cls.partner = cls.partner_model.create({"name": "Test Partner"})
+        cls.brand = cls.brand_model.create({"partner_id": cls.partner.id})
diff --git a/brand/tests/test_brand.py b/brand/tests/test_brand.py
@@ -0,0 +1,8 @@
+from .common import CommonCase
+
+
+class TestBrandMixin(CommonCase):
+    def test_brand_creation(self):
+        """Test creation of a brand."""
+        brand = self.brand_model.create({"partner_id": self.partner.id})
+        self.assertTrue(brand.exists())
diff --git a/brand/tests/test_brand_mixin.py b/brand/tests/test_brand_mixin.py
@@ -0,0 +1,13 @@
+from lxml import etree
+
+from .common import CommonCase
+
+
+class TestBrand(CommonCase):
+    def test_get_view(self):
+        view = self.env["res.config.settings"].get_view(
+            view_id=self.env.ref("base.res_config_settings_view_form").id,
+            view_type="form",
+        )
+        doc = etree.XML(view["arch"])
+        self.assertTrue(doc.xpath("//field[@name='brand_use_level']"))
diff --git a/brand/views/res_brand.xml b/brand/views/res_brand.xml
@@ -62,12 +62,17 @@
                                     placeholder="ZIP"
                                     class="o_address_zip"
                                 />
-                                <field
-                                    name="country_id"
-                                    placeholder="Country"
-                                    class="o_address_country"
-                                    options="{&quot;no_open&quot;: True, &quot;no_create&quot;: True}"
-                                />
+                                <div
+                                    name="partner_address_country"
+                                    class="d-flex justify-content-between"
+                                >
+                                    <field
+                                        name="country_id"
+                                        placeholder="Country"
+                                        class="o_address_country"
+                                        options="{&quot;no_open&quot;: True, &quot;no_create&quot;: True}"
+                                    />
+                                </div>
                             </div>
                             <field name="vat" placeholder="e.g. BE0477472701" />
                         </group>
@@ -120,74 +125,55 @@
                 <field name="image_128" />
                 <field name="type" />
                 <templates>
-                    <t t-name="kanban-box">
-                        <div
-                            class="oe_kanban_global_click o_kanban_record_has_image_fill o_res_partner_kanban"
-                        >
-                            <t
-                                t-set="placeholder"
-                                t-value="'/base/static/img/company_image.png'"
-                            />
+                    <t t-name="card" class="flex-row">
+                        <t
+                            t-set="placeholder"
+                            t-value="'/base/static/img/company_image.png'"
+                        />
+                        <field
+                            name="image_128"
+                            widget="image"
+                            class="h-100"
+                            options="{'img_class': 'object-fit-cover'}"
+                        />
+                        <main class="ps-2 ps-md-0">
+                            <div class="mb-1">
+                                <field name="display_name" class="mb-0 fw-bold fs-5" />
+                            </div>
                             <div
-                                class="o_kanban_image_fill_left o_kanban_image_full"
-                                t-attf-style="background-image: url(#{kanban_image('res.brand', 'image_128', record.id.raw_value, placeholder)})"
-                                role="img"
-                            />
-                            <div class="oe_kanban_details d-flex flex-column">
-                                <strong
-                                    class="o_kanban_record_title oe_partner_heading"
-                                >
-                                    <field name="display_name" />
-                                </strong>
-                                <div
-                                    class="o_kanban_tags_section oe_kanban_partner_categories"
-                                />
-                                <ul>
-                                    <li
-                                        t-if="record.city.raw_value or record.country_id.raw_value"
-                                    >
-                                        <t t-if="record.city.raw_value">
-                                            <field name="city" />
-                                            <t t-if="record.country_id.raw_value">
-                                                ,
-                                            </t>
-                                        </t>
-                                        <t t-if="record.country_id.raw_value">
-                                            <field name="country_id" />
-                                        </t>
-                                    </li>
-                                    <li
-                                        t-if="record.email.raw_value"
-                                        class="o_text_overflow"
-                                    >
-                                        <field name="email" />
-                                    </li>
-                                </ul>
-                                <div class="o_row">
-                                    <span class="oe_kanban_partner_links" />
-                                </div>
+                                t-if="record.city.raw_value or record.country_id.raw_value"
+                            >
+                                <field name="city" />
+                                <span
+                                    t-if="record.city.raw_value and record.country_id.raw_value"
+                                >, </span>
+                                <field name="country_id" />
                             </div>
-                        </div>
+                            <field name="email" class="text-truncate" />
+                            <footer>
+                                <div />
+                            </footer>
+                        </main>
                     </t>
                 </templates>
             </kanban>
         </field>
     </record>
-    <record model="ir.ui.view" id="res_brand_tree_view">
-        <field name="name">res.brand.tree (in partner_brand)</field>
+    <record model="ir.ui.view" id="res_brand_list_view">
+        <field name="name">res.brand.list (in partner_brand)</field>
         <field name="model">res.brand</field>
         <field name="inherit_id" ref="base.view_partner_tree" />
         <field name="mode">primary</field>
         <field name="arch" type="xml">
-            <xpath expr="//tree" position="attributes">
+            <xpath expr="//list" position="attributes">
                 <attribute name="string">Brands</attribute>
             </xpath>
         </field>
     </record>
     <record model="ir.actions.act_window" id="res_brand_act_window">
         <field name="name">Brands</field>
         <field name="res_model">res.brand</field>
-        <field name="view_mode">kanban,tree,form</field>
+        <field name="view_mode">kanban,list,form</field>
         <field name="context">{'default_customer': 0, 'default_supplier': 0,}
         </field>
     </record>