diff --git a/product_brand/README.rst b/product_brand/README.rst index 6026e75e2..348cbed61 100644 --- a/product_brand/README.rst +++ b/product_brand/README.rst @@ -17,13 +17,13 @@ Product Brand Manager :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/product_brand + :target: https://github.com/OCA/brand/tree/18.0/product_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-product_brand + :target: https://translation.odoo-community.org/projects/brand-18-0/brand-18-0-product_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| @@ -76,7 +76,7 @@ Bug Tracker Bugs are tracked on `GitHub 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 `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -106,6 +106,7 @@ Contributors - Marcelo Pickler - Andrius Laukavičius (Boolit) - Daniel Campos +- Samir Guesmi - `Tecnativa `__ - David Vidal @@ -123,12 +124,13 @@ Contributors - `Trobz `__: - Thao Le + - Do Anh Duy Other credits ------------- -The migration of this module from 16.0 to 17.0 was financially supported -by Camptocamp. +The migration of this module from 16.0 to 17.0 and then from 17.0 to +18.0 was financially supported by Camptocamp. Maintainers ----------- @@ -143,6 +145,6 @@ 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. -This module is part of the `OCA/brand `_ project on GitHub. +This module is part of the `OCA/brand `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/product_brand/__manifest__.py b/product_brand/__manifest__.py index 1ee950da4..0907a2286 100644 --- a/product_brand/__manifest__.py +++ b/product_brand/__manifest__.py @@ -9,7 +9,7 @@ { "name": "Product Brand Manager", - "version": "17.0.1.1.1", + "version": "18.0.1.0.0", "development_status": "Mature", "category": "Product", "summary": "Product Brand Manager", diff --git a/product_brand/readme/CONTRIBUTORS.md b/product_brand/readme/CONTRIBUTORS.md index 162ecfe6e..9efb64fce 100644 --- a/product_brand/readme/CONTRIBUTORS.md +++ b/product_brand/readme/CONTRIBUTORS.md @@ -7,6 +7,7 @@ - Marcelo Pickler \<\> - Andrius Laukavičius \<\> (Boolit) - Daniel Campos \<\> +- Samir Guesmi \<\> - [Tecnativa](https://www.tecnativa.com) - David Vidal - João Marques @@ -15,5 +16,6 @@ - Alan Ramos - [NuoBiT Solutions](https://www.nuobit.com) - Eric Antones \<\> -- [Trobz](https://trobz.com): +- [Trobz](https://trobz.com): - Thao Le \<\> + - Do Anh Duy \<\> diff --git a/product_brand/readme/CREDITS.md b/product_brand/readme/CREDITS.md index 8add88a2e..58da683a0 100644 --- a/product_brand/readme/CREDITS.md +++ b/product_brand/readme/CREDITS.md @@ -1 +1 @@ -The migration of this module from 16.0 to 17.0 was financially supported by Camptocamp. +The migration of this module from 16.0 to 17.0 and then from 17.0 to 18.0 was financially supported by Camptocamp. diff --git a/product_brand/reports/account_invoice_report.py b/product_brand/reports/account_invoice_report.py index fb8897f56..772e43a0f 100644 --- a/product_brand/reports/account_invoice_report.py +++ b/product_brand/reports/account_invoice_report.py @@ -2,6 +2,7 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) from odoo import api, fields, models +from odoo.tools import SQL class AccountInvoiceReport(models.Model): @@ -10,15 +11,11 @@ class AccountInvoiceReport(models.Model): product_brand_id = fields.Many2one(comodel_name="product.brand", string="Brand") @api.model - def _select(self): - select_str = super()._select() - select_str += """ - , template.product_brand_id as product_brand_id - """ - return select_str + def _select(self) -> SQL: + return SQL( + "%s, template.product_brand_id as product_brand_id", super()._select() + ) @api.model - def _group_by(self): - group_by_str = super()._group_by() - group_by_str += ", template.product_brand_id" - return group_by_str + def _group_by(self) -> SQL: + return SQL("%s, template.product_brand_id", super()._group_by()) diff --git a/product_brand/static/description/index.html b/product_brand/static/description/index.html index 05bb63c22..a180b2182 100644 --- a/product_brand/static/description/index.html +++ b/product_brand/static/description/index.html @@ -369,7 +369,7 @@

Product Brand Manager

!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! source digest: sha256:a7a9c5429fcfddf3b8fb5b4a07cb7eb47f5ec2d96769b0f4e71129041ea91ea5 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

Mature License: AGPL-3 OCA/brand Translate me on Weblate Try me on Runboat

+

Mature License: AGPL-3 OCA/brand Translate me on Weblate Try me on Runboat

This module allows odoo users to easily manage product brands.

Table of contents

@@ -426,7 +426,7 @@

Bug Tracker

Bugs are tracked on GitHub 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.

+feedback.

Do not contact contributors directly about support or help with technical issues.

@@ -455,6 +455,7 @@

Contributors

  • Marcelo Pickler <loxamir@gmail.com>
  • Andrius Laukavičius <ala@boolit.eu> (Boolit)
  • Daniel Campos <danielcampos@avanzosc.es>
    • +
  • Samir Guesmi <samir.guesmi@acsone.eu>
  • Tecnativa

    • Other credits

    -

    The migration of this module from 16.0 to 17.0 was financially supported -by Camptocamp.

    +

    The migration of this module from 16.0 to 17.0 and then from 17.0 to +18.0 was financially supported by Camptocamp.

    Maintainers

    @@ -489,7 +491,7 @@

    Maintainers

    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.

    -

    This module is part of the OCA/brand project on GitHub.

    +

    This module is part of the OCA/brand project on GitHub.

    You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

    diff --git a/product_brand/tests/common.py b/product_brand/tests/common.py index c0c17c2a0..60014356c 100644 --- a/product_brand/tests/common.py +++ b/product_brand/tests/common.py @@ -3,16 +3,13 @@ # @author: Simone Orsi # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from odoo.tests.common import TransactionCase +from odoo.addons.base.tests.common import BaseCommon -from odoo.addons.base.tests.common import DISABLED_MAIL_CONTEXT - -class CommonCase(TransactionCase): +class CommonCase(BaseCommon): @classmethod def setUpClass(cls): super().setUpClass() - cls.env = cls.env(context=dict(cls.env.context, **DISABLED_MAIL_CONTEXT)) cls.product = cls.env.ref("product.product_product_4") cls.supplier = cls.env.ref("base.res_partner_2") cls.product_brand_obj = cls.env["product.brand"] diff --git a/product_brand/views/product_brand_view.xml b/product_brand/views/product_brand_view.xml index e86ac14fa..1024bf1f2 100644 --- a/product_brand/views/product_brand_view.xml +++ b/product_brand/views/product_brand_view.xml @@ -13,13 +13,13 @@ Brand Products product.template - kanban,form,tree + kanban,form,list [('product_brand_id', '=', active_id)] Product Brand product.brand - kanban,form,tree + kanban,form,list current [('product_ids', 'in', active_id)] @@ -69,11 +69,11 @@ product.brand.tree product.brand - + - + @@ -81,34 +81,23 @@ product.brand - - - -
    -
    - Logo -
    -
    -

    - -

    - -
    -
    + + +
    + + + + Products + +
    @@ -138,7 +127,7 @@ -
    + @@ -147,7 +136,7 @@ product.template - +
    product.product - + @@ -200,7 +186,7 @@ Brand product.brand - kanban,form,tree + kanban,form,list