[FIX] add weighted margin percent

Author: sergiocorato

Diff for: sale_report_margin_percent/__manifest__.py

@@ -1,11 +1,11 @@
 # Copyright 2024 Sergio Corato <https://github.com/sergiocorato>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 {
-    "name": "Sale Report Margin Percent",
+    "name": "Sale Report Weighted Margin Percent",
     "version": "14.0.1.0.1",
     "category": "Sales",
     "author": "Sergio Corato",
-    "summary": "Adds the margin percent to sale analysis report",
+    "summary": "Adds the weighted margin percent to sale analysis report",
     "website": "https://github.com/sergiocorato/e-account",
     "license": "AGPL-3",
     "depends": ["sale_margin"],

Diff for: sale_report_margin_percent/i18n/it.po

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 14.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-11-27 18:09+0000\n"
-"PO-Revision-Date: 2024-11-27 18:09+0000\n"
+"POT-Creation-Date: 2024-12-02 11:01+0000\n"
+"PO-Revision-Date: 2024-12-02 11:01+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,36 +16,40 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: sale_report_margin_percent
+#: model:ir.model.fields,field_description:sale_report_margin_percent.field_sale_order__assigned_attachment_ids
 #: model:ir.model.fields,field_description:sale_report_margin_percent.field_sale_report__assigned_attachment_ids
 msgid "Assigned Attachments"
 msgstr "Allegati assegnati"
 
 #. module: sale_report_margin_percent
+#: model:ir.model.fields,field_description:sale_report_margin_percent.field_sale_order__display_name
 #: model:ir.model.fields,field_description:sale_report_margin_percent.field_sale_report__display_name
 msgid "Display Name"
 msgstr "Nome visualizzato"
 
 #. module: sale_report_margin_percent
+#: model:ir.model.fields,field_description:sale_report_margin_percent.field_sale_order__id
 #: model:ir.model.fields,field_description:sale_report_margin_percent.field_sale_report__id
 msgid "ID"
 msgstr ""
 
 #. module: sale_report_margin_percent
+#: model:ir.model.fields,field_description:sale_report_margin_percent.field_sale_order____last_update
 #: model:ir.model.fields,field_description:sale_report_margin_percent.field_sale_report____last_update
 msgid "Last Modified on"
 msgstr "Ultima modifica il"
 
 #. module: sale_report_margin_percent
-#: model:ir.model.fields,field_description:sale_report_margin_percent.field_sale_report__margin_percent_line
-msgid "Margin Line (%)"
-msgstr "Margine riga (%)"
-
-#. module: sale_report_margin_percent
-#: model:ir.model.fields,field_description:sale_report_margin_percent.field_sale_report__margin_percent_order
-msgid "Margin Order (%)"
-msgstr "Margine ordine (%)"
+#: model:ir.model.fields,field_description:sale_report_margin_percent.field_sale_report__margin_percent_weighted
+msgid "Margin Weighted (%)"
+msgstr "Margine pesato (%)"
 
 #. module: sale_report_margin_percent
 #: model:ir.model,name:sale_report_margin_percent.model_sale_report
 msgid "Sales Analysis Report"
 msgstr "Resoconto di analisi vendite"
+
+#. module: sale_report_margin_percent
+#: model:ir.model,name:sale_report_margin_percent.model_sale_order
+msgid "Sales Order"
+msgstr "Ordine di vendita"

Diff for: sale_report_margin_percent/models/sale_order.py

@@ -26,8 +26,11 @@ def read_group(
         )
         for order in res:
             if "__domain" in order and "margin_percent:avg" in fields:
-                orders = self.search(order["__domain"])
-                order["margin_percent"] = sum(orders.mapped("margin")) / (
-                    sum(orders.mapped("amount_untaxed")) or 1
+                orders = self.search_read(
+                    order["__domain"],
+                    ["margin", "amount_untaxed"]
                 )
+                order["margin_percent"] = sum([x["margin"] for x in orders]) / (
+                    sum([x["amount_untaxed"] for x in orders]) or 1
+                ) * 100.0
         return res

Diff for: sale_report_margin_percent/readme/DESCRIPTION.rst

@@ -1 +1 @@
-Adds margin percent of the whole sale order and of the single lines fields to sale report.
+Adds weighted margin percent to sale report.

Diff for: sale_report_margin_percent/reports/sale_report.py

@@ -1,21 +1,47 @@
-from odoo import fields, models
+from odoo import api, fields, models
 
 
 class SaleReport(models.Model):
     _inherit = "sale.report"
 
-    margin_percent_order = fields.Float(
-        string="Margin Order (%)", readonly=True, group_operator="avg"
-    )
-    margin_percent_line = fields.Float(
-        string="Margin Line (%)", readonly=True, group_operator="avg"
+    margin_percent_weighted = fields.Float(
+        string="Margin Weighted (%)", readonly=True, group_operator="avg"
     )
 
     def _select_additional_fields(self, fields):
         fields[
-            "margin_percent_order"
-        ] = ", MAX(s.margin_percent * 100.0) AS margin_percent_order"
-        fields[
-            "margin_percent_line"
-        ] = ", MAX(l.margin_percent * 100.0) AS margin_percent_line"
+            "margin_percent_weighted"
+        ] = ", MAX(s.margin_percent * 100.0) AS margin_percent_weighted"
         return super()._select_additional_fields(fields)
+
+    @api.model
+    def read_group(
+        self,
+        domain,
+        fields,
+        groupby,
+        offset=0,
+        limit=None,
+        orderby=False,
+        lazy=True,
+    ):
+        res = super().read_group(
+            domain,
+            fields,
+            groupby,
+            offset=offset,
+            limit=limit,
+            orderby=orderby,
+            lazy=lazy,
+        )
+        for order_line in res:
+            if "__domain" in order_line and "margin_percent_weighted:avg" in fields:
+                order_lines = self.search_read(
+                    order_line["__domain"],
+                    ["margin", "price_subtotal"]
+                )
+                margin_percent = sum([x["margin"] for x in order_lines]) / (
+                    sum([x["price_subtotal"] for x in order_lines]) or 1
+                ) * 100.0
+                order_line["margin_percent_weighted"] = margin_percent
+        return res