[FIX]crm: lead/opp convert/opp wizard: Add salesperson and salesteam in wizard form

[odoo/odoo.git] / addons / crm / wizard / crm_merge_opportunities.py

diff --git a/addons/crm/wizard/crm_merge_opportunities.py b/addons/crm/wizard/crm_merge_opportunities.py
index 8b78c03..43fbaa7 100644 (file)
--- a/addons/crm/wizard/crm_merge_opportunities.py
+++ b/addons/crm/wizard/crm_merge_opportunities.py
@@ -34,6 +34,8 @@ class crm_merge_opportunity(osv.osv_memory):
     _description = 'Merge opportunities'
     _columns = {
         'opportunity_ids': fields.many2many('crm.lead', rel='merge_opportunity_rel', id1='merge_id', id2='opportunity_id', string='Leads/Opportunities'),
+        'user_id': fields.many2one('res.users', 'Salesperson', select=True),
+        'section_id': fields.many2one('crm.case.section', 'Sales Team', select=True),
     }
 
     def action_merge(self, cr, uid, ids, context=None):
@@ -47,7 +49,7 @@ class crm_merge_opportunity(osv.osv_memory):
         #TODO: why is this passed through the context ?
         context['lead_ids'] = [opportunity2merge_ids[0].id]
 
-        merge_id = lead_obj.merge_opportunity(cr, uid, [x.id for x in opportunity2merge_ids], context=context)
+        merge_id = lead_obj.merge_opportunity(cr, uid, [x.id for x in opportunity2merge_ids], wizard.user_id.id, wizard.section_id.id, context=context)
 
         # The newly created lead might be a lead or an opp: redirect toward the right view
         merge_result = lead_obj.browse(cr, uid, merge_id, context=context)
@@ -79,4 +81,19 @@ class crm_merge_opportunity(osv.osv_memory):
 
         return res
 
+    def on_change_user(self, cr, uid, ids, user_id, section_id, context=None):
+        """ When changing the user, also set a section_id or restrict section id
+            to the ones user_id is member of. """
+        if user_id:
+            if section_id:
+                user_in_section = self.pool.get('crm.case.section').search(cr, uid, [('id', '=', section_id), '|', ('user_id', '=', user_id), ('member_ids', '=', user_id)], context=context, count=True)
+            else:
+                user_in_section = False
+            if not user_in_section:
+                section_id = False
+                section_ids = self.pool.get('crm.case.section').search(cr, uid, ['|', ('user_id', '=', user_id), ('member_ids', '=', user_id)], context=context)
+                if section_ids:
+                    section_id = section_ids[0]
+        return {'value': {'section_id': section_id}}
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: