[MERGE] OPW 50921: purchase report: fix duplicated row for UoM category having more...

bzr revid: xal@openerp.com-20120313140216-ybhj9qubp5jwu6gj

diff --cc addons/purchase/report/purchase_report.py
index af22332,4c59f9e..8e724c2
--- 1/addons/purchase/report/purchase_report.py
--- 2/addons/purchase/report/purchase_report.py
+++ b/addons/purchase/report/purchase_report.py
@@@ -102,20 -98,17 +98,21 @@@ class purchase_report(osv.osv)
                      extract(epoch from age(s.date_approve,s.date_order))/(24*60*60)::decimal(16,2) as delay,
                      extract(epoch from age(l.date_planned,s.date_order))/(24*60*60)::decimal(16,2) as delay_pass,
                      count(*) as nbr,
-                     (l.price_unit*l.product_qty*u.factor)::decimal(16,2) as price_total,
-                     avg(100.0 * (l.price_unit*l.product_qty*u.factor) / NULLIF(t.standard_price*l.product_qty*u.factor, 0.0) / rcr.rate)::decimal(16,2) as negociation,
+                     (l.price_unit*l.product_qty)::decimal(16,2) as price_total,
 -                    avg(100.0 * (l.price_unit*l.product_qty) / NULLIF(t.standard_price*l.product_qty/u.factor*u2.factor, 0.0))::decimal(16,2) as negociation,
++                    avg(100.0 * (l.price_unit*l.product_qty) / NULLIF(t.standard_price*l.product_qty/u.factor*u2.factor, 0.0) / rcr.rate)::decimal(16,2) as negociation
  
-                     sum(t.standard_price*l.product_qty*u.factor)::decimal(16,2) as price_standard,
-                     (sum(l.product_qty*l.price_unit)/NULLIF(sum(l.product_qty*u.factor),0.0))::decimal(16,2) as price_average
+                     sum(t.standard_price*l.product_qty/u.factor*u2.factor)::decimal(16,2) as price_standard,
+                     (sum(l.product_qty*l.price_unit)/NULLIF(sum(l.product_qty/u.factor*u2.factor),0.0))::decimal(16,2) as price_average
                  from purchase_order s
                      left join purchase_order_line l on (s.id=l.order_id)
                          left join product_product p on (l.product_id=p.id)
                              left join product_template t on (p.product_tmpl_id=t.id)
                      left join product_uom u on (u.id=l.product_uom)
+                     left join product_uom u2 on (u2.id=t.uom_id)
 +                    left join product_pricelist pl on (s.pricelist_id=pl.id)
 +                        left join res_currency rc on (pl.currency_id=rc.id)
 +                            left join res_currency_rate rcr on (rc.id=rcr.currency_id)
-                         
++
                  where l.product_id is not null
                  group by
                      s.company_id,