[MERGE]

bzr revid: hmo@tinyerp.com-20100129125649-ehqw02o57dx95bix

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"/>
 
 	 <act_window
@@ -19,6 +20,7 @@
             src_model="crm.opportunity"
             view_mode="calendar,tree,form"
             context="{'default_partner_id': active_id, 'default_duration': 1.0}"
+            domain="[('opportunity_id','=',active_id)]"
             view_type="form"/>            
             
      <record model="ir.actions.act_window" id="crm_case_category_act_oppor11">

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',

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',

addons/report_crm/report_crm_view.xml

@@ -148,8 +148,6 @@
 
         <act_window domain="[('section_id', '=', active_id)]" id="act_crm_case_section_2_report_crm_case_user" name="Monthly cases by user" res_model="report.crm.case.user" src_model="crm.case.section"/>
 
-        <act_window domain="[('categ_id', '=', active_id)]" id="act_crm_case_categ_2_report_crm_case_categ" name="Monthly cases" res_model="report.crm.case.categ" src_model="crm.case.categ"/>
-
         <act_window domain="[('section_id', '=', active_id)]" id="act_crm_case_section_2_report_crm_case_categ" name="Monthly cases by section" res_model="report.crm.case.categ" src_model="crm.case.section"/>