diff --git a/addons/crm/crm_opportunity_menu.xml b/addons/crm/crm_opportunity_menu.xml index 7a2a0c21d3f..dfc21212b3e 100644 --- a/addons/crm/crm_opportunity_menu.xml +++ b/addons/crm/crm_opportunity_menu.xml @@ -10,6 +10,7 @@ src_model="crm.opportunity" view_mode="calendar,graph" context="{'default_partner_id': active_id, 'default_duration': 4.0}" + domain="[('opportunity_id','=',active_id)]" view_type="form"/> diff --git a/addons/crm/wizard/crm_opportunity_wizard.py b/addons/crm/wizard/crm_opportunity_wizard.py index 4d41404aa03..945f92ea688 100644 --- a/addons/crm/wizard/crm_opportunity_wizard.py +++ b/addons/crm/wizard/crm_opportunity_wizard.py @@ -144,8 +144,7 @@ class opportunity2meeting(wizard.interface): }) new_meeting = meeting_case_obj.browse(cr, uid, new_meeting_id) vals = {} - opportunity_case_obj.write(cr, uid, [opportunity.id], vals) - opportunity_case_obj.case_cancel(cr, uid, [opportunity.id]) + opportunity_case_obj.write(cr, uid, [opportunity.id], vals) meeting_case_obj.case_open(cr, uid, [new_meeting_id]) data_obj = pool.get('ir.model.data') result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_meetings_filter') @@ -161,6 +160,7 @@ class opportunity2meeting(wizard.interface): id3 = data_obj.browse(cr, uid, id3, context=context).res_id return { 'name': _('Meetings'), + 'domain' : "[('opportunity_id','in',%s)]"%(data['ids']), 'view_type': 'form', 'view_mode': 'calendar,form,tree', 'res_model': 'crm.meeting', diff --git a/addons/crm/wizard/crm_phonecall_wizard.py b/addons/crm/wizard/crm_phonecall_wizard.py index 0c163586a8e..e341e46f03e 100644 --- a/addons/crm/wizard/crm_phonecall_wizard.py +++ b/addons/crm/wizard/crm_phonecall_wizard.py @@ -223,6 +223,7 @@ class phonecall2meeting(wizard.interface): id3 = data_obj.browse(cr, uid, id3, context=context).res_id return { 'name': _('Meetings'), + 'domain' : "[('phonecall_id','in',%s)]"%(data['ids']), 'view_type': 'form', 'view_mode': 'calendar,form,tree', 'res_model': 'crm.meeting', diff --git a/addons/report_crm/report_crm_view.xml b/addons/report_crm/report_crm_view.xml index a5ac4a942b5..7b46928cb6b 100644 --- a/addons/report_crm/report_crm_view.xml +++ b/addons/report_crm/report_crm_view.xml @@ -148,8 +148,6 @@ - -