Merge pull request #265 from OCA/18.0

Syncing from upstream OCA/sale-reporting (18.0)

README.md

@@ -23,6 +23,7 @@ addon | version | maintainers | summary
 --- | --- | --- | ---
 [sale_order_line_position](sale_order_line_position/) | 18.0.1.0.0 |  | Adds position number on sale order line.
 [sale_report_delivered](sale_report_delivered/) | 18.0.1.0.0 | [![sergio-teruel](https://github.com/sergio-teruel.png?size=30px)](https://github.com/sergio-teruel) | Sale Report Delivered
+[sale_report_delivered_brand](sale_report_delivered_brand/) | 18.0.1.0.1 | [![CarlosRoca13](https://github.com/CarlosRoca13.png?size=30px)](https://github.com/CarlosRoca13) | Sale Report Delivered Brand
 [sale_report_salesperson_from_partner](sale_report_salesperson_from_partner/) | 18.0.1.0.0 | [![pilarvargas-tecnativa](https://github.com/pilarvargas-tecnativa.png?size=30px)](https://github.com/pilarvargas-tecnativa) | Sale Report Salesperson From Partner
 
 [//]: # (end addons)

sale_report_delivered_brand/README.rst

@@ -0,0 +1,95 @@
+===========================
+Sale Report Delivered Brand
+===========================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:54dd6f45cfb10c324658c0a7354d24c23c3926c97a2846cca9143be976d861da
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fsale--reporting-lightgray.png?logo=github
+    :target: https://github.com/OCA/sale-reporting/tree/18.0/sale_report_delivered_brand
+    :alt: OCA/sale-reporting
+.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
+    :target: https://translation.odoo-community.org/projects/sale-reporting-18-0/sale-reporting-18-0-sale_report_delivered_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/sale-reporting&target_branch=18.0
+    :alt: Try me on Runboat
+
+|badge1| |badge2| |badge3| |badge4| |badge5|
+
+Adds product brand on the sale report delivered.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Usage
+=====
+
+Go to *Sales > Reporting > Sale from deliveries* and you'll be able to
+search by product brand.
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/OCA/sale-reporting/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/sale-reporting/issues/new?body=module:%20sale_report_delivered_brand%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.
+
+Credits
+=======
+
+Authors
+-------
+
+* Tecnativa
+
+Contributors
+------------
+
+- `Tecnativa <https://www.tecnativa.com>`__:
+
+     - Carlos Roca
+     - Víctor Martínez
+     - Ernesto Tejeda
+     - Juan Carlos Oñate
+
+Maintainers
+-----------
+
+This module is maintained by the OCA.
+
+.. image:: https://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: https://odoo-community.org
+
+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.
+
+.. |maintainer-CarlosRoca13| image:: https://github.com/CarlosRoca13.png?size=40px
+    :target: https://github.com/CarlosRoca13
+    :alt: CarlosRoca13
+
+Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
+
+|maintainer-CarlosRoca13| 
+
+This module is part of the `OCA/sale-reporting <https://github.com/OCA/sale-reporting/tree/18.0/sale_report_delivered_brand>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

sale_report_delivered_brand/__init__.py

@@ -0,0 +1 @@
+from . import models

sale_report_delivered_brand/__manifest__.py

@@ -0,0 +1,15 @@
+# Copyright 2022 Tecnativa - Carlos Roca
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+{
+    "name": "Sale Report Delivered Brand",
+    "version": "18.0.1.0.1",
+    "author": "Tecnativa, Odoo Community Association (OCA)",
+    "website": "https://github.com/OCA/sale-reporting",
+    "category": "Sales",
+    "license": "AGPL-3",
+    "depends": ["sale_report_delivered", "product_brand"],
+    "data": ["views/sale_report_delivered_views.xml"],
+    "installable": True,
+    "maintainers": ["CarlosRoca13"],
+    "auto_install": True,
+}

sale_report_delivered_brand/i18n/es.po

@@ -0,0 +1,28 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* sale_report_delivered_brand
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 13.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-04-27 06:47+0000\n"
+"PO-Revision-Date: 2022-04-27 08:49+0200\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 2.3\n"
+
+#. module: sale_report_delivered_brand
+#: model:ir.model.fields,field_description:sale_report_delivered_brand.field_sale_report_delivered__product_brand_id
+msgid "Brand"
+msgstr "Marca"
+
+#. module: sale_report_delivered_brand
+#: model:ir.model,name:sale_report_delivered_brand.model_sale_report_delivered
+msgid "Sales Delivered Analysis Report"
+msgstr "Análisis de ventas"

sale_report_delivered_brand/i18n/sale_report_delivered_brand.pot

@@ -0,0 +1,24 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* sale_report_delivered_brand
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 18.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: sale_report_delivered_brand
+#: model:ir.model.fields,field_description:sale_report_delivered_brand.field_sale_report_delivered__product_brand_id
+msgid "Brand"
+msgstr ""
+
+#. module: sale_report_delivered_brand
+#: model:ir.model,name:sale_report_delivered_brand.model_sale_report_delivered
+msgid "Sales Delivered Analysis Report"
+msgstr ""

sale_report_delivered_brand/models/__init__.py

@@ -0,0 +1 @@
+from . import sale_report_delivered

sale_report_delivered_brand/models/sale_report_delivered.py

@@ -0,0 +1,24 @@
+# Copyright 2022 Tecnativa - Carlos Roca
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+from odoo import fields, models
+
+
+class SaleReportDelivered(models.Model):
+    _inherit = "sale.report.delivered"
+
+    product_brand_id = fields.Many2one(comodel_name="product.brand", string="Brand")
+
+    def _select(self):
+        select_str = super()._select()
+        select_str += ", sub.product_brand_id"
+        return select_str
+
+    def _sub_select(self):
+        sub_select_str = super()._sub_select()
+        sub_select_str += ", t.product_brand_id as product_brand_id"
+        return sub_select_str
+
+    def _group_by(self):
+        group_by_str = super()._group_by()
+        group_by_str += ", sub.product_brand_id"
+        return group_by_str

sale_report_delivered_brand/pyproject.toml

@@ -0,0 +1,3 @@
+[build-system]
+requires = ["whool"]
+build-backend = "whool.buildapi"

sale_report_delivered_brand/readme/CONTRIBUTORS.md

@@ -0,0 +1,6 @@
+- [Tecnativa](https://www.tecnativa.com):
+
+  > - Carlos Roca
+  > - Víctor Martínez
+  > - Ernesto Tejeda
+  > - Juan Carlos Oñate

sale_report_delivered_brand/readme/DESCRIPTION.md

@@ -0,0 +1 @@
+Adds product brand on the sale report delivered.

sale_report_delivered_brand/readme/USAGE.md

@@ -0,0 +1,2 @@
+Go to *Sales \> Reporting \> Sale from deliveries* and you'll be able to
+search by product brand.