[IMP] salesteams: use read_group to simplify

bzr revid: chm@openerp.com-20130524135255-myzntlue5e87j6vk

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 3841c25..92e6584 100644 (file)
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -148,23 +148,20 @@ class crm_case_section(osv.osv):
 
     def _get_won_opportunity_per_duration(self, cr, uid, ids, field_name, arg, context=None):
         res = dict.fromkeys(ids, [])
-        lead_obj = self.pool.get('crm.lead')
+        obj = self.pool.get('crm.lead')
         first_day = date.today().replace(day=1)
 
         for section in self.browse(cr, uid, ids, context=context):
             dates = [first_day + relativedelta(months=-(MONTHS[section.target_duration]*(key+1)-1)) for key in range(0, 5)]
-            nb_leads = []
+            rates = []
             for when in range(0, 5):
                 domain = [("section_id", "=", section.id), ('state', '=', 'done'), ('type', '=', 'opportunity'), ('date_closed', '>=', dates[when].strftime(tools.DEFAULT_SERVER_DATE_FORMAT))]
                 if when:
                     domain += [('date_closed', '<', dates[when-1].strftime(tools.DEFAULT_SERVER_DATE_FORMAT))]
-                rate = 0
-                opportunity_ids = lead_obj.search(cr, uid, domain, context=context)
-                for opportunity in lead_obj.browse(cr, uid, opportunity_ids, context=context):
-                    rate += opportunity.planned_revenue
-                nb_leads.append(rate)
-            nb_leads.reverse()
-            res[section.id] = nb_leads
+                group_obj = obj.read_group(cr, uid, domain, ['planned_revenue', 'section_id'], "section_id", context=context)
+                rates.append(group_obj and group_obj[0]['planned_revenue'] or 0)
+            rates.reverse()
+            res[section.id] = rates
         return res
 
     _columns = {

diff --git a/addons/sale_crm/sale_crm.py b/addons/sale_crm/sale_crm.py
index bd3cd70..5b189d0 100644 (file)
--- a/addons/sale_crm/sale_crm.py
+++ b/addons/sale_crm/sale_crm.py
@@ -61,18 +61,20 @@ class crm_case_section(osv.osv):
 
         for section in self.browse(cr, uid, ids, context=context):
             dates = [first_day + relativedelta(months=-(MONTHS[section.target_duration]*(key+1)-1)) for key in range(0, 5)]
-            rate_invoice = []
+            rates = []
             for when in range(0, 5):
                 domain = [("section_id", "=", section.id), ('state', 'in', ['draft', 'sent']), ('date_order', '>=', dates[when].strftime(tools.DEFAULT_SERVER_DATE_FORMAT))]
                 if when:
                     domain += [('date_order', '<', dates[when-1].strftime(tools.DEFAULT_SERVER_DATE_FORMAT))]
-                rate = 0
-                order_ids = obj.search(cr, uid, domain, context=context)
-                for order in obj.browse(cr, uid, order_ids, context=context):
-                    rate += order.amount_total
-                rate_invoice.append(rate)
-            rate_invoice.reverse()
-            res[section.id] = rate_invoice
+                # rate = 0
+                # order_ids = obj.search(cr, uid, domain, context=context)
+                # for order in obj.browse(cr, uid, order_ids, context=context):
+                #     rate += order.amount_total
+                # rates.append(rate)
+                group_obj = obj.read_group(cr, uid, domain, ['amount_total', 'section_id'], "section_id", context=context)
+                rates.append(group_obj and group_obj[0]['amount_total'] or 0)
+            rates.reverse()
+            res[section.id] = rates
         return res
 
     def _get_validate_saleorder_per_duration(self, cr, uid, ids, field_name, arg, context=None):
@@ -82,18 +84,15 @@ class crm_case_section(osv.osv):
 
         for section in self.browse(cr, uid, ids, context=context):
             dates = [first_day + relativedelta(months=-(MONTHS[section.target_duration]*(key+1)-1)) for key in range(0, 5)]
-            rate_invoice = []
+            rates = []
             for when in range(0, 5):
                 domain = [("section_id", "=", section.id), ('state', 'not in', ['draft', 'sent']), ('date_confirm', '>=', dates[when].strftime(tools.DEFAULT_SERVER_DATE_FORMAT))]
                 if when:
                     domain += [('date_confirm', '<', dates[when-1].strftime(tools.DEFAULT_SERVER_DATE_FORMAT))]
-                rate = 0
-                order_ids = obj.search(cr, uid, domain, context=context)
-                for order in obj.browse(cr, uid, order_ids, context=context):
-                    rate += order.amount_total
-                rate_invoice.append(rate)
-            rate_invoice.reverse()
-            res[section.id] = rate_invoice
+                group_obj = obj.read_group(cr, uid, domain, ['amount_total', 'section_id'], "section_id", context=context)
+                rates.append(group_obj and group_obj[0]['amount_total'] or 0)
+            rates.reverse()
+            res[section.id] = rates
         return res
 
     def _get_sent_invoice_per_duration(self, cr, uid, ids, field_name, arg, context=None):
@@ -103,18 +102,15 @@ class crm_case_section(osv.osv):
 
         for section in self.browse(cr, uid, ids, context=context):
             dates = [first_day + relativedelta(months=-(MONTHS[section.target_duration]*(key+1)-1)) for key in range(0, 5)]
-            rate_invoice = []
+            rates = []
             for when in range(0, 5):
                 domain = [("section_id", "=", section.id), ('state', 'not in', ['draft', 'cancel']), ('date', '>=', dates[when].strftime(tools.DEFAULT_SERVER_DATE_FORMAT))]
                 if when:
                     domain += [('date', '<', dates[when-1].strftime(tools.DEFAULT_SERVER_DATE_FORMAT))]
-                rate = 0
-                invoice_ids = obj.search(cr, uid, domain, context=context)
-                for invoice in obj.browse(cr, uid, invoice_ids, context=context):
-                    rate += invoice.price_total
-                rate_invoice.append(rate)
-            rate_invoice.reverse()
-            res[section.id] = rate_invoice
+                group_obj = obj.read_group(cr, uid, domain, ['price_total', 'section_id'], "section_id", context=context)
+                rates.append(group_obj and group_obj[0]['price_total'] or 0)
+            rates.reverse()
+            res[section.id] = rates
         return res
 
     _columns = {