From d461ace02627f9fd206ab3c05c3d8fcb06b3a9d2 Mon Sep 17 00:00:00 2001
From: pso <pso@tinyerp.com>
Date: Wed, 22 Dec 2010 15:06:31 +0530
Subject: [PATCH 1/2] [FIX] sale: Improved price avg operator

lp bug: https://launchpad.net/bugs/646350 fixed

bzr revid: pso@tinyerp.com-20101222093631-k8yxe5u3o3agc61p
---
 addons/sale/report/sale_report.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py
index f1dcbc32574..7406f8f124f 100644
--- a/addons/sale/report/sale_report.py
+++ b/addons/sale/report/sale_report.py
@@ -47,7 +47,7 @@ class sale_report(osv.osv):
         'user_id': fields.many2one('res.users', 'Salesman', readonly=True),
         'price_total': fields.float('Total Price', readonly=True),
         'delay': fields.float('Commitment Delay', digits=(16,2), readonly=True),
-        'price_average': fields.float('Average Price', readonly=True,group_operator="avg"),
+        'price_average': fields.float('Average Price', readonly=True,group_operator="sum(price_total)/(sum(product_uom_qty)*sum(price_average))*sum"),
         'categ_id': fields.many2one('product.category','Category of Product', readonly=True),
         'nbr': fields.integer('# of Lines', readonly=True),
         'state': fields.selection([

From 81a13374c7f68a790d69445bed428bc0a61d37d1 Mon Sep 17 00:00:00 2001
From: pso <pso@tinyerp.com>
Date: Wed, 22 Dec 2010 15:39:11 +0530
Subject: [PATCH 2/2] [FIX] sale: Improved price avg operator

lp bug: https://launchpad.net/bugs/646350 fixed

bzr revid: pso@tinyerp.com-20101222100911-n8ndi1yl9j879wes
---
 addons/sale/report/sale_report.py       | 3 ---
 addons/sale/report/sale_report_view.xml | 1 -
 2 files changed, 4 deletions(-)

diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py
index 7406f8f124f..cdc86891e62 100644
--- a/addons/sale/report/sale_report.py
+++ b/addons/sale/report/sale_report.py
@@ -47,7 +47,6 @@ class sale_report(osv.osv):
         'user_id': fields.many2one('res.users', 'Salesman', readonly=True),
         'price_total': fields.float('Total Price', readonly=True),
         'delay': fields.float('Commitment Delay', digits=(16,2), readonly=True),
-        'price_average': fields.float('Average Price', readonly=True,group_operator="sum(price_total)/(sum(product_uom_qty)*sum(price_average))*sum"),
         'categ_id': fields.many2one('product.category','Category of Product', readonly=True),
         'nbr': fields.integer('# of Lines', readonly=True),
         'state': fields.selection([
@@ -98,7 +97,6 @@ class sale_report(osv.osv):
                         end) as uom_name,
                         sum(l.product_uom_qty/u.factor) as product_uom_qty,
                         sum(l.product_uom_qty*l.price_unit) as price_total,
-                        (sum(l.product_uom_qty*l.price_unit)/sum(l.product_uom_qty/u.factor)*count(l.product_id))::decimal(16,2) as price_average,
                         pt.categ_id, l.order_id
                     from
                      sale_order_line l
@@ -111,7 +109,6 @@ class sale_report(osv.osv):
                     el.uom_name,
                     el.product_uom_qty,
                     el.price_total,
-                    el.price_average,
                     el.categ_id,
                     el.order_id,
                     s.date_order,
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index 40e6b0256e0..b1d98eacc74 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -23,7 +23,6 @@
                 <field name="product_uom_qty" sum="# of Qty"/>
                 <field name="shipped_qty_1" sum="Shipped Qty"/>
                 <field name="uom_name" invisible="not context.get('set_visible',False)"/>
-                <field name="price_average" sum="Average Price"/>
                 <field name="price_total" sum="Total Price"/>
                 <field name="delay" sum="Commitment Delay"/>
                 <field name="state" invisible="1"/>