[MERGE] crm: fixed bug 907316: undefined context in opportunity creation wizard

bzr revid: tde@openerp.com-20111222091055-szsz2lca1499gg61

diff --cc addons/crm/res_partner.py
index e2016f6,b93600b..2bccdee
--- 1/addons/crm/res_partner.py
--- 2/addons/crm/res_partner.py
+++ b/addons/crm/res_partner.py
@@@ -68,7 -68,7 +68,7 @@@ class res_partner(osv.osv)
                  'categ_id' : categ_ids and categ_ids[0] or '',
                  'state' :'draft',
                  'type': 'opportunity'
-             })
 -            },context=context)
++            }, context=context)
              opportunity_ids[partner_id] = opportunity_id
          return opportunity_ids
  res_partner()

diff --cc addons/crm/wizard/crm_partner_to_opportunity.py
index 6322d03,d7a409f..a1e1f0f
--- 1/addons/crm/wizard/crm_partner_to_opportunity.py
--- 2/addons/crm/wizard/crm_partner_to_opportunity.py
+++ b/addons/crm/wizard/crm_partner_to_opportunity.py
@@@ -58,6 -58,6 +58,7 @@@ class crm_partner2opportunity(osv.osv_m
  
      def make_opportunity(self, cr, uid, ids, context=None):
          partner_ids = context and context.get('active_ids', []) or []
++        partner_id = partner_ids[0] if partner_ids else None
          partner = self.pool.get('res.partner')
          lead = self.pool.get('crm.lead')
          data = self.browse(cr, uid, ids, context=context)[0]
@@@ -65,6 -65,8 +66,8 @@@
              data.name,
              data.planned_revenue,
              data.probability,
 -            partner_ids[0],
++            partner_id,
+             context=context,
          )
          opportunity_id = opportunity_ids[partner_ids[0]]
          return lead.redirect_opportunity_view(cr, uid, opportunity_id, context=context)