Merge commit 'refs/pull/155/head' of https://github.com/oca/brand int…

…o 15.0-2532

product_brand_invoice_report/README.rst

@@ -0,0 +1,103 @@
+=====================
+Product Brand Manager
+=====================
+
+.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Mature-brightgreen.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Mature
+.. |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%2Fbrand-lightgray.png?logo=github
+    :target: https://github.com/OCA/brand/tree/15.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-15-0/brand-15-0-product_brand
+    :alt: Translate me on Weblate
+.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
+    :target: https://runbot.odoo-community.org/runbot/284/15.0
+    :alt: Try me on Runbot
+
+|badge1| |badge2| |badge3| |badge4| |badge5| 
+
+This module allows odoo users to print product brand on invoice reports.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Usage
+=====
+
+To create a new brand:
+
+#. Go to **Sales > Configuration > Products > Product Brands**.
+#. You can set its logo, associate a partner and add a description.
+
+*Note:* You must have the **Sales** addon installed.
+
+To add a product to a brand:
+
+#. Go to the product itself and edit.
+#. Below the product's name there is a Brand field where you can pick the one
+   the product belongs to.
+
+To see the sales report based on brand dimension:
+
+#. Go to **Sales > Reporting > Sales**.
+#. There you can **Group by** brand or add it as a dimension in the pivot view.
+
+To see the invoice report based on brand dimension:
+
+#. Go to **Invoicing > Reporting > Management > Invoice Analysis**.
+#. There you can **Group by** brand or add it as a dimension in the pivot view.
+
+Known issues / Roadmap
+======================
+
+
+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 smashing it by providing a detailed and welcomed
+`feedback <https://github.com/OCA/brand/issues/new?body=module:%20product_brand%0Aversion:%2015.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
+~~~~~~~
+
+* Adhoc
+
+Contributors
+~~~~~~~~~~~~
+
+* Augusto Weiss <awe@adhoc.com.ar>
+
+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.
+
+This module is part of the `OCA/brand <https://github.com/OCA/brand/tree/15.0/product_brand>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

product_brand_invoice_report/__manifest__.py

@@ -0,0 +1,13 @@
+{
+    "name": "Print Product Brand",
+    "summary": "This module add the product brand on invoice reports",
+    "version": "15.0.1.0.0",
+    "license": "AGPL-3",
+    "website": "https://github.com/OCA/brand",
+    "author": "Adhoc SA, Odoo Community Association (OCA)",
+    "category": "Warehouse Management",
+    "depends": ["product_brand", "sale"],
+    "data": ["reports/report_invoice.xml"],
+    "installable": True,
+    "auto_install": True,
+}

product_brand_invoice_report/reports/report_invoice.xml

@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<odoo>
+    <template id="report_invoice_document" inherit_id="account.report_invoice_document">
+                <xpath expr="//th[@name='th_description']" position="after">
+            <th class="text-left">Brand</th>
+        </xpath>
+        <xpath expr="//td[@name='account_invoice_line_name']" position="after">
+            <td name="td_product_brand">
+                <span t-field="line.product_id.product_brand_id.display_name" />
+            </td>
+        </xpath>
+    </template>
+</odoo>

product_brand_sale_report/README.rst

@@ -0,0 +1,103 @@
+=====================
+Product Brand Manager
+=====================
+
+.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Mature-brightgreen.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Mature
+.. |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%2Fbrand-lightgray.png?logo=github
+    :target: https://github.com/OCA/brand/tree/15.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-15-0/brand-15-0-product_brand
+    :alt: Translate me on Weblate
+.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
+    :target: https://runbot.odoo-community.org/runbot/284/15.0
+    :alt: Try me on Runbot
+
+|badge1| |badge2| |badge3| |badge4| |badge5| 
+
+This module allows odoo users to print product brand on sale reports.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Usage
+=====
+
+To create a new brand:
+
+#. Go to **Sales > Configuration > Products > Product Brands**.
+#. You can set its logo, associate a partner and add a description.
+
+*Note:* You must have the **Sales** addon installed.
+
+To add a product to a brand:
+
+#. Go to the product itself and edit.
+#. Below the product's name there is a Brand field where you can pick the one
+   the product belongs to.
+
+To see the sales report based on brand dimension:
+
+#. Go to **Sales > Reporting > Sales**.
+#. There you can **Group by** brand or add it as a dimension in the pivot view.
+
+To see the invoice report based on brand dimension:
+
+#. Go to **Invoicing > Reporting > Management > Invoice Analysis**.
+#. There you can **Group by** brand or add it as a dimension in the pivot view.
+
+Known issues / Roadmap
+======================
+
+
+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 smashing it by providing a detailed and welcomed
+`feedback <https://github.com/OCA/brand/issues/new?body=module:%20product_brand%0Aversion:%2015.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
+~~~~~~~
+
+* Adhoc
+
+Contributors
+~~~~~~~~~~~~
+
+* Augusto Weiss <awe@adhoc.com.ar>
+
+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.
+
+This module is part of the `OCA/brand <https://github.com/OCA/brand/tree/15.0/product_brand>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

product_brand_sale_report/__manifest__.py

@@ -0,0 +1,13 @@
+{
+    "name": "Print Product Brand",
+    "summary": "This module add the product brand on sale reports",
+    "version": "15.0.1.0.0",
+    "license": "AGPL-3",
+    "website": "https://github.com/OCA/brand",
+    "author": "Adhoc SA, Odoo Community Association (OCA)",
+    "category": "Warehouse Management",
+    "depends": ["product_brand", "sale"],
+    "data": ["reports/sale_reports.xml"],
+    "installable": True,
+    "auto_install": True,
+}

product_brand_sale_report/reports/sale_reports.xml

@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<odoo>
+    <template id="report_saleorder" inherit_id="sale.report_saleorder_document">
+                <xpath expr="//th[@name='th_description']" position="after">
+            <th class="text-left">Brand</th>
+        </xpath>
+        <xpath expr="//td[@name='td_name']" position="after">
+            <td name="td_product_brand">
+                <span t-field="line.product_id.product_brand_id.display_name" />
+            </td>
+        </xpath>
+    </template>
+</odoo>

setup/product_brand_invoice_report/odoo/addons/product_brand_invoice_report

@@ -0,0 +1 @@
+../../../../product_brand_invoice_report

setup/product_brand_invoice_report/setup.py

@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)

setup/product_brand_sale_report/odoo/addons/product_brand_sale_report

@@ -0,0 +1 @@
+../../../../product_brand_sale_report

setup/product_brand_sale_report/setup.py

@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)