Merge lp:~openerp-dev/openobject-addons/trunk-bug-1092852-hip into lp:openobject-addons

[Hiral Patel (OpenERP)]

Unmerged revisions

8476. By Hiral Patel (OpenERP) on 2012-12-24

[FIX][trunk] Sales > Customer number of sales includes Cancelled orders

=== modified file 'sale/res_partner.py'
--- sale/res_partner.py	2012-12-06 14:56:32 +0000
+++ sale/res_partner.py	2012-12-24 09:08:23 +0000
@@ -29,8 +29,11 @@
         res = dict(map(lambda x: (x,0), ids))
         # The current user may not have access rights for sale orders
         try:
+            sale_obj = self.pool.get('sale.order')
             for partner in self.browse(cr, uid, ids, context):
-                res[partner.id] = len(partner.sale_order_ids)
+                for i in range(0, len(partner.sale_order_ids)):
+                    cancel_order = len(sale_obj.search(cr, uid, [('state','=','cancel'),('partner_id','=',partner.sale_order_ids[i].partner_id.id)]))
+                res[partner.id] = len(partner.sale_order_ids) - cancel_order
         except:
             pass
         return res