From 31487c201e1e84c872388885e83b0715a44e960f Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 9 Mar 2010 14:39:07 +0530
Subject: [PATCH] [IMP]: crm: changes for opening meetings related to
 opportunity

bzr revid: rpa@tinyerp.com-20100309090907-kxbr4h3x2p3yomao
---
 addons/crm/crm_opportunity_menu.xml         |  6 +++---
 addons/crm/wizard/crm_opportunity_wizard.py | 14 +++++---------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/addons/crm/crm_opportunity_menu.xml b/addons/crm/crm_opportunity_menu.xml
index dc7e100152a..49d0452167b 100644
--- a/addons/crm/crm_opportunity_menu.xml
+++ b/addons/crm/crm_opportunity_menu.xml
@@ -8,9 +8,9 @@
             name="Meetings"
             res_model="crm.meeting"
             src_model="crm.opportunity"
-            view_mode="calendar,tree,form"
-            context="{'default_duration': 4.0}"
-            domain="[('user_id','=',uid)]"
+            view_mode="tree,form,calendar,"
+            context="{'default_duration': 4.0, 'default_opportunity_id': active_id}"
+            domain="[('user_id','=',uid), ('opportunity_id', '=', active_id)]"
             view_type="form"/>
 
 	 <act_window
diff --git a/addons/crm/wizard/crm_opportunity_wizard.py b/addons/crm/wizard/crm_opportunity_wizard.py
index e2636027c92..d7ec0b72cb6 100644
--- a/addons/crm/wizard/crm_opportunity_wizard.py
+++ b/addons/crm/wizard/crm_opportunity_wizard.py
@@ -154,20 +154,16 @@ class opportunity2meeting(wizard.interface):
         partner_id = opportunity.partner_id and opportunity.partner_id.id or False
         name = opportunity.name
         email = opportunity.email_from
-        section_id = opportunity.section_id and opportunity.section_id.id or False
+        section_id = opportunity.section_id and opportunity.section_id.id or False        
         return {            
             'name': _('Meetings'),
-            'domain' : "[('user_id','=',%s), ('opportunity_id', '=', %s)]"%(uid, data['id']),  
-            'context': {'default_partner_id': partner_id, 
-                        'default_opportunity_id': data['id'], 
-                        'default_section_id': section_id, 
-                        'default_email_from': email, 
-                        'default_state':'open', 'default_name':name},
+            'domain' : "[('user_id','=',%s)]"%(uid),  
+            'context': {'default_partner_id': partner_id, 'default_section_id': section_id, 'default_email_from': email, 'default_state':'open', 'default_name':name},
             'view_type': 'form',
-            'view_mode': 'tree,form,calendar',
+            'view_mode': 'calendar,form,tree',
             'res_model': 'crm.meeting',
             'view_id': False,
-            'views': [(id3, 'tree'), (id2, 'form'), (id1, 'calendar')], 
+            'views': [(id1,'calendar'),(id2,'form'),(id3,'tree')],
             'type': 'ir.actions.act_window',
             'search_view_id': id['res_id']
             }