From 40c5366861c8bd6f3e04a724a4388ea09d5736a5 Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@odoo.com>
Date: Mon, 29 May 2017 18:24:09 +0200
Subject: [PATCH] [FIX] product_margin: graph view only use one non-stored
 field as measure fixes #16565

Because read_group can not handle non-stored fields well,
we fall back to the similar implementation as for the stock
valuation report.  This allows only one non-stored field as a measure in
the graph.  Then it is more logical to show the total margin as that is
what the module is meant for.
---
 addons/product_margin/product_margin.py       | 5 ++---
 addons/product_margin/product_margin_view.xml | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/addons/product_margin/product_margin.py b/addons/product_margin/product_margin.py
index 7c62a8a97aa..598885c23e5 100644
--- a/addons/product_margin/product_margin.py
+++ b/addons/product_margin/product_margin.py
@@ -103,9 +103,8 @@ class product_product(osv.osv):
             res[val.id]['total_cost'] = result[2] and result[2] or 0.0
             res[val.id]['normal_cost'] = prod.standard_price * res[val.id]['purchase_num_invoiced']
             res[val.id]['purchase_gap'] = res[val.id]['normal_cost'] - res[val.id]['total_cost']
-
-            if 'total_margin' in field_names:
-                res[val.id]['total_margin'] = res[val.id]['turnover'] - res[val.id]['total_cost']
+            res[val.id]['total_margin'] = res[val.id]['turnover'] - res[val.id]['total_cost']
+            
             if 'expected_margin' in field_names:
                 res[val.id]['expected_margin'] = res[val.id]['sale_expected'] - res[val.id]['normal_cost']
             if 'total_margin_rate' in field_names:
diff --git a/addons/product_margin/product_margin_view.xml b/addons/product_margin/product_margin_view.xml
index 9b4eede75a4..bc58a051987 100644
--- a/addons/product_margin/product_margin_view.xml
+++ b/addons/product_margin/product_margin_view.xml
@@ -8,8 +8,7 @@
             <field name="arch" type="xml">
                 <graph string="Product Margins" type="bar">
                     <field name="product_tmpl_id"/>
-                    <field name="turnover" operator="+"/>
-                    <field name="total_cost" operator="+"/>
+                    <field name="total_margin" type="measure" operator="+"/>
                 </graph>
             </field>
     </record>
@@ -74,7 +73,7 @@
                     <field name="sales_gap" sum="Sales Gap"/>
                     <field name="total_cost" sum="Total Cost"/>
                     <field name="purchase_num_invoiced" string="#Purchased"/>
-                    <field name="total_margin"/>
+                    <field name="total_margin" sum="Total Margin"/>
                     <field name="expected_margin"/>
                     <field name="total_margin_rate"  widget="progressbar"/>
                     <field name="expected_margin_rate" widget="progressbar"/>