diff options
Diffstat (limited to 'addons/crm')
| -rw-r--r-- | addons/crm/calendar_event_menu.xml | 11 | ||||
| -rw-r--r-- | addons/crm/crm_lead.py | 1 | ||||
| -rw-r--r-- | addons/crm/crm_lead_view.xml | 2 |
3 files changed, 13 insertions, 1 deletions
diff --git a/addons/crm/calendar_event_menu.xml b/addons/crm/calendar_event_menu.xml index aec88a5748e..66c1119727f 100644 --- a/addons/crm/calendar_event_menu.xml +++ b/addons/crm/calendar_event_menu.xml @@ -5,5 +5,16 @@ <menuitem name="Import & Synchronize" id="base.menu_import_crm" parent="base.menu_base_partner"/> + <record id="view_crm_meeting_search" model="ir.ui.view"> + <field name="name">CRM - Meetings Search</field> + <field name="model">crm.meeting</field> + <field name="inherit_id" ref="base_calendar.view_crm_meeting_search"/> + <field name="arch" type="xml"> + <xpath expr="//field[@name='user_id']" position="after"> + <field name="opportunity_id"/> + </xpath> + </field> + </record> + </data> </openerp> diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index c00df49bb20..42956043aba 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -919,6 +919,7 @@ class crm_lead(format_address, osv.osv): opportunity = self.browse(cr, uid, ids[0], context) res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid, 'calendar', 'action_calendar_event', context) res['context'] = { + 'search_default_opportunity_id': opportunity.id, 'default_opportunity_id': opportunity.id, 'default_partner_id': opportunity.partner_id and opportunity.partner_id.id or False, 'default_partner_ids' : opportunity.partner_id and [opportunity.partner_id.id] or False, diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index 6b23be6b97e..f21e6f88195 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -392,7 +392,7 @@ name="%(opportunity2phonecall_act)d"/> <button string="Meeting" type="object" name="action_makeMeeting" - context="{'search_default_attendee_id': active_id, 'default_attendee_id' : active_id}"/> + type="object" /> </div> <div class="oe_title"> <label for="name" class="oe_edit_only"/> |