Merge lp:~openerp-dev/openobject-addons/trunk-crm_wizard_convert_osv_memory-bde into lp:openobject-addons

[Bharat Devnani (Open ERP)]

Hello Sir,

I have converted wizards from wizard.interface to osv.osv_memory for crm module.

Thanks & Regards,
Devnani Bharat R.

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

'crm/wizard/wizard_history_event.py' => improve the wizard as you have change the name of method from _open_history_event to default_get.

And do not forget to mention in comment which wizards you have converted to osv memory.

Thanks,
Mustufa

review: Needs Fixing

[Bharat Devnani (Open ERP) (bde-openerp)]

Hello Sir,

I have converted and improved the wizard_history_event as per your suggestions. As crm_phonecall_to_meeting wizard was already converted to osv.osv_memory so i have just removed the previous version (wizard.interface) of the same.

Thanks & Regards,
Devnani Bharat R.

review: Needs Resubmitting

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

Open history event wizard converted to osv memory (not used anywhere).

review: Approve

=== modified file 'crm/wizard/crm_phonecall_to_meeting.py'
--- crm/wizard/crm_phonecall_to_meeting.py	2011-01-14 00:11:01 +0000
+++ crm/wizard/crm_phonecall_to_meeting.py	2011-09-15 11:38:33 +0000
@@ -21,60 +21,6 @@
 
 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=None):
-        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 """
@@ -109,7 +55,7 @@
         record_id = context and context.get('active_id', False) or False
 
         if record_id:
-            phonecall_obj = self.pool.get('crm.phonecall')                   
+            phonecall_obj = self.pool.get('crm.phonecall')
             data_obj = self.pool.get('ir.model.data')
 
             # Get meeting views
@@ -127,22 +73,22 @@
 
             phonecall = phonecall_obj.browse(cr, uid, record_id, context=context)
             context = {
-                        'default_phonecall_id': phonecall.id, 
-                        'default_partner_id': phonecall.partner_id and phonecall.partner_id.id or False, 
-                        'default_email': phonecall.email_from , 
+                        'default_phonecall_id': phonecall.id,
+                        'default_partner_id': phonecall.partner_id and phonecall.partner_id.id or False,
+                        'default_email': phonecall.email_from ,
                         'default_name': phonecall.name
                     }
 
             value = {
-                'name': _('Meetings'), 
-                'domain' : "[('user_id','=',%s)]" % (uid), 
-                'context': context, 
-                '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', 
+                'name': _('Meetings'),
+                'domain' : "[('user_id','=',%s)]" % (uid),
+                'context': context,
+                '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': res['res_id']
                 }
 

=== modified file 'crm/wizard/wizard_history_event.py'
--- crm/wizard/wizard_history_event.py	2011-08-09 23:44:28 +0000
+++ crm/wizard/wizard_history_event.py	2011-09-15 11:38:33 +0000
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution    
+#    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    $Id$
 #
@@ -20,6 +20,40 @@
 #
 ##############################################################################
 
+<<<<<<< TREE
+from osv import osv, fields
+
+class case_history_event(osv.osv_memory):
+
+    _name = 'case.history.event'
+    _description = "Case History Event"
+
+    def open_history_event(self, cr, uid, ids, context=None):
+        model = context.get('active_model', False)
+        act_id = context.get('active_id', False)
+        data_obj = self.pool.get('ir.model.data')
+        result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_filter')
+        id = data_obj.read(cr, uid, result, ['res_id'])
+        id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_calendar_section-view')
+        if id2:
+            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+        res = ''
+        if model and ids:
+            model_obj = self.pool.get(model)
+            res = model_obj.browse(cr, uid, ids, context=context)
+            if len(res):
+                res = res[0].name
+        return {
+            'name': 'History : ' +  res,
+            'view_type': 'form',
+            "view_mode": 'calendar, tree, form',
+            'view_id' : False,
+            'views': [(id2,'calendar'),(False,'form'),(False,'tree'),(False,'graph')],
+            'res_model': 'crm.case',
+            'type': 'ir.actions.act_window',
+            'domain': act_id and "[('case_id','=',%d)]" % act_id or "[]",
+            'search_view_id': id['res_id']
+=======
 import wizard
 import pooler
 
@@ -54,7 +88,9 @@
     'init': {
             'actions': [],
             'result': {'type': 'action', 'action': _open_history_event, 'state':'end'}
+>>>>>>> MERGE-SOURCE
         }
-    }
-    
-case_history_event('crm.case.history.events')
+
+case_history_event()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: