diff --git a/addons/calendar/calendar.py b/addons/calendar/calendar.py
index 34a348c5b25..5420f67acc0 100644
--- a/addons/calendar/calendar.py
+++ b/addons/calendar/calendar.py
@@ -855,6 +855,15 @@ class calendar_event(osv.Model):
'alarm_ids': fields.many2many('calendar.alarm', string='Reminders', ondelete="restrict"),
}
+
+ def _get_default_partners(self, cr, uid, ctx=None):
+ ret = [self.pool['res.users'].browse(cr, uid, uid, context=ctx).partner_id.id]
+ active_id = ctx.get('active_id')
+ if ctx.get('active_model') == 'res.partner' and active_id:
+ if active_id not in ret:
+ ret.append(active_id)
+ return ret
+
_defaults = {
'end_type': 'count',
'count': 1,
@@ -866,7 +875,7 @@ class calendar_event(osv.Model):
'interval': 1,
'active': 1,
'user_id': lambda self, cr, uid, ctx: uid,
- 'partner_ids': lambda self, cr, uid, ctx: [self.pool['res.users'].browse(cr, uid, [uid], context=ctx)[0].partner_id.id]
+ 'partner_ids': _get_default_partners,
}
def _check_closing_date(self, cr, uid, ids, context=None):
diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index 7613c2161fc..ad7cee3a27e 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -97,7 +97,7 @@
+ context="{'search_default_partner_ids': active_id}"/>