diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 9a6fb6fb9a1..17dc6ee393a 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -64,7 +64,7 @@
+ name="%(wizard_crm_opportunity_meeting_set)d" icon="gtk-redo" type="action" />
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 1574b171c3c..64be1683d74 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -54,7 +54,7 @@
type="action" attrs="{'invisible':[('opportunity_id','!=',False)]}" />
+ name="%(wizard_crm_phonecall_meeting_set)d" type="action" />
@@ -75,7 +75,7 @@
diff --git a/addons/crm/wizard/crm_opportunity_to_meeting.py b/addons/crm/wizard/crm_opportunity_to_meeting.py
index 2af7ddc8e35..a2f94a5a96f 100644
--- a/addons/crm/wizard/crm_opportunity_to_meeting.py
+++ b/addons/crm/wizard/crm_opportunity_to_meeting.py
@@ -21,6 +21,64 @@
from osv import osv
from tools.translate import _
+import wizard
+import pooler
+
+#===============================================================================
+# Put original wizard because of action in init
+# Remove it after solution foraction in init
+#===============================================================================
+
+class opportunity2meeting(wizard.interface):
+
+ def _makeMeeting(self, cr, uid, data, context):
+ pool = pooler.get_pool(cr.dbname)
+ opportunity_case_obj = pool.get('crm.opportunity')
+ data_obj = pool.get('ir.model.data')
+ result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_meetings_filter')
+ id = data_obj.read(cr, uid, result, ['res_id'])
+ id1 = data_obj._get_id(cr, uid, 'crm', 'crm_case_calendar_view_meet')
+ id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_meet')
+ id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_meet')
+ if id1:
+ id1 = data_obj.browse(cr, uid, id1, context=context).res_id
+ if id2:
+ id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+ if id3:
+ id3 = data_obj.browse(cr, uid, id3, context=context).res_id
+ opportunity = opportunity_case_obj.browse(cr, uid, data['id'], context=context)
+ 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
+ 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},
+ 'view_type': 'form',
+ 'view_mode': 'tree,form,calendar',
+ 'res_model': 'crm.meeting',
+ 'view_id': False,
+ 'views': [(id1, 'calendar'), (id3, 'tree'), (id2, 'form')],
+ 'type': 'ir.actions.act_window',
+ 'search_view_id': id['res_id']
+ }
+
+ states = {
+ 'init': {
+ 'actions': [],
+ 'result': {'type': 'action', 'action': _makeMeeting, 'state': 'order'}
+ },
+ 'order': {
+ 'actions': [],
+ 'result': {'type': 'state', 'state': 'end'}
+ }
+ }
+opportunity2meeting('crm.opportunity.meeting_set')
class crm_opportunity2meeting(osv.osv_memory):
_name = 'crm.opportunity2meeting'
diff --git a/addons/crm/wizard/crm_opportunity_to_meeting_view.xml b/addons/crm/wizard/crm_opportunity_to_meeting_view.xml
index 7ea05598d28..9fdf506d313 100644
--- a/addons/crm/wizard/crm_opportunity_to_meeting_view.xml
+++ b/addons/crm/wizard/crm_opportunity_to_meeting_view.xml
@@ -1,6 +1,16 @@
+
+
+
+
diff --git a/addons/crm/wizard/crm_phonecall_to_meeting.py b/addons/crm/wizard/crm_phonecall_to_meeting.py
index e3edcf894e0..bf63c319a71 100644
--- a/addons/crm/wizard/crm_phonecall_to_meeting.py
+++ b/addons/crm/wizard/crm_phonecall_to_meeting.py
@@ -21,6 +21,60 @@
from osv import osv
from tools.translate import _
+import wizard
+import pooler
+
+#===============================================================================
+# Put original wizard because of action in init
+# Remove it after solution foraction in init
+#===============================================================================
+
+class phonecall2meeting(wizard.interface):
+
+ def _makeMeeting(self, cr, uid, data, context):
+ pool = pooler.get_pool(cr.dbname)
+ phonecall_case_obj = pool.get('crm.phonecall')
+ data_obj = pool.get('ir.model.data')
+ result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_meetings_filter')
+ id = data_obj.read(cr, uid, result, ['res_id'])
+ id1 = data_obj._get_id(cr, uid, 'crm', 'crm_case_calendar_view_meet')
+ id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_meet')
+ id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_meet')
+ if id1:
+ id1 = data_obj.browse(cr, uid, id1, context=context).res_id
+ if id2:
+ id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+ if id3:
+ id3 = data_obj.browse(cr, uid, id3, context=context).res_id
+ phonecall = phonecall_case_obj.browse(cr, uid, data['id'], context=context)
+ partner_id = phonecall.partner_id and phonecall.partner_id.id or False
+ name = phonecall.name
+ email = phonecall.email_from
+ section_id = phonecall.section_id and phonecall.section_id.id or False
+ return {
+ 'name': _('Meetings'),
+ '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': 'calendar,form,tree',
+ 'res_model': 'crm.meeting',
+ 'view_id': False,
+ 'views': [(id1,'calendar'),(id2,'form'),(id3,'tree')],
+ 'type': 'ir.actions.act_window',
+ 'search_view_id': id['res_id']
+ }
+
+ states = {
+ 'init': {
+ 'actions': [],
+ 'result': {'type': 'action', 'action': _makeMeeting, 'state': 'order'}
+ },
+ 'order': {
+ 'actions': [],
+ 'result': {'type': 'state', 'state': 'end'}
+ }
+ }
+phonecall2meeting('crm.phonecall.meeting_set')
class crm_phonecall2meeting(osv.osv_memory):
""" Phonecall to Meeting """
diff --git a/addons/crm/wizard/crm_phonecall_to_meeting_view.xml b/addons/crm/wizard/crm_phonecall_to_meeting_view.xml
index 0e889c7b272..ef2fe196348 100644
--- a/addons/crm/wizard/crm_phonecall_to_meeting_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_meeting_view.xml
@@ -2,6 +2,16 @@
+
+
+
+