From 126ba0a9a8a1aaaf959a1c2c0f235640e766a9de Mon Sep 17 00:00:00 2001 From: Ravi Gohil Date: Mon, 9 Jun 2014 14:58:30 +0530 Subject: [PATCH] [FIX] crm: correct open lead or opportunity view from calls When opening a lead/opportunity from the phonecalls view, we did not open the correct view (always the lead). This will use the type of the crm.lead to determine which view should be used, opw 608493. --- addons/crm/crm_lead.py | 5 +++++ addons/crm/crm_phonecall_view.xml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index 6c4ef607c0d..b04eae9e31f 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -165,6 +165,11 @@ class crm_lead(base_stage, format_address, osv.osv): return result, fold def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None, toolbar=False, submenu=False): + if view_type == 'form' and context and context.get('opportunity_id'): + # TODO: replace by get_formview_action call + lead_type = self.browse(cr, user, context['opportunity_id'], context=context).type + view_lead_xml_id = 'crm_case_form_view_oppor' if lead_type == 'opportunity' else 'crm_case_form_view_leads' + _, view_id = self.pool['ir.model.data'].get_object_reference(cr, user, 'crm', view_lead_xml_id) res = super(crm_lead,self).fields_view_get(cr, user, view_id, view_type, context, toolbar=toolbar, submenu=submenu) if view_type == 'form': res['arch'] = self.fields_view_get_address(cr, user, res['arch'], context=context) diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml index 21e18d8affc..4737065be6e 100644 --- a/addons/crm/crm_phonecall_view.xml +++ b/addons/crm/crm_phonecall_view.xml @@ -110,7 +110,7 @@ domain="[('object_id.model', '=', 'crm.phonecall')]"/> - +