Merge pull request #252 from OCA/15.0

Syncing from upstream OCA/sale-reporting (15.0)
brain-tec · Dec 5, 2024 · 80b23a8 · 80b23a8
2 parents 545f54e + 933a803
commit 80b23a8
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 90 deletions.
diff --git a/README.md b/README.md
@@ -37,7 +37,7 @@ addon | version | maintainers | summary
 [sale_report_delivered_subtotal](sale_report_delivered_subtotal/) | 15.0.1.0.1 | [![sergio-teruel](https://github.com/sergio-teruel.png?size=30px)](https://github.com/sergio-teruel) | Sale Report Delivered subtotal
 [sale_report_delivered_volume](sale_report_delivered_volume/) | 15.0.1.0.0 |  | Sale Report Delivered Volume
 [sale_report_salesman](sale_report_salesman/) | 15.0.1.0.1 | [![carolina-fernandez](https://github.com/carolina-fernandez.png?size=30px)](https://github.com/carolina-fernandez) | Sale Report Salesman
-[sale_report_salesperson_from_partner](sale_report_salesperson_from_partner/) | 15.0.1.0.0 | [![pilar-vargas](https://github.com/pilar-vargas.png?size=30px)](https://github.com/pilar-vargas) | Sale Report Salesperson From Partner
+[sale_report_salesperson_from_partner](sale_report_salesperson_from_partner/) | 15.0.1.1.0 | [![pilarvargas-tecnativa](https://github.com/pilarvargas-tecnativa.png?size=30px)](https://github.com/pilarvargas-tecnativa) | Sale Report Salesperson From Partner
 
 [//]: # (end addons)
 

diff --git 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:29ae87a8d364e41eda281238b680bc1a3f0208035e2872996306b995de6764b0
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
@@ -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 <https://odoo-community.org/page/maintainer-role>`__:
 
-|maintainer-pilar-vargas| 
+|maintainer-pilarvargas-tecnativa| 
 
 This module is part of the `OCA/sale-reporting <https://github.com/OCA/sale-reporting/tree/15.0/sale_report_salesperson_from_partner>`_ project on GitHub.
 

diff --git a/sale_report_salesperson_from_partner/__manifest__.py b/sale_report_salesperson_from_partner/__manifest__.py
@@ -2,14 +2,14 @@
 # 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": "15.0.1.1.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"],
+    "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/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."
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
@@ -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 ""
diff --git 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
diff --git a/sale_report_salesperson_from_partner/static/description/index.html b/sale_report_salesperson_from_partner/static/description/index.html
@@ -367,7 +367,7 @@ <h1 class="title">Sale Report Salesperson From Partner</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:521a47bdeb8f3dbb42f3f7965d9ea3b75c0478fe04c4eace5ed278733f8a90ea
+!! source digest: sha256:29ae87a8d364e41eda281238b680bc1a3f0208035e2872996306b995de6764b0
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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/sale-reporting/tree/15.0/sale_report_salesperson_from_partner"><img alt="OCA/sale-reporting" src="https://img.shields.io/badge/github-OCA%2Fsale--reporting-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/sale-reporting-15-0/sale-reporting-15-0-sale_report_salesperson_from_partner"><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/sale-reporting&amp;target_branch=15.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module extends the sales report in Odoo to allow sales to be grouped by the sales
@@ -422,7 +422,7 @@ <h2><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h2>
 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/pilar-vargas"><img alt="pilar-vargas" src="https://github.com/pilar-vargas.png?size=40px" /></a></p>
+<p><a class="reference external image-reference" href="https://github.com/pilarvargas-tecnativa"><img alt="pilarvargas-tecnativa" src="https://github.com/pilarvargas-tecnativa.png?size=40px" /></a></p>
 <p>This module is part of the <a class="reference external" href="https://github.com/OCA/sale-reporting/tree/15.0/sale_report_salesperson_from_partner">OCA/sale-reporting</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>

diff --git a/sale_report_salesperson_from_partner/views/sale_order_views.xml b/sale_report_salesperson_from_partner/views/sale_order_views.xml
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		from . import sale_order
		from . import sale_report