[MRG] merge with lp:openobject-addons

bzr revid: tpa@tinyerp.com-20131126052924-xn4qn67lehe6x2pj

diff --cc addons/crm/crm.py
Simple merge

diff --cc addons/sale/report/sale_report.py
index 969df76,2368a98..88b4b14
--- 1/addons/sale/report/sale_report.py
--- 2/addons/sale/report/sale_report.py
+++ b/addons/sale/report/sale_report.py
@@@ -82,24 -84,15 +82,23 @@@ class sale_report(osv.osv)
                      t.categ_id as categ_id,
                      s.pricelist_id as pricelist_id,
                      s.project_id as analytic_account_id
 -                from
 -                    sale_order_line l
 +        """
 +        return select_str
 +
 +    def _from(self):
 +        from_str = """
-                 sale_order s
-                     join sale_order_line l on (s.id=l.order_id)
++                sale_order_line l
+                       join sale_order s on (l.order_id=s.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)
 -                group by
 -                    l.product_id,
 +        """
 +        return from_str
 +
 +    def _group_by(self):
 +        group_by_str = """
 +            GROUP BY l.product_id,
-                     l.product_uom_qty,
                      l.order_id,
                      t.uom_id,
                      t.categ_id,

diff --cc addons/sale_crm/sale_crm_view.xml
Simple merge