diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py index 63dc175a0dd..1b777ab3525 100644 --- a/addons/crm/__openerp__.py +++ b/addons/crm/__openerp__.py @@ -109,6 +109,7 @@ Dashboard for CRM will include: 'test': [ 'test/crm_access_group_users.yml', 'test/crm_lead_message.yml', + 'test/lead2opportunity2win.yml', 'test/lead2opportunity_assign_salesmen.yml', 'test/crm_lead_merge.yml', 'test/crm_lead_cancel.yml', diff --git a/addons/gamification/models/goal.py b/addons/gamification/models/goal.py index 8e79c43c8a6..62b4e6a9585 100644 --- a/addons/gamification/models/goal.py +++ b/addons/gamification/models/goal.py @@ -279,8 +279,8 @@ class gamification_goal(osv.Model): if goal.definition_id.computation_mode == 'sum': field_name = goal.definition_id.field_id.name - res = obj.read_group(cr, uid, domain, [field_name], [''], context=context) - new_value = res and res[0][field_name] or 0.0 + res = obj.read_group(cr, uid, domain, [field_name], [], context=context) + new_value = res and res[res.keys()[0]][field_name] or 0.0 else: # computation mode = count new_value = obj.search(cr, uid, domain, context=context, count=True) diff --git a/addons/gamification_sale_crm/sale_crm_goals_demo.xml b/addons/gamification_sale_crm/sale_crm_goals_demo.xml index 5c0466f34ed..064d2cbdc20 100644 --- a/addons/gamification_sale_crm/sale_crm_goals_demo.xml +++ b/addons/gamification_sale_crm/sale_crm_goals_demo.xml @@ -3,10 +3,10 @@ - + @@ -16,7 +16,6 @@ 2000 - inprogress