From 35c4bd28f284032ce9ccec240813ee13d0347979 Mon Sep 17 00:00:00 2001 From: pilarvargas-tecnativa Date: Wed, 27 Nov 2024 14:07:06 +0100 Subject: [PATCH 01/10] [ADD] sale_report_salesperson_from_partner: New module TT51908 --- .../README.rst | 87 ++++ .../__init__.py | 1 + .../__manifest__.py | 15 + .../i18n/es.po | 41 ++ .../sale_report_salesperson_from_partner.pot | 37 ++ .../readme/CONTRIBUTORS.rst | 3 + .../readme/DESCRIPTION.rst | 2 + .../report/__init__.py | 2 + .../report/sale_order.py | 9 + .../report/sale_report.py | 20 + .../static/description/icon.png | Bin 0 -> 9455 bytes .../static/description/index.html | 432 ++++++++++++++++++ .../tests/__init__.py | 1 + ...st_sale_report_salesperson_from_partner.py | 56 +++ .../views/sale_order_views.xml | 46 ++ .../views/sale_report_views.xml | 19 + 16 files changed, 771 insertions(+) create mode 100644 sale_report_salesperson_from_partner/README.rst create mode 100644 sale_report_salesperson_from_partner/__init__.py create mode 100644 sale_report_salesperson_from_partner/__manifest__.py create mode 100644 sale_report_salesperson_from_partner/i18n/es.po create mode 100644 sale_report_salesperson_from_partner/i18n/sale_report_salesperson_from_partner.pot create mode 100644 sale_report_salesperson_from_partner/readme/CONTRIBUTORS.rst create mode 100644 sale_report_salesperson_from_partner/readme/DESCRIPTION.rst create mode 100644 sale_report_salesperson_from_partner/report/__init__.py create mode 100644 sale_report_salesperson_from_partner/report/sale_order.py create mode 100644 sale_report_salesperson_from_partner/report/sale_report.py create mode 100644 sale_report_salesperson_from_partner/static/description/icon.png create mode 100644 sale_report_salesperson_from_partner/static/description/index.html create mode 100644 sale_report_salesperson_from_partner/tests/__init__.py create mode 100644 sale_report_salesperson_from_partner/tests/test_sale_report_salesperson_from_partner.py create mode 100644 sale_report_salesperson_from_partner/views/sale_order_views.xml create mode 100644 sale_report_salesperson_from_partner/views/sale_report_views.xml diff --git a/sale_report_salesperson_from_partner/README.rst b/sale_report_salesperson_from_partner/README.rst new file mode 100644 index 000000000..394eaac2c --- /dev/null +++ b/sale_report_salesperson_from_partner/README.rst @@ -0,0 +1,87 @@ +==================================== +Sale Report Salesperson From Partner +==================================== + +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:521a47bdeb8f3dbb42f3f7965d9ea3b75c0478fe04c4eace5ed278733f8a90ea + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |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/15.0/sale_report_salesperson_from_partner + :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-15-0/sale-reporting-15-0-sale_report_salesperson_from_partner + :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=15.0 + :alt: Try me on Runboat + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module extends the sales report in Odoo to allow sales to be grouped by the sales +person assigned to the partner. + +**Table of contents** + +.. contents:: + :local: + +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 `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* Tecnativa + +Contributors +~~~~~~~~~~~~ + +* `Tecnativa `_: + + * Pilar Vargas + +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-pilar-vargas| image:: https://github.com/pilar-vargas.png?size=40px + :target: https://github.com/pilar-vargas + :alt: pilar-vargas + +Current `maintainer `__: + +|maintainer-pilar-vargas| + +This module is part of the `OCA/sale-reporting `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/sale_report_salesperson_from_partner/__init__.py b/sale_report_salesperson_from_partner/__init__.py new file mode 100644 index 000000000..4c4f242fa --- /dev/null +++ b/sale_report_salesperson_from_partner/__init__.py @@ -0,0 +1 @@ +from . import report diff --git a/sale_report_salesperson_from_partner/__manifest__.py b/sale_report_salesperson_from_partner/__manifest__.py new file mode 100644 index 000000000..00de3262f --- /dev/null +++ b/sale_report_salesperson_from_partner/__manifest__.py @@ -0,0 +1,15 @@ +# Copyright 2024 Tecnativa - Pilar Vargas +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +{ + "name": "Sale Report Salesperson From Partner", + "version": "15.0.1.0.0", + "author": "Tecnativa," "Odoo Community Association (OCA)", + "website": "https://github.com/OCA/sale-reporting", + "category": "Sales", + "license": "AGPL-3", + "data": ["views/sale_order_views.xml", "views/sale_report_views.xml"], + "depends": ["sale"], + "maintainers": ["pilar-vargas"], + "installable": True, + "application": False, +} diff --git a/sale_report_salesperson_from_partner/i18n/es.po b/sale_report_salesperson_from_partner/i18n/es.po new file mode 100644 index 000000000..f2e764905 --- /dev/null +++ b/sale_report_salesperson_from_partner/i18n/es.po @@ -0,0 +1,41 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * sale_report_salesperson_from_partner +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 15.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2024-11-29 07:18+0000\n" +"PO-Revision-Date: 2024-11-29 08:20+0100\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 3.4.2\n" + +#. module: sale_report_salesperson_from_partner +#: model:ir.model,name:sale_report_salesperson_from_partner.model_sale_report +msgid "Sales Analysis Report" +msgstr "Informe de análisis de ventas" + +#. module: sale_report_salesperson_from_partner +#: model:ir.model,name:sale_report_salesperson_from_partner.model_sale_order +msgid "Sales Order" +msgstr "Pedido de venta" + +#. module: sale_report_salesperson_from_partner +#: model:ir.model.fields,field_description:sale_report_salesperson_from_partner.field_sale_order__user_from_partner_id +#: model:ir.model.fields,field_description:sale_report_salesperson_from_partner.field_sale_report__user_from_partner_id +#: model_terms:ir.ui.view,arch_db:sale_report_salesperson_from_partner.view_order_product_search +#: model_terms:ir.ui.view,arch_db:sale_report_salesperson_from_partner.view_sales_order_filter +msgid "Salesperson From Partner" +msgstr "Comercial del cliente" + +#. module: sale_report_salesperson_from_partner +#: model:ir.model.fields,help:sale_report_salesperson_from_partner.field_sale_order__user_from_partner_id +msgid "The internal user in charge of this contact." +msgstr "El usuario interno a cargo de este contacto." diff --git a/sale_report_salesperson_from_partner/i18n/sale_report_salesperson_from_partner.pot b/sale_report_salesperson_from_partner/i18n/sale_report_salesperson_from_partner.pot new file mode 100644 index 000000000..c07b551d8 --- /dev/null +++ b/sale_report_salesperson_from_partner/i18n/sale_report_salesperson_from_partner.pot @@ -0,0 +1,37 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * sale_report_salesperson_from_partner +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 15.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_salesperson_from_partner +#: model:ir.model,name:sale_report_salesperson_from_partner.model_sale_report +msgid "Sales Analysis Report" +msgstr "" + +#. module: sale_report_salesperson_from_partner +#: model:ir.model,name:sale_report_salesperson_from_partner.model_sale_order +msgid "Sales Order" +msgstr "" + +#. module: sale_report_salesperson_from_partner +#: model:ir.model.fields,field_description:sale_report_salesperson_from_partner.field_sale_order__user_from_partner_id +#: model:ir.model.fields,field_description:sale_report_salesperson_from_partner.field_sale_report__user_from_partner_id +#: model_terms:ir.ui.view,arch_db:sale_report_salesperson_from_partner.view_order_product_search +#: model_terms:ir.ui.view,arch_db:sale_report_salesperson_from_partner.view_sales_order_filter +msgid "Salesperson From Partner" +msgstr "" + +#. module: sale_report_salesperson_from_partner +#: model:ir.model.fields,help:sale_report_salesperson_from_partner.field_sale_order__user_from_partner_id +msgid "The internal user in charge of this contact." +msgstr "" diff --git a/sale_report_salesperson_from_partner/readme/CONTRIBUTORS.rst b/sale_report_salesperson_from_partner/readme/CONTRIBUTORS.rst new file mode 100644 index 000000000..c1d7564b9 --- /dev/null +++ b/sale_report_salesperson_from_partner/readme/CONTRIBUTORS.rst @@ -0,0 +1,3 @@ +* `Tecnativa `_: + + * Pilar Vargas diff --git a/sale_report_salesperson_from_partner/readme/DESCRIPTION.rst b/sale_report_salesperson_from_partner/readme/DESCRIPTION.rst new file mode 100644 index 000000000..6be59769d --- /dev/null +++ b/sale_report_salesperson_from_partner/readme/DESCRIPTION.rst @@ -0,0 +1,2 @@ +This module extends the sales report in Odoo to allow sales to be grouped by the sales +person assigned to the partner. diff --git a/sale_report_salesperson_from_partner/report/__init__.py b/sale_report_salesperson_from_partner/report/__init__.py new file mode 100644 index 000000000..6b9bbd7b5 --- /dev/null +++ b/sale_report_salesperson_from_partner/report/__init__.py @@ -0,0 +1,2 @@ +from . import sale_order +from . import sale_report diff --git a/sale_report_salesperson_from_partner/report/sale_order.py b/sale_report_salesperson_from_partner/report/sale_order.py new file mode 100644 index 000000000..f96322164 --- /dev/null +++ b/sale_report_salesperson_from_partner/report/sale_order.py @@ -0,0 +1,9 @@ +from odoo import fields, models + + +class SaleOrder(models.Model): + _inherit = "sale.order" + + user_from_partner_id = fields.Many2one( + string="Salesperson From Partner", related="partner_id.user_id", store=True + ) diff --git a/sale_report_salesperson_from_partner/report/sale_report.py b/sale_report_salesperson_from_partner/report/sale_report.py new file mode 100644 index 000000000..d9c88c15c --- /dev/null +++ b/sale_report_salesperson_from_partner/report/sale_report.py @@ -0,0 +1,20 @@ +from odoo import fields, models + + +class SaleReport(models.Model): + _inherit = "sale.report" + + user_from_partner_id = fields.Many2one( + "res.users", + string="Salesperson From Partner", + readonly=True, + ) + + def _group_by_sale(self, groupby=""): + res = super()._group_by_sale(groupby) + res += """,partner.user_id""" + return res + + def _select_additional_fields(self, fields): + fields["user_from_partner_id"] = ", partner.user_id as user_from_partner_id" + return super()._select_additional_fields(fields) diff --git a/sale_report_salesperson_from_partner/static/description/icon.png b/sale_report_salesperson_from_partner/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/sale_report_salesperson_from_partner/static/description/index.html b/sale_report_salesperson_from_partner/static/description/index.html new file mode 100644 index 000000000..fc100ddbe --- /dev/null +++ b/sale_report_salesperson_from_partner/static/description/index.html @@ -0,0 +1,432 @@ + + + + + +Sale Report Salesperson From Partner + + + +
+

Sale Report Salesperson From Partner

+ + +

Beta License: AGPL-3 OCA/sale-reporting Translate me on Weblate Try me on Runboat

+

This module extends the sales report in Odoo to allow sales to be grouped by the sales +person assigned to the partner.

+

Table of contents

+ +
+

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.

+

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

+
+
+

Credits

+
+

Authors

+
    +
  • Tecnativa
    • +
+
+
+

Contributors

+ +
+
+

Maintainers

+

This module is maintained by the OCA.

+ +Odoo Community Association + +

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.

+

Current maintainer:

+

pilar-vargas

+

This module is part of the OCA/sale-reporting project on GitHub.

+

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

+
+
+
+ + diff --git a/sale_report_salesperson_from_partner/tests/__init__.py b/sale_report_salesperson_from_partner/tests/__init__.py new file mode 100644 index 000000000..2e9166ba1 --- /dev/null +++ b/sale_report_salesperson_from_partner/tests/__init__.py @@ -0,0 +1 @@ +from . import test_sale_report_salesperson_from_partner diff --git a/sale_report_salesperson_from_partner/tests/test_sale_report_salesperson_from_partner.py b/sale_report_salesperson_from_partner/tests/test_sale_report_salesperson_from_partner.py new file mode 100644 index 000000000..c97e37893 --- /dev/null +++ b/sale_report_salesperson_from_partner/tests/test_sale_report_salesperson_from_partner.py @@ -0,0 +1,56 @@ +# Copyright 2022 Tecnativa - Víctor Martínez +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo.tests import Form, common, new_test_user + + +class SaleReportSalespersonFromPartner(common.TransactionCase): + @classmethod + def setUpClass(cls): + super().setUpClass() + # Remove this variable in v16 and put instead: + # from odoo.addons.base.tests.common import DISABLED_MAIL_CONTEXT + DISABLED_MAIL_CONTEXT = { + "tracking_disable": True, + "mail_create_nolog": True, + "mail_create_nosubscribe": True, + "mail_notrack": True, + "no_reset_password": True, + } + cls.env = cls.env(context=dict(cls.env.context, **DISABLED_MAIL_CONTEXT)) + cls.salesperson = new_test_user( + cls.env, + login="test_salesperson_from_partner", + groups="sales_team.group_sale_manager", + ) + cls.partner = cls.env["res.partner"].create( + { + "name": "Test Partner", + "user_id": cls.salesperson.id, + } + ) + cls.product = cls.env["product.product"].create({"name": "Test product"}) + cls.order = cls._create_order(cls, cls.product) + cls.order.action_confirm() + + def _create_order(self, product): + order_form = Form(self.env["sale.order"]) + order_form.partner_id = self.partner + with order_form.order_line.new() as line_form: + line_form.product_id = product + line_form.product_uom_qty = 1 + return order_form.save() + + def test_sale_report_user_from_partner_id(self): + sale_report = self.env["sale.report"].search( + [("user_from_partner_id", "=", self.salesperson.id)], limit=1 + ) + self.assertTrue(sale_report) + self.assertEqual( + sale_report.user_from_partner_id, + self.salesperson, + ) + self.assertEqual( + sale_report.order_id, + self.order, + ) diff --git a/sale_report_salesperson_from_partner/views/sale_order_views.xml b/sale_report_salesperson_from_partner/views/sale_order_views.xml new file mode 100644 index 000000000..8dc408d34 --- /dev/null +++ b/sale_report_salesperson_from_partner/views/sale_order_views.xml @@ -0,0 +1,46 @@ + + + + + sale.order + + + + + + + + + + + + sale.order + + + + + + + + + sale.order + + + + + + + diff --git a/sale_report_salesperson_from_partner/views/sale_report_views.xml b/sale_report_salesperson_from_partner/views/sale_report_views.xml new file mode 100644 index 000000000..7c39b3776 --- /dev/null +++ b/sale_report_salesperson_from_partner/views/sale_report_views.xml @@ -0,0 +1,19 @@ + + + + + sale.report + + + + + + + + + + From a9506aa8a129c19b6d08123d582a3de9f4f55be4 Mon Sep 17 00:00:00 2001 From: pilarvargas-tecnativa Date: Wed, 4 Dec 2024 16:22:51 +0100 Subject: [PATCH 02/10] [FIX] sale_report_salesperson_from_partner: remove unnecessary resources TT51908 --- .../README.rst | 10 ++-- .../__manifest__.py | 4 +- .../report/__init__.py | 1 - .../report/sale_order.py | 9 ---- .../static/description/index.html | 6 +-- .../views/sale_order_views.xml | 46 ------------------- 6 files changed, 10 insertions(+), 66 deletions(-) delete mode 100644 sale_report_salesperson_from_partner/report/sale_order.py delete mode 100644 sale_report_salesperson_from_partner/views/sale_order_views.xml diff --git a/sale_report_salesperson_from_partner/README.rst b/sale_report_salesperson_from_partner/README.rst index 394eaac2c..a6ae50a0c 100644 --- a/sale_report_salesperson_from_partner/README.rst +++ b/sale_report_salesperson_from_partner/README.rst @@ -17,13 +17,13 @@ Sale Report Salesperson From Partner :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/15.0/sale_report_salesperson_from_partner + :target: https://github.com/OCA/sale-reporting/tree/16.0/sale_report_salesperson_from_partner :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-15-0/sale-reporting-15-0-sale_report_salesperson_from_partner + :target: https://translation.odoo-community.org/projects/sale-reporting-16-0/sale-reporting-16-0-sale_report_salesperson_from_partner :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=15.0 + :target: https://runboat.odoo-community.org/builds?repo=OCA/sale-reporting&target_branch=16.0 :alt: Try me on Runboat |badge1| |badge2| |badge3| |badge4| |badge5| @@ -42,7 +42,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. @@ -82,6 +82,6 @@ Current `maintainer `__: |maintainer-pilar-vargas| -This module is part of the `OCA/sale-reporting `_ project on GitHub. +This module is part of the `OCA/sale-reporting `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/sale_report_salesperson_from_partner/__manifest__.py b/sale_report_salesperson_from_partner/__manifest__.py index 00de3262f..18c4d2568 100644 --- a/sale_report_salesperson_from_partner/__manifest__.py +++ b/sale_report_salesperson_from_partner/__manifest__.py @@ -7,9 +7,9 @@ "website": "https://github.com/OCA/sale-reporting", "category": "Sales", "license": "AGPL-3", - "data": ["views/sale_order_views.xml", "views/sale_report_views.xml"], + "data": ["views/sale_report_views.xml"], "depends": ["sale"], - "maintainers": ["pilar-vargas"], + "maintainers": ["pilarvargas-tecnativa"], "installable": True, "application": False, } diff --git a/sale_report_salesperson_from_partner/report/__init__.py b/sale_report_salesperson_from_partner/report/__init__.py index 6b9bbd7b5..cd23411b8 100644 --- a/sale_report_salesperson_from_partner/report/__init__.py +++ b/sale_report_salesperson_from_partner/report/__init__.py @@ -1,2 +1 @@ -from . import sale_order from . import sale_report diff --git a/sale_report_salesperson_from_partner/report/sale_order.py b/sale_report_salesperson_from_partner/report/sale_order.py deleted file mode 100644 index f96322164..000000000 --- a/sale_report_salesperson_from_partner/report/sale_order.py +++ /dev/null @@ -1,9 +0,0 @@ -from odoo import fields, models - - -class SaleOrder(models.Model): - _inherit = "sale.order" - - user_from_partner_id = fields.Many2one( - string="Salesperson From Partner", related="partner_id.user_id", store=True - ) diff --git a/sale_report_salesperson_from_partner/static/description/index.html b/sale_report_salesperson_from_partner/static/description/index.html index fc100ddbe..e51bd270a 100644 --- a/sale_report_salesperson_from_partner/static/description/index.html +++ b/sale_report_salesperson_from_partner/static/description/index.html @@ -369,7 +369,7 @@

Sale Report Salesperson From Partner

!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! source digest: sha256:521a47bdeb8f3dbb42f3f7965d9ea3b75c0478fe04c4eace5ed278733f8a90ea !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

Beta License: AGPL-3 OCA/sale-reporting Translate me on Weblate Try me on Runboat

+

Beta License: AGPL-3 OCA/sale-reporting Translate me on Weblate Try me on Runboat

This module extends the sales report in Odoo to allow sales to be grouped by the sales person assigned to the partner.

Table of contents

@@ -389,7 +389,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.

@@ -423,7 +423,7 @@

Maintainers

promote its widespread use.

Current maintainer:

pilar-vargas

-

This module is part of the OCA/sale-reporting project on GitHub.

+

This module is part of the OCA/sale-reporting project on GitHub.

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

diff --git a/sale_report_salesperson_from_partner/views/sale_order_views.xml b/sale_report_salesperson_from_partner/views/sale_order_views.xml deleted file mode 100644 index 8dc408d34..000000000 --- a/sale_report_salesperson_from_partner/views/sale_order_views.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - sale.order - - - - - - - - - - - - sale.order - - - - - - - - - sale.order - - - - - - - From 675b5dff1637fabac262cbe8d8c94d3f5fdc94ff Mon Sep 17 00:00:00 2001 From: pilarvargas-tecnativa Date: Fri, 29 Nov 2024 17:17:19 +0100 Subject: [PATCH 03/10] [MIG] sale_report_salesperson_from_partner: Migration to 16.0 TT51908 --- .../README.rst | 8 ++++---- .../__manifest__.py | 2 +- .../report/sale_report.py | 11 ++++++----- .../static/description/index.html | 2 +- ...est_sale_report_salesperson_from_partner.py | 18 +++++------------- 5 files changed, 17 insertions(+), 24 deletions(-) diff --git a/sale_report_salesperson_from_partner/README.rst b/sale_report_salesperson_from_partner/README.rst index a6ae50a0c..921116543 100644 --- a/sale_report_salesperson_from_partner/README.rst +++ b/sale_report_salesperson_from_partner/README.rst @@ -74,13 +74,13 @@ 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-pilar-vargas| image:: https://github.com/pilar-vargas.png?size=40px - :target: https://github.com/pilar-vargas - :alt: pilar-vargas +.. |maintainer-pilarvargas-tecnativa| image:: https://github.com/pilarvargas-tecnativa.png?size=40px + :target: https://github.com/pilarvargas-tecnativa + :alt: pilarvargas-tecnativa Current `maintainer `__: -|maintainer-pilar-vargas| +|maintainer-pilarvargas-tecnativa| This module is part of the `OCA/sale-reporting `_ project on GitHub. diff --git a/sale_report_salesperson_from_partner/__manifest__.py b/sale_report_salesperson_from_partner/__manifest__.py index 18c4d2568..5bf58b000 100644 --- a/sale_report_salesperson_from_partner/__manifest__.py +++ b/sale_report_salesperson_from_partner/__manifest__.py @@ -2,7 +2,7 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). { "name": "Sale Report Salesperson From Partner", - "version": "15.0.1.0.0", + "version": "16.0.1.0.0", "author": "Tecnativa," "Odoo Community Association (OCA)", "website": "https://github.com/OCA/sale-reporting", "category": "Sales", diff --git a/sale_report_salesperson_from_partner/report/sale_report.py b/sale_report_salesperson_from_partner/report/sale_report.py index d9c88c15c..f063aaa59 100644 --- a/sale_report_salesperson_from_partner/report/sale_report.py +++ b/sale_report_salesperson_from_partner/report/sale_report.py @@ -10,11 +10,12 @@ class SaleReport(models.Model): readonly=True, ) - def _group_by_sale(self, groupby=""): - res = super()._group_by_sale(groupby) + def _group_by_sale(self): + res = super()._group_by_sale() res += """,partner.user_id""" return res - def _select_additional_fields(self, fields): - fields["user_from_partner_id"] = ", partner.user_id as user_from_partner_id" - return super()._select_additional_fields(fields) + def _select_additional_fields(self): + res = super()._select_additional_fields() + res["user_from_partner_id"] = "partner.user_id" + return res diff --git a/sale_report_salesperson_from_partner/static/description/index.html b/sale_report_salesperson_from_partner/static/description/index.html index e51bd270a..3e6c54367 100644 --- a/sale_report_salesperson_from_partner/static/description/index.html +++ b/sale_report_salesperson_from_partner/static/description/index.html @@ -422,7 +422,7 @@

Maintainers

mission is to support the collaborative development of Odoo features and promote its widespread use.

Current maintainer:

-

pilar-vargas

+

pilarvargas-tecnativa

This module is part of the OCA/sale-reporting project on GitHub.

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

diff --git a/sale_report_salesperson_from_partner/tests/test_sale_report_salesperson_from_partner.py b/sale_report_salesperson_from_partner/tests/test_sale_report_salesperson_from_partner.py index c97e37893..7414c98a1 100644 --- a/sale_report_salesperson_from_partner/tests/test_sale_report_salesperson_from_partner.py +++ b/sale_report_salesperson_from_partner/tests/test_sale_report_salesperson_from_partner.py @@ -1,23 +1,15 @@ -# Copyright 2022 Tecnativa - Víctor Martínez +# Copyright 2024 Tecnativa - Pilar Vargas # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from odoo.tests import Form, common, new_test_user +from odoo.tests import Form, new_test_user +from odoo.addons.base.tests.common import BaseCommon -class SaleReportSalespersonFromPartner(common.TransactionCase): + +class SaleReportSalespersonFromPartner(BaseCommon): @classmethod def setUpClass(cls): super().setUpClass() - # Remove this variable in v16 and put instead: - # from odoo.addons.base.tests.common import DISABLED_MAIL_CONTEXT - DISABLED_MAIL_CONTEXT = { - "tracking_disable": True, - "mail_create_nolog": True, - "mail_create_nosubscribe": True, - "mail_notrack": True, - "no_reset_password": True, - } - cls.env = cls.env(context=dict(cls.env.context, **DISABLED_MAIL_CONTEXT)) cls.salesperson = new_test_user( cls.env, login="test_salesperson_from_partner", From 74900918c961ef31fd0fa0de7deed483bffa6609 Mon Sep 17 00:00:00 2001 From: oca-ci Date: Thu, 5 Dec 2024 10:39:31 +0000 Subject: [PATCH 04/10] [UPD] Update sale_report_salesperson_from_partner.pot --- .../i18n/sale_report_salesperson_from_partner.pot | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/sale_report_salesperson_from_partner/i18n/sale_report_salesperson_from_partner.pot b/sale_report_salesperson_from_partner/i18n/sale_report_salesperson_from_partner.pot index c07b551d8..48db998c8 100644 --- a/sale_report_salesperson_from_partner/i18n/sale_report_salesperson_from_partner.pot +++ b/sale_report_salesperson_from_partner/i18n/sale_report_salesperson_from_partner.pot @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 15.0\n" +"Project-Id-Version: Odoo Server 16.0\n" "Report-Msgid-Bugs-To: \n" "Last-Translator: \n" "Language-Team: \n" @@ -19,19 +19,7 @@ msgid "Sales Analysis Report" msgstr "" #. module: sale_report_salesperson_from_partner -#: model:ir.model,name:sale_report_salesperson_from_partner.model_sale_order -msgid "Sales Order" -msgstr "" - -#. module: sale_report_salesperson_from_partner -#: model:ir.model.fields,field_description:sale_report_salesperson_from_partner.field_sale_order__user_from_partner_id #: model:ir.model.fields,field_description:sale_report_salesperson_from_partner.field_sale_report__user_from_partner_id #: model_terms:ir.ui.view,arch_db:sale_report_salesperson_from_partner.view_order_product_search -#: model_terms:ir.ui.view,arch_db:sale_report_salesperson_from_partner.view_sales_order_filter msgid "Salesperson From Partner" msgstr "" - -#. module: sale_report_salesperson_from_partner -#: model:ir.model.fields,help:sale_report_salesperson_from_partner.field_sale_order__user_from_partner_id -msgid "The internal user in charge of this contact." -msgstr "" From 1d9231d04a89109bd091619a922b9f5a59c47ff5 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Thu, 5 Dec 2024 10:42:11 +0000 Subject: [PATCH 05/10] [BOT] post-merge updates --- sale_report_salesperson_from_partner/README.rst | 2 +- sale_report_salesperson_from_partner/__manifest__.py | 2 +- .../static/description/index.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sale_report_salesperson_from_partner/README.rst b/sale_report_salesperson_from_partner/README.rst index 921116543..171ee5a10 100644 --- a/sale_report_salesperson_from_partner/README.rst +++ b/sale_report_salesperson_from_partner/README.rst @@ -7,7 +7,7 @@ Sale Report Salesperson From Partner !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! source digest: sha256:521a47bdeb8f3dbb42f3f7965d9ea3b75c0478fe04c4eace5ed278733f8a90ea + !! source digest: sha256:25e8ade2df0057e6c9341a6aa4b6e5be47344b6eb18c6190476bcc488811a8de !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png diff --git a/sale_report_salesperson_from_partner/__manifest__.py b/sale_report_salesperson_from_partner/__manifest__.py index 5bf58b000..9acf3b0c7 100644 --- a/sale_report_salesperson_from_partner/__manifest__.py +++ b/sale_report_salesperson_from_partner/__manifest__.py @@ -2,7 +2,7 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). { "name": "Sale Report Salesperson From Partner", - "version": "16.0.1.0.0", + "version": "16.0.1.1.0", "author": "Tecnativa," "Odoo Community Association (OCA)", "website": "https://github.com/OCA/sale-reporting", "category": "Sales", diff --git a/sale_report_salesperson_from_partner/static/description/index.html b/sale_report_salesperson_from_partner/static/description/index.html index 3e6c54367..8d0c4cda2 100644 --- a/sale_report_salesperson_from_partner/static/description/index.html +++ b/sale_report_salesperson_from_partner/static/description/index.html @@ -367,7 +367,7 @@

Sale Report Salesperson From Partner

!! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -!! source digest: sha256:521a47bdeb8f3dbb42f3f7965d9ea3b75c0478fe04c4eace5ed278733f8a90ea +!! source digest: sha256:25e8ade2df0057e6c9341a6aa4b6e5be47344b6eb18c6190476bcc488811a8de !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->

Beta License: AGPL-3 OCA/sale-reporting Translate me on Weblate Try me on Runboat

This module extends the sales report in Odoo to allow sales to be grouped by the sales From 924161b5c51a648498d2e91a4bbe2f2022126e9d Mon Sep 17 00:00:00 2001 From: Weblate Date: Thu, 5 Dec 2024 11:53:10 +0000 Subject: [PATCH 06/10] Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: sale-reporting-16.0/sale-reporting-16.0-sale_report_salesperson_from_partner Translate-URL: https://translation.odoo-community.org/projects/sale-reporting-16-0/sale-reporting-16-0-sale_report_salesperson_from_partner/ --- sale_report_salesperson_from_partner/i18n/es.po | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/sale_report_salesperson_from_partner/i18n/es.po b/sale_report_salesperson_from_partner/i18n/es.po index f2e764905..1a5964af7 100644 --- a/sale_report_salesperson_from_partner/i18n/es.po +++ b/sale_report_salesperson_from_partner/i18n/es.po @@ -23,19 +23,13 @@ msgid "Sales Analysis Report" msgstr "Informe de análisis de ventas" #. module: sale_report_salesperson_from_partner -#: model:ir.model,name:sale_report_salesperson_from_partner.model_sale_order -msgid "Sales Order" -msgstr "Pedido de venta" - -#. module: sale_report_salesperson_from_partner -#: model:ir.model.fields,field_description:sale_report_salesperson_from_partner.field_sale_order__user_from_partner_id #: model:ir.model.fields,field_description:sale_report_salesperson_from_partner.field_sale_report__user_from_partner_id #: model_terms:ir.ui.view,arch_db:sale_report_salesperson_from_partner.view_order_product_search -#: model_terms:ir.ui.view,arch_db:sale_report_salesperson_from_partner.view_sales_order_filter msgid "Salesperson From Partner" msgstr "Comercial del cliente" -#. module: sale_report_salesperson_from_partner -#: model:ir.model.fields,help:sale_report_salesperson_from_partner.field_sale_order__user_from_partner_id -msgid "The internal user in charge of this contact." -msgstr "El usuario interno a cargo de este contacto." +#~ msgid "Sales Order" +#~ msgstr "Pedido de venta" + +#~ msgid "The internal user in charge of this contact." +#~ msgstr "El usuario interno a cargo de este contacto." From 21bd7d87c6a97476277630cdde2040a810d47b30 Mon Sep 17 00:00:00 2001 From: mymage Date: Mon, 9 Dec 2024 07:26:17 +0000 Subject: [PATCH 07/10] Added translation using Weblate (Italian) --- .../i18n/it.po | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 sale_report_salesperson_from_partner/i18n/it.po diff --git a/sale_report_salesperson_from_partner/i18n/it.po b/sale_report_salesperson_from_partner/i18n/it.po new file mode 100644 index 000000000..4358428c3 --- /dev/null +++ b/sale_report_salesperson_from_partner/i18n/it.po @@ -0,0 +1,26 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * sale_report_salesperson_from_partner +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 16.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: Automatically generated\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" + +#. module: sale_report_salesperson_from_partner +#: model:ir.model,name:sale_report_salesperson_from_partner.model_sale_report +msgid "Sales Analysis Report" +msgstr "" + +#. module: sale_report_salesperson_from_partner +#: model:ir.model.fields,field_description:sale_report_salesperson_from_partner.field_sale_report__user_from_partner_id +#: model_terms:ir.ui.view,arch_db:sale_report_salesperson_from_partner.view_order_product_search +msgid "Salesperson From Partner" +msgstr "" From 6042dd71a94a0c4eff7b3dfc44f52889fde35cc7 Mon Sep 17 00:00:00 2001 From: mymage Date: Mon, 9 Dec 2024 07:39:35 +0000 Subject: [PATCH 08/10] Translated using Weblate (Italian) Currently translated at 100.0% (2 of 2 strings) Translation: sale-reporting-16.0/sale-reporting-16.0-sale_report_salesperson_from_partner Translate-URL: https://translation.odoo-community.org/projects/sale-reporting-16-0/sale-reporting-16-0-sale_report_salesperson_from_partner/it/ --- sale_report_salesperson_from_partner/i18n/it.po | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sale_report_salesperson_from_partner/i18n/it.po b/sale_report_salesperson_from_partner/i18n/it.po index 4358428c3..3750b1aac 100644 --- a/sale_report_salesperson_from_partner/i18n/it.po +++ b/sale_report_salesperson_from_partner/i18n/it.po @@ -6,21 +6,23 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 16.0\n" "Report-Msgid-Bugs-To: \n" -"Last-Translator: Automatically generated\n" +"PO-Revision-Date: 2024-12-09 10:06+0000\n" +"Last-Translator: mymage \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 5.6.2\n" #. module: sale_report_salesperson_from_partner #: model:ir.model,name:sale_report_salesperson_from_partner.model_sale_report msgid "Sales Analysis Report" -msgstr "" +msgstr "Resoconto analisi vendite" #. module: sale_report_salesperson_from_partner #: model:ir.model.fields,field_description:sale_report_salesperson_from_partner.field_sale_report__user_from_partner_id #: model_terms:ir.ui.view,arch_db:sale_report_salesperson_from_partner.view_order_product_search msgid "Salesperson From Partner" -msgstr "" +msgstr "Venditore dal partner" From c2ecf27d3d914d333b2f9e2a509786b606546bc5 Mon Sep 17 00:00:00 2001 From: Bhavesh Heliconia Date: Fri, 17 Jan 2025 17:25:20 +0530 Subject: [PATCH 09/10] [IMP] sale_report_salesperson_from_partner: pre-commit auto fixes --- .../README.rst | 24 +++++++++---------- .../pyproject.toml | 3 +++ .../readme/CONTRIBUTORS.md | 3 +++ .../readme/CONTRIBUTORS.rst | 3 --- .../{DESCRIPTION.rst => DESCRIPTION.md} | 4 ++-- .../static/description/index.html | 10 ++++---- 6 files changed, 25 insertions(+), 22 deletions(-) create mode 100644 sale_report_salesperson_from_partner/pyproject.toml create mode 100644 sale_report_salesperson_from_partner/readme/CONTRIBUTORS.md delete mode 100644 sale_report_salesperson_from_partner/readme/CONTRIBUTORS.rst rename sale_report_salesperson_from_partner/readme/{DESCRIPTION.rst => DESCRIPTION.md} (53%) diff --git a/sale_report_salesperson_from_partner/README.rst b/sale_report_salesperson_from_partner/README.rst index 171ee5a10..e1de4367a 100644 --- a/sale_report_salesperson_from_partner/README.rst +++ b/sale_report_salesperson_from_partner/README.rst @@ -17,19 +17,19 @@ Sale Report Salesperson From Partner :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/16.0/sale_report_salesperson_from_partner + :target: https://github.com/OCA/sale-reporting/tree/18.0/sale_report_salesperson_from_partner :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-16-0/sale-reporting-16-0-sale_report_salesperson_from_partner + :target: https://translation.odoo-community.org/projects/sale-reporting-18-0/sale-reporting-18-0-sale_report_salesperson_from_partner :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=16.0 + :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| -This module extends the sales report in Odoo to allow sales to be grouped by the sales -person assigned to the partner. +This module extends the sales report in Odoo to allow sales to be +grouped by the sales person assigned to the partner. **Table of contents** @@ -42,7 +42,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. @@ -50,19 +50,19 @@ Credits ======= Authors -~~~~~~~ +------- * Tecnativa Contributors -~~~~~~~~~~~~ +------------ -* `Tecnativa `_: +- `Tecnativa `__: - * Pilar Vargas + - Pilar Vargas Maintainers -~~~~~~~~~~~ +----------- This module is maintained by the OCA. @@ -82,6 +82,6 @@ Current `maintainer `__: |maintainer-pilarvargas-tecnativa| -This module is part of the `OCA/sale-reporting `_ project on GitHub. +This module is part of the `OCA/sale-reporting `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/sale_report_salesperson_from_partner/pyproject.toml b/sale_report_salesperson_from_partner/pyproject.toml new file mode 100644 index 000000000..4231d0ccc --- /dev/null +++ b/sale_report_salesperson_from_partner/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +requires = ["whool"] +build-backend = "whool.buildapi" diff --git a/sale_report_salesperson_from_partner/readme/CONTRIBUTORS.md b/sale_report_salesperson_from_partner/readme/CONTRIBUTORS.md new file mode 100644 index 000000000..6efd183e0 --- /dev/null +++ b/sale_report_salesperson_from_partner/readme/CONTRIBUTORS.md @@ -0,0 +1,3 @@ +- [Tecnativa](https://www.tecnativa.com): + + > - Pilar Vargas diff --git a/sale_report_salesperson_from_partner/readme/CONTRIBUTORS.rst b/sale_report_salesperson_from_partner/readme/CONTRIBUTORS.rst deleted file mode 100644 index c1d7564b9..000000000 --- a/sale_report_salesperson_from_partner/readme/CONTRIBUTORS.rst +++ /dev/null @@ -1,3 +0,0 @@ -* `Tecnativa `_: - - * Pilar Vargas diff --git a/sale_report_salesperson_from_partner/readme/DESCRIPTION.rst b/sale_report_salesperson_from_partner/readme/DESCRIPTION.md similarity index 53% rename from sale_report_salesperson_from_partner/readme/DESCRIPTION.rst rename to sale_report_salesperson_from_partner/readme/DESCRIPTION.md index 6be59769d..7862e97a0 100644 --- a/sale_report_salesperson_from_partner/readme/DESCRIPTION.rst +++ b/sale_report_salesperson_from_partner/readme/DESCRIPTION.md @@ -1,2 +1,2 @@ -This module extends the sales report in Odoo to allow sales to be grouped by the sales -person assigned to the partner. +This module extends the sales report in Odoo to allow sales to be +grouped by the sales person assigned to the partner. diff --git a/sale_report_salesperson_from_partner/static/description/index.html b/sale_report_salesperson_from_partner/static/description/index.html index 8d0c4cda2..3a81664b4 100644 --- a/sale_report_salesperson_from_partner/static/description/index.html +++ b/sale_report_salesperson_from_partner/static/description/index.html @@ -369,9 +369,9 @@

Sale Report Salesperson From Partner

!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! source digest: sha256:25e8ade2df0057e6c9341a6aa4b6e5be47344b6eb18c6190476bcc488811a8de !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

Beta License: AGPL-3 OCA/sale-reporting Translate me on Weblate Try me on Runboat

-

This module extends the sales report in Odoo to allow sales to be grouped by the sales -person assigned to the partner.

+

Beta License: AGPL-3 OCA/sale-reporting Translate me on Weblate Try me on Runboat

+

This module extends the sales report in Odoo to allow sales to be +grouped by the sales person assigned to the partner.

Table of contents

    @@ -389,7 +389,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.

@@ -423,7 +423,7 @@

Maintainers

promote its widespread use.

Current maintainer:

pilarvargas-tecnativa

-

This module is part of the OCA/sale-reporting project on GitHub.

+

This module is part of the OCA/sale-reporting project on GitHub.

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

From 01d9b0feedf7ba8714b75440448be16bd0aae4d3 Mon Sep 17 00:00:00 2001 From: Bhavesh Heliconia Date: Fri, 17 Jan 2025 17:26:04 +0530 Subject: [PATCH 10/10] [MIG] sale_report_salesperson_from_partner: Migration to 18.0 --- sale_report_salesperson_from_partner/__manifest__.py | 2 +- .../tests/test_sale_report_salesperson_from_partner.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sale_report_salesperson_from_partner/__manifest__.py b/sale_report_salesperson_from_partner/__manifest__.py index 9acf3b0c7..03c2ca4cf 100644 --- a/sale_report_salesperson_from_partner/__manifest__.py +++ b/sale_report_salesperson_from_partner/__manifest__.py @@ -2,7 +2,7 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). { "name": "Sale Report Salesperson From Partner", - "version": "16.0.1.1.0", + "version": "18.0.1.0.0", "author": "Tecnativa," "Odoo Community Association (OCA)", "website": "https://github.com/OCA/sale-reporting", "category": "Sales", diff --git a/sale_report_salesperson_from_partner/tests/test_sale_report_salesperson_from_partner.py b/sale_report_salesperson_from_partner/tests/test_sale_report_salesperson_from_partner.py index 7414c98a1..3ab7ff58c 100644 --- a/sale_report_salesperson_from_partner/tests/test_sale_report_salesperson_from_partner.py +++ b/sale_report_salesperson_from_partner/tests/test_sale_report_salesperson_from_partner.py @@ -43,6 +43,6 @@ def test_sale_report_user_from_partner_id(self): self.salesperson, ) self.assertEqual( - sale_report.order_id, + sale_report.order_reference, self.order, )