diff --git a/addons/audittrail/__terp__.py b/addons/audittrail/__terp__.py
index e7ecd839efb..8718523e7f1 100644
--- a/addons/audittrail/__terp__.py
+++ b/addons/audittrail/__terp__.py
@@ -31,6 +31,7 @@
     'depends': ['base'],
     'init_xml': [],
     'update_xml': [
+        'wizard/audittrail_view_log_view.xml',
         'audittrail_view.xml',
         'security/ir.model.access.csv',
         'security/audittrail_security.xml'
diff --git a/addons/audittrail/audittrail_view.xml b/addons/audittrail/audittrail_view.xml
index 98a4ecc00e9..536ca78741e 100644
--- a/addons/audittrail/audittrail_view.xml
+++ b/addons/audittrail/audittrail_view.xml
@@ -124,8 +124,8 @@
 		</record>
 		<menuitem name="Logs" id="menu_action_audittrail_log_tree" action="action_audittrail_log_tree" parent="menu_action_audittrail"/>
 
-		<wizard string="View log" menu="False" model="audittrail.log" name="audittrail.view.log" id="wizard_audittrail_log"/>
-		<menuitem name="View Logs" id="menu_action_log_tree2" action="wizard_audittrail_log" type="wizard" parent="menu_action_audittrail"/>
+		<!--  <wizard string="View log" menu="False" model="audittrail.log" name="audittrail.view.log" id="wizard_audittrail_log"/>-->
+		<menuitem name="View Logs" id="menu_action_log_tree2" action="action_audittrail_view_log"  parent="menu_action_audittrail"/>
 
 </data>
 </openerp>
diff --git a/addons/audittrail/wizard/__init__.py b/addons/audittrail/wizard/__init__.py
index c7b5a20d884..9b2af466a01 100644
--- a/addons/audittrail/wizard/__init__.py
+++ b/addons/audittrail/wizard/__init__.py
@@ -19,6 +19,6 @@
 #
 ##############################################################################
 
-import wizard_view_log
+import audittrail_view_log
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/audittrail/wizard/audittrail_view_log.py b/addons/audittrail/wizard/audittrail_view_log.py
new file mode 100644
index 00000000000..2e170f27200
--- /dev/null
+++ b/addons/audittrail/wizard/audittrail_view_log.py
@@ -0,0 +1,72 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+import netsvc
+import pooler
+import time
+import tools
+import wizard
+
+class audittrail_view_log(osv.osv_memory):
+    
+    _name = "audittrail.view.log"
+    _description = "View Log"
+    _columns ={
+               'from':fields.datetime('Log From'),
+               'to':fields.datetime('Log To', required = True)
+               }
+    _defaults = {
+                 'to': lambda *a: time.strftime("%Y-%m-%d %H:%M:%S"),
+             }
+    
+    def log_open_window(self, cr, uid, ids, context):
+        """
+        Open Log  form from given date range..
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of audittrail view log’s IDs.
+        @return: Dictionary of  audittrail log form on given date range.
+        """
+        mod_obj = self.pool.get('ir.model.data')
+        act_obj = self.pool.get('ir.actions.act_window')
+        result = mod_obj._get_id(cr, uid, 'audittrail', 'action_audittrail_log_tree')
+        id = mod_obj.read(cr, uid, [result], ['res_id'])[0]['res_id']
+        result = act_obj.read(cr, uid, [id])[0]
+        log_obj= self.pool.get(result['res_model'])
+        log_id = log_obj.search(cr, uid, [])
+        log_model=log_obj.read(cr, uid,log_id,['object_id'])  
+        for datas in self.read(cr, uid, ids):     
+            if not datas['from']:
+                if  datas['to'] <> time.strftime("%Y-%m-%d %H:%M:%S"):
+                    result['domain'] = str([('timestamp', '<',datas['to'])])                
+                else:
+                        pass
+            else:
+                result['domain'] = str([('timestamp', '>',datas['from']),('timestamp', '<',datas['to'])])
+        return result
+
+audittrail_view_log()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/audittrail/wizard/audittrail_view_log_view.xml b/addons/audittrail/wizard/audittrail_view_log_view.xml
new file mode 100644
index 00000000000..87648c7e136
--- /dev/null
+++ b/addons/audittrail/wizard/audittrail_view_log_view.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_audittrail_view_log" model="ir.ui.view">
+            <field name="name">audittrail.view.log.form</field>
+            <field name="model">audittrail.view.log</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Audit Logs">
+                	<group colspan="4" >
+                		 <field name="from" colspan="4"/>
+              			 <newline/>
+              			 <field name="to" colspan="4"/>   
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button  icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button  icon="gtk-open" string="Open Logs" name="log_open_window" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+        <record id="action_audittrail_view_log" model="ir.actions.act_window">
+            <field name="name">View log</field>
+            <field name="res_model">audittrail.view.log</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_audittrail_view_log"/> 
+           <field name="target">new</field>
+        </record>
+        
+    </data>
+</openerp>
diff --git a/addons/audittrail/wizard/wizard_view_log.py b/addons/audittrail/wizard/wizard_view_log.py
deleted file mode 100644
index 81936bcd54c..00000000000
--- a/addons/audittrail/wizard/wizard_view_log.py
+++ /dev/null
@@ -1,81 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import pooler
-import time
-
-class wizard_view_log(wizard.interface):
-    
-    form1 = '''<?xml version="1.0"?>
-    <form string="Audit Logs">
-        <field name="from" colspan="4"/>
-        <newline/>
-        <field name="to" colspan="4"/>        
-    </form>'''
-    
-    form1_fields = {
-            'from': {
-                'string': 'Log From',
-                'type': 'datetime',
-        
-        },
-             'to': {
-                'string': 'Log To',
-                'type': 'datetime',
-                'default': lambda *a: time.strftime("%Y-%m-%d %H:%M:%S"),
-                'required':True
-        },
-    }
-    
-    
-    def _log_open_window(self, cr, uid, data, context):
-        mod_obj = pooler.get_pool(cr.dbname).get('ir.model.data')
-        act_obj = pooler.get_pool(cr.dbname).get('ir.actions.act_window')
-        result = mod_obj._get_id(cr, uid, 'audittrail', 'action_audittrail_log_tree')
-        id = mod_obj.read(cr, uid, [result], ['res_id'])[0]['res_id']
-        result = act_obj.read(cr, uid, [id])[0]
-        log_obj= pooler.get_pool(cr.dbname).get(result['res_model'])
-        log_id = log_obj.search(cr, uid, [])
-        log_model=log_obj.read(cr, uid,log_id,['object_id'])       
-        if not data['form']['from']:
-            if  data['form']['to'] <> time.strftime("%Y-%m-%d %H:%M:%S"):
-                result['domain'] = str([('timestamp', '<',data['form']['to'])])                
-            else:
-                pass
-        else:
-            result['domain'] = str([('timestamp', '>',data['form']['from']),('timestamp', '<',data['form']['to'])])
-            
-        return result
-
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch':form1, 'fields':form1_fields, 'state': [('end', 'Cancel'), ('open', 'Open Logs')]}
-        },
-        'open': {
-            'actions': [],
-            'result': {'type': 'action', 'action':_log_open_window, 'state':'end'}
-        }
-    }
-wizard_view_log('audittrail.view.log')
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/base_calendar/__terp__.py b/addons/base_calendar/__terp__.py
index e433fbb7668..ce65e1166c5 100644
--- a/addons/base_calendar/__terp__.py
+++ b/addons/base_calendar/__terp__.py
@@ -40,7 +40,8 @@
                    ], 
     "demo_xml" : [], 
     "update_xml" : [
-                    'security/ir.model.access.csv', 
+                    'security/ir.model.access.csv',
+                    'wizard/calendar_event_edit_all_view.xml',
                     'base_calendar_view.xml'
                     ], 
     "installable" : True, 
diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 4d0f85376f3..9835217c0e3 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -775,7 +775,7 @@ rule or repeating pattern for anexception to a recurrence set"),
         'base_calendar_alarm_id': fields.many2one('calendar.alarm', 'Alarm'), 
         'recurrent_uid': fields.integer('Recurrent ID'), 
         'recurrent_id': fields.datetime('Recurrent ID date'), 
-        'vtimezone': fields.related('user_id', 'context_tz', type='char', size=24, string='Timezone'), 
+        'vtimezone': fields.related('user_id', 'context_tz', type='char', size=24, string='Timezone', store=True), 
         'user_id': fields.many2one('res.users', 'Responsible'), 
         'freq': fields.selection([('None', 'No Repeat'), \
                             ('secondly', 'Secondly'), \
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index d6430ca98a2..bcc30fe0a81 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -82,7 +82,7 @@
                                 <field name="event_date" />
                                 <field name="event_end_date" />
                                 <field name="language"/>
-                                <field name="ref" colspan="4"/>
+                                <field name="ref" colspan="4" readonly="1"/>
                             </group>
             			</page>
             			<page string="Delegation Info">
diff --git a/addons/base_calendar/wizard/__init__.py b/addons/base_calendar/wizard/__init__.py
index 60c61475131..38f790bcd42 100644
--- a/addons/base_calendar/wizard/__init__.py
+++ b/addons/base_calendar/wizard/__init__.py
@@ -18,7 +18,8 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
 #
 ##############################################################################
-import wizard_cal_edit_event
+
+import calendar_event_edit_all
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/base_calendar/wizard/calendar_event_edit_all.py b/addons/base_calendar/wizard/calendar_event_edit_all.py
new file mode 100644
index 00000000000..d13b6ef8b38
--- /dev/null
+++ b/addons/base_calendar/wizard/calendar_event_edit_all.py
@@ -0,0 +1,85 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+import netsvc
+import pooler
+import time
+import tools
+import wizard
+
+class calendar_event_edit_all(osv.osv_memory):
+    
+    def _default_values(self, cr, uid, context={}):
+            """
+            @Return : Get Default value for Start Date
+            """
+            if context.get('date'):
+                 return context.get('date')
+            else:
+                model = context.get('model')
+                model_obj = self.pool.get(model)
+                event = model_obj.read(cr, uid, context['active_id'], ['name', 'location', 'alarm_id'])
+                return event['date']
+        
+    def _default_deadline(self, cr, uid, context={}):
+            """
+            @return : Get Default value for End Date
+            """
+            if context.get('date_deadline'):
+                 return context.get('date_deadline')
+            else:
+                model = context.get('model')
+                model_obj = self.pool.get(model)
+                event = model_obj.read(cr, uid, context['active_id'], ['name', 'location', 'alarm_id'])
+                return event['date_deadline']
+
+    def modify_this(self, cr, uid, ids, context=None):
+        """
+        Modify All event for Crm Meeting.
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of calendar event edit all’s IDs
+        """
+        for datas in self.read(cr, uid, ids):
+            model = context.get('model')
+            model_obj = self.pool.get(model)
+            model_obj.modify_all(cr, uid, [context['active_id']], datas, context)
+            return {}
+    
+    _name = "calendar.event.edit.all"
+    _description = "Calendar Edit all event"
+    _columns ={
+              'name':fields.char('Title', size=64, required=True),
+              'date':fields.datetime('Start Date', required=True),
+              'date_deadline':fields.datetime('End Date', required=True),
+              'location':fields.char('Location', size=124),
+              'alarm_id':fields.many2one('res.alarm', 'Reminder'),
+               }
+    _defaults = {
+                 'date':_default_values,
+                 'date_deadline':_default_deadline
+             }
+    
+calendar_event_edit_all()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_calendar/wizard/calendar_event_edit_all_view.xml b/addons/base_calendar/wizard/calendar_event_edit_all_view.xml
new file mode 100644
index 00000000000..8e406c4d8b0
--- /dev/null
+++ b/addons/base_calendar/wizard/calendar_event_edit_all_view.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_calendar_event_edit_all" model="ir.ui.view">
+            <field name="name">calendar.event.edit.all.form</field>
+            <field name="model">calendar.event.edit.all</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Edit all Occurrences">
+                	<group colspan="4" >
+                		 <separator string="" colspan="4" />
+              			 <newline/>
+              			 <field name='name' colspan="4" />
+              			 <newline />
+              			 <field name='location' colspan="4" />
+              			 <newline />
+              			 <field name='date' />
+              			 <field name='date_deadline' />
+              			 <newline />
+              			 <field name='alarm_id'/>  
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button  icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button  icon="gtk-save" string="_Save" name="modify_this" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+        <record id="action_calendar_event_edit_all" model="ir.actions.act_window">
+            <field name="name">Edit all events</field>
+            <field name="res_model">calendar.event.edit.all</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_calendar_event_edit_all"/> 
+           <field name="target">new</field>
+        </record>
+        
+    </data>
+</openerp>
diff --git a/addons/base_calendar/wizard/wizard_cal_edit_event.py b/addons/base_calendar/wizard/wizard_cal_edit_event.py
deleted file mode 100644
index 8c2da2314c5..00000000000
--- a/addons/base_calendar/wizard/wizard_cal_edit_event.py
+++ /dev/null
@@ -1,78 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import wizard
-import pooler
-
-class event_edit_all(wizard.interface):
-    event_form = """<?xml version="1.0"?>
-                <form string="Edit all Occurrences">
-                    <separator string="" colspan="4" />
-                    <newline />
-                    <field name='name' colspan="4" />
-                    <newline />
-                    <field name='location' colspan="4" />
-                    <newline />
-                    <field name='date' />
-                    <field name='date_deadline' />
-                    <newline />
-                    <field name='alarm_id'/>
-                </form>"""
-
-    event_fields = {
-        'name': {'string': 'Title', 'type': 'char', 'size': 64, 'required': True}, 
-        'date': {'string': 'Start Date', 'type': 'datetime', 'required': True}, 
-        'date_deadline': {'string': 'End Date', 'type': 'datetime', 'required': True}, 
-        'location': {'string': 'Location', 'type': 'char', 'size': 124}, 
-        'alarm_id': {'string': 'Reminder', 'type': 'many2one', 'relation': 'res.alarm'}, 
-    }
-    
-    def _default_values(self, cr, uid, data, context=None):
-        model = data.get('model')
-        model_obj = pooler.get_pool(cr.dbname).get(model)
-        event = model_obj.read(cr, uid, data['id'], ['name', 'location', 'alarm_id'])
-        event.update({
-                      'date': context.get('date'), 
-                      'date_deadline': context.get('date_deadline')
-                      })
-        return event
-
-    def _modify_all(self, cr, uid, datas, context=None):
-        model = datas.get('model')
-        model_obj = pooler.get_pool(cr.dbname).get(model)
-        model_obj.modify_all(cr, uid, datas['id'], datas['form'], context)
-        return {}
-
-    states = {
-        'init': {
-            'actions': [_default_values], 
-            'result': {'type': 'form', 'arch': event_form, 'fields': event_fields, 
-                'state': [('end', 'Cancel', 'gtk-cancel'), ('edit', '_Save', 'gtk-save')]}
-        }, 
-        'edit': {
-            'actions': [], 
-            'result': {'type': 'action', 'action': _modify_all, 'state': 'end'}
-        }
-    }
-
-event_edit_all('calendar.event.edit.all')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_report_creator/__terp__.py b/addons/base_report_creator/__terp__.py
index 5a78a903a5c..bee7ec57c91 100644
--- a/addons/base_report_creator/__terp__.py
+++ b/addons/base_report_creator/__terp__.py
@@ -37,6 +37,7 @@ the "Dashboard" menu.
     'init_xml': [],
     'update_xml': [
         'security/ir.model.access.csv',
+        'wizard/report_menu_create_view.xml',
         'base_report_creator_wizard.xml',
         'base_report_creator_view.xml'
     ],
diff --git a/addons/base_report_creator/base_report_creator_view.xml b/addons/base_report_creator/base_report_creator_view.xml
index 30c6b3735a9..1d606b93ec4 100644
--- a/addons/base_report_creator/base_report_creator_view.xml
+++ b/addons/base_report_creator/base_report_creator_view.xml
@@ -41,7 +41,7 @@
                     <field name="model_ids" colspan="4" context="{'model_ids':model_ids}"/>
                     <separator string="State"  colspan="4"/>
                     <field name="state"/>
-                    <button string="Create Menu" name="%(wizard_menu_create)d" type="action" colspan="2" icon="gtk-justify-fill"/>
+                    <button string="Create Menu" name="%(action_report_menu_create)d" type="action" colspan="2" icon="gtk-justify-fill"/>
                 </page><page string="View parameters">
                     <separator string="Used View" colspan="4"/>
                     <field name="view_type1"/>
diff --git a/addons/base_report_creator/base_report_creator_wizard.xml b/addons/base_report_creator/base_report_creator_wizard.xml
index eb956e89c6d..a8dad6f9b41 100644
--- a/addons/base_report_creator/base_report_creator_wizard.xml
+++ b/addons/base_report_creator/base_report_creator_wizard.xml
@@ -1,13 +1,8 @@
 <?xml version="1.0"?>
 <openerp>
-<data>
-	<wizard
-			id="wizard_set_filter_fields"
-			string="Set Filter Fields"
-			name="base_report_creator.report_filter.fields"/>
-	<wizard
-			id="wizard_menu_create"
-			string="Create Menu for Report"
-			name="base_report_creator.report.menu.create"/>
-</data>
+	<data>
+		<wizard id="wizard_set_filter_fields" string="Set Filter Fields"
+			name="base_report_creator.report_filter.fields" />
+
+	</data>
 </openerp>
diff --git a/addons/base_report_creator/wizard/__init__.py b/addons/base_report_creator/wizard/__init__.py
index 8fd4dff283a..945d42586d1 100644
--- a/addons/base_report_creator/wizard/__init__.py
+++ b/addons/base_report_creator/wizard/__init__.py
@@ -22,5 +22,6 @@
 import wiz_set_filter_fields
 import base_report_creator_open
 import report_menu_create
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/base_report_creator/wizard/report_menu_create.py b/addons/base_report_creator/wizard/report_menu_create.py
index 5d3cc322a7f..38821a81797 100644
--- a/addons/base_report_creator/wizard/report_menu_create.py
+++ b/addons/base_report_creator/wizard/report_menu_create.py
@@ -20,62 +20,55 @@
 ##############################################################################
 
 
-import time
-import wizard
-import osv
+from osv import fields, osv
+from tools.translate import _
+import netsvc
 import pooler
+import time
+import tools
+import wizard
 
-section_form = '''<?xml version="1.0"?>
-<form string="Create Menu For This Report">
-    <separator string="Menu Information" colspan="4"/>
-    <field name="menu_name"/>
-    <field name="menu_parent_id"/>
-</form>'''
-
-section_fields = {
-    'menu_name': {'string':'Menu Name', 'type':'char', 'required':True, 'size':64},
-    'menu_parent_id': {'string':'Parent Menu', 'type':'many2one', 'relation':'ir.ui.menu', 'required':True},
-}
-
-def report_menu_create(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    board = pool.get('base_report_creator.report').browse(cr, uid, data['id'])
-
-    view = board.view_type1
-    if board.view_type2:
-        view+=','+board.view_type2
-    if board.view_type3:
-        view+=','+board.view_type3
-    action_id = pool.get('ir.actions.act_window').create(cr, uid, {
-        'name': board.name,
-        'view_type':'form',
-        'view_mode':view,
-        'context': "{'report_id':%d}" % (board.id,),
-        'res_model': 'base_report_creator.report'
-    })
-    pool.get('ir.ui.menu').create(cr, uid, {
-        'name': data['form']['menu_name'],
-        'parent_id': data['form']['menu_parent_id'],
-        'icon': 'STOCK_SELECT_COLOR',
-        'action': 'ir.actions.act_window,'+str(action_id)
-    }, context)
-    return {}
-
-class wizard_section_menu_create(wizard.interface):
-    states = {
-        'init': {
-            'actions': [], 
-            'result': {'type':'form', 'arch':section_form, 'fields':section_fields, 'state':[('end','Cancel'),('create_menu','Create Menu')]}
-        },
-        'create_menu': {
-            'actions': [report_menu_create], 
-            'result': {
-                'type':'state', 
-                'state':'end'
-            }
-        }
-    }
-wizard_section_menu_create('base_report_creator.report.menu.create')
+class report_menu_create(osv.osv_memory):
+    """
+    Create Menu
+    """
+    _name = "report.menu.create"
+    _description = "Menu Create"
+    _columns ={
+              'menu_name':fields.char('Menu Name', size=64, required=True),
+              'menu_parent_id':fields.many2one('ir.ui.menu', 'Parent Menu', required=True),
+               }
+    
+    def report_menu_create(self, cr, uid, ids, context):
+        """
+        Create Menu.
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Report Menu Create's IDs
+        """
+        board = self.pool.get('base_report_creator.report').browse(cr, uid, context['active_id'])
+        view = board.view_type1
+        if board.view_type2:
+            view+=','+board.view_type2
+        if board.view_type3:
+            view+=','+board.view_type3
+        action_id = self.pool.get('ir.actions.act_window').create(cr, uid, {
+            'name': board.name,
+            'view_type':'form',
+            'view_mode':view,
+            'context': "{'report_id':%d}" % (board.id,),
+            'res_model': 'base_report_creator.report'
+            })
+        for data in self.read(cr, uid, ids):
+            self.pool.get('ir.ui.menu').create(cr, uid, {
+                'name': data['menu_name'],
+                'parent_id': data['menu_parent_id'],
+                'icon': 'STOCK_SELECT_COLOR',
+                'action': 'ir.actions.act_window,'+str(action_id)
+                }, context)
+            return {}
+    
+report_menu_create()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/base_report_creator/wizard/report_menu_create_view.xml b/addons/base_report_creator/wizard/report_menu_create_view.xml
new file mode 100644
index 00000000000..dd8ecb441c4
--- /dev/null
+++ b/addons/base_report_creator/wizard/report_menu_create_view.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_report_menu_create" model="ir.ui.view">
+            <field name="name">report.menu.create.form</field>
+            <field name="model">report.menu.create</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Create Menu For This Report">
+                	<group colspan="4" >
+                		 <separator string="Menu Information" colspan="4"/>
+              			 <field name="menu_name"/>
+              			 <field name="menu_parent_id"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button  icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button  icon="gtk-save" string="Create Menu" name="report_menu_create" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+        <record id="action_report_menu_create" model="ir.actions.act_window">
+            <field name="name">Create Menu for Report</field>
+            <field name="res_model">report.menu.create</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_report_menu_create"/> 
+           <field name="target">new</field>
+        </record>
+        
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/board/__terp__.py b/addons/board/__terp__.py
index 07c595c1fc9..8476be95f4e 100644
--- a/addons/board/__terp__.py
+++ b/addons/board/__terp__.py
@@ -27,7 +27,7 @@
     'description': """Base module for all dashboards.""",
     'author': 'Tiny',
     'depends': ['base'],
-    'update_xml': ['security/ir.model.access.csv', 'board_view.xml'],
+    'update_xml': ['security/ir.model.access.csv', 'wizard/board_menu_create_view.xml', 'board_view.xml'],
     'demo_xml': [],
     'installable': True,
     'active': False,
diff --git a/addons/board/board_view.xml b/addons/board/board_view.xml
index 4b55e43c4dd..981a5521818 100644
--- a/addons/board/board_view.xml
+++ b/addons/board/board_view.xml
@@ -34,7 +34,7 @@
             <field name="view_mode">form,tree</field>
         </record>
 
-        <wizard id="wizard_board_create_menu" model="board.board" multi="True" name="board.board.menu.create" string="Create Board Menu" />
+        <!-- <wizard id="wizard_board_create_menu" model="board.board" multi="True" name="board.board.menu.create" string="Create Board Menu" /> -->
 
         <record id="view_board_tree" model="ir.ui.view">
             <field name="name">board.board.tree</field>
@@ -54,7 +54,7 @@
             <field name="arch" type="xml">
                 <form string="Dashboard">
                     <field name="name" select="1"/>
-                    <button colspan="2" name="%(wizard_board_create_menu)d" string="Create Menu" type="action" icon="gtk-justify-fill"/>
+                    <button colspan="2" name="%(action_board_menu_create)d" string="Create Menu" type="action" icon="gtk-justify-fill"/>
                     <field colspan="4" name="line_ids">
                         <tree string="Dashboard View">
                             <field name="name"/>
diff --git a/addons/board/wizard/__init__.py b/addons/board/wizard/__init__.py
index e6cc92cbfb1..a22e1d05e43 100644
--- a/addons/board/wizard/__init__.py
+++ b/addons/board/wizard/__init__.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-import board_wizard
+import board_menu_create
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/board/wizard/board_menu_create.py b/addons/board/wizard/board_menu_create.py
new file mode 100644
index 00000000000..5c5dc800ba1
--- /dev/null
+++ b/addons/board/wizard/board_menu_create.py
@@ -0,0 +1,74 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+
+class board_menu_create(osv.osv_memory):
+    """
+    Create Menu
+    """
+    def check_views(self, cr, uid, context):
+        board = self.pool.get('board.board').browse(cr, uid, context['active_id'])
+        if not board.line_ids:
+            raise osv.except_osv(_('User Error!'), _('Please Insert Dashboard View(s) !'))    
+        return False
+    
+    def board_menu_create(self, cr, uid, ids, context):
+        """
+        Create Menu.
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Board Menu Create's IDs
+        @return : Dictionary {}.
+        """
+        board = self.pool.get('board.board').browse(cr, uid, context['active_id'])
+        action_id = self.pool.get('ir.actions.act_window').create(cr, uid, {
+            'name': board.name,
+            'view_type':'form',
+            'view_mode':'form',
+            'res_model': 'board.board',
+            'view_id': board.view_id.id,
+            })
+        for data in self.read(cr, uid, ids):
+            self.pool.get('ir.ui.menu').create(cr, uid, {
+                'name': data['menu_name'],
+                'parent_id': data['menu_parent_id'],
+                'icon': 'STOCK_SELECT_COLOR',
+                'action': 'ir.actions.act_window,'+str(action_id)
+                }, context)
+        
+        return {}
+    
+    _name = "board.menu.create"
+    _description = "Menu Create"
+    _columns = {
+             'menu_name':fields.char('Menu Name', size=64, required=True),
+             'menu_parent_id':fields.many2one('ir.ui.menu', 'Parent Menu', required=True),
+          }
+    _defaults = {
+            'menu_name':check_views,
+          }
+
+board_menu_create()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/board/wizard/board_menu_create_view.xml b/addons/board/wizard/board_menu_create_view.xml
new file mode 100644
index 00000000000..e33e6d1cd52
--- /dev/null
+++ b/addons/board/wizard/board_menu_create_view.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_board_menu_create" model="ir.ui.view">
+            <field name="name">board.menu.create.form</field>
+            <field name="model">board.menu.create</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Create Menu For Dashboard">
+                	<group colspan="4" >
+                		 <separator string="Menu Information" colspan="4"/>
+              			 <field name="menu_name"/>
+              			 <field name="menu_parent_id"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button  icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button  icon="gtk-save" string="Create Menu" name="board_menu_create" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+        <record id="action_board_menu_create" model="ir.actions.act_window">
+            <field name="name">Create Board Menu</field>
+            <field name="res_model">board.menu.create</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_board_menu_create"/> 
+           <field name="target">new</field>
+        </record>
+        
+    </data>
+</openerp>
diff --git a/addons/board/wizard/board_wizard.py b/addons/board/wizard/board_wizard.py
deleted file mode 100644
index 9fae1c2ea7c..00000000000
--- a/addons/board/wizard/board_wizard.py
+++ /dev/null
@@ -1,86 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-
-import time
-import wizard
-import osv
-import pooler
-from tools.translate import _
-
-section_form = '''<?xml version="1.0"?>
-<form string="Create Menu For Dashboard">
-    <separator string="Menu Information" colspan="4"/>
-    <field name="menu_name"/>
-    <field name="menu_parent_id"/>
-</form>'''
-
-section_fields = {
-    'menu_name': {'string':'Menu Name', 'type':'char', 'required':True, 'size':64},
-    'menu_parent_id': {'string':'Parent Menu', 'type':'many2one', 'relation':'ir.ui.menu', 'required':True},
-}
-
-def check_views(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    board = pool.get('board.board').browse(cr, uid, data['id'])
-    if not board.line_ids:
-        raise wizard.except_wizard(_('User Error!'),_('Please Insert Dashboard View(s) !'))    
-    return data['form']
-
-def board_menu_create(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    board = pool.get('board.board').browse(cr, uid, data['id'])
-
-    action_id = pool.get('ir.actions.act_window').create(cr, uid, {
-        'name': board.name,
-        'view_type':'form',
-        'view_mode':'form',
-        'res_model': 'board.board',
-        'view_id': board.view_id.id,
-    })
-    pool.get('ir.ui.menu').create(cr, uid, {
-        'name': data['form']['menu_name'],
-        'parent_id': data['form']['menu_parent_id'],
-        'icon': 'STOCK_SELECT_COLOR',
-        'action': 'ir.actions.act_window,'+str(action_id)
-    }, context)
-        
-    return {}
-
-class wizard_section_menu_create(wizard.interface):
-    states = {
-        'init': {
-            'actions': [check_views], 
-            'result': {'type':'form', 'arch':section_form, 'fields':section_fields, 'state':[('end','Cancel'),('create_menu','Create Menu')]}
-        },
-        'create_menu': {
-            'actions': [board_menu_create], 
-            'result': {
-                'type':'state', 
-                'state':'end'
-            }
-        }
-    }
-wizard_section_menu_create('board.board.menu.create')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/board_crm_configuration/__init__.py b/addons/board_crm/__init__.py
similarity index 100%
rename from addons/board_crm_configuration/__init__.py
rename to addons/board_crm/__init__.py
diff --git a/addons/board_crm_configuration/__terp__.py b/addons/board_crm/__terp__.py
similarity index 92%
rename from addons/board_crm_configuration/__terp__.py
rename to addons/board_crm/__terp__.py
index 3c303ee2d1c..1742a491009 100644
--- a/addons/board_crm_configuration/__terp__.py
+++ b/addons/board_crm/__terp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Dashboard for CRM Configuration',
+    'name': 'Dashboard for CRM',
     'version': '1.0',
     'category': 'Board/CRM',
     'description': """
@@ -31,10 +31,10 @@ This module implements a dashboard for CRM that includes:
     * My Meetings (list)
     * Sales Pipeline by Stage (graph)
     * My Cases (list)
-    * Jobs Tracking (graph)
+    * Leads of the month by user (list)
     """,
     'author': 'Tiny',
-    'depends': ['board', 'crm', 'report_crm'],
+    'depends': ['board', 'crm'],
     'update_xml': ['board_crm_statistical_view.xml', 'board_crm_view.xml'],
     'demo_xml': ['board_crm_demo.xml'],
     'installable': True,
diff --git a/addons/board_crm_configuration/board_crm_demo.xml b/addons/board_crm/board_crm_demo.xml
similarity index 100%
rename from addons/board_crm_configuration/board_crm_demo.xml
rename to addons/board_crm/board_crm_demo.xml
diff --git a/addons/board_crm_configuration/board_crm_statistical_view.xml b/addons/board_crm/board_crm_statistical_view.xml
similarity index 82%
rename from addons/board_crm_configuration/board_crm_statistical_view.xml
rename to addons/board_crm/board_crm_statistical_view.xml
index 8dbe05735f0..9d738721821 100644
--- a/addons/board_crm_configuration/board_crm_statistical_view.xml
+++ b/addons/board_crm/board_crm_statistical_view.xml
@@ -6,40 +6,38 @@
          -->
         <record model="ir.ui.view" id="view_crm_lead_stage_graph1">
             <field name="name">Leads By Stage - Graph</field>
-            <field name="model">report.crm.lead.section.stage</field>
+            <field name="model">crm.lead.report</field>
             <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Leads By Stage" type="pie">
                     <field name="stage_id"/>
                     <field name="nbr" operator="+"/>
-                    <field name="state" group="True"/>
                 </graph>
             </field>
         </record>
 
         <record model="ir.ui.view" id="view_crm_opportunity_categ_graph">
-            <field name="name">report.crm.opportunity.categ.graph</field>
-            <field name="model">report.crm.opportunity.categ</field>
+            <field name="name">crm.opportunity.report.graph</field>
+            <field name="model">crm.opportunity.report</field>
             <field name="type">graph</field>
             <field name="arch" type="xml">
-                <graph string="Opportunity by Sections and Categories" type="bar" orientation="horizontal">
+                <graph string="Opportunities" type="bar" orientation="horizontal">
                     <field name="categ_id"/>
                     <field name="nbr" operator="+"/>
-                    <field name="state" group="True"/>
                 </graph>
             </field>
         </record>
 
         <act_window name="Opportunities By Categories"
             domain="[('state','!=','done'),('state','!=','cancel')]"
-            res_model="report.crm.opportunity.categ"
+            res_model="crm.opportunity.report"
             view_type="form"
             view_mode="graph,tree,form"
             view_id="view_crm_opportunity_categ_graph"
             id="act_oppor_categ"/>
 
         <record model="ir.actions.act_window" id="act_leads_state">
-            <field name="res_model">report.crm.lead.section.stage</field>
+            <field name="res_model">crm.lead.report</field>
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree,form</field>
             <field name="view_id" ref="view_crm_lead_stage_graph1"/>
@@ -47,8 +45,8 @@
         </record>
 
         <act_window name="Leads Of The Month By User"
-            domain="[('month','=',time.strftime('%%m')),('state','!=','cancel')]"
-            res_model="report.crm.lead.user"
+            domain="[('month','=',time.strftime('%%m')),('state','!=','cancel'),('user_id','=',uid)]"
+            res_model="crm.lead.report"
             view_type="form"
             view_mode="graph,tree,form"
             view_id="view_crm_lead_stage_graph1"
@@ -63,14 +61,14 @@
                     <hpaned>
                         <child1>
                             <action
-                                string="Opportunities By Categories"
+                                string="Opportunities"
                                 name="%(act_oppor_categ)d"
                                 colspan="4"
                                 height="200"
                                 width="250"/>
 
                             <action
-                                string="Leads By Stage"
+                                string="Leads"
                                 name="%(act_leads_state)d"
                                 height="200"
                                 colspan="4"/>
@@ -100,7 +98,7 @@
 
 		<menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
         <menuitem
-            name="CRM Configuration" parent="base.dashboard"
+            name="CRM" parent="base.dashboard"
             id="menu_board_crm_config"
             groups="crm.group_crm_manager"/>
         <menuitem
diff --git a/addons/board_crm_configuration/board_crm_view.xml b/addons/board_crm/board_crm_view.xml
similarity index 92%
rename from addons/board_crm_configuration/board_crm_view.xml
rename to addons/board_crm/board_crm_view.xml
index 586a3c64baa..8905f9d8530 100644
--- a/addons/board_crm_configuration/board_crm_view.xml
+++ b/addons/board_crm/board_crm_view.xml
@@ -2,12 +2,12 @@
 <openerp>
 	<data>
 		<record model="board.note.type" id="note_crm_type">
-			<field name="name">CRM Configuration</field>
+			<field name="name">CRM</field>
 		</record>
 		
 		<record model="ir.ui.view" id="view_crm_opportunity_user_graph1">
-			<field name="name">crm.opportunity.user.graph1</field>
-			<field name="model">report.crm.opportunity.user</field>
+			<field name="name">crm.opportunity.report.graph1</field>
+			<field name="model">crm.opportunity.report</field>
 			<field name="type">graph</field>
 			<field name="arch" type="xml">
 				<graph string="Opportunities by User and Section" type="pie">
@@ -41,7 +41,7 @@
 				id="act_my_cases"/>
 
 		<record model="ir.actions.act_window" id="act_my_leads_stage">
-			<field name="res_model">report.crm.lead.section.stage</field>
+			<field name="res_model">crm.lead.report</field>
 			<field name="view_type">form</field>
 			<field name="view_mode">graph,tree,form</field>
 			<field name="view_id" ref="view_crm_lead_stage_graph1"/>
@@ -49,7 +49,7 @@
 		</record>
 
 		<record model="ir.actions.act_window" id="act_sales_pipeline">
-			<field name="res_model">report.crm.opportunity.user</field>
+			<field name="res_model">crm.opportunity.report</field>
 			<field name="view_type">form</field>
 			<field name="view_mode">graph,tree,form</field>
 			<field name="view_id" ref="view_crm_opportunity_user_graph1"/>
diff --git a/addons/board_crm_configuration/i18n/ar.po b/addons/board_crm/i18n/ar.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/ar.po
rename to addons/board_crm/i18n/ar.po
diff --git a/addons/board_crm_configuration/i18n/bg.po b/addons/board_crm/i18n/bg.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/bg.po
rename to addons/board_crm/i18n/bg.po
diff --git a/addons/board_crm_configuration/i18n/board_crm_configuration.pot b/addons/board_crm/i18n/board_crm_configuration.pot
similarity index 100%
rename from addons/board_crm_configuration/i18n/board_crm_configuration.pot
rename to addons/board_crm/i18n/board_crm_configuration.pot
diff --git a/addons/board_crm_configuration/i18n/bs.po b/addons/board_crm/i18n/bs.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/bs.po
rename to addons/board_crm/i18n/bs.po
diff --git a/addons/board_crm_configuration/i18n/ca.po b/addons/board_crm/i18n/ca.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/ca.po
rename to addons/board_crm/i18n/ca.po
diff --git a/addons/board_crm_configuration/i18n/cs.po b/addons/board_crm/i18n/cs.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/cs.po
rename to addons/board_crm/i18n/cs.po
diff --git a/addons/board_crm_configuration/i18n/de.po b/addons/board_crm/i18n/de.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/de.po
rename to addons/board_crm/i18n/de.po
diff --git a/addons/board_crm_configuration/i18n/el.po b/addons/board_crm/i18n/el.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/el.po
rename to addons/board_crm/i18n/el.po
diff --git a/addons/board_crm_configuration/i18n/es.po b/addons/board_crm/i18n/es.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/es.po
rename to addons/board_crm/i18n/es.po
diff --git a/addons/board_crm_configuration/i18n/es_AR.po b/addons/board_crm/i18n/es_AR.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/es_AR.po
rename to addons/board_crm/i18n/es_AR.po
diff --git a/addons/board_crm_configuration/i18n/et.po b/addons/board_crm/i18n/et.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/et.po
rename to addons/board_crm/i18n/et.po
diff --git a/addons/board_crm_configuration/i18n/fr.po b/addons/board_crm/i18n/fr.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/fr.po
rename to addons/board_crm/i18n/fr.po
diff --git a/addons/board_crm_configuration/i18n/hr.po b/addons/board_crm/i18n/hr.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/hr.po
rename to addons/board_crm/i18n/hr.po
diff --git a/addons/board_crm_configuration/i18n/hu.po b/addons/board_crm/i18n/hu.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/hu.po
rename to addons/board_crm/i18n/hu.po
diff --git a/addons/board_crm_configuration/i18n/id.po b/addons/board_crm/i18n/id.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/id.po
rename to addons/board_crm/i18n/id.po
diff --git a/addons/board_crm_configuration/i18n/it.po b/addons/board_crm/i18n/it.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/it.po
rename to addons/board_crm/i18n/it.po
diff --git a/addons/board_crm_configuration/i18n/ko.po b/addons/board_crm/i18n/ko.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/ko.po
rename to addons/board_crm/i18n/ko.po
diff --git a/addons/board_crm_configuration/i18n/lt.po b/addons/board_crm/i18n/lt.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/lt.po
rename to addons/board_crm/i18n/lt.po
diff --git a/addons/board_crm_configuration/i18n/nl.po b/addons/board_crm/i18n/nl.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/nl.po
rename to addons/board_crm/i18n/nl.po
diff --git a/addons/board_crm_configuration/i18n/nl_BE.po b/addons/board_crm/i18n/nl_BE.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/nl_BE.po
rename to addons/board_crm/i18n/nl_BE.po
diff --git a/addons/board_crm_configuration/i18n/pl.po b/addons/board_crm/i18n/pl.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/pl.po
rename to addons/board_crm/i18n/pl.po
diff --git a/addons/board_crm_configuration/i18n/pt.po b/addons/board_crm/i18n/pt.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/pt.po
rename to addons/board_crm/i18n/pt.po
diff --git a/addons/board_crm_configuration/i18n/pt_BR.po b/addons/board_crm/i18n/pt_BR.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/pt_BR.po
rename to addons/board_crm/i18n/pt_BR.po
diff --git a/addons/board_crm_configuration/i18n/ro.po b/addons/board_crm/i18n/ro.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/ro.po
rename to addons/board_crm/i18n/ro.po
diff --git a/addons/board_crm_configuration/i18n/ru.po b/addons/board_crm/i18n/ru.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/ru.po
rename to addons/board_crm/i18n/ru.po
diff --git a/addons/board_crm_configuration/i18n/sk.po b/addons/board_crm/i18n/sk.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/sk.po
rename to addons/board_crm/i18n/sk.po
diff --git a/addons/board_crm_configuration/i18n/sl.po b/addons/board_crm/i18n/sl.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/sl.po
rename to addons/board_crm/i18n/sl.po
diff --git a/addons/board_crm_configuration/i18n/sq.po b/addons/board_crm/i18n/sq.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/sq.po
rename to addons/board_crm/i18n/sq.po
diff --git a/addons/board_crm_configuration/i18n/sv.po b/addons/board_crm/i18n/sv.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/sv.po
rename to addons/board_crm/i18n/sv.po
diff --git a/addons/board_crm_configuration/i18n/tlh.po b/addons/board_crm/i18n/tlh.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/tlh.po
rename to addons/board_crm/i18n/tlh.po
diff --git a/addons/board_crm_configuration/i18n/tr.po b/addons/board_crm/i18n/tr.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/tr.po
rename to addons/board_crm/i18n/tr.po
diff --git a/addons/board_crm_configuration/i18n/uk.po b/addons/board_crm/i18n/uk.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/uk.po
rename to addons/board_crm/i18n/uk.po
diff --git a/addons/board_crm_configuration/i18n/vi.po b/addons/board_crm/i18n/vi.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/vi.po
rename to addons/board_crm/i18n/vi.po
diff --git a/addons/board_crm_configuration/i18n/zh_CN.po b/addons/board_crm/i18n/zh_CN.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/zh_CN.po
rename to addons/board_crm/i18n/zh_CN.po
diff --git a/addons/board_crm_configuration/i18n/zh_TW.po b/addons/board_crm/i18n/zh_TW.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/zh_TW.po
rename to addons/board_crm/i18n/zh_TW.po
diff --git a/addons/caldav/__init__.py b/addons/caldav/__init__.py
index 19f11301420..a7731ca526a 100644
--- a/addons/caldav/__init__.py
+++ b/addons/caldav/__init__.py
@@ -20,10 +20,10 @@
 ##############################################################################
 
 import caldav
-import caldav_cache
-import caldav_fs
-import caldav_node
-import webdav_server
+#import caldav_cache
+#import caldav_fs
+#import caldav_node
+#import webdav_server
 import wizard
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/caldav/__terp__.py b/addons/caldav/__terp__.py
index db6e46b1daa..1d25ad8cb77 100644
--- a/addons/caldav/__terp__.py
+++ b/addons/caldav/__terp__.py
@@ -49,7 +49,9 @@
     "demo_xml" : [], 
     "update_xml" : [
                     'security/ir.model.access.csv', 
-                    'caldav_wizard.xml', 
+                    'wizard/calendar_event_export_view.xml',
+                    'wizard/calendar_event_import_view.xml',
+                    'wizard/calendar_event_subscribe_view.xml',
                     'caldav_view.xml'
                     ], 
     "installable" : True, 
diff --git a/addons/caldav/caldav.py b/addons/caldav/caldav.py
index ce7bbe62e24..91491dd1688 100644
--- a/addons/caldav/caldav.py
+++ b/addons/caldav/caldav.py
@@ -207,6 +207,7 @@ class CalDAV(object):
     def create_ics(self, cr, uid, datas, name, ical, context=None):
         if not datas:
             return
+        timezones = []
         for data in datas:
             tzval = None
             vevent = ical.add(name)
@@ -246,11 +247,12 @@ class CalDAV(object):
                         alarm_obj = self.pool.get('basic.calendar.alarm')
                         vevent = alarm_obj.export_cal(cr, uid, model, \
                                     data[map_field][0], vevent, context=ctx)
-                    elif field == 'vtimezone' and data[map_field]:
+                    elif field == 'vtimezone' and data[map_field] and data[map_field] not in timezones:
                         tzval = data[map_field]
                         tz_obj = self.pool.get('basic.calendar.timezone')
                         ical = tz_obj.export_cal(cr, uid, None, \
                                      data[map_field], ical, context=context)
+                        timezones.append(data[map_field])
                     elif data[map_field]:
                         if map_type in ("char", "text"):
                             if field in ('exdate'):
diff --git a/addons/caldav/caldav_wizard.xml b/addons/caldav/caldav_wizard.xml
deleted file mode 100644
index eaebba4234a..00000000000
--- a/addons/caldav/caldav_wizard.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-	<data>
-		<wizard string="Import .ics File" model="basic.calendar"
-			name="calendar.event.import" id="wizard_cal_event_import" />
-
-		<wizard string="Subscribe"
-			model="basic.calendar" name="calendar.event.subscribe"
-			id="wizard_cal_event_subscribe" multi="True" />
-
-		<wizard string="Export .ics File" model="basic.calendar"
-			name="calendar.event.export" id="wizard_cal_event_export" />
-
-		<wizard string="Edit this event" model="basic.calendar.event"
-			name="calendar.event.edit.this" id="wizard_edit_this_event"
-			menu="False" />
-
-	</data>
-</openerp>
\ No newline at end of file
diff --git a/addons/caldav/wizard/__init__.py b/addons/caldav/wizard/__init__.py
index 4ab34601a96..1c45cb2a191 100755
--- a/addons/caldav/wizard/__init__.py
+++ b/addons/caldav/wizard/__init__.py
@@ -19,9 +19,8 @@
 #
 ##############################################################################
 
-import wizard_cal_export
-import wizard_cal_import
-import wizard_cal_subscribe
+import calendar_event_export
+import calendar_event_import
+import calendar_event_subscribe
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/caldav/wizard/calendar_event_export.py b/addons/caldav/wizard/calendar_event_export.py
new file mode 100644
index 00000000000..3bee5a5089f
--- /dev/null
+++ b/addons/caldav/wizard/calendar_event_export.py
@@ -0,0 +1,69 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+import netsvc
+import pooler
+import time
+import tools
+import wizard
+import base64
+
+class calendar_event_export(osv.osv_memory):
+    """
+    Export Calendar Event.
+    """
+    def _process_export_ics(self, cr, uid, context):
+        """
+        Get Default value for file_path field.
+        """
+        model = context.get('model', 'basic.calendar')
+        model_obj = self.pool.get(model)
+        calendar = model_obj.export_cal(cr, uid, context['active_ids'], context)
+        #TODO: check why returns wrong value
+        return base64.encodestring(calendar)
+                            
+    def _process_export_ics_name(self, cr, uid, context):
+        """
+        Get Default value for Name field.
+        """
+        model = context.get('model', 'basic.calendar')
+        model_obj = self.pool.get(model)
+        calendar = model_obj.export_cal(cr, uid, context['active_ids'], context)
+        return  'OpenERP %s.ics' % (model_obj._description)
+    
+    _name = "calendar.event.export"
+    _description = "Event Export"
+    _columns = {
+              'file_path':fields.binary('Save ICS file', filters='*.ics', required=True),
+              'name':fields.char('File name', size=34, required=True, help='Save in .ics format')
+               }
+    
+    _defaults={
+               'name':_process_export_ics_name,
+               'file_path':_process_export_ics
+               }
+    
+calendar_event_export()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/caldav/wizard/calendar_event_export_view.xml b/addons/caldav/wizard/calendar_event_export_view.xml
new file mode 100644
index 00000000000..0a049e15083
--- /dev/null
+++ b/addons/caldav/wizard/calendar_event_export_view.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_calendar_event_export" model="ir.ui.view">
+            <field name="name">calendar.event.export.form</field>
+            <field name="model">calendar.event.export</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Export ICS">
+                	<group colspan="4" >
+                		 <field name="name"/>
+              			 <field name="file_path" colspan="4" width="300"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button  icon="gtk-cancel" special="cancel" string="_Cancel"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+        <record id="action_calendar_event_export" model="ir.actions.act_window">
+            <field name="name">Export .ics File</field>
+            <field name="res_model">calendar.event.export</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_calendar_event_export"/> 
+           <field name="target">new</field>
+           <field name="context">{'record_id':active_id}</field>
+        </record>
+              
+<!--        <record id="action_calendar_event_export_values" model="ir.values">-->
+<!--            <field name="model_id" ref="caldav.model_basic_calendar" />-->
+<!--            <field name="object" eval="1" />-->
+<!--            <field name="name">Export .ics File</field>-->
+<!--            <field name="key2">client_action_multi</field>-->
+<!--            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_calendar_event_export'))"/>-->
+<!--            <field name="key">action</field> -->
+<!--            <field name="model">basic.calendar</field>-->
+<!--        </record>-->
+
+
+    	<act_window id="action_calendar_event_export_values"
+    		key2="client_action_multi" name="Export .ics File"
+    		res_model="calendar.event.export" src_model="basic.calendar"
+    		view_mode="form" target="new" view_type="form" />
+
+    </data>
+</openerp>
diff --git a/addons/caldav/wizard/calendar_event_import.py b/addons/caldav/wizard/calendar_event_import.py
new file mode 100644
index 00000000000..ba72e1c8c6d
--- /dev/null
+++ b/addons/caldav/wizard/calendar_event_import.py
@@ -0,0 +1,78 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+import netsvc
+import pooler
+import time
+import tools
+import wizard
+import base64
+
+class calendar_event_import(osv.osv_memory):
+    """
+    Import Calendar Event.
+    """
+    cnt = 0
+    def _process_imp_ics(self, cr, uid, ids, context=None):
+        """
+        Process Import ics File.
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of calendar event import’s IDs
+        @return: dictionary of calendar evet import  window with Import successful msg.
+        """
+        for data in self.read(cr, uid, ids):
+            model = data.get('model', 'basic.calendar')
+            model_obj = self.pool.get(model)
+            context.update({'model': model})
+            data_obj = self.pool.get('ir.model.data')
+            id2 = data_obj._get_id(cr, uid, 'caldav', 'view_calendar_event_import_display')
+            if id2:
+                 id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+            vals = model_obj.import_cal(cr, uid, data['file_path'], context['active_id'], context)
+            global cnt
+            if vals:
+                cnt = len(vals)
+            value = {
+                'view_type': 'form',
+                'view_mode': 'form',
+                'res_model': 'calendar.event.import',
+                'views': [(id2,'form'),(False,'tree'),(False,'calendar'),(False,'graph')],
+                'type': 'ir.actions.act_window',
+                'target': 'new'
+            }
+            return value
+    
+    _name = "calendar.event.import"
+    _description = "Event Import"
+    _columns = {
+                  'file_path': fields.binary('Select ICS file', filters='*.ics', required=True),
+                  'msg': fields.text('', readonly=True),
+               }
+    _defaults={
+               'msg':lambda *a:'Import Sucessful'
+               }
+    
+calendar_event_import()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/caldav/wizard/calendar_event_import_view.xml b/addons/caldav/wizard/calendar_event_import_view.xml
new file mode 100644
index 00000000000..1fbd89b2499
--- /dev/null
+++ b/addons/caldav/wizard/calendar_event_import_view.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_calendar_event_import" model="ir.ui.view">
+            <field name="name">calendar.event.import.form</field>
+            <field name="model">calendar.event.import</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Import ICS">
+                	<group colspan="4" >
+                		 <separator string="Select ICS file"/>
+              			 <field name="file_path" colspan="4" width="300" nolabel="1"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button  icon="gtk-cancel" special="cancel" string="_Cancel"/>
+                    	<button  icon="gtk-ok"  name="_process_imp_ics"  string="_Import" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+  		<record id="view_calendar_event_import_display" model="ir.ui.view">
+            <field name="name">calendar.event.import.form.display</field>
+            <field name="model">calendar.event.import</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Import Message">
+                	<group colspan="4" >
+                		  <field name="msg" colspan="4" width="300" nolabel="1"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4">
+                    	<button  icon="gtk-ok" special="cancel" string="Ok"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+        <record id="action_calendar_event_import" model="ir.actions.act_window">
+            <field name="name">Import .ics File</field>
+            <field name="res_model">calendar.event.import</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_calendar_event_import"/> 
+           <field name="target">new</field>
+           <field name="context">{'record_id':active_id}</field>
+        </record>
+              
+        <record id="action_calendar_event_import_values" model="ir.values">
+            <field name="model_id" ref="caldav.model_basic_calendar" />
+            <field name="object" eval="1" />
+            <field name="name">Import .ics File</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_calendar_event_import'))"/>
+            <field name="key">action</field> 
+            <field name="model">basic.calendar</field>
+        </record>
+        
+    </data>
+</openerp>
diff --git a/addons/caldav/wizard/calendar_event_subscribe.py b/addons/caldav/wizard/calendar_event_subscribe.py
new file mode 100644
index 00000000000..aa539938877
--- /dev/null
+++ b/addons/caldav/wizard/calendar_event_subscribe.py
@@ -0,0 +1,89 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+import netsvc
+import pooler
+import time
+import tools
+import wizard
+import base64
+import urllib
+
+class calendar_event_subscribe(osv.osv_memory):
+    """
+    Subscribe  Calendar Event.
+    """
+    cnt = 0
+    def _process_imp_ics(self, cr, uid, ids, context=None):
+        """
+        process ics file.
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of calendar event subscribe’s IDs
+        @return: dictionary of calendar evet subscribe  window with Import successful msg.
+        """
+        global cnt
+        for data in self.read(cr, uid, ids):
+            try:
+                f =  urllib.urlopen(data['url_path'])
+                caldata = f.fp.read()
+                f.close()
+            except Exception,e:
+                raise osv.except_osv(_('Error!'), _('Please provide Proper URL !'))
+            model = data.get('model', 'basic.calendar')
+            model_obj = self.pool.get(model)
+            context.update({'url': data['url_path'],
+                                    'model': data.get('model', 'basic.calendar')})
+            vals = model_obj.import_cal(cr, uid, base64.encodestring(caldata), \
+                                            context['active_id'],  context)
+            if vals:
+                cnt = vals['count']
+            data_obj = self.pool.get('ir.model.data')
+            id2 = data_obj._get_id(cr, uid, 'caldav', 'view_calendar_event_subscribe_display')
+            if id2:
+                 id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+          
+            value = {
+                'view_type': 'form',
+                'view_mode': 'form',
+                'res_model': 'calendar.event.subscribe',
+                'views': [(id2,'form'),(False,'tree'),(False,'calendar'),(False,'graph')],
+                'type': 'ir.actions.act_window',
+                'target': 'new'
+            }
+            return value
+    
+    _name = "calendar.event.subscribe"
+    _description = "Event subscribe"
+    _columns = {
+                'url_path': fields.char('Provide path for remote calendar', size=124, required=True),
+                'msg': fields.text('', readonly=True),
+               }
+    _defaults={
+               'msg':lambda *a:'Import Sucessful.'
+               }
+    
+calendar_event_subscribe()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/caldav/wizard/calendar_event_subscribe_view.xml b/addons/caldav/wizard/calendar_event_subscribe_view.xml
new file mode 100644
index 00000000000..95c06c20f6e
--- /dev/null
+++ b/addons/caldav/wizard/calendar_event_subscribe_view.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_calendar_event_subscribe" model="ir.ui.view">
+            <field name="name">calendar.event.subscribe.form</field>
+            <field name="model">calendar.event.subscribe</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Subscribe to Remote Calendar">
+                	<group colspan="4" >
+                		 <separator string="Provide path for Remote Calendar"/>
+              			  <field name="url_path" colspan="4" width="300" nolabel="1" widget="url"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button  icon="gtk-cancel" special="cancel" string="_Cancel"/>
+                    	<button  icon="gtk-ok"  name="_process_imp_ics"  string="_Subscribe" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+  		<record id="view_calendar_event_subscribe_display" model="ir.ui.view">
+            <field name="name">calendar.event.subscribe.form.display</field>
+            <field name="model">calendar.event.subscribe</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Message...">
+                	<group colspan="4" >
+                		  <field name="msg" colspan="4" width="300" nolabel="1"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4">
+                    	<button  icon="gtk-ok" special="cancel" string="Ok"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+        <record id="action_calendar_event_subscribe" model="ir.actions.act_window">
+            <field name="name">Subscribe</field>
+            <field name="res_model">calendar.event.subscribe</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_calendar_event_subscribe"/> 
+           <field name="target">new</field>
+           <field name="context">{'record_id':active_id}</field>
+        </record>
+              
+        <record id="action_calendar_event_subscribe_values" model="ir.values">
+            <field name="model_id" ref="caldav.model_basic_calendar" />
+            <field name="object" eval="1" />
+            <field name="name">Subscribe</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_calendar_event_subscribe'))"/>
+            <field name="key">action</field> 
+            <field name="model">basic.calendar</field>
+        </record>
+        
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/caldav/wizard/wizard_cal_export.py b/addons/caldav/wizard/wizard_cal_export.py
deleted file mode 100644
index f7896c738d7..00000000000
--- a/addons/caldav/wizard/wizard_cal_export.py
+++ /dev/null
@@ -1,65 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import base64
-import pooler
-
-
-class cal_event_export_wizard(wizard.interface):
-    form1 = '''<?xml version="1.0"?>
-    <form string="Export ICS">
-        <field name="name"/>
-        <field name="file_path" colspan="4" width="300"/>
-    </form>'''
-    
-    form1_fields = {
-            'file_path': {
-                'string': 'Save ICS file', 
-                'type': 'binary', 
-                'required': True, 
-                'filters': '*.ics'
-                },
-            'name': {
-                    'string': 'File name', 
-                    'type': 'char', 
-                    'size': 34, 
-                    'required': True, 
-                    'help': 'Save in .ics format'}, 
-            }
-    
-    def _process_export_ics(self, cr, uid, data, context):
-        model = data.get('model')
-        model_obj = pooler.get_pool(cr.dbname).get(model)
-        calendar = model_obj.export_cal(cr, uid, data['ids'], context)
-        return {'file_path': base64.encodestring(calendar), \
-                            'name': 'OpenERP %s.ics' % (model_obj._description)}
-
-    states = {
-        'init': {
-            'actions': [_process_export_ics], 
-            'result': {'type': 'form', 'arch':form1, 'fields':form1_fields, \
-                       'state': [('end', '_Cancel', 'gtk-cancel')]}}, 
-    }
-    
-cal_event_export_wizard('calendar.event.export')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/caldav/wizard/wizard_cal_import.py b/addons/caldav/wizard/wizard_cal_import.py
deleted file mode 100644
index a5670f545fa..00000000000
--- a/addons/caldav/wizard/wizard_cal_import.py
+++ /dev/null
@@ -1,88 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import pooler
-
-
-class cal_event_import_wizard(wizard.interface):
-    form1 = '''<?xml version="1.0"?>
-    <form string="Import ICS">
-        <separator string="Select ICS file"/>
-        <field name="file_path" colspan="4" width="300" nolabel="1"/>
-    </form>'''
-    
-    form1_fields = {
-            'file_path': {
-                'string': 'Select ICS file', 
-                'type': 'binary', 
-                'required': True, 
-                'filters': '*.ics'
-                }
-            }
-    display = '''<?xml version="1.0"?>
-    <form string="Import Message">
-        <field name="msg" colspan="4" width="300" nolabel="1"/>
-    </form>'''
-    
-    display_fields = {
-            'msg': {
-                'string': '', 
-                'type': 'text', 
-                'readonly': True, 
-                }
-            }
-
-    def _process_imp_ics(self, cr, uid, data, context=None):
-        model = data.get('model')
-        model_obj = pooler.get_pool(cr.dbname).get(model)
-        context.update({'model': model})
-        vals = model_obj.import_cal(cr, uid, data['form']['file_path'], data['id'], context)
-        global cnt
-        cnt = 0
-        if vals:
-            cnt = len(vals)
-        return {}
-    
-    def _result_set(self, cr, uid, data, context=None):
-        msg = (cnt and "Imported %s components" % cnt) or 'Import Sucessful' 
-        return {'msg': msg}
-    
-    states = {
-        'init': {
-            'actions': [], 
-            'result': {'type': 'form', 'arch': form1, 'fields': form1_fields, \
-                       'state': [('end', '_Cancel', 'gtk-cancel'), ('open', '_Import', 'gtk-ok')]}
-        }, 
-        'open': {
-            'actions': [], 
-            'result': {'type': 'action', 'action': _process_imp_ics, 'state': 'display'}
-        }, 
-       'display': {
-            'actions': [_result_set], 
-            'result': {'type': 'form', 'arch': display, 'fields': display_fields, \
-                       'state': [('end', 'Ok', 'gtk-ok')]}
-        }, 
-    }
-    
-cal_event_import_wizard('calendar.event.import')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/caldav/wizard/wizard_cal_subscribe.py b/addons/caldav/wizard/wizard_cal_subscribe.py
deleted file mode 100644
index 709c61d0b25..00000000000
--- a/addons/caldav/wizard/wizard_cal_subscribe.py
+++ /dev/null
@@ -1,97 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-from tools.translate import _
-import base64
-import pooler
-import urllib
-import wizard
-
-class cal_event_subscribe_wizard(wizard.interface):
-    form1 = '''<?xml version="1.0"?>
-    <form string="Subscribe to Remote Calendar">
-        <separator string="Provide path for Remote Calendar"/>
-        <field name="url_path" colspan="4" width="300" nolabel="1" widget="url"/>
-    </form>'''
-    
-    form1_fields = {
-            'url_path': {
-                'string': 'Provide path for remote calendar', 
-                'type': 'char', 
-                'required': True, 
-                'size': 124
-                }
-            }
-    display = '''<?xml version="1.0"?>
-    <form string="Message...">
-        <field name="msg" colspan="4" width="300" nolabel="1"/>
-    </form>'''
-    
-    display_fields = {
-            'msg': {
-                'string': '', 
-                'type': 'text', 
-                'readonly': True, 
-                }
-            }
-
-    def _process_imp_ics(self, cr, uid, data, context=None):
-        global cnt
-        cnt = 0
-        try:
-            f =  urllib.urlopen(data['form']['url_path'])
-            caldata = f.fp.read()
-            f.close()
-        except Exception,e:
-            raise wizard.except_wizard(_('Error!'), _('Please provide Proper URL !'))
-        model = data.get('model')
-        model_obj = pooler.get_pool(cr.dbname).get(model)
-        context.update({'url': data['form']['url_path'],
-                                    'model': data.get('model')})
-        vals = model_obj.import_cal(cr, uid, base64.encodestring(caldata), \
-                                            data['id'],  context)
-        if vals:
-            cnt = vals['count']
-        return {}
-    
-    def _result_set(self, cr, uid, data, context=None):
-        return {'msg': 'Import Sucessful.'}
-    
-    states = {
-        'init': {
-            'actions': [], 
-            'result': {'type': 'form', 'arch': form1, 'fields': form1_fields, \
-                       'state': [('end', '_Cancel', 'gtk-cancel'), ('open', '_Subscribe', 'gtk-ok')]}
-        }, 
-        'open': {
-            'actions': [], 
-            'result': {'type': 'action', 'action': _process_imp_ics, 'state': 'display'}
-        },
-       'display': {
-            'actions': [_result_set], 
-            'result': {'type': 'form', 'arch': display, 'fields': display_fields, \
-                       'state': [('end', 'Ok', 'gtk-ok')]}
-        }, 
-    }
-    
-cal_event_subscribe_wizard('calendar.event.subscribe')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/__terp__.py b/addons/crm/__terp__.py
index 994f11f3212..bf14aab0eb6 100644
--- a/addons/crm/__terp__.py
+++ b/addons/crm/__terp__.py
@@ -61,19 +61,25 @@ between mails and Open ERP.""",
     ], 
 
     'update_xml': [
+        'wizard/crm_lead_to_partner_view.xml',
+        'wizard/crm_lead_to_opportunity_view.xml',
+        'wizard/crm_phonecall2phonecall.xml',
+        'wizard/phonecall2meeting.xml',
+        'wizard/phonecall2partner_view.xml',
+        'wizard/phonecall2opportunity.xml',
+        'wizard/crm_opportunity_to_meeting_view.xml',
+        'wizard/crm_opportunity_to_phonecall_view.xml',
         'crm_wizard.xml', 
-        'crm_view.xml', 
+        'crm_view.xml',
+         
         'crm_action_rule_view.xml', 
-        'crm_lead_wizard.xml', 
         'crm_lead_view.xml', 
         'crm_lead_menu.xml', 
-        'crm_meeting_wizard.xml', 
         'crm_meeting_view.xml', 
         'crm_meeting_menu.xml', 
-        'crm_phonecall_wizard.xml', 
+        #'crm_phonecall_wizard.xml', 
         'crm_phonecall_view.xml', 
         'crm_phonecall_menu.xml',         
-        'crm_opportunity_wizard.xml', 
         'crm_opportunity_view.xml', 
         'crm_opportunity_menu.xml', 
         'crm_fund_view.xml', 
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 282584b8c6f..b4602f67f05 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -19,14 +19,6 @@
 #
 ##############################################################################
 
-import time
-import re
-import os
-import base64
-import tools
-import mx.DateTime
-import datetime
-
 from datetime import datetime
 from datetime import timedelta
 from osv import fields
@@ -34,7 +26,12 @@ from osv import orm
 from osv import osv
 from osv.orm import except_orm
 from tools.translate import _
-
+import base64
+import mx.DateTime
+import os
+import re
+import time
+import tools
 
 
 MAX_LEVEL = 15
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index da9f2ed7230..6424030dc66 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -19,28 +19,69 @@
 #
 ##############################################################################
 
-from osv import fields,osv,orm
+from osv import fields, osv, orm
+from datetime import datetime, timedelta
 import crm
+import math
 
 class crm_lead(osv.osv):
     _name = "crm.lead"
     _description = "Leads Cases"
     _order = "priority desc, id desc"
-    _inherit = ['res.partner.address','crm.case']
+    _inherit = ['res.partner.address', 'crm.case']
+
+    def _compute_openday(self, cr, uid, ids, name, args, context={}):
+        result = {}
+        for r in self.browse(cr, uid, ids , context):
+            result[r.id] = 0
+            model_id = self.pool.get('ir.model').search(cr, uid, [('model', '=', 'crm.lead')])
+            log_obj = self.pool.get('crm.case.log')
+            hist_id = log_obj.search(cr, uid, [('model_id', '=', model_id[0]), \
+                                                     ('res_id', '=', r.id), \
+                                                     ('name', '=', 'Open')])
+
+            if hist_id:
+                # Considering last log for opening case
+                log = log_obj.browse(cr, uid, hist_id[-1])
+                date_lead_open = datetime.strptime(r.create_date, "%Y-%m-%d %H:%M:%S")
+                date_log_open = datetime.strptime(log.date, "%Y-%m-%d %H:%M:%S")
+                ans = date_lead_open - date_log_open
+                duration =  float(ans.days) + (float(ans.seconds) / 86400)
+                result[r.id] = abs(int(duration))
+        return result
+
+    def _compute_closeday(self, cr, uid, ids, name, args, context={}):
+        result = {}
+        for r in self.browse(cr, uid, ids , context):
+            result[r.id] = 0
+            if r.date_closed:
+                date_create = datetime.strptime(r.create_date, "%Y-%m-%d %H:%M:%S")
+                date_close = datetime.strptime(r.date_closed, "%Y-%m-%d %H:%M:%S")
+                ans = date_close - date_create
+                duration =  float(ans.days) + (float(ans.seconds) / 86400)
+                result[r.id] = abs(int(duration))
+        return result
+
     _columns = {
-        'categ_id': fields.many2one('crm.case.categ', 'Lead Source', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.opportunity')]"),
-        'type_id': fields.many2one('crm.case.resource.type', 'Lead Type', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.lead')]"),
-        'partner_name': fields.char("Lead Name", size=64),
+        'categ_id': fields.many2one('crm.case.categ', 'Lead Source', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.opportunity')]"), 
+        'type_id': fields.many2one('crm.case.resource.type', 'Lead Type', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.lead')]"), 
+        'partner_name': fields.char("Lead Name", size=64), 
 
-        'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
-        'date_closed': fields.datetime('Closed', readonly=True),
-        'stage_id': fields.many2one('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.lead')]"),
-        'opportunity_id': fields.many2one('crm.opportunity', 'Opportunity'),
+        'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'), 
+        'date_closed': fields.datetime('Closed', readonly=True), 
+        'stage_id': fields.many2one('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.lead')]"), 
+        'opportunity_id': fields.many2one('crm.opportunity', 'Opportunity'), 
+
+        'user_id': fields.many2one('res.users', 'Salesman'), 
+        'referred': fields.char('Referred By', size=32), 
+        'day_open': fields.function(_compute_openday, string='Days to Open', \
+                                method=True, type="integer", store=True), 
+        'day_close': fields.function(_compute_closeday, string='Days to Close', \
+                                method=True, type="integer", store=True), 
+        }
 
-        'user_id': fields.many2one('res.users', 'Salesman'),
-        'referred': fields.char('Referred By', size=32),
-    }
     _defaults = {
-        'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.lead', context=c),
+        'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.lead', context=c), 
     }
+
 crm_lead()
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 61763ce41ce..c884ad7afc7 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -46,7 +46,7 @@
                     <field name="priority"/>
                     <field name="date_deadline"/>
                     <button
-                            name="%(wizard_crm_lead_opportunity_set)d" 
+                            name="%(action_crm_lead2opportunity)d" 
                             string="Convert"
                             help="Convert into Opportunity"
                             icon="gtk-index" 
@@ -90,7 +90,7 @@
                         <separator string="Links" colspan="4" col="3"/>
                         <field name="partner_id"/>
                         <button
-                            name="%(wizard_crm_lead_partner_create)d" 
+                            name="%(action_crm_lead2partner)d" 
                             icon="gtk-index" type="action"
                             string="Create"
                             attrs="{'invisible':[('partner_id','!=',False)]}"/>
@@ -155,6 +155,11 @@
                         <field name="write_date"/>
                         <field name="date_closed"/>
                     </group>
+                    <group colspan="2" col="2">
+                        <separator string="Statistics" colspan="2" col="2"/>
+                        <field name="day_open"/>
+                        <field name="day_close"/>
+                    </group>
                  </page>
                 </notebook>
             </form>
@@ -185,7 +190,7 @@
                 <field name="state"/>
                 <button name="case_open" string="Open" states="draft,pending" type="object"  icon="gtk-go-forward"/>
                 <button name="case_close" string="Close" states="open,draft,pending" type="object"  icon="gtk-close"/>
-                <button string="Convert to Opportunity" name="%(wizard_crm_lead_opportunity_set)d" states="draft,open,pending" icon="gtk-index" type="action"/>
+                <button string="Convert to Opportunity" name="%(action_crm_lead2opportunity)d" states="draft,open,pending" icon="gtk-index" type="action"/>
                 <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object"  icon="gtk-go-up"/>
                 <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object"  icon="gtk-cancel"/>
             </tree>
diff --git a/addons/crm/crm_lead_wizard.xml b/addons/crm/crm_lead_wizard.xml
deleted file mode 100644
index 6ce8750ac08..00000000000
--- a/addons/crm/crm_lead_wizard.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <wizard
-            id="wizard_crm_lead_partner_create"
-            keyword="client_action_multi"
-            model="crm.lead"
-            name="crm.lead.partner_create"
-            multi="True"
-            string="Create Partner"/>
-
-        <wizard
-            id="wizard_crm_lead_opportunity_set"
-            keyword="client_action_multi"
-            model="crm.lead"
-            name="crm.lead.opportunity_set"
-            multi="True"
-            string="Convert To Opportunity"/>
-    </data>
-</openerp>
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index a1f1cef502e..59bedbb3b6a 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -38,7 +38,7 @@
                            <field name="rrule_type" string="Recurrency"
                                 colspan="1" attrs="{'readonly':[('recurrent_uid','!=',False)]}"/>
                             <button string="Edit All" help="Edit all Ourrences of recurrent Meeting" attrs="{'invisible':[('rrule_type','in', ('none', False))]}"
-                            name="%(wizard_edit_all_events)d" icon="gtk-edit"
+                            name="%(base_calendar.action_calendar_event_edit_all)d" icon="gtk-edit"
                             type="action" context="{'model' : 'crm.meeting', 'date': date, 'date_deadline': date_deadline}" />
                     </group>
 
diff --git a/addons/crm/crm_meeting_wizard.xml b/addons/crm/crm_meeting_wizard.xml
deleted file mode 100644
index 8d6b66b3f2d..00000000000
--- a/addons/crm/crm_meeting_wizard.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-	<data>
-		<wizard string="Edit all events" model="crm.meeting"
-			name="calendar.event.edit.all" id="wizard_edit_all_events"
-			menu="False" />
-	</data>
-</openerp>
diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
index ea70e850ed8..d2fff629c5a 100644
--- a/addons/crm/crm_opportunity.py
+++ b/addons/crm/crm_opportunity.py
@@ -19,6 +19,7 @@
 #
 ##############################################################################
 
+from datetime import datetime
 from osv import fields,osv,orm
 import crm
 
@@ -35,6 +36,39 @@ class crm_opportunity(osv.osv):
     _description = "Opportunity Cases"
     _order = "id desc"
     _inherit = 'crm.case'
+
+    def _compute_openday(self, cr, uid, ids, name, args, context={}):
+        result = {}
+        for r in self.browse(cr, uid, ids , context):
+            result[r.id] = 0
+            model_id = self.pool.get('ir.model').search(cr, uid, [('model', '=', 'crm.opportunity')])
+            log_obj = self.pool.get('crm.case.log')
+            hist_id = log_obj.search(cr, uid, [('model_id', '=', model_id[0]), \
+                                                     ('res_id', '=', r.id), \
+                                                     ('name', '=', 'Open')])
+
+            if hist_id:
+                # Considering last log for opening case
+                log = log_obj.browse(cr, uid, hist_id[-1])
+                date_lead_open = datetime.strptime(r.create_date, "%Y-%m-%d %H:%M:%S")
+                date_log_open = datetime.strptime(log.date, "%Y-%m-%d %H:%M:%S")
+                ans = date_lead_open - date_log_open
+                duration =  float(ans.days) + (float(ans.seconds) / 86400)
+                result[r.id] = abs(int(duration))
+        return result
+
+    def _compute_closeday(self, cr, uid, ids, name, args, context={}):
+        result = {}
+        for r in self.browse(cr, uid, ids , context):
+            result[r.id] = 0
+            if r.date_closed:
+                date_create = datetime.strptime(r.create_date, "%Y-%m-%d %H:%M:%S")
+                date_close = datetime.strptime(r.date_closed, "%Y-%m-%d %H:%M:%S")
+                ans = date_close - date_create
+                duration =  float(ans.days) + (float(ans.seconds) / 86400)
+                result[r.id] = abs(int(duration))
+        return result
+
     _columns = {
         'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.opportunity')]"),
         'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.opportunity')]"),
@@ -52,7 +86,13 @@ class crm_opportunity(osv.osv):
                                   \nIf the case is in progress the state is set to \'Open\'.\
                                   \nWhen the case is over, the state is set to \'Done\'.\
                                   \nIf the case needs to be reviewed then the state is set to \'Pending\'.'),
-    }
+
+        'day_open': fields.function(_compute_openday, string='Days to Open', \
+                                method=True, type="integer", store=True),
+        'day_close': fields.function(_compute_closeday, string='Days to Close', \
+                                method=True, type="integer", store=True),
+       }
+
     def onchange_stage_id(self, cr, uid, ids, stage_id, context={}):
         if not stage_id:
             return {'value':{}}
@@ -64,16 +104,16 @@ class crm_opportunity(osv.osv):
     def stage_next(self, cr, uid, ids, context={}):
         res = super(crm_opportunity, self).stage_next(cr, uid, ids, context=context)
         for case in self.browse(cr, uid, ids, context):
-            if case.stage_id and case.stage_id.on_change:                                
+            if case.stage_id and case.stage_id.on_change:
                 self.write(cr, uid, [case.id], {'probability': case.stage_id.probability})
         return res
 
     def stage_previous(self, cr, uid, ids, context={}):
         res = super(crm_opportunity, self).stage_previous(cr, uid, ids, context=context)
         for case in self.browse(cr, uid, ids, context):
-            if case.stage_id and case.stage_id.on_change:                                
+            if case.stage_id and case.stage_id.on_change:
                 self.write(cr, uid, [case.id], {'probability': case.stage_id.probability})
-        return res 
+        return res
 
     _defaults = {
         'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.opportunity', context=c),
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/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 9b6e3739dce..55f3d2f3dc1 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -63,17 +63,17 @@
                     </group>
                     <field name="user_id"/>
                     <button string="Schedule Meeting"
-                        name="%(wizard_crm_opportunity_meeting_set)d" icon="gtk-redo" type="action" />
+                        name="%(opportunity2meeting_act)d" icon="gtk-redo" type="action" />
                     <field name="planned_revenue"/>
                     <field name="probability"/>
                     <field name="date_deadline" string="Expected Closing"/>
                     <button string="Schedule Call"
-                        name="%(wizard_crm_opportunity_reschedule_phone_call)d" icon="gtk-redo" type="action"  />
+                        name="%(opportunity2phonecall_act)d" icon="gtk-redo" type="action"  />
                 </group>
                 <notebook colspan="4">
                 <page string="Opportunity">
-                    <group col="2" colspan="2">
-                        <separator colspan="2" string="Contacts"/>
+                    <group col="3" colspan="2">
+                        <separator colspan="3" string="Contacts"/>
                         <field name="partner_id" select="1" on_change="onchange_partner_id(partner_id, email_from)" colspan="2"/>
                         <field name="partner_address_id" string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="1"/>
                         <field name="email_from" string="Email"/>
@@ -112,6 +112,8 @@
                     <group col="2" colspan="2">
                         <separator string="Misc" colspan="2"/>
                         <field name="active"/>
+                        <field name="day_open"/>
+                        <field name="day_close"/>
                     </group>
                     <separator colspan="4" string="References"/>
                     <field name="ref"/>
diff --git a/addons/crm/crm_opportunity_wizard.xml b/addons/crm/crm_opportunity_wizard.xml
index 5ba7ed0601f..24ee8257911 100644
--- a/addons/crm/crm_opportunity_wizard.xml
+++ b/addons/crm/crm_opportunity_wizard.xml
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>        
-        <wizard
-            id="wizard_crm_opportunity_reschedule_phone_call"
-            keyword="client_action_multi"
-            model="crm.opportunity"
-            name="crm.opportunity.reschedule_phone_call"
-            multi="True"
-            string="Schedule Phone Call" />
-
        <wizard
           id="wizard_partner_create_opportunity"
             keyword="client_action_multi"
@@ -16,20 +8,6 @@
             name="crm.case.opportunity.partner_opportunity"
             menu="False"
             string="Create Opportunity"/>
-	  
-	  <wizard
-            id="wizard_crm_opportunity_meeting_set"
-            keyword="client_action_multi"
-            model="crm.opportunity"
-			name="crm.opportunity.meeting_set"
-			menu="False"
-            string="Schedule Meeting"/>	
-	
-	   <wizard
-          id="wizard_partner_create_opportunity1"
-            keyword="client_action_relate"
-            model="res.partner"
-            name="crm.case.opportunity.partner_opportunity"
-            string="Create Opportunity"/>
+
     </data>
 </openerp>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index c9f114845f2..416e0802b92 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -49,12 +49,12 @@
                 <field name="partner_phone"/>                
                 <field name="user_id"/>
                 <button string="Opportunity" 
-                    name="%(wizard_crm_phonecall_opportunity_set)d"
+                    name="%(phonecall2opportunity_act)d"
                     states="draft,open,pending"
                     type="action" attrs="{'invisible':[('opportunity_id','!=',False)]}" />
                 <button string="Meeting"
                     states="draft,open,pending"
-                    name="%(wizard_crm_phonecall_meeting_set)d"  type="action" />
+                    name="%(phonecall2meeting_act)d"  type="action" />
                 <field name="state"/>
                 <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
                 <button name="case_close" string="Held" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
@@ -75,26 +75,29 @@
                     <field name="date" string="Planned Date"/>
                     <field name="user_id"/>
                     <button string="Schedule a Meeting"
-                        name="%(wizard_crm_phonecall_meeting_set)d"
+                        name="%(phonecall2meeting_act)d"
                         icon="gtk-redo"
                         type="action" />
-                    <newline/>
-
                     <field name="partner_phone"/>
                     <field name="duration"/>
                     <field name="section_id" colspan="1" widget="selection" />
-
                     <button string="Convert to Opportunity"
-                        name="%(wizard_crm_phonecall_opportunity_set)d"
+                        name="%(phonecall2opportunity_act)d"
                         icon="gtk-index" type="action"
                         attrs="{'invisible':[('opportunity_id','!=',False)]}" />
+					<label colspan="6"  string=""/>                                 
+	                <button string="Schedule Call Other" 
+	                 icon="gtk-redo"
+                    name="%(phonecall_to_phonecall_act)d"
+                    type="action"  />
+ 					               
                 </group>
                 <group col="3" colspan="2">
                     <separator colspan="3" string="Contacts" />
                     <field name="partner_id" />
                     <button string="Create a Partner"
                         icon="terp-crm"
-                        name="%(wizard_crm_phonecall_partner_create)d"
+                        name="%(action_crm_phonecall2partner)d"
                         type="action"
                         attrs="{'invisible':[('partner_id','!=',False)]}" />
                     <newline/>
diff --git a/addons/crm/report/crm_opportunity_report.py b/addons/crm/report/crm_opportunity_report.py
index 5aa2a91e555..d6d3fb8a95b 100644
--- a/addons/crm/report/crm_opportunity_report.py
+++ b/addons/crm/report/crm_opportunity_report.py
@@ -14,7 +14,8 @@ class crm_opportunity_report(osv.osv):
         'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.opportunity')]", readonly=True),
         'stage_id':fields.many2one('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.opportunity')]", readonly=True),
         'partner_id': fields.many2one('res.partner', 'Partner',readonly=True),  
-        'company_id': fields.many2one('res.company', 'Company',readonly=True),  
+        'company_id': fields.many2one('res.company', 'Company',readonly=True),
+        'user_id':fields.many2one('res.users', 'User', readonly=True),  
     }
     def init(self, cr):
         tools.drop_view_if_exists(cr, 'crm_opportunity_report')
diff --git a/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py b/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py
index 22264710fcf..27b84e4941b 100755
--- a/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py
+++ b/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py
@@ -29,7 +29,6 @@ import os
 import binascii
 import time, socket
 
-
 email_re = re.compile(r"""
     ([a-zA-Z][\w\.-]*[a-zA-Z0-9]     # username part
     @                                # mandatory @ sign
@@ -186,8 +185,8 @@ class email_parser(object):
 
         try:
             id = self.rpc(self.model, 'create', data)
-            self.rpc(self.model, 'history', [id], 'Receive', True, msg['From'], message['body'])
-            #self.rpc(self.model, 'case_open', [id])
+            self.rpc(self.model, 'history', [id], 'send', False, msg['From'], message['body'])
+            self.rpc(self.model, 'case_open', [id])
         except Exception, e:
             if getattr(e, 'faultCode', '') and 'AccessError' in e.faultCode:
                 e = '\n\nThe Specified user does not have an access to the CRM case.'
@@ -302,7 +301,7 @@ class email_parser(object):
 
         self.rpc(self.model, act, [id])
         self.rpc(self.model, 'write', [id], data)
-        self.rpc(self.model, 'history', [id], 'Send', True, msg['From'], message['body'])
+        self.rpc(self.model, 'history', [id], 'send', False, msg['From'], message['body'])
         return id
 
     def msg_send(self, msg, emails, priority=None):
@@ -334,7 +333,7 @@ class email_parser(object):
             'description':body, 
         }
         self.rpc(self.model, 'write', [id], data)
-        self.rpc(self.model, 'history', [id], 'Send', True, msg['From'], message['body'])
+        self.rpc(self.model, 'history', [id], 'send', False, msg['From'], message['body'])
         return id
 
     def msg_test(self, msg, case_str):
diff --git a/addons/crm/wizard/__init__.py b/addons/crm/wizard/__init__.py
index 62be2041d98..b477600af07 100644
--- a/addons/crm/wizard/__init__.py
+++ b/addons/crm/wizard/__init__.py
@@ -19,14 +19,23 @@
 #
 ##############################################################################
 
-import crm_opportunity_wizard
-import crm_lead_wizard
 import crm_phonecall_wizard
 
 import wizard_crm_send_email
 import wizard_crm_new_send_email
 import wizard_history_event
 
+import crm_lead_to_partner
+import crm_lead_to_opportunity
+
+import crm_opportunity_to_meeting
+import crm_opportunity_to_phonecall
+
+import crm_phonecall2phonecall
+import phonecall2partner
+import phonecall2meeting
+import phonecall_to_opportunity
+
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
new file mode 100644
index 00000000000..3604c025d0a
--- /dev/null
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -0,0 +1,144 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv, fields
+from tools.translate import _
+
+class crm_lead2opportunity(osv.osv_memory):
+    _name = 'crm.lead2opportunity'
+    _description = 'Lead To Opportunity'
+
+    def action_cancel(self, cr, uid, ids, context=None):
+        """
+        Closes Lead To Opportunity form
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Lead to Partner's IDs
+        @param context: A standard dictionary for contextual values
+
+        """
+        return {'type': 'ir.actions.act_window_close'}
+
+    def action_apply(self, cr, uid, ids, context=None):
+        """
+        This converts lead to opportunity and opens Opportunity view
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Lead to Opportunity IDs
+        @param context: A standard dictionary for contextual values
+
+        @return : Dictionary value for created Opportunity form
+        """
+        value = {}
+        record_ids = context and context.get('active_ids', []) or []
+        if record_ids:
+            lead_obj = self.pool.get('crm.lead')
+            opp_obj = self. pool.get('crm.opportunity')
+            data_obj = self.pool.get('ir.model.data')
+
+            result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_opportunities_filter')
+            res = data_obj.read(cr, uid, result, ['res_id'])
+            id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_oppor')
+            id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_oppor')
+            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
+
+        for this in self.browse(cr, uid, ids, context=context):
+            for case in lead_obj.browse(cr, uid, record_ids, context=context):
+                new_opportunity_id = opp_obj.create(cr, uid, {
+                        'name': this.name, 
+                        'planned_revenue': this.planned_revenue, 
+                        'probability': this.probability, 
+                        'partner_id': case.partner_id and case.partner_id.id or False , 
+                        'section_id': case.section_id and case.section_id.id or False, 
+                        'description': case.description or False, 
+                        'date_deadline': case.date_deadline or False, 
+                        'partner_address_id': case.partner_address_id and \
+                                        case.partner_address_id.id or False , 
+                        'priority': case.priority, 
+                        'phone': case.phone, 
+                        'email_from': case.email_from
+                    })
+
+                new_opportunity = opp_obj.browse(cr, uid, new_opportunity_id)
+                vals = {
+                        'partner_id': this.partner_id and this.partner_id.id or False, 
+                        }
+                if not case.opportunity_id:
+                        vals.update({'opportunity_id' : new_opportunity.id})
+
+                lead_obj.write(cr, uid, [case.id], vals)
+                lead_obj.case_close(cr, uid, [case.id])
+                opp_obj.case_open(cr, uid, [new_opportunity_id])
+
+            value = {
+                    'name': _('Opportunity'), 
+                    'view_type': 'form', 
+                    'view_mode': 'form,tree', 
+                    'res_model': 'crm.opportunity', 
+                    'res_id': int(new_opportunity_id), 
+                    'view_id': False, 
+                    'views': [(id2, 'form'), (id3, 'tree'), (False, 'calendar'), (False, 'graph')], 
+                    'type': 'ir.actions.act_window', 
+                    'search_view_id': res['res_id']
+                    }
+        return value
+
+    _columns = {
+        'name' : fields.char('Opportunity Summary', size=64, required=True, select=1), 
+        'probability': fields.float('Success Probability'), 
+        'planned_revenue': fields.float('Expected Revenue'), 
+        'partner_id': fields.many2one('res.partner', 'Partner'), 
+    }
+
+    def default_get(self, cr, uid, fields, context=None):
+        """
+        This function gets default values
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param fields: List of fields for default value
+        @param context: A standard dictionary for contextual values
+
+        @return : default values of fields.
+        """
+        lead_obj = self.pool.get('crm.lead')
+        res = super(crm_lead2opportunity, self).default_get(cr, uid, fields, context=context)
+
+        for lead in lead_obj.browse(cr, uid, context.get('active_ids', [])):
+            if lead.state in ['done', 'cancel']:
+                raise osv.except_osv(_("Warning !"), _("Closed/Cancelled \
+Leads Could not convert into Opportunity"))
+            if lead.state != 'open':
+                raise osv.except_osv(_('Warning !'), _('Lead should be in \
+\'Open\' state before converting to Opportunity.'))
+
+            res['name'] = lead.partner_name
+            res['partner_id'] = lead.partner_id and lead.partner_id.id or False
+        return res
+
+crm_lead2opportunity()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/wizard/crm_lead_to_opportunity_view.xml b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
new file mode 100644
index 00000000000..ac559c070a9
--- /dev/null
+++ b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
@@ -0,0 +1,37 @@
+<openerp>
+  	<data>
+		
+		<!-- Lead to Opportunity view -->
+
+  		<record id="view_crm_lead2opportunity_create" model="ir.ui.view">
+	      <field name="name">crm.lead2opportunity.create</field>
+	      <field name="model">crm.lead2opportunity</field>
+	      <field name="type">form</field>
+	      <field name="arch" type="xml">
+	      	<form string="Convert To Opportunity">
+		        <field name="name"/>
+		        <field name="partner_id"/>
+		        <newline/>
+		        <field name="planned_revenue"/>
+		        <field name="probability"/>
+		        <group col="4" colspan="4">
+	      			<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+	      			<button name="action_apply" string="Create Opportunity" type="object" icon="gtk-ok"/>
+	      		</group>
+		    </form>
+	      </field>
+	   </record>
+	   
+	   <!-- Lead to Opportunity action -->
+	   
+	   <record id="action_crm_lead2opportunity" model="ir.actions.act_window">
+	      <field name="name">Create Opportunity</field>
+	      <field name="type">ir.actions.act_window</field>
+	      <field name="res_model">crm.lead2opportunity</field>
+	      <field name="view_type">form</field>
+	      <field name="view_mode">form</field>
+	      <field name="target">new</field>
+	   </record>
+
+ 	</data>
+</openerp>
diff --git a/addons/crm/wizard/crm_lead_to_partner.py b/addons/crm/wizard/crm_lead_to_partner.py
new file mode 100644
index 00000000000..ec59e483bc9
--- /dev/null
+++ b/addons/crm/wizard/crm_lead_to_partner.py
@@ -0,0 +1,201 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv, fields
+from tools.translate import _
+
+class crm_lead2partner(osv.osv_memory):
+    """ Converts lead to partner """
+
+    _name = 'crm.lead2partner'
+    _description = 'Lead to Partner'
+
+    _columns = {
+        'action': fields.selection([('exist', 'Link to an existing partner'), \
+                                    ('create', 'Create a new partner')], \
+                                    'Action', required=True), 
+        'partner_id': fields.many2one('res.partner', 'Partner')
+        }
+
+    def _select_partner(self, cr, uid, context=None):
+        """
+        This function Searches for Partner from selected lead.
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param fields: List of fields for default value 
+        @param context: A standard dictionary for contextual values 
+
+        @return : Partner id if any for selected lead.
+        """
+        if not context:
+            context = {}
+
+        lead_obj = self.pool.get('crm.lead')
+        partner_obj = self.pool.get('res.partner')
+        contact_obj = self.pool.get('res.partner.address')
+        rec_ids = context and context.get('active_ids', [])
+        value={}
+        for lead in lead_obj.browse(cr, uid, rec_ids, context=context):
+            if lead.partner_id:
+                 raise osv.except_osv(_('Warning !'), 
+                    _('A partner is already defined on this lead.'))
+
+            partner_ids = partner_obj.search(cr, uid, [('name', '=', lead.partner_name or lead.name)])
+            if not partner_ids and lead.email_from:
+                address_ids = contact_obj.search(cr, uid, [('email', '=', lead.email_from)])
+                if address_ids:
+                    addresses = contact_obj.browse(cr, uid, address_ids)
+                    partner_ids = addresses and [addresses[0].partner_id.id] or False
+
+            partner_id = partner_ids and partner_ids[0] or False
+        return partner_id
+
+    _defaults = {
+        'action': lambda *a:'exist', 
+        'partner_id': _select_partner
+        }
+
+    def open_create_partner(self, cr, uid, ids, context=None):
+        """
+        This function Opens form of create partner.
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Lead to Partner's IDs
+        @param context: A standard dictionary for contextual values
+
+        @return : Dictionary value for next form.
+        """
+        if not context:
+            context = {}
+
+        view_obj = self.pool.get('ir.ui.view')
+        view_id = view_obj.search(cr, uid, [('model', '=', 'crm.lead2partner'), \
+                                     ('name', '=', 'crm.lead2partner.view')])
+        return {
+            'view_mode': 'form', 
+            'view_type': 'form', 
+            'view_id': view_id or False, 
+            'res_model': 'crm.lead2partner', 
+            'context': context, 
+            'type': 'ir.actions.act_window', 
+            'target': 'new', 
+            }
+
+
+    def _create_partner(self, cr, uid, ids, context=None):
+        """
+        This function Creates partner based on action.
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Lead to Partner's IDs
+        @param context: A standard dictionary for contextual values
+
+        @return : Dictionary {}.
+        """
+        if not context:
+            context = {}
+
+        lead_obj = self.pool.get('crm.lead')
+        partner_obj = self.pool.get('res.partner')
+        contact_obj = self.pool.get('res.partner.address')
+        partner_ids = []
+        partner_id = False
+        contact_id = False
+        rec_ids = context and context.get('active_ids', [])
+        
+        for data in self.browse(cr, uid, ids):
+            for lead in lead_obj.browse(cr, uid, rec_ids):
+                if data.action == 'create':
+                    partner_id = partner_obj.create(cr, uid, {
+                        'name': lead.partner_name or lead.name, 
+                        'user_id': lead.user_id.id, 
+                        'comment': lead.description, 
+                    })
+                    contact_id = contact_obj.create(cr, uid, {
+                        'partner_id': partner_id, 
+                        'name': lead.name, 
+                        'phone': lead.phone, 
+                        'mobile': lead.mobile, 
+                        'email': lead.email_from, 
+                        'fax': lead.fax, 
+                        'title': lead.title, 
+                        'function': lead.function and lead.function.id or False, 
+                        'street': lead.street, 
+                        'street2': lead.street2, 
+                        'zip': lead.zip, 
+                        'city': lead.city, 
+                        'country_id': lead.country_id and lead.country_id.id or False, 
+                        'state_id': lead.state_id and lead.state_id.id or False, 
+                    })
+    
+                else:
+                    if data.partner_id:
+                        partner_id = data.partner_id.id
+                        contact_id = partner_obj.address_get(cr, uid, [partner_id])['default']
+
+                partner_ids.append(partner_id)
+
+                vals = {}
+                if partner_id:
+                    vals.update({'partner_id': partner_id})
+                if contact_id:
+                    vals.update({'partner_address_id': contact_id})
+                lead_obj.write(cr, uid, [lead.id], vals)
+        return partner_ids
+
+    def make_partner(self, cr, uid, ids, context=None):
+        """
+        This function Makes partner based on action.
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Lead to Partner's IDs
+        @param context: A standard dictionary for contextual values
+
+        @return : Dictionary value for created Partner form.
+        """
+        if not context:
+            context = {}
+
+        partner_ids = self._create_partner(cr, uid, ids, context)
+        mod_obj = self.pool.get('ir.model.data')
+        result = mod_obj._get_id(cr, uid, 'base', 'view_res_partner_filter')
+        res = mod_obj.read(cr, uid, result, ['res_id'])
+
+        value = {
+            'domain': "[]", 
+            'view_type': 'form', 
+            'view_mode': 'form,tree', 
+            'res_model': 'res.partner', 
+            'res_id': partner_ids and int(partner_ids[0]) or False, 
+            'view_id': False, 
+            'context': context, 
+            'type': 'ir.actions.act_window', 
+            'search_view_id': res['res_id']
+        }
+        return value
+
+crm_lead2partner()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/wizard/crm_lead_to_partner_view.xml b/addons/crm/wizard/crm_lead_to_partner_view.xml
new file mode 100644
index 00000000000..78898dd25da
--- /dev/null
+++ b/addons/crm/wizard/crm_lead_to_partner_view.xml
@@ -0,0 +1,51 @@
+<openerp>
+  	<data>
+
+		<!-- Lead to partner confirmation form -->
+
+  		<record id="view_crm_lead2partner_create" model="ir.ui.view">
+	      <field name="name">crm.lead2partner.view.create</field>
+	      <field name="model">crm.lead2partner</field>
+	      <field name="type">form</field>
+	      <field name="arch" type="xml">
+	      	<form string="Create a Partner?">
+	      		<label string="Are you sure you want to create a partner based on this lead ?" colspan="4"/>
+        		<label string="You may have to verify that this partner does not exist already." colspan="4"/>
+	      		<group col="4" colspan="4">
+	      			<button special="cancel" string="_Cancel" icon="gtk-cancel"/>
+	      			<button name="open_create_partner" string="Create _Partner" type="object" icon="gtk-ok"/>
+	      		</group>
+	      	</form>
+	      </field>
+	   </record>
+
+	   <!-- Lead to Partner form view -->
+
+	   <record id="view_crm_lead2partner" model="ir.ui.view">
+	      <field name="name">crm.lead2partner.view</field>
+	      <field name="model">crm.lead2partner</field>
+	      <field name="type">form</field>
+	      <field name="arch" type="xml">
+	      	<form string="Create a Partner">
+	      		<field name="action"/>
+	      		<group attrs="{'invisible':[('action','!=','exist')]}">
+		            <field name="partner_id" attrs="{'required': [('action', '=', 'exist')]}"/>
+		        </group>
+	      		<group col="4" colspan="4">
+	      			<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+	      			<button name="make_partner" string="Continue" type="object" icon="gtk-ok"/>
+	      		</group>
+	      	</form>
+	      </field>
+	   </record>
+
+	   <!-- Lead to Partner wizard -->
+
+	   <act_window id="action_crm_lead2partner"
+    		key2="client_action_multi" name="Create a Partner"
+    		res_model="crm.lead2partner" src_model="crm.lead"
+    		view_id="view_crm_lead2partner_create"
+    		view_mode="form" target="new" view_type="form" />
+
+ 	</data>
+</openerp>
diff --git a/addons/crm/wizard/crm_lead_wizard.py b/addons/crm/wizard/crm_lead_wizard.py
deleted file mode 100644
index ccbcabbcf28..00000000000
--- a/addons/crm/wizard/crm_lead_wizard.py
+++ /dev/null
@@ -1,297 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-from mx.DateTime import now
-
-import wizard
-import netsvc
-import ir
-import pooler
-from tools.translate import _
-
-class partner_create(wizard.interface):
-
-    case_form = """<?xml version="1.0"?>
-    <form string="Create a Partner">
-        <label string="Are you sure you want to create a partner based on this lead ?" colspan="4"/>
-        <label string="You may have to verify that this partner does not exist already." colspan="4"/>
-        <!--field name="close"/-->
-    </form>"""
-
-    case_fields = {
-        'close': {'type':'boolean', 'string':'Close Lead'}
-    }
-
-    partner_form = """<?xml version="1.0"?>
-    <form string="Create a Partner">
-        <label string="Are you sure you want to create a partner based on this lead ?" colspan="4"/>
-        <label string="You may have to verify that this partner does not exist already." colspan="4"/>
-        <newline />
-        <field name="action"/>
-        <group attrs="{'invisible':[('action','!=','exist')]}">
-            <field name="partner_id"/>
-        </group>
-    </form>"""
-
-    partner_fields = {
-        'action': {'type':'selection',
-                'selection':[('exist','Link to an existing partner'),('create','Create a new partner')],
-                'string':'Action', 'required':True, 'default': lambda *a:'exist'},
-        'partner_id' : {'type':'many2one', 'relation':'res.partner', 'string':'Partner'},
-    }
-    
-    def _selectPartner(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        case_obj = pool.get('crm.lead')
-        partner_obj = pool.get('res.partner')
-        contact_obj = pool.get('res.partner.address')
-        for case in case_obj.browse(cr, uid, data['ids']):
-            if case.partner_id:
-                raise wizard.except_wizard(_('Warning !'),
-                    _('A partner is already defined on this lead.'))
-           
-            partner_ids = partner_obj.search(cr, uid, [('name', '=', case.partner_name or case.name)])            
-            if not partner_ids and case.email_from:
-                address_ids = contact_obj.search(cr, uid, [('email', '=', case.email_from)])
-                if address_ids:
-                    addresses = contact_obj.browse(cr, uid, address_ids)
-                    partner_ids = addresses and [addresses[0].partner_id.id] or False
-
-            partner_id = partner_ids and partner_ids[0] or False
-        vals = {'partner_id': partner_id}
-        if not partner_id:
-            vals['action'] = 'create'            
-        return vals
-
-    def _create_partner(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)        
-        case_obj = pool.get('crm.lead')
-        partner_obj = pool.get('res.partner')
-        contact_obj = pool.get('res.partner.address')
-        partner_ids = []
-        partner_id = False
-        contact_id = False
-        for case in case_obj.browse(cr, uid, data['ids']):
-            if data['form']['action'] == 'create':
-                partner_id = partner_obj.create(cr, uid, {
-                    'name': case.partner_name or case.name,
-                    'user_id': case.user_id.id,
-                    'comment': case.description,
-                })
-                contact_id = contact_obj.create(cr, uid, {
-                    'partner_id': partner_id,
-                    'name': case.name,
-                    'phone': case.phone,
-                    'mobile': case.mobile,
-                    'email': case.email_from,
-                    'fax': case.fax,
-                    'title': case.title,
-                    'function': case.function and case.function.id or False,
-                    'street': case.street,
-                    'street2': case.street2,
-                    'zip': case.zip,
-                    'city': case.city,
-                    'country_id': case.country_id and case.country_id.id or False,
-                    'state_id': case.state_id and case.state_id.id or False,
-                })
-
-            else:
-                if data['form']['partner_id']:
-                    partner = partner_obj.browse(cr,uid,data['form']['partner_id'])
-                    partner_id = partner.id
-                    contact_id = partner.address and partner.address[0].id
-
-            partner_ids.append(partner_id)
-            vals = {}
-            if partner_id:
-                vals.update({'partner_id': partner_id})
-            if contact_id:
-                vals.update({'partner_address_id': contact_id})
-            case_obj.write(cr, uid, [case.id], vals)   
-        return partner_ids
-
-    def _make_partner(self, cr, uid, data, context): 
-        pool = pooler.get_pool(cr.dbname)             
-        partner_ids = self._create_partner(cr, uid, data, context)
-        mod_obj = pool.get('ir.model.data') 
-        result = mod_obj._get_id(cr, uid, 'base', 'view_res_partner_filter')
-        res = mod_obj.read(cr, uid, result, ['res_id'])
-        value = {
-            'domain': "[]",
-            'view_type': 'form',
-            'view_mode': 'form,tree',
-            'res_model': 'res.partner',
-            'res_id': partner_ids and int(partner_ids[0]) or False,
-            'view_id': False,
-            'type': 'ir.actions.act_window',
-            'search_view_id': res['res_id'] 
-        }
-        return value
-
-    states = {
-        'init': {
-            'actions': [_selectPartner],
-            'result': {'type': 'form', 'arch': case_form, 'fields': case_fields,
-                'state' : [('end', 'Cancel', 'gtk-cancel'),('create_partner', 'Create Partner', 'gtk-go-forward')]}
-        },
-        'create_partner': {
-            'actions': [],
-            'result': {'type': 'form', 'arch': partner_form, 'fields': partner_fields,
-                'state' : [('end', 'Cancel', 'gtk-cancel'),('create', 'Continue', 'gtk-go-forward')]}
-        },
-        'create': {
-            'actions': [],
-            'result': {'type': 'action', 'action': _make_partner, 'state': 'end'}
-        }
-    }
-
-partner_create('crm.lead.partner_create')
-
-
-class lead2opportunity(partner_create):
-
-    case_form = """<?xml version="1.0"?>
-    <form string="Convert To Opportunity">
-        <field name="name"/>
-        <field name="partner_id"/>
-        <newline/>
-        <field name="planned_revenue"/>
-        <field name="probability"/>
-    </form>"""
-
-    case_fields = {
-        'name': {'type':'char', 'size':64, 'string':'Opportunity Summary', 'required':True},
-        'planned_revenue': {'type':'float', 'digits':(16,2), 'string': 'Expected Revenue'},
-        'probability': {'type':'float', 'digits':(16,2), 'string': 'Success Probability'},
-        'partner_id' : {'type':'many2one', 'relation':'res.partner', 'string':'Partner'},
-    }
-    
-    def _check_state(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        case_obj = pool.get('crm.lead')
-        for case in case_obj.browse(cr, uid, data['ids']):
-            if case.state != 'open':
-                raise wizard.except_wizard(_('Warning !'),
-                    _('Lead should be in \'Open\' state before converting to Opportunity.'))
-        return {}
-
-    def _selectopportunity(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        case_obj = pool.get('crm.lead')
-        case = case_obj.browse(cr, uid, data['id'])
-        return {'name': case.name, 'partner_id':case.partner_id and case.partner_id.id or False}
-
-    def _selectChoice(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        case_obj = pool.get('crm.lead')
-        for case in case_obj.browse(cr, uid, data['ids']):
-            if not case.partner_id:
-                return 'create_partner'
-        return 'opportunity'
-
-    def _makeOrder(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        data_obj = pool.get('ir.model.data')
-        result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_opportunities_filter')
-        res = data_obj.read(cr, uid, result, ['res_id'])
-        
-
-        id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_oppor')
-        id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_oppor')
-        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
-
-        lead_case_obj = pool.get('crm.lead')
-        opportunity_case_obj = pool.get('crm.opportunity')        
-        for lead in lead_case_obj.browse(cr, uid, data['ids']):
-            new_opportunity_id = opportunity_case_obj.create(cr, uid, {            
-                'name': data['form']['name'],
-                'planned_revenue': data['form']['planned_revenue'],
-                'probability': data['form']['probability'],
-                'partner_id': data['form']['partner_id'],
-                'section_id':lead.section_id.id,
-                'description':lead.description,
-                'date_deadline': lead.date_deadline,
-                'partner_address_id':lead.partner_address_id.id, 
-                'priority': lead.priority,
-                'phone': lead.phone,                
-                'email_from': lead.email_from
-            })       
-            
-            new_opportunity = opportunity_case_obj.browse(cr, uid, new_opportunity_id)
-            
-            vals = {
-                'partner_id': data['form']['partner_id'],                
-                }
-            if not lead.opportunity_id:
-                vals.update({'opportunity_id' : new_opportunity.id})
-
-            lead_case_obj.write(cr, uid, [lead.id], vals)
-            lead_case_obj.case_close(cr, uid, [lead.id])
-            opportunity_case_obj.case_open(cr, uid, [new_opportunity_id])
-        
-        value = {            
-            'name': _('Opportunity'),
-            'view_type': 'form',
-            'view_mode': 'form,tree',
-            'res_model': 'crm.opportunity',
-            'res_id': int(new_opportunity_id),
-            'view_id': False,
-            'views': [(id2,'form'),(id3,'tree'),(False,'calendar'),(False,'graph')],
-            'type': 'ir.actions.act_window',
-            'search_view_id': res['res_id'] 
-        }
-        return value
-
-    def _makePartner(self, cr, uid, data, context):
-        partner_ids = self._create_partner(cr, uid, data, context)
-        return {}
-
-    states = {
-        'init': {
-            'actions': [_check_state],
-            'result': {'type':'choice','next_state':_selectChoice}
-        },
-        'create_partner': {
-            'actions': [partner_create._selectPartner],
-            'result': {'type': 'form', 'arch': partner_create.partner_form, 'fields': partner_create.partner_fields,
-                'state' : [('end', 'Cancel', 'gtk-cancel'),('opportunity', 'Skip', 'gtk-goto-last'), ('create', 'Continue', 'gtk-go-forward')]}
-        },
-        'create': {
-            'actions': [],
-            'result': {'type': 'action', 'action': _makePartner, 'state':'opportunity' }
-        },
-        'opportunity': {
-            'actions': [_selectopportunity],
-            'result': {'type': 'form', 'arch': case_form, 'fields': case_fields,
-                'state' : [('end', 'Cancel', 'gtk-cancel'),('confirm', 'Create Opportunity', 'gtk-go-forward')]}
-        },
-        'confirm': {
-            'actions': [],
-            'result': {'type': 'action', 'action': _makeOrder, 'state': 'end'}
-        }
-    }
-
-lead2opportunity('crm.lead.opportunity_set')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/wizard/crm_opportunity_to_meeting.py b/addons/crm/wizard/crm_opportunity_to_meeting.py
new file mode 100644
index 00000000000..23b8b135833
--- /dev/null
+++ b/addons/crm/wizard/crm_opportunity_to_meeting.py
@@ -0,0 +1,98 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv
+from tools.translate import _
+
+class crm_opportunity2meeting(osv.osv_memory):
+    _name = 'crm.opportunity2meeting'
+    _description = 'Opportunity To Meeting'
+
+    def action_cancel(self, cr, uid, ids, context=None):
+        """
+        Closes Opportunity to Meeting form
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Opportunity to Meeting IDs
+        @param context: A standard dictionary for contextual values
+
+        """
+        return {'type': 'ir.actions.act_window_close'}
+
+    def action_makeMeeting(self, cr, uid, ids, context=None):
+        """
+        This opens Meeting's calendar view to schedule meeting on current Opportunity
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Opportunity to Meeting IDs
+        @param context: A standard dictionary for contextual values
+
+        @return : Dictionary value for created Meeting view
+        """
+        value = {}
+        record_ids = context and context.get('active_ids', []) or []
+        if record_ids:
+            opp_obj = self.pool.get('crm.opportunity')
+            data_obj = self.pool.get('ir.model.data')
+
+            result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_meetings_filter')
+            res = 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
+
+        for this in self.browse(cr, uid, ids, context=context):
+            for opp in opp_obj.browse(cr, uid, record_ids, context=context):
+                context = {
+                            'default_opportunity_id': opp.id, 
+                            'default_partner_id': opp.partner_id and opp.partner_id.id or False, 
+                            'default_section_id': opp.section_id and opp.section_id.id or False, 
+                            'default_email_from': opp.email_from, 
+                            'default_state': 'open', 
+                            'default_name': opp.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', 
+                    'search_view_id': res['res_id']
+                    }
+
+        return value
+
+crm_opportunity2meeting()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/wizard/crm_opportunity_to_meeting_view.xml b/addons/crm/wizard/crm_opportunity_to_meeting_view.xml
new file mode 100644
index 00000000000..99229aa738d
--- /dev/null
+++ b/addons/crm/wizard/crm_opportunity_to_meeting_view.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+	    <!-- Opportunity to meeting view -->
+
+        <record model="ir.ui.view" id="opportunity2meeting_view">
+            <field name="name">crm.opportunity2meeting.form</field>
+            <field name="model">crm.opportunity2meeting</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Convert To Meeting">
+                	<label string="Are you sure to schedule a meeting for this Opportunity?" colspan="4"/>
+                	<newline/>
+                	<separator colspan="4" string=""/>
+                	<button name="action_cancel" string="_Cancel"
+                		icon="gtk-cancel" special="cancel" />
+                	<button name="action_makeMeeting" type="object"
+                		string="_Schedule" icon="gtk-go-forward" />
+                </form>
+            </field>
+        </record>
+		
+		<!-- Opportunity to meeting action -->
+
+        <record model="ir.actions.act_window" id="opportunity2meeting_act">
+            <field name="name">Convert To Meeting</field>
+            <field name="res_model">crm.opportunity2meeting</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="opportunity2meeting_view"/>
+            <field name="target">new</field>
+         	<field name="context">{'record_id' : active_id}</field>
+        </record>
+
+    </data>
+</openerp>   
\ No newline at end of file
diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall.py b/addons/crm/wizard/crm_opportunity_to_phonecall.py
new file mode 100644
index 00000000000..359ae594320
--- /dev/null
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall.py
@@ -0,0 +1,131 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv, fields
+from tools.translate import _
+
+class crm_opportunity2phonecall(osv.osv_memory):
+    _name = 'crm.opportunity2phonecall'
+    _description = 'Opportunity to Phonecall'
+
+    _columns = {
+        'name' : fields.char('Call summary', size=64, required=True, select=1), 
+        'user_id' : fields.many2one('res.users', "Assign To"), 
+        'date': fields.datetime('Date' , required=True), 
+        'section_id': fields.many2one('crm.case.section', 'Sales Team'), 
+    }
+
+    def default_get(self, cr, uid, fields, context=None):
+        """
+        This function gets default values
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param fields: List of fields for default value
+        @param context: A standard dictionary for contextual values
+
+        @return : default values of fields.
+        """
+
+        opp_obj = self.pool.get('crm.opportunity')
+        record_ids = context and context.get('active_ids', []) or []
+        res = {}
+        for opp in opp_obj.browse(cr, uid, record_ids, context=context):
+            res['name'] = opp.name
+            res['user_id'] = opp.user_id and opp.user_id.id or False
+            res['section_id'] = opp.section_id and opp.section_id.id or False
+        return res
+
+    def action_cancel(self, cr, uid, ids, context=None):
+        """
+        Closes Opportunity to Phonecall form
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Opportunity to Phonecall's IDs
+        @param context: A standard dictionary for contextual values
+        """
+        return {'type': 'ir.actions.act_window_close'}
+
+    def action_apply(self, cr, uid, ids, context=None):
+        """
+        This converts Opportunity to Phonecall and opens Phonecall view
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Opportunity to Phonecall IDs
+        @param context: A standard dictionary for contextual values
+
+        @return : Dictionary value for created Opportunity form
+        """
+        value = {}
+        record_ids = context and context.get('active_ids', []) or []
+
+        phonecall_obj = self.pool.get('crm.phonecall')
+        opp_obj = self.pool.get('crm.opportunity')
+        mod_obj = self.pool.get('ir.model.data')
+        result = mod_obj._get_id(cr, uid, 'crm', 'view_crm_case_phonecalls_filter')
+        res = mod_obj.read(cr, uid, result, ['res_id'])
+
+        # Select the view
+        data_obj = self.pool.get('ir.model.data')
+        id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_phone_tree_view')
+        id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_phone_form_view')
+        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
+
+        for this in self.browse(cr, uid, ids, context=context):
+            for opp in opp_obj.browse(cr, uid, record_ids, context=context):
+                new_case = phonecall_obj.create(cr, uid, {
+                        'name' : opp.name, 
+                        'case_id' : opp.id , 
+                        'user_id' : this.user_id and this.user_id.id or False, 
+                        'categ_id' : opp.categ_id and opp.categ_id.id or False, 
+                        'description' : opp.description or False, 
+                        'date' : this.date, 
+                        'section_id' : opp.section_id and opp.section_id.id or False, 
+                        'partner_id': opp.partner_id and opp.partner_id.id or False, 
+                        'partner_address_id': opp.partner_address_id and opp.partner_address_id.id or False, 
+                        'partner_phone' : opp.phone or (opp.partner_address_id and opp.partner_address_id.phone or False), 
+                        'partner_mobile' : opp.partner_address_id and opp.partner_address_id.mobile or False, 
+                        'priority': opp.priority, 
+                        'opp_id': opp.id
+                }, context=context)
+
+                phonecall_obj.case_open(cr, uid, [new_case])
+
+            value = {
+                'name': _('Phone Call'), 
+                'view_type': 'form', 
+                'view_mode': 'tree,form', 
+                'res_model': 'crm.phonecall', 
+                'res_id' : new_case, 
+                'views': [(id3, 'form'), (id2, 'tree'), (False, 'calendar'), (False, 'graph')], 
+                'type': 'ir.actions.act_window', 
+                'search_view_id': res['res_id']
+            }
+        return value
+
+crm_opportunity2phonecall()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
new file mode 100644
index 00000000000..ae07471e07c
--- /dev/null
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+    	
+    	<!-- Opportunity to Phonecall view -->
+    	
+        <record model="ir.ui.view" id="opportunity2phonecall_view">
+            <field name="name">crm.opportunity2phonecall.form</field>
+            <field name="model">crm.opportunity2phonecall</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Schedule Other Call">
+					<group colspan="2" >
+                		<field name="name"/>
+                		<field name="date" string="Planned Date"/>
+                		<newline/>
+						<field name="user_id" />
+						<field name="section_id"/>
+						<label string ="" colspan="2"/>
+						<button name="action_cancel" string="_Cancel"
+							icon="gtk-cancel" special="cancel" />
+						<button name="action_apply" type="object"
+							string="_Schedule Call" icon="gtk-ok" />
+					</group>
+                </form>
+            </field>
+        </record>
+		
+		<!-- Opportunity to Phonecall action -->
+		
+ 		<record model="ir.actions.act_window" id="opportunity2phonecall_act">
+            <field name="name">Schedule Call</field>
+            <field name="res_model">crm.opportunity2phonecall</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="opportunity2phonecall_view"/>
+            <field name="target">new</field>
+         	<field name="context">{'record_id' : active_id}</field>
+        </record>
+        
+    </data>
+</openerp>   
\ No newline at end of file
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']
             }
diff --git a/addons/crm/wizard/crm_phonecall2phonecall.py b/addons/crm/wizard/crm_phonecall2phonecall.py
new file mode 100644
index 00000000000..557b5da71f5
--- /dev/null
+++ b/addons/crm/wizard/crm_phonecall2phonecall.py
@@ -0,0 +1,88 @@
+# -*- encoding: utf-8 -*-
+############################################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    Copyright (C) 2008-2009 AJM Technologies S.A. (<http://www.ajm.lu). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+############################################################################################
+############################################################################################
+
+from osv import osv, fields
+import netsvc
+import time
+import tools
+import mx.DateTime
+from tools import config
+from tools.translate import _
+import tools
+
+class crm_phonecall2phonecall(osv.osv_memory):
+    _name = 'crm.phonecall2phonecall'
+    _description = 'Phonecall To Phonecall'
+
+    def action_cancel(self, cr, uid, ids, context=None):
+        return {'type':'ir.actions.act_window_close'}
+
+    def action_apply(self, cr, uid, ids, context=None):
+        this = self.browse(cr, uid, ids)[0]
+        values={}
+        record_id = context and context.get('record_id', False) or False
+        if record_id:
+            for case in self.pool.get('crm.phonecall').browse(cr, uid, [record_id], context=context):
+                values['name']=this.name
+                values['user_id']=this.user_id and this.user_id.id
+                values['categ_id']=case.categ_id and case.categ_id.id or False
+                values['section_id']=case.section_id and case.section_id.id
+                values['description']=case.description or ''
+                values['partner_id']=case.partner_id.id
+                values['partner_address_id']=case.partner_address_id.id
+                values['partner_mobile']=case.partner_mobile or False
+                values['priority']=case.priority
+                values['partner_phone']=case.partner_phone or False
+                values['date']=this.date
+                phonecall_proxy = self.pool.get('crm.phonecall')
+                phonecall_id = phonecall_proxy.create(cr, uid, values, context=context)
+            value = {            
+                'name': _('Phone Call'),
+                'view_type': 'form',
+                'view_mode': 'form',
+                'res_model': 'crm.phonecall',
+                'view_id': False,
+                'type': 'ir.actions.act_window',
+                'res_id': phonecall_id
+                }
+        return value
+
+    _columns = {
+        'name' : fields.char('Call summary', size=64, required=True, select=1),
+        'user_id' : fields.many2one('res.users',"Assign To"),
+        'date': fields.datetime('Date'),
+        'section_id':fields.many2one('crm.case.section','Sales Team'),
+
+    }
+    def default_get(self, cr, uid, fields, context=None):
+        record_id = context and context.get('record_id', False) or False
+        res = super(crm_phonecall2phonecall, self).default_get(cr, uid, fields, context=context)
+        if record_id:
+            phonecall_id = self.pool.get('crm.phonecall').browse(cr, uid, record_id, context=context)
+            res['name']=phonecall_id.name
+            res['user_id']=phonecall_id.user_id and phonecall_id.user_id.id or False
+            res['date']=phonecall_id.date 
+            res['section_id']=phonecall_id.section_id and phonecall_id.section_id.id or False 
+        return res
+crm_phonecall2phonecall()
\ No newline at end of file
diff --git a/addons/crm/wizard/crm_phonecall2phonecall.xml b/addons/crm/wizard/crm_phonecall2phonecall.xml
new file mode 100644
index 00000000000..b4911e48b15
--- /dev/null
+++ b/addons/crm/wizard/crm_phonecall2phonecall.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="phonecall_to_phonecall_view">
+            <field name="name">crm.phonecall2phonecall.form</field>
+            <field name="model">crm.phonecall2phonecall</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Schedule Other Call" col="2">
+                		<field name="name"/>
+						<field name="user_id" />
+						<field name="date" string="Planned Date"/>
+						<field name="section_id"/>
+                    <group colspan="2" col="2" >
+                        <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
+                        <button name="action_apply" type="object" string="_Apply" icon="gtk-apply" />
+                    </group>
+                </form>
+            </field>
+        </record>
+        <record model="ir.actions.act_window" id="phonecall_to_phonecall_act">
+            <field name="name">Schedule Other Call</field>
+            <field name="res_model">crm.phonecall2phonecall</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="phonecall_to_phonecall_view"/>
+            <field name="target">new</field>
+         	<field name="context">{'record_id' : active_id}</field>
+        </record>
+    </data>
+</openerp>   
\ No newline at end of file
diff --git a/addons/crm/wizard/crm_phonecall_wizard.py b/addons/crm/wizard/crm_phonecall_wizard.py
index 6ac2f30b994..9fcec41936e 100644
--- a/addons/crm/wizard/crm_phonecall_wizard.py
+++ b/addons/crm/wizard/crm_phonecall_wizard.py
@@ -78,15 +78,15 @@ class partner_create(wizard.interface):
         for case in case_obj.browse(cr, uid, data['ids']):
             if data['form']['action'] == 'create':
                 partner_id = partner_obj.create(cr, uid, {
-                    'name': case.partner_name or case.name,
+                    'name': case.partner_contact or case.name,
                     'user_id': case.user_id.id,
                     'comment': case.description,
                 })
                 contact_id = contact_obj.create(cr, uid, {
                     'partner_id': partner_id,
                     'name': case.name,
-                    'phone': case.phone,
-                    'mobile': case.mobile,
+                    'phone': case.partner_phone,
+                    'mobile': case.partner_mobile,
                     'email': case.email_from
                 })
 
diff --git a/addons/crm/wizard/phonecall2meeting.py b/addons/crm/wizard/phonecall2meeting.py
new file mode 100644
index 00000000000..89c0537aadd
--- /dev/null
+++ b/addons/crm/wizard/phonecall2meeting.py
@@ -0,0 +1,75 @@
+# -*- encoding: utf-8 -*-
+############################################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    Copyright (C) 2008-2009 AJM Technologies S.A. (<http://www.ajm.lu). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+############################################################################################
+############################################################################################
+
+from osv import osv, fields
+import netsvc
+import time
+import tools
+import mx.DateTime
+from tools import config
+from tools.translate import _
+import tools
+
+class crm_phonecall2meeting(osv.osv_memory):
+    _name = 'crm.phonecall2meeting'
+    _description = 'Phonecall To Meeting'
+
+    def action_cancel(self, cr, uid, ids, context=None):
+        return {'type':'ir.actions.act_window_close'}
+
+    def action_makeMeeting(self, cr, uid, ids, context=None):
+        this = self.browse(cr, uid, ids[0], context=context)
+        record_id = context and context.get('record_id', False) or False
+        if record_id:
+            phonecall_case_obj = self.pool.get('crm.phonecall')                   
+            data_obj = self.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, record_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']
+            }
+crm_phonecall2meeting()
\ No newline at end of file
diff --git a/addons/crm/wizard/phonecall2meeting.xml b/addons/crm/wizard/phonecall2meeting.xml
new file mode 100644
index 00000000000..fe90bbe5cd6
--- /dev/null
+++ b/addons/crm/wizard/phonecall2meeting.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="phonecall2phonecall2meeting_view">
+            <field name="name">crm.phonecall2meeting.form</field>
+            <field name="model">crm.phonecall2meeting</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Convert To Meeting ">
+                        <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
+                        <button name="action_makeMeeting" type="object" string="_Apply" icon="gtk-apply" />
+                </form>
+            </field>
+        </record>
+        <record model="ir.actions.act_window" id="phonecall2meeting_act">
+            <field name="name">Convert To Meeting</field>
+            <field name="res_model">crm.phonecall2meeting</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="phonecall2phonecall2meeting_view"/>
+            <field name="target">new</field>
+         	<field name="context">{'record_id' : active_id}</field>
+        </record>
+    </data>
+</openerp>   
\ No newline at end of file
diff --git a/addons/crm/wizard/phonecall2opportunity.xml b/addons/crm/wizard/phonecall2opportunity.xml
new file mode 100644
index 00000000000..607db601433
--- /dev/null
+++ b/addons/crm/wizard/phonecall2opportunity.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="phonecall2opportunity_view">
+            <field name="name">crm.phonecall2opportunity.form</field>
+            <field name="model">crm.phonecall2opportunity</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Convert To Opportunity " col="2">
+                		<field name="name"/>
+						<field name="partner_id" />
+						<newline/>
+						<field name="planned_revenue"/>
+						<field name="probability"/>
+                    <group colspan="2" col="2" >
+                        <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
+                        <button name="action_apply" type="object" string="_Apply" icon="gtk-apply" />
+                    </group>
+                </form>
+            </field>
+        </record>
+        <record model="ir.actions.act_window" id="phonecall2opportunity_act">
+            <field name="name">Convert To Opportunity</field>
+            <field name="res_model">crm.phonecall2opportunity</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="phonecall2opportunity_view"/>
+            <field name="target">new</field>
+         	<field name="context">{'record_id' : active_id}</field>
+        </record>
+    </data>
+</openerp>   
\ No newline at end of file
diff --git a/addons/crm/wizard/phonecall2partner.py b/addons/crm/wizard/phonecall2partner.py
new file mode 100644
index 00000000000..295a46f57a4
--- /dev/null
+++ b/addons/crm/wizard/phonecall2partner.py
@@ -0,0 +1,134 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+from mx.DateTime import now
+
+from osv import osv, fields
+import netsvc
+import ir
+import pooler
+from tools.translate import _
+
+class crm_phonecall2partner(osv.osv_memory):
+    _name = 'crm.phonecall2partner'
+    _description = 'Phone Call to Partner'
+    
+    _columns = {
+        'action': fields.selection([('exist','Link to an existing partner'),('create','Create a new partner')],'Action',required=True),
+        'partner_id': fields.many2one('res.partner','Partner'), 
+    }
+    _defaults = {
+        'action': lambda *a:'exist',
+    }
+    
+    def create_partner(self, cr, uid, ids, context):
+        view_obj = self.pool.get('ir.ui.view')
+        view_id = view_obj.search(cr,uid,[('model','=','crm.phonecall2partner'),('name','=','crm.phonecall2partner.view')])
+        return {
+            'view_mode': 'form',
+            'view_type': 'form',
+            'view_id': view_id or False,
+            'res_model': 'crm.phonecall2partner',
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+        }
+        
+    def selectPartner(self, cr, uid, ids, context):
+        case_obj = self.pool.get('crm.phonecall')
+        partner_obj = self.pool.get('res.partner')
+        contact_obj = self.pool.get('res.partner.address')
+        rec_ids = context and context.get('record_ids',False)
+        value={}
+        for case in case_obj.browse(cr, uid, rec_ids):
+            if case.partner_id:
+                raise osv.except_osv(_('Warning !'),
+                    _('A partner is already defined on this lead.'))
+           
+            partner_ids = partner_obj.search(cr, uid, [('name', '=', case.partner_contact or case.name)])            
+            if not partner_ids and case.email_from:
+                address_ids = contact_obj.search(cr, uid, [('email', '=', case.email_from)])
+                if address_ids:
+                    addresses = contact_obj.browse(cr, uid, address_ids)
+                    partner_ids = addresses and [addresses[0].partner_id.id] or False
+
+            partner_id = partner_ids and partner_ids[0] or False
+        if not partner_id:
+            value = self._make_partner(cr, uid, ids, context)           
+        return value 
+
+    def _create_partner(self, cr, uid, ids, context):
+        case_obj = self.pool.get('crm.phonecall')
+        partner_obj = self.pool.get('res.partner')
+        contact_obj = self.pool.get('res.partner.address')
+        datas = self.browse(cr, uid, ids)[0]
+        partner_ids = []
+        partner_id = False
+        contact_id = False
+        rec_ids = context and context.get('record_ids',False)
+        for case in case_obj.browse(cr, uid, rec_ids):
+            if datas.action == 'create':
+                partner_id = partner_obj.create(cr, uid, {
+                    'name': case.partner_contact or case.name,
+                    'user_id': case.user_id.id,
+                    'comment': case.description,
+                })
+                contact_id = contact_obj.create(cr, uid, {
+                    'partner_id': partner_id,
+                    'name': case.name,
+                    'phone': case.partner_phone,
+                    'mobile': case.partner_mobile,
+                    'email': case.email_from
+                })
+
+            else:
+                if datas.partner_id:
+                    partner = partner_obj.browse(cr,uid,datas.partner_id.id)
+                    partner_id = partner.id
+                    contact_id = partner.address and partner.address[0].id
+
+            partner_ids.append(partner_id)
+            vals = {}
+            if partner_id:
+                vals.update({'partner_id': partner_id})
+            if contact_id:
+                vals.update({'partner_address_id': contact_id})
+            case_obj.write(cr, uid, [case.id], vals)   
+        return partner_ids
+
+    def _make_partner(self, cr, uid, ids, context): 
+        partner_ids = self._create_partner(cr, uid, ids, context)
+        mod_obj = self.pool.get('ir.model.data') 
+        result = mod_obj._get_id(cr, uid, 'base', 'view_res_partner_filter')
+        res = mod_obj.read(cr, uid, result, ['res_id'])
+        value = {
+            'domain': "[]",
+            'view_type': 'form',
+            'view_mode': 'form,tree',
+            'res_model': 'res.partner',
+            'res_id': partner_ids and int(partner_ids[0]) or False,
+            'view_id': False,
+            'type': 'ir.actions.act_window',
+            'search_view_id': res['res_id'] 
+        }
+        return value
+    
+crm_phonecall2partner()
+
diff --git a/addons/crm/wizard/phonecall2partner_view.xml b/addons/crm/wizard/phonecall2partner_view.xml
new file mode 100644
index 00000000000..cad1e421406
--- /dev/null
+++ b/addons/crm/wizard/phonecall2partner_view.xml
@@ -0,0 +1,67 @@
+<openerp>
+  	<data>
+  		<record id="view_crm_phonecall2partner_create" model="ir.ui.view">
+	      <field name="name">crm.phonecall2partner.view.create</field>
+	      <field name="model">crm.phonecall2partner</field>
+	      <field name="type">form</field>
+	      <field name="arch" type="xml">
+	      	<form string="Create a Partner">
+	      		<label string="Are you sure you want to create a partner based on this lead ?" colspan="4"/>
+        		<label string="You may have to verify that this partner does not exist already." colspan="4"/>
+	      		<group col="4" colspan="4">
+	      			<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+	      			<button name="create_partner" string="Create Partner" type="object" icon="gtk-ok"/>
+	      		</group>
+	      	</form>
+	      </field>
+	   </record>
+	   <record id="action_crm_phonecall2partner_create" model="ir.actions.act_window">
+	      <field name="name">Create a Partner</field>
+	      <field name="type">ir.actions.act_window</field>
+	      <field name="res_model">crm.phonecall2partner</field>
+	      <field name="view_id" ref="view_crm_lead2partner_create"/>
+	      <field name="view_type">form</field>
+	      <field name="view_mode">form</field>
+	      <field name="target">new</field>
+	      <field name="context">{'record_ids' : active_ids}</field>
+	   </record>
+	   
+	   <record model="ir.values" id="values_crm_phonecall2partner_create">
+            <field name="model_id" ref="crm.model_crm_lead" />
+            <field name="object" eval="1" />
+            <field name="name">Create Partner</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_crm_phonecall2partner_create'))" />
+            <field name="key">action</field>
+            <field name="model">crm.phonecall</field>
+        </record>
+	   
+	   <record id="view_crm_phonecall2partner" model="ir.ui.view">
+	      <field name="name">crm.phonecall2partner.view</field>
+	      <field name="model">crm.phonecall2partner</field>
+	      <field name="type">form</field>
+	      <field name="arch" type="xml">
+	      	<form string="Create a Partner">
+	      		<field name="action"/>
+	      		<group attrs="{'invisible':[('action','!=','exist')]}">
+		            <field name="partner_id"/>
+		        </group>
+	      		<group col="4" colspan="4">
+	      			<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+	      			<button name="selectPartner" string="Continue" type="object" icon="gtk-ok"/>
+	      		</group>
+	      	</form>
+	      </field>
+	   </record>
+	   <record id="action_crm_phonecall2partner" model="ir.actions.act_window">
+	      <field name="name">Create a Partner</field>
+	      <field name="type">ir.actions.act_window</field>
+	      <field name="res_model">crm.phonecall2partner</field>
+	      <field name="view_id" ref="view_crm_phonecall2partner"/>
+	      <field name="view_type">form</field>
+	      <field name="view_mode">form</field>
+	      <field name="target">new</field>
+	      <field name="context">{'record_ids' : active_ids}</field>
+	   </record>
+ 	</data>
+</openerp>
diff --git a/addons/crm/wizard/phonecall_to_opportunity.py b/addons/crm/wizard/phonecall_to_opportunity.py
new file mode 100644
index 00000000000..f2cd3897fa6
--- /dev/null
+++ b/addons/crm/wizard/phonecall_to_opportunity.py
@@ -0,0 +1,107 @@
+# -*- encoding: utf-8 -*-
+############################################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    Copyright (C) 2008-2009 AJM Technologies S.A. (<http://www.ajm.lu). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+############################################################################################
+############################################################################################
+
+from osv import osv, fields
+import netsvc
+import time
+import tools
+import mx.DateTime
+from tools import config
+from tools.translate import _
+import tools
+
+class crm_phonecall2opportunity(osv.osv_memory):
+    _name = 'crm.phonecall2opportunity'
+    _description = 'Phonecall To Opportunity'
+
+    def action_cancel(self, cr, uid, ids, context=None):
+        return {'type':'ir.actions.act_window_close'}
+
+    def action_apply(self, cr, uid, ids, context=None):
+        this = self.browse(cr, uid, ids[0], context=context)
+        record_id = context and context.get('record_id', False) or False
+        if record_id:
+            for case in self.pool.get('crm.phonecall').browse(cr, uid, [record_id], context=context):
+                if case.state in ['done', 'cancel']:       
+                            raise osv.except_osv(_("Warning"),
+                                                 _("Closed/Cancelled Phone Call Could not convert into Opportunity"))
+                else:
+                    data_obj = self.pool.get('ir.model.data')
+                    result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_opportunities_filter')
+                    res = data_obj.read(cr, uid, result, ['res_id'])
+                    id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_oppor')
+                    id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_oppor')
+                    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_case_obj = self.pool.get('crm.opportunity')
+                    phonecall_case_obj = self.pool.get('crm.phonecall')
+                           
+                    new_opportunity_id = opportunity_case_obj.create(cr, uid, {            
+                                    'name': this.name,
+                                    'planned_revenue': this.planned_revenue,
+                                    'probability': this.probability,
+                                    'partner_id': this.partner_id and  this.partner_id.id or False,                 
+                                    'section_id': case.section_id and case.section_id.id or False,
+                                    'description': case.description or False,         
+                                    'phonecall_id': case.id,
+                                    'priority': case.priority,
+                                    'phone': case.partner_phone or False,
+                                })
+                    new_opportunity = opportunity_case_obj.browse(cr, uid, new_opportunity_id)
+                    vals = {
+                                'partner_id': this.partner_id.id, 
+                                'opportunity_id' : new_opportunity_id,                
+                                }            
+                    phonecall_case_obj.write(cr, uid, [case.id], vals)
+                    phonecall_case_obj.case_close(cr, uid, [case.id])
+                    phonecall_case_obj.case_open(cr, uid, [new_opportunity_id])
+            value = {            
+                'name': _('Opportunity'),
+                'view_type': 'form',
+                'view_mode': 'form,tree',
+                'res_model': 'crm.opportunity',
+                'res_id': int(new_opportunity_id),
+                'view_id': False,
+                'views': [(id2,'form'),(id3,'tree'),(False,'calendar'),(False,'graph')],
+                'type': 'ir.actions.act_window',
+                'search_view_id': res['res_id'] 
+            }
+            return value
+    _columns = {
+        'name' : fields.char('Opportunity Summary', size=64, required=True, select=1),
+        'probability': fields.float('Success Probability'),
+        'planned_revenue': fields.float('Expected Revenue'),
+        'partner_id': fields.many2one('res.partner', 'Partner'),
+    }
+    def default_get(self, cr, uid, fields, context=None):
+        record_id = context and context.get('record_id', False) or False
+        res = super(crm_phonecall2opportunity, self).default_get(cr, uid, fields, context=context)
+        if record_id:
+            phonecall_id = self.pool.get('crm.phonecall').browse(cr, uid, record_id, context=context)
+            res['name']=phonecall_id.name
+            res['partner_id']=phonecall_id.partner_id and phonecall_id.partner_id.id
+        return res
+crm_phonecall2opportunity()
\ No newline at end of file
diff --git a/addons/document/content_index.py b/addons/document/content_index.py
index 9fc0023e833..9e47621b4c3 100644
--- a/addons/document/content_index.py
+++ b/addons/document/content_index.py
@@ -158,7 +158,8 @@ class contentIndex():
                     os.write(fd, content)
                     os.close(fd)
             
-                fp = Popen(['file','-b','--mime-type',fname], shell=False, stdout=PIPE).stdout
+                #fp = Popen(['file','-b','--mime-type',fname], shell=False, stdout=PIPE).stdout
+                fp = Popen(['file','-b',fname], shell=False, stdout=PIPE).stdout
                 result = fp.read()
                 fp.close()
                 mime2 = result.strip()
diff --git a/addons/document/document_directory.py b/addons/document/document_directory.py
index 17c3dfb66d9..1557941e7c6 100644
--- a/addons/document/document_directory.py
+++ b/addons/document/document_directory.py
@@ -65,9 +65,10 @@ class document_directory(osv.osv):
         objid=self.pool.get('ir.model.data')
         try:
             mid = objid._get_id(cr, uid, 'document', 'dir_root')
-            return False # TODO: check why not display root dir 
             if not mid:
                 return False
+            root_id = objid.read(cr, uid, mid, ['res_id'])['res_id']
+            return root_id
         except Exception, e:
             import netsvc
             logger = netsvc.Logger()
@@ -111,6 +112,21 @@ class document_directory(osv.osv):
             res.append((d.id, s))
         return res
 
+    def get_full_path(self, cr, uid, dir_id, context=None):
+        """ Return the full path to this directory, in a list, root first
+        """
+        def _parent(dir_id, path):
+            parent=self.browse(cr,uid,dir_id)
+            if parent.parent_id and not parent.ressource_parent_type_id:
+                _parent(parent.parent_id.id,path)
+                path.append(parent.name)
+            else:
+                path.append(parent.name)
+                return path
+        path = []
+        _parent(dir_id, path)
+        return path
+
     def ol_get_resource_path(self,cr,uid,dir_id,res_model,res_id):
         # this method will be used in process module
         # to be need test and Improvement if resource dir has parent resource (link resource)
diff --git a/addons/document/document_storage.py b/addons/document/document_storage.py
index 2b50e7a27c9..0fd85e0be6d 100644
--- a/addons/document/document_storage.py
+++ b/addons/document/document_storage.py
@@ -154,7 +154,6 @@ class document_storage(osv.osv):
                     netsvc.Logger().notifyChannel('document', netsvc.LOG_WARNING, "ir.attachment #%d does not have a filename, but is at filestore, fix it!" % ira.id)
                 return None
             fpath = os.path.join(boo.path, ira.store_fname)
-            print "Trying to read \"%s\".." % fpath
             return file(fpath, 'rb').read()
         elif boo.type == 'db':
             # TODO: we need a better api for large files
@@ -164,8 +163,19 @@ class document_storage(osv.osv):
                 out = ''
             return out
         elif boo.type == 'realstore':
-            # fpath = os.path.join(boo.path,
-            return None
+            if not ira.store_fname:
+                # On a migrated db, some files may have the wrong storage type
+                # try to fix their directory.
+                if ira.file_size:
+                    netsvc.Logger().notifyChannel('document',netsvc.LOG_WARNING,"ir.attachment #%d does not have a filename, trying the name." %ira.id)
+                sfname = ira.name
+            fpath = os.path.join(boo.path,ira.store_fname or ira.name)
+            if os.path.exists(fpath):
+                return file(fpath,'rb').read()
+            elif not ira.store_fname:
+                return None
+            else:
+                raise IOError("File not found: %s" % fpath)
         else:
             raise TypeError("No %s storage" % boo.type)
 
@@ -219,6 +229,36 @@ class document_storage(osv.osv):
             out = base64.encodestring(data)
             cr.execute('UPDATE ir_attachment SET db_datas = %s WHERE id = %s',
                 (out, file_node.file_id))
+        elif boo.type == 'realstore':
+            try:
+                file_node.fix_ppath(cr, ira)
+                npath = file_node.full_path() or []
+                # npath may contain empty elements, for root directory etc.
+                for i, n in enumerate(npath):
+                    if n == None:
+                        del npath[i]
+                for n in npath:
+                    for ch in ('*', '|', "\\", '/', ':', '"', '<', '>', '?', '..'):
+                        if ch in n:
+                            raise ValueError("Invalid char %s in path %s" %(ch, n))
+                dpath = [boo.path,]
+                dpath += npath[:-1]
+                path = os.path.join(*dpath)
+                if not os.path.isdir(path):
+                    os.makedirs(path)
+                fname = os.path.join(path, npath[-1])
+                fp = file(fname,'wb')
+                fp.write(data)
+                fp.close()
+                logger.notifyChannel('document',netsvc.LOG_DEBUG,"Saved data to %s" % fname)
+                filesize = len(data) # os.stat(fname).st_size
+                store_fname = os.path.join(*npath)
+                # TODO Here, an old file would be left hanging.
+            except Exception,e :
+                import traceback
+                traceback.print_exc()
+                netsvc.Logger().notifyChannel('document',netsvc.LOG_WARNING,"Couldn't save data: %s" % e)
+                raise except_orm(_('Error!'), str(e))
         else:
             raise TypeError("No %s storage" % boo.type)
 
@@ -262,6 +302,12 @@ class document_storage(osv.osv):
             return (storage_bo.id, 'file', os.path.join(path, fname))
         elif storage_bo.type == 'db':
             return None
+        elif storage_bo.type == 'realstore':
+            fname = fil_bo.store_fname
+            if not fname:
+                return None
+            path = storage_bo.path
+            return ( storage_bo.id, 'file', os.path.join(path,fname))
         else:
             raise TypeError("No %s storage" % boo.type)
 
diff --git a/addons/document/nodes.py b/addons/document/nodes.py
index c6e2f1b10d1..543610a0d22 100644
--- a/addons/document/nodes.py
+++ b/addons/document/nodes.py
@@ -599,7 +599,33 @@ class node_file(node_class):
             self.storage_id = fil.parent_id.storage_id.id
         else:
             self.storage_id = None                       
-            
+
+    def fix_ppath(self, cr, fbro):
+        """Sometimes we may init this w/o path, parent.
+        This function fills the missing path from the file browse object
+        
+        Note: this may be an expensive operation, do on demand. However,
+        once caching is in, we might want to do that at init time and keep
+        this object anyway
+        """
+        if self.path or self.parent:
+            return
+        assert fbro
+        uid = self.context.uid
+        
+        dirpath = []
+        if fbro.parent_id:
+            dirobj = self.context._dirobj.pool.get('document.directory')
+            dirpath = dirobj.get_full_path(cr, uid, fbro.parent_id.id, context=self.context.context)
+        if fbro.datas_fname:
+            dirpath.append(fbro.datas_fname)
+        else:
+            dirpath.append(fbro.name)
+        
+        if len(dirpath)>1:
+            self.path = dirpath
+        else:
+            self.path = dirpath[0]   
     
     def get_data(self, cr, fil_obj = None):
         """ Retrieve the data for some file. 
@@ -631,6 +657,11 @@ class node_file(node_class):
             the browse object. """
         # this is where storage kicks in..
         stor = self.storage_id
+        if not stor:
+            data_obj = self.context._dirobj.pool.get('ir.model.data')
+            data_id = data_obj._get_id(cr, self.context.uid, 'document', 'storage_db')
+            if data_id:
+                stor = data_obj.browse(cr, self.context.uid, data_id, context=self.context.context).res_id 
         assert stor
         stobj = self.context._dirobj.pool.get('document.storage')
         return stobj.set_data(cr,self.context.uid,stor, self, data, self.context.context, fil_obj)
diff --git a/addons/document/std_index.py b/addons/document/std_index.py
index 1f639a32fa3..26e5d542f01 100644
--- a/addons/document/std_index.py
+++ b/addons/document/std_index.py
@@ -21,7 +21,7 @@
 
 import StringIO
 import odt2txt
-
+from subprocess import Popen, PIPE
 from content_index import indexer, cntIndex
 from subprocess import Popen, PIPE
 
@@ -50,6 +50,19 @@ class TxtIndex(indexer):
         
 cntIndex.register(TxtIndex())
 
+class PptIndex(indexer):
+    def _getMimeTypes(self):
+        return [ 'application/ms-word']
+    
+    def _getExtensions(self):
+        return ['.ppt']
+
+    def _doIndexFile(self,fname):
+        fp = Popen(['ppthtml', fname], shell=False, stdout=PIPE).stdout
+        return _to_unicode( fp.read())
+
+cntIndex.register(PptIndex())
+
 class DocIndex(indexer):
     def _getMimeTypes(self):
         return [ 'application/ms-word']
@@ -58,7 +71,7 @@ class DocIndex(indexer):
         return ['.doc']
 
     def _doIndexFile(self,fname):
-        fp = Popen(['antiword',fname], shell=False, stdout=PIPE).stdout
+        fp = Popen(['antiword', fname], shell=False, stdout=PIPE).stdout
         return _to_unicode( fp.read())
 
 cntIndex.register(DocIndex())
diff --git a/addons/idea/__terp__.py b/addons/idea/__terp__.py
index c56d89e669a..f373506e3f1 100644
--- a/addons/idea/__terp__.py
+++ b/addons/idea/__terp__.py
@@ -30,7 +30,7 @@
     'depends': ['base'],
     'init_xml': [],
     'update_xml': [
-        'idea_wizard.xml',
+        'wizard/idea_post_vote_view.xml',
         'idea_view.xml',
         'idea_workflow.xml',
         'security/idea_security.xml',
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index f80e7156f04..9ccc56464d0 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -166,7 +166,7 @@
             <field name="vote_avg" />
             <field name="count_comments" />
             <field name="count_votes" />
-            <button name="%(wizard_idea_post_vote)d" icon="gtk-execute" type="action" states="draft,open" string="Vote"/>
+            <button name="%(action_idea_post_vote)d" icon="gtk-execute" type="action" states="draft,open" string="Vote"/>
         </tree>
         </field>
     </record>
diff --git a/addons/idea/idea_wizard.xml b/addons/idea/idea_wizard.xml
deleted file mode 100644
index 206be1dfcaf..00000000000
--- a/addons/idea/idea_wizard.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <wizard
-            id="wizard_idea_post_vote"
-            model="idea.idea"
-            name="idea.post.vote"
-			menu="True"
-            string="Vote"/>
-
-       
-    </data>
-</openerp>
diff --git a/addons/idea/wizard/__init__.py b/addons/idea/wizard/__init__.py
index 2db6aa6982c..2e6f6d42096 100644
--- a/addons/idea/wizard/__init__.py
+++ b/addons/idea/wizard/__init__.py
@@ -18,5 +18,5 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
 #
 ##############################################################################
-import idea_vote
+import idea_post_vote
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/idea/wizard/idea_post_vote.py b/addons/idea/wizard/idea_post_vote.py
new file mode 100644
index 00000000000..901f2c0a28d
--- /dev/null
+++ b/addons/idea/wizard/idea_post_vote.py
@@ -0,0 +1,54 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+from osv import fields, osv
+
+class idea_post_vote(osv.osv_memory):
+    
+    _name = "idea.post.vote"
+    _description = "Post vote"
+    _columns = {
+                'vote': fields.selection([('-1', 'Not Voted'), 
+                                          ('0', 'Very Bad'), 
+                                          ('25', 'Bad'), 
+                                          ('50', 'Normal'), 
+                                          ('75', 'Good'), 
+                                          ('100', 'Very Good') ], 'Post Vote', required=True)
+                }
+    
+    def do_vote(self, cr, uid, ids, context):
+        """
+        Create idea vote.
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Idea Post vote’s IDs.
+        @return: Dictionary {}
+        """
+        vote_obj = self.pool.get('idea.vote')
+        for data in self.read(cr, uid, ids):
+            score = str(data['vote'])
+            dic = {'idea_id': context['active_id'], 'user_id': uid, 'score': score }
+            vote = vote_obj.create(cr, uid, dic)
+            return {}
+
+idea_post_vote()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/idea/wizard/idea_post_vote_view.xml b/addons/idea/wizard/idea_post_vote_view.xml
new file mode 100644
index 00000000000..7316340723c
--- /dev/null
+++ b/addons/idea/wizard/idea_post_vote_view.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_idea_post_vote" model="ir.ui.view">
+            <field name="name">idea.post.vote.form</field>
+            <field name="model">idea.post.vote</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Create Tasks">
+                	<group colspan="4" >
+                		 <field name="vote"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button  icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button  icon="gtk-ok" name="do_vote" string="Post Vote" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+        <record id="action_idea_post_vote" model="ir.actions.act_window">
+            <field name="name">Vote</field>
+            <field name="res_model">idea.post.vote</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_idea_post_vote"/> 
+           <field name="target">new</field>
+           <field name="context">{'record_id':active_id}</field>
+        </record>
+              
+     <!--    <record id="action_idea_post_vote_values" model="ir.values">
+            <field name="model_id" ref="idea.model_idea_idea" />
+            <field name="object" eval="1" />
+            <field name="name">vote</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_idea_post_vote'))"/>
+            <field name="key">action</field> 
+            <field name="model">idea.idea</field>
+        </record> -->
+        
+        <act_window id="action_idea_post_vote_values"
+    		key2="client_action_multi" name="vote"
+    		res_model="idea.post.vote" src_model="idea.idea"
+    		view_mode="form" target="new" view_type="form" />
+        
+        
+    </data>
+</openerp>
diff --git a/addons/idea/wizard/idea_vote.py b/addons/idea/wizard/idea_vote.py
deleted file mode 100644
index c040aa45be5..00000000000
--- a/addons/idea/wizard/idea_vote.py
+++ /dev/null
@@ -1,63 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import ir
-from mx.DateTime import now
-import pooler
-import netsvc
-
-vote_form = """<?xml version="1.0" ?>
-<form string="Create Tasks">
-    <field name="vote"/>
-</form>"""
-
-vote_fields = {
-      'vote': {'string': 'Post Vote', 'type': 'selection',
-        'selection': [('-1','Not Voted'),('0','Very Bad'),('25', 'Bad'),('50','Normal'),('75','Good'),('100','Very Good') ]},
-}
-
-
-
-class idea_vote(wizard.interface):
-    def _do_vote(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        vote_obj = pool.get('idea.vote')
-        score=str(data['form']['vote'])
-        dic={'idea_id' : data['id'], 'user_id' : uid, 'score' : score }
-        vote=vote_obj.create(cr,uid,dic)
-        return True
-
-    states = {
-        'init':{
-            'actions': [],
-            'result': {'type':'form', 'arch':vote_form, 'fields':vote_fields, 'state':[('end', 'Cancel'), ('post', 'Post Vote')] },
-        },
-        'post':{
-            'actions': [],
-            'result': {'type':'action', 'action': _do_vote, 'state':'end'},
-        },
-    }
-idea_vote('idea.post.vote')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/lunch/__terp__.py b/addons/lunch/__terp__.py
index bc7dfcbfef7..b4fe451aac1 100644
--- a/addons/lunch/__terp__.py
+++ b/addons/lunch/__terp__.py
@@ -27,8 +27,10 @@
     "category" : "Generic Modules/Others",
     "init_xml": [],
     "update_xml": [
-        'security/ir.model.access.csv', 
-        'lunch_wizard.xml', 
+        'security/ir.model.access.csv',
+        'wizard/lunch_order_cancel_view.xml',
+        'wizard/lunch_order_confirm_view.xml',
+        'wizard/lunch_cashbox_clean_view.xml', 
         'lunch_view.xml', 
         'lunch_report.xml',
         #'process/lunch_process.xml'
diff --git a/addons/lunch/lunch_wizard.xml b/addons/lunch/lunch_wizard.xml
deleted file mode 100644
index 0820ae7d80c..00000000000
--- a/addons/lunch/lunch_wizard.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" ?>
-<openerp>
-    <data>
-        <wizard 
-            string="Confirm Order"
-            model="lunch.order"
-            name="lunch.order.confirm"
-            keyword="client_action_multi"
-            id="lunch_order_confirm"/>
-
-        <wizard
-            string="Cancel Order"
-            model="lunch.order"
-            name="lunch.order.cancel"
-            keyword="client_action_multi"
-            id="wizard_id_cancel"/>
-
-        <wizard
-            string="Set CashBox to Zero"
-            model="lunch.cashbox"
-            name="lunch.cashbox.clean"
-            keyword="client_action_multi"
-            id="wizard_clean_cashbox"/>
-    </data>
-</openerp>
diff --git a/addons/lunch/wizard/__init__.py b/addons/lunch/wizard/__init__.py
index e290a2e933c..543ebdbf8dc 100644
--- a/addons/lunch/wizard/__init__.py
+++ b/addons/lunch/wizard/__init__.py
@@ -18,9 +18,8 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
 #
 ##############################################################################
-
-import confirm
-import cancel
-import reset_box
+import lunch_order_confirm
+import lunch_order_cancel
+import lunch_cashbox_clean
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/lunch/wizard/lunch_cashbox_clean.py b/addons/lunch/wizard/lunch_cashbox_clean.py
new file mode 100644
index 00000000000..5656ca92dbe
--- /dev/null
+++ b/addons/lunch/wizard/lunch_cashbox_clean.py
@@ -0,0 +1,54 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+from osv import fields, osv
+
+class lunch_cashbox_clean(osv.osv_memory):
+    
+     _name = "lunch.cashbox.clean"
+     _description = "clean cashbox"
+    
+     def set_to_zero(self, cr, uid, ids, context):
+         """
+         clean Cashbox. set active fields False.
+         @param cr: the current row, from the database cursor,
+         @param uid: the current user’s ID for security checks,
+         @param ids: List  Lunch cashbox Clean’s IDs
+         @return:Dictionary {}.
+         """
+         cashmove_ref = self.pool.get('lunch.cashmove')
+         cr.execute("select user_cashmove, box,sum(amount) from lunch_cashmove where active = 't' and box in (%s) group by user_cashmove, box" % ','.join(map(str, context['active_ids'])))
+         res = cr.fetchall()
+         cr.execute("update lunch_cashmove set active = 'f' where active= 't' and box in (%s)" % ','.join(map(str, context['active_ids'])))
+##    to_unactive= {}.fromkeys([r[0] for r in cr.fetchall]).keys()
+##    print to_unactive
+##    cashmove_ref.write(cr,uid,to_unactive,{'active':False})            
+         for (user_id, box_id, amount) in res:
+            cashmove_ref.create(cr, uid, {'name': 'Summary for user' + str(user_id), 
+                        'amount': amount, 
+                        'user_cashmove': user_id, 
+                        'box': box_id, 
+                        'active': True, 
+                        })
+         return {}
+
+lunch_cashbox_clean()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/lunch/wizard/lunch_cashbox_clean_view.xml b/addons/lunch/wizard/lunch_cashbox_clean_view.xml
new file mode 100644
index 00000000000..6e151dc0484
--- /dev/null
+++ b/addons/lunch/wizard/lunch_cashbox_clean_view.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_lunch_cashbox_clean" model="ir.ui.view">
+            <field name="name">lunch.cashbox.clean.form</field>
+            <field name="model">lunch.cashbox.clean</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Reset cashbox">
+                	<group colspan="4" >
+                		 <label string="Are you sure you want to reset this cashbox ?"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button  icon="gtk-cancel" special="cancel" string="No"/>
+                    	<button  icon="gtk-ok" name="set_to_zero" string="Set to Zero" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+        <record id="action_lunch_cashbox_clean" model="ir.actions.act_window">
+            <field name="name">Set CashBox to Zero</field>
+            <field name="res_model">lunch.cashbox.clean</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_lunch_cashbox_clean"/> 
+           <field name="target">new</field>
+           <field name="context">{'record_id':active_id}</field>
+        </record>
+              
+        <act_window id="action_lunch_cashbox_clean_values"
+    		key2="client_action_multi" name="Set CashBox to Zero"
+    		res_model="lunch.cashbox.clean" src_model="lunch.cashbox"
+    		view_mode="form" target="new" view_type="form" />
+        
+    </data>
+</openerp>
diff --git a/addons/lunch/wizard/cancel.py b/addons/lunch/wizard/lunch_order_cancel.py
similarity index 58%
rename from addons/lunch/wizard/cancel.py
rename to addons/lunch/wizard/lunch_order_cancel.py
index 1acc1535a90..91f25aa421a 100644
--- a/addons/lunch/wizard/cancel.py
+++ b/addons/lunch/wizard/lunch_order_cancel.py
@@ -18,36 +18,25 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
 #
 ##############################################################################
+from osv import fields, osv
 
-import wizard
-import netsvc
-import ir
-import pooler
-
-cancel_form = """<?xml version="1.0"?>
-<form string="Cancel Order">
-    <label string="Are you sure you want to cancel this order ?"/>
-</form>"""
-
-
-cancel_fields = {
-}
-
-def _cancel(self,cr,uid,data,context):
-    return pooler.get_pool(cr.dbname).get('lunch.order').lunch_order_cancel(cr,uid,data['ids'],context)
-
-class order_cancel(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type':'form', 'arch':cancel_form, 'fields':cancel_fields, 'state':[('end','No'),('cancel','Yes')]}
-        },
-        'cancel': {
-            'actions': [_cancel],
-            'result': {'type':'state', 'state':'end'}
-        }
-    }
-order_cancel('lunch.order.cancel')
+class lunch_order_cancel(osv.osv_memory):
+    """
+    Cancel Lunch Order
+    """
+    _name = "lunch.order.cancel"
+    _description = "Cancel Order"
+    
+    def cancel(self, cr, uid, ids, context):
+        """
+        Cancel cashmove entry from cashmoves and update state to draft.
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List  Lunch Order Cancel’s IDs
+        """
+        return self.pool.get('lunch.order').lunch_order_cancel(cr, uid, context['active_ids'], context)
+        
+lunch_order_cancel()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/lunch/wizard/lunch_order_cancel_view.xml b/addons/lunch/wizard/lunch_order_cancel_view.xml
new file mode 100644
index 00000000000..c69d321b938
--- /dev/null
+++ b/addons/lunch/wizard/lunch_order_cancel_view.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_lunch_order_cancel" model="ir.ui.view">
+            <field name="name">lunch.order.cancel.form</field>
+            <field name="model">lunch.order.cancel</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Cancel Order">
+                	<group colspan="4" >
+                		 <label string="Are you sure you want to cancel this order ?"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button  icon="gtk-cancel" special="cancel" string="No"/>
+                    	<button  icon="gtk-ok" name="cancel" string="Yes" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+        <record id="action_lunch_order_cancel" model="ir.actions.act_window">
+            <field name="name">Cancel Order</field>
+            <field name="res_model">lunch.order.cancel</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_lunch_order_cancel"/> 
+           <field name="target">new</field>
+           <field name="context">{'record_id':active_id}</field>
+        </record>
+        
+        <act_window id="action_lunch_order_cancel_values"
+    		key2="client_action_multi" name="Cancel Order"
+    		res_model="lunch.order.cancel" src_model="lunch.order"
+    		view_mode="form" target="new" view_type="form" />
+        
+    </data>
+</openerp>
diff --git a/addons/lunch/wizard/confirm.py b/addons/lunch/wizard/lunch_order_confirm.py
similarity index 50%
rename from addons/lunch/wizard/confirm.py
rename to addons/lunch/wizard/lunch_order_confirm.py
index 64891098349..9b7476f40e3 100644
--- a/addons/lunch/wizard/confirm.py
+++ b/addons/lunch/wizard/lunch_order_confirm.py
@@ -19,42 +19,33 @@
 #
 ##############################################################################
 
-import wizard
-import netsvc
-import ir
-import pooler
+from osv import fields, osv
 
-confirm_order_form = """<?xml version="1.0"?>
-<form title="Confirm">
-    <separator string="Orders Confirmation" colspan="4"/>
-    <field name="confirm_cashbox"/>
-    <newline/>
-</form>
-"""
-
-confirm_order_fields = {
-    'confirm_cashbox': {'string':'Name of box', 'type':'many2one', 'required':True, 'relation':'lunch.cashbox' },
-}
-
-def _confirm(self,cr,uid,data,context):
-    pool= pooler.get_pool(cr.dbname)
-    order_ref = pool.get('lunch.order')
-    order_ref.confirm(cr,uid,data['ids'],data['form']['confirm_cashbox'],context)
-    return {}
-
-class order_confirm(wizard.interface):
-    states = {
-        'init': {
-            'action':[],
-            'result':{'type' : 'form', 'arch' : confirm_order_form, 'fields' : confirm_order_fields, 'state' : [('end', 'Cancel'),('go', 'Confirm Order') ]},
-        },
-        'go' : {
-            'actions' : [_confirm],
-            'result' : {'type' : 'state', 'state' : 'end'}
-        },
-    }
-order_confirm('lunch.order.confirm')
+class lunch_order_confirm(osv.osv_memory):
+    """
+    Confirm Lunch Order
+    """
+    _name = "lunch.order.confirm"
+    _description = "confirm Order"
+    _columns = {
+                'confirm_cashbox':fields.many2one('lunch.cashbox', 'Name of box', required=True), 
+                }
+    
+    def confirm(self, cr, uid, ids, context):
+        """
+        confirm Lunch Order.Create cashmoves in launch cashmoves when state is 
+                        confirm in lunch order.
+        @param cr: the current row, from the database cursor, 
+        @param uid: the current user’s ID for security checks, 
+        @param ids: List  Lunch Order confirm’s IDs
+        @return: Dictionary {}.                
+        """
+        order_ref = self.pool.get('lunch.order')
+        for data in self.read(cr, uid, ids):
+            order_ref.confirm(cr, uid, context['active_ids'], data['confirm_cashbox'], context)
+            return {}
 
+lunch_order_confirm()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/lunch/wizard/lunch_order_confirm_view.xml b/addons/lunch/wizard/lunch_order_confirm_view.xml
new file mode 100644
index 00000000000..89ddd8f6153
--- /dev/null
+++ b/addons/lunch/wizard/lunch_order_confirm_view.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_lunch_order_confirm" model="ir.ui.view">
+            <field name="name">lunch.order.confirm.form</field>
+            <field name="model">lunch.order.confirm</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Confirm">
+                	<group colspan="4" >
+                		 <separator string="Orders Confirmation" colspan="4"/>
+                		 <field name="confirm_cashbox"/>
+                		 <newline/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button  icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button  icon="gtk-ok" name="confirm" string="Confirm Order" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+        <record id="action_lunch_order_confirm" model="ir.actions.act_window">
+            <field name="name">Confirm Order</field>
+            <field name="res_model">lunch.order.confirm</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_lunch_order_confirm"/> 
+           <field name="target">new</field>
+           <field name="context">{'record_id':active_id}</field>
+        </record>
+              
+        <act_window id="action_lunch_order_confirm_values"
+    		key2="client_action_multi" name="Confirm Order"
+    		res_model="lunch.order.confirm" src_model="lunch.order"
+    		view_mode="form" target="new" view_type="form" />
+        
+    </data>
+</openerp>
diff --git a/addons/lunch/wizard/reset_box.py b/addons/lunch/wizard/reset_box.py
deleted file mode 100644
index 83999fc3ba0..00000000000
--- a/addons/lunch/wizard/reset_box.py
+++ /dev/null
@@ -1,76 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import netsvc
-import ir
-import pooler
-
-set_to_zero_form = """<?xml version="1.0"?>
-<form string="Reset cashbox">
-    <label string="Are you sure you want to reset this cashbox ?"/>
-</form>"""
-
-
-
-confirm_setting_zero_fields = {}
-
-def _set_to_zero(self,cr,uid,data,context):
-    pool= pooler.get_pool(cr.dbname)
-    cashmove_ref = pool.get('lunch.cashmove')
-    cr.execute("select user_cashmove, box,sum(amount) from lunch_cashmove where active= 't' and box in (%s) group by user_cashmove, box"%','.join(map(str,data['ids'])))
-    res= cr.fetchall()
-    cr.execute("update lunch_cashmove set active = 'f' where active= 't' and box in (%s)"%','.join(map(str,data['ids'])))
-##    to_unactive= {}.fromkeys([r[0] for r in cr.fetchall]).keys()
-##    print to_unactive
-##    cashmove_ref.write(cr,uid,to_unactive,{'active':False})            
-##    
-    for (user_id,box_id,amount) in res:
-        cashmove_ref.create(cr,uid,{'name': 'Summary for user'+ str(user_id),
-                        'amount': amount,
-                        'user_cashmove': user_id,
-                        'box': box_id,
-                        'active': True,
-                        })
-    return {}
-
-
-class cashbox_set_to_zero(wizard.interface):
-
-    states = {
-            
-        'init': {
-                        'action':[],
-                        'result':{'type' : 'form',
-                          'arch' : set_to_zero_form,
-              'fields' : confirm_setting_zero_fields,
-                          'state' : [('end', 'Cancel'),('zero', 'Set to Zero') ]},
-    
-        },
-        'zero' : {
-            'actions' : [_set_to_zero],
-            'result' : {'type' : 'state', 'state' : 'end'}
-        },
-    }
-    
-cashbox_set_to_zero('lunch.cashbox.clean')
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/olap/__terp__.py b/addons/olap/__terp__.py
index 7583de75182..d716fb83ddf 100644
--- a/addons/olap/__terp__.py
+++ b/addons/olap/__terp__.py
@@ -10,8 +10,10 @@
     """,
     "init_xml" :  ["data/olap_data.xml"],
     "update_xml" : [
-        "data/olap_view.xml",
+        "wizard/olap_query_logs_clear_view.xml",
+        "wizard/olap_load_column_view.xml",
         "data/olap_wizard.xml",
+        "data/olap_view.xml",
         "data/olap_cube_view.xml",
         "data/olap_fact_view.xml",
         "data/olap_cube_workflow.xml",
diff --git a/addons/olap/data/olap_fact_view.xml b/addons/olap/data/olap_fact_view.xml
index d46669e2725..74a794d9eee 100755
--- a/addons/olap/data/olap_fact_view.xml
+++ b/addons/olap/data/olap_fact_view.xml
@@ -81,7 +81,7 @@
                 <field name="active"/>
                 <field name="hide"/>
 <!--                <button name="show_col_view" string="Columns" type="object"/>-->
-                <!--<button string="Columns_wiz" name="%(bi_load_column)d" type="action"/>-->
+
                 <button name="hide_col" string="Hide" type="object"/>
                 <button name="show_col" string="Show" type="object"/>
             </tree>
@@ -108,7 +108,7 @@
                         <button name="hide_col" string="Hide" type="object"/>
                         <button name="show_col" string="Show" type="object"/>
                     </tree>
-                </field>            
+                </field>
                 <field name="fact_database_id" select="1" colspan="2"/>
                 <field name="active"/>
                 <field name="hide"/>
@@ -150,7 +150,7 @@
             </tree>
         </field>
     </record>
-    
+
     <record model="ir.ui.view" id="view_olap_database_columns_tree_m20">
         <field name="name">olap.database.columns.tree.m20</field>
         <field name="model">olap.database.columns</field>
@@ -165,7 +165,7 @@
             </tree>
         </field>
     </record>
-    
+
     <record model="ir.ui.view" id="view_olap_database_columns_form">
         <field name="name">olap.database.columns.form</field>
         <field name="model">olap.database.columns</field>
@@ -318,7 +318,7 @@
             <form string="Olap Application Field">
                 <newline/>
                 <field name="name" select="1" colspan="2"/>
-                <field name="field_name" select="1" />              
+                <field name="field_name" select="1" />
                 <field name="table_name" select="1" />
                 <newline/>
                 <field name="is_hidden" select="1" colspan="2"/>
diff --git a/addons/olap/data/olap_view.xml b/addons/olap/data/olap_view.xml
index ac6b50711e6..35aac4a20c0 100755
--- a/addons/olap/data/olap_view.xml
+++ b/addons/olap/data/olap_view.xml
@@ -47,7 +47,9 @@
         id="menu_bi_conf_tools"
         parent="menu_bi_configuration"/>
 
-
+	<menuitem name="Clear Logs" action="action_view_olap_query_logs_clear" icon="STOCK_EXECUTE"
+         id="menu_bi_clear_logs" sequence="30" parent="menu_bi_conf_tools"/>
+         
     <record model="ir.actions.url" id="menu_url_cube_browser">
             <field name="name">name_menu_url_cube_browser</field>
             <field name="url">http://localhost:8080/browser</field>
diff --git a/addons/olap/data/olap_wizard.xml b/addons/olap/data/olap_wizard.xml
index c2cda9ef29a..beb3453d224 100755
--- a/addons/olap/data/olap_wizard.xml
+++ b/addons/olap/data/olap_wizard.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    
+
     <wizard
             string="Query Builder"
             model="olap.schema"
@@ -9,8 +9,6 @@
             menu= "False"
             multi="True"
             id="bi_conf_cube_query_builder"/>
-        <!--        <menuitem name="Query Builder" action="bi_conf_cube_query_builder" type="wizard"  id="menu_bi_conf_cube_query_builder" sequence="40" parent="menu_bi_conf_tools"/>
-        -->
 
     <wizard
             string="Load Tables"
@@ -28,20 +26,19 @@
             menu= "False"
             multi="True"
             id="bi_menu_olap_load_table"/>
-            
+
         <wizard
             string="Open Configuration"
             model="olap.schema"
             name="olap.load.configuration.table"
             menu= "False"
             multi="True"
-            id="bi_load_configuration_table"/>          
+            id="bi_load_configuration_table"/>
 
         <wizard
             string="Configure from Application"
             model="olap.schema"
             name="olap.application.configuration"
-            menu="False"
             multi="True"
             id="bi_application_configuration"/>
 
@@ -50,23 +47,7 @@
             model="olap.fact.database"
             name="olap.fact.database.test_connection"
             menu="False"
-            id="bi_test_connection"/> 
-
-        <wizard
-            string="Open Columns"
-            model="olap.database.columns"
-            name="olap.load.column"
-            menu= "False"
-            multi="True"
-            id="bi_load_column"/> 
-            
-        <wizard
-            string="Clear Logs"
-            model="olap.query.logs"
-            name="olap.query.logs.clear"
-            menu="True"
-            id="bi_clear_logs"/>    
-        <menuitem name="Clear Logs" action="bi_clear_logs" type="wizard"  id="menu_bi_clear_logs" sequence="30" parent="menu_bi_conf_tools"/>
+            id="bi_test_connection"/>
 
 
     </data>
diff --git a/addons/olap/wizard/__init__.py b/addons/olap/wizard/__init__.py
index a7b3a6af17f..e7871702628 100755
--- a/addons/olap/wizard/__init__.py
+++ b/addons/olap/wizard/__init__.py
@@ -28,7 +28,6 @@
 import wizard_query_builder
 import wizard_load_data
 import wizard_load_configured_table
-import wizard_clear_logs
-import wizard_application_configure
-import wizard_load_columns
 import wizard_test_connection
+import olap_query_logs_clear
+import olap_load_column
\ No newline at end of file
diff --git a/addons/olap/wizard/wizard_load_columns.py b/addons/olap/wizard/olap_load_column.py
similarity index 60%
rename from addons/olap/wizard/wizard_load_columns.py
rename to addons/olap/wizard/olap_load_column.py
index f64a94399b4..97dc635d3fc 100755
--- a/addons/olap/wizard/wizard_load_columns.py
+++ b/addons/olap/wizard/olap_load_column.py
@@ -24,17 +24,30 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 ##############################################################################
-import time
 
-import wizard
-import pooler
+from osv import fields, osv
 
-class wizard_load_columns(wizard.interface):
-    def _get_table_data(self, cr, uid, data, context={}):
-        pool_obj = pooler.get_pool(cr.dbname)
-        ids_cols=pool_obj.get('olap.database.columns').search(cr, uid, ([('table_id','=',data['id'])]),context={})
-        model_data_ids = pool_obj.get('ir.model.data').search(cr,uid,[('model','=','ir.ui.view'),('name','=','view_olap_database_columns_form')],context={})
-        resource_id = pool_obj.get('ir.model.data').read(cr,uid,model_data_ids,fields=['res_id'])[0]['res_id']
+class olap_load_column(osv.osv_memory):
+    """ Load Database Column """
+    _name = "olap.load.column"
+    _description = "Olap Load Column"
+
+    def get_table_data(self, cr, uid, ids, context={}):
+        """
+        This function load column
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user\'s ID for security checks,
+        @param ids: List of load column,
+        @return : dictionary of database columns window on give id
+
+        """
+        ids_cols = self.pool.get('olap.database.columns').search(cr, uid,\
+                             ([('table_id','=',context['active_id'])]),context={})
+        model_data_ids = self.pool.get('ir.model.data').search(cr,uid,\
+                        [('model','=','ir.ui.view'),\
+                    ('name','=','view_olap_database_columns_form')],context={})
+        resource_id = self.pool.get('ir.model.data').read(cr,uid,\
+                                model_data_ids,fields=['res_id'])[0]['res_id']
         return {
             'domain': "[('id','in', ["+','.join(map(str,ids_cols))+"])]",
             'name': 'Database Columns',
@@ -44,12 +57,10 @@ class wizard_load_columns(wizard.interface):
             'views': [(False,'tree'),(resource_id,'form')],
             'type': 'ir.actions.act_window',
         }
-        
-    states = {
-        'init' : {
-            'actions' : [],
-            'result' : {'type' : 'action' ,'action':_get_table_data,'state':'end'}
-        }
-      }
+    _columns = {
 
-wizard_load_columns('olap.load.column')
+            }
+
+olap_load_column()
+
+# vim: ts=4 sts=4 sw=4 si et
\ No newline at end of file
diff --git a/addons/olap/wizard/olap_load_column_view.xml b/addons/olap/wizard/olap_load_column_view.xml
new file mode 100644
index 00000000000..ef76ec555c6
--- /dev/null
+++ b/addons/olap/wizard/olap_load_column_view.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    	<record id="view_olap_load_column" model="ir.ui.view">
+            <field name="name">Create Logs</field>
+            <field name="model">olap.load.column</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+              <form string="">
+              	<separator string="                        " colspan="4"/>
+            	<button name="get_table_data" string="Open" type="object"/>
+			</form>
+            </field>
+		</record>
+
+		<record id="action_olap_load_column" model="ir.actions.act_window">
+            <field name="name">Open Columns</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">olap.load.column</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="context">{'record_id' : active_id}</field>
+            <field name="target">new</field>
+    	</record>
+
+        <act_window id="action_olap_load_column_values"
+    		key2="client_action_multi" name="Open Columns"
+    		res_model="olap.load.column" src_model="olap.database.columns"
+    		view_mode="form" target="new" view_type="form" />
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/olap/wizard/olap_query_logs_clear.py b/addons/olap/wizard/olap_query_logs_clear.py
new file mode 100755
index 00000000000..8d271315874
--- /dev/null
+++ b/addons/olap/wizard/olap_query_logs_clear.py
@@ -0,0 +1,80 @@
+##############################################################################
+#
+# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+from osv import fields, osv
+
+class olap_query_logs_clear(osv.osv_memory):
+    """ Clear the Logs for Given User  """
+    _name = "olap.query.logs.clear"
+    _description = "Olap Query Logs Clear"
+    _columns = {
+        'user_name':fields.char('User',size=64,required=True,readonly=True),
+    }
+
+    def _getdata(self,cr,uid,context={}):
+        user = self.pool.get('res.users').browse(cr,uid,uid)
+        return user.name
+
+    _defaults = {
+        'user_name': _getdata
+            }
+
+    def clear_logs(self,cr,uid,part,context={}):
+        """
+        This function load column
+        @param cr: the current row, from the database cursor,
+        @param uid: the current users ID for security checks,
+        @param ids: List of load column,
+        @return: dictionary of query logs clear message window
+        """
+        ids = self.pool.get('olap.query.logs').search(cr,uid,[('user_id','=',uid)])
+        self.pool.get('olap.query.logs').unlink(cr, uid,ids,context)
+        data_obj = self.pool.get('ir.model.data')
+        id2 = data_obj._get_id(cr, uid, 'olap', 'view_olap_query_logs_clear_msg')
+        if id2:
+            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+        value = {
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'olap.query.logs.clear.msg',
+            'views': [(id2,'form'),(False,'tree'),(False,'calendar'),(False,'graph')],
+            'type': 'ir.actions.act_window',
+            'target': 'new'
+        }
+        return value
+
+olap_query_logs_clear()
+
+class olap_query_logs_clear_msg(osv.osv_memory):
+    """   Display clear log message    """
+    _name = "olap.query.logs.clear.msg"
+    _description = "Olap Query Logs Clear Message"
+    _columns = {
+
+            }
+olap_query_logs_clear_msg()
+# vim: ts=4 sts=4 sw=4 si et
diff --git a/addons/olap/wizard/olap_query_logs_clear_view.xml b/addons/olap/wizard/olap_query_logs_clear_view.xml
new file mode 100644
index 00000000000..08d93c9410b
--- /dev/null
+++ b/addons/olap/wizard/olap_query_logs_clear_view.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    	<record id="view_olap_query_logs_clear" model="ir.ui.view">
+            <field name="name">Create Logs</field>
+            <field name="model">olap.query.logs.clear</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+              <form string=" To Load Data">
+    			<field name='user_name'/>
+    			<separator string="" colspan="4" />
+    	        <label string="" colspan="2" />
+    	        <group colspan="4">
+        	    <button special="cancel" string="Cancel" />
+            	<button name="clear_logs" string="Clear Logs" type="object"/>
+            	</group>
+			</form>
+            </field>
+		</record>
+
+		<record id="action_view_olap_query_logs_clear" model="ir.actions.act_window">
+            <field name="name">Create Logs </field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">olap.query.logs.clear</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+    	</record>
+
+		<record id="view_olap_query_logs_clear_msg" model="ir.ui.view">
+            <field name="name">Create Logs Message</field>
+            <field name="model">olap.query.logs.clear.msg</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+              <form string="Load Data">
+    			<label string="Logs Cleared successfully"/>
+    	        <group colspan="4">
+            	 <button special="cancel" string="Ok" />
+            	</group>
+			</form>
+            </field>
+		</record>
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/olap/wizard/wizard_application_configure.py b/addons/olap/wizard/wizard_application_configure.py
deleted file mode 100755
index 3dfac9e2974..00000000000
--- a/addons/olap/wizard/wizard_application_configure.py
+++ /dev/null
@@ -1,194 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-##############################################################################
-import time
-
-import wizard
-import pooler
-from osv import osv
-import netsvc
-
-info = '''<?xml version="1.0"?>
-<form string="Auto Configure">
-    <label string="Your database structure (Open ERP) has been sucessfully configured."/>
-</form>'''
-
-form1 = '''<?xml version="1.0"?>
-<form string=" Auto Configure ">
-    <label string="This will Auto Configure Application"/>
-</form>'''
-
-class wizard_application_configure(wizard.interface):
-    
-    def configure_application(self,cr,uid,data,context):
-        
-        vals={}
-        apptabnew_vals={}
-        appfieldnew_vals={}
-        
-        ids=pooler.get_pool(cr.dbname).get('olap.schema').browse(cr,uid,data['id'])
-        
-        if ids.app_detect == "Unknown Application":
-            raise wizard.except_wizard('Warning', 'The Application is Unknown, we can not configure it automatically.')
-
-        else:
-            app_objs = pooler.get_pool(cr.dbname).get('olap.application')
-            app_ids = app_objs.search(cr, uid, [])
-            app_res = app_objs.browse(cr,uid, app_ids)
-            app_id=''
-            for x_app in app_res:
-                  app_id = x_app['id']
-                  
-            apptab_objs = pooler.get_pool(cr.dbname).get('olap.application.table')
-            apptab_ids = apptab_objs.search(cr, uid, [])
-            apptab_res = apptab_objs.browse(cr,uid, apptab_ids)
-            apptab_name=[]
-            for aptab in apptab_res:
-                apptab_name.append(aptab.name)
-
-            appfield_objs = pooler.get_pool(cr.dbname).get('olap.application.field')
-            appfield_ids = appfield_objs.search(cr, uid, [])
-            appfield_res = appfield_objs.browse(cr,uid, appfield_ids)
-            appcol_name=[]
-            for apcol in appfield_res:
-                appcol_name.append(apcol.name)
-            
-
-            apptab_objs = pooler.get_pool(cr.dbname).get('olap.application.table')
-            apptab_ids = apptab_objs.search(cr, uid, [])
-            apptab_res = apptab_objs.browse(cr,uid, apptab_ids)
-#            apptab_data_res = apptab_objs.read(cr,uid, apptab_ids,[])[0]
-            
-            apptab_name=[]
-            map_apptab_name_id={}
-            for aptab in apptab_res:
-                apptab_name.append(aptab.name)
-                map_apptab_name_id[aptab.table_name]=aptab
-            
-            appfield_objs = pooler.get_pool(cr.dbname).get('olap.application.field')
-            appfield_ids = appfield_objs.search(cr, uid, [])
-            appfield_res = appfield_objs.browse(cr,uid, appfield_ids)
-            appfield_data_res = appfield_objs.read(cr,uid, appfield_ids,[])
-            
-            appcol_name=[]
-            for apcol in appfield_res:
-                appcol_name.append(apcol.name)
-                
-            id_tables=pooler.get_pool(cr.dbname).get('olap.database.tables').search(cr,uid,[('fact_database_id','=',ids.database_id.id),('table_db_name','not in',['inherit','res_roles','user_rule_group_rel','res_roles_users_rel','group_rule_group_rel'])])
-            tables=pooler.get_pool(cr.dbname).get('olap.database.tables').read(cr,uid,id_tables,[])
-            
-            for tables in tables:
-                if not(tables['table_db_name'].startswith('ir') or tables['table_db_name'].startswith('wkf') or tables['table_db_name'].startswith('res_groups')):
-                    vals={}
-                    if len(apptab_ids)==0 and (tables['table_db_name'] not in apptab_name):
-                        vals['table_name']=tables['table_db_name']
-                        vals['name']=(" ").join(map(lambda x:x.capitalize(),tables['name'].split("_")))
-                        vals['is_hidden']=tables['hide']
-                        vals['application_id']=app_id
-                        apptab_new_obj=apptab_objs.create(cr,uid,vals)
-                    else:
-                        if map_apptab_name_id.has_key(tables['table_db_name']):
-                            app_table = map_apptab_name_id[tables['table_db_name']]
-                            if ((app_table['table_name']==tables['table_db_name']) and not (app_table['table_name']==tables['name'])):
-                                vals['name']=aptable_obj.table_name
-                                vals['hide']=aptable_obj.is_hidden
-                                tables_obj_new=apptab_objs.write(cr,uid,tables['id'],vals)
-                        else:
-                            vals['table_name']=tables['table_db_name']
-                            vals['name']=(" ").join(map(lambda x:x.capitalize(),tables['name'].split("_")))
-                            vals['is_hidden']=tables['hide']
-                            vals['application_id']=app_id
-                            apptab_new_obj=apptab_objs.create(cr,uid,vals)
-                    
-            id_columns=pooler.get_pool(cr.dbname).get('olap.database.columns').search(cr,uid,[('table_id','in',id_tables)])
-            columns=pooler.get_pool(cr.dbname).get('olap.database.columns').read(cr,uid,id_columns,[])
-            for columns in columns:
-                vals={}
-                if len(appfield_ids) == 0 and (columns['column_db_name'] not in appcol_name):
-                    vals['field_name']=columns['column_db_name']
-                    vals['table_name']=columns['table_id'][1]
-                    vals['name']=(" ").join(map(lambda x:x.capitalize(),columns['name'].split("_")))
-                    vals['is_hidden']=columns['hide']
-                    vals['application_id']=x_app['id']                      
-                    appfield_new_obj=appfield_objs.create(cr,uid,vals)
-                else:
-                    if map_apptab_name_id.has_key(columns['table_id'][1]):
-                        table_id_write = map_apptab_name_id[columns['table_id'][1]]
-                        filter_column=filter(lambda x: columns['column_db_name']==x['field_name'] and columns['table_id'][1]==x['table_name'],appfield_data_res)
-                        vals['name']=(" ").join(map(lambda x:x.capitalize(),columns['name'].split("_")))
-                        vals['is_hidden']=columns['hide']
-                        appfield_new_obj=appfield_objs.write(cr,uid,filter_column[0]['id'],vals)
-                    else:
-                        vals['field_name']=columns['column_db_name']
-                        vals['table_name']=columns['table_id'][1]
-                        vals['name']=(" ").join(map(lambda x:x.capitalize(),columns['name'].split("_")))
-                        vals['is_hidden']=columns['hide']
-                        vals['application_id']=x_app['id']                      
-                        appfield_new_obj=appfield_objs.create(cr,uid,vals)
-        
-        
-            database_tables = pooler.get_pool(cr.dbname).get('olap.database.tables')
-            id_tables=database_tables.search(cr,uid,[('fact_database_id','=',ids.database_id.id)])
-            tables=database_tables.read(cr,uid,id_tables,[])
-            make_id=[]
-            for table in tables:
-                vals={}
-                if (table['table_db_name'].startswith('ir') or table['table_db_name'].startswith('wkf')) or (table['table_db_name'].startswith('res_groups')) or (table['table_db_name'] in ['inherit','res_roles','user_rule_group_rel','res_roles_users_rel','group_rule_group_rel']):            
-                    vals['hide']=True
-                    vals['active']=False
-                    make_id.append(table['id'])
-                    database_tables.write(cr,uid,table['id'],vals)
-                    
-            database_columns=pooler.get_pool(cr.dbname).get('olap.database.columns')
-            id_columns=database_columns.search(cr,uid,[('table_id','in',make_id)])
-            columns=database_columns.read(cr,uid,id_columns,[])
-            for col in columns:
-                val={}
-                vals['hide']=True
-                vals['active']=False
-                database_columns.write(cr,uid,col['id'],vals)
-                
-            
-        wf_service = netsvc.LocalService('workflow')
-        wf_service.trg_validate(uid, 'olap.schema', data['id'], 'dbconfigure', cr)
-        return {}
-      
-    
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch':form1, 'fields':{}, 'state':[('configure','Configure'),('end','Cancel')]}
-        },
-        'configure': {
-            'actions': [configure_application],
-            'result': {'type':'form', 'arch':info, 'fields':{}, 'state':[('end','Ok')]}   
-        },
-
-      }
-
-
-wizard_application_configure('olap.application.configuration')
-# vim: ts=4 sts=4 sw=4 si et
diff --git a/addons/olap/wizard/wizard_clear_logs.py b/addons/olap/wizard/wizard_clear_logs.py
deleted file mode 100755
index 38b6531485a..00000000000
--- a/addons/olap/wizard/wizard_clear_logs.py
+++ /dev/null
@@ -1,83 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-##############################################################################
-import time
-
-import wizard
-import pooler
-from osv import osv
-
-
-info = '''<?xml version="1.0"?>
-<form string="Load Data">
-    <label string="Logs Cleared successfully"/>
-</form>'''
-
-form1 = '''<?xml version="1.0"?>
-<form string=" To Load Data">
-    <field name='user_name'/>
-</form>'''
-
-field1 = {
- #   'account_id': {'string':"Analytic Account", 'type':'many2one', 'relation':'account.analytic.account', 'required':True, 'domain':"[('type','=','normal')]"},
-    'user_name': {'string':'User', 'type':'char','size':'64', 'required':True, 'readonly':True},
-#    'db_name': {'string':'Database Name', 'type':'char','size':'64', 'required':True, 'readonly':True},
-
-}
-
-def clear_logs(self,cr,uid,part,context={}):
-    ids=pooler.get_pool(cr.dbname).get('olap.query.logs').search(cr,uid,[('user_id','=',uid)])
-    pooler.get_pool(cr.dbname).get('olap.query.logs').unlink(cr, uid,ids,context)
-    return {}
-
-def _getdata(self,cr,uid,part,context={}):
-    ids=pooler.get_pool(cr.dbname).get('res.users').browse(cr,uid,uid)
-    part['form']['user_name']=ids['name']
-#    part['form']['db_name']=lines.database_id.db_name
-    return part['form']
-
-class wizard_clear_logs(wizard.interface):
-
-    states = {
-
-       'init': {
-            'actions': [_getdata],
-            'result': {'type':'form','arch':form1, 'fields':field1, 'state':[('end','Cancel'),('ok','Clear Logs')]}
-        },
-
-        'ok': {
-            'actions': [clear_logs],
-            'result': {'type':'form','arch':info,'fields':{}, 'state':[('end','Ok')]}
-                },
-
-         'info': {
-            'actions': [],
-            'result': {'type':'form', 'arch':info, 'fields':{}, 'state':[('end','Ok')]}
-                },
-
-      }
-
-wizard_clear_logs('olap.query.logs.clear')
diff --git a/addons/project_caldav/project_caldav_wizard.xml b/addons/project_caldav/project_caldav_wizard.xml
index 2bb677eea46..53c78a99bf2 100644
--- a/addons/project_caldav/project_caldav_wizard.xml
+++ b/addons/project_caldav/project_caldav_wizard.xml
@@ -1,18 +1,5 @@
 <openerp>
 	<data>
-		<wizard string="Import .ics File" model="project.task"
-			name="calendar.event.import" id="caldav.wizard_cal_event_import" />
-
-		<wizard string="Subscribe"
-			model="project.task" name="calendar.event.subscribe"
-			id="caldav.wizard_cal_event_subscribe" />
-
-		<wizard string="Export .ics File" model="project.task"
-			name="calendar.event.export" id="caldav.wizard_cal_event_export" />
-
-		<wizard string="Edit this event" model="project.task"
-			name="calendar.event.edit.this" id="caldav.wizard_edit_this_event"
-			menu="False" />
 
 	</data>
 </openerp>
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 48492f44675..cfb6961d112 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -29,13 +29,50 @@ from tools.translate import _
 import tools
 from osv import fields,osv,orm
 from osv.orm import except_orm
+from datetime import datetime, timedelta
+
 from crm import crm
+import time
+
 
 class project_issue(osv.osv):
     _name = "project.issue"
     _description = "Project Issue"
     _order = "priority, id desc"
     _inherit = 'crm.case'
+
+    def _compute_openday(self, cr, uid, ids, name, args, context={}):
+        result = {}
+        for r in self.browse(cr, uid, ids , context):
+            result[r.id] = 0
+            model_id = self.pool.get('ir.model').search(cr, uid, [('model', '=', 'project.issue')])
+            log_obj = self.pool.get('crm.case.log')
+            hist_id = log_obj.search(cr, uid, [('model_id', '=', model_id[0]), \
+                                                     ('res_id', '=', r.id), \
+                                                     ('name', '=', 'Open')])
+
+            if hist_id:
+                # Considering last log for opening case
+                log = log_obj.browse(cr, uid, hist_id[-1])
+                date_lead_open = datetime.strptime(r.create_date, "%Y-%m-%d %H:%M:%S")
+                date_log_open = datetime.strptime(log.date, "%Y-%m-%d %H:%M:%S")
+                ans = date_lead_open - date_log_open
+                duration =  float(ans.days) + (float(ans.seconds) / 86400)
+                result[r.id] = abs(int(duration))
+        return result
+
+    def _compute_closeday(self, cr, uid, ids, name, args, context={}):
+        result = {}
+        for r in self.browse(cr, uid, ids , context):
+            result[r.id] = 0
+            if r.date_closed:
+                date_create = datetime.strptime(r.create_date, "%Y-%m-%d %H:%M:%S")
+                date_close = datetime.strptime(r.date_closed, "%Y-%m-%d %H:%M:%S")
+                ans = date_close - date_create
+                duration =  float(ans.days) + (float(ans.seconds) / 86400)
+                result[r.id] = abs(int(duration))
+        return result
+
     _columns = {
         'date_closed': fields.datetime('Closed', readonly=True),
         'date': fields.datetime('Date'),
@@ -43,17 +80,29 @@ class project_issue(osv.osv):
         'ref2' : fields.reference('Reference 2', selection=crm._links_get, size=128),
         'canal_id': fields.many2one('res.partner.canal', 'Channel',help="The channels represent the different communication modes available with the customer." \
                                                                         " With each commercial opportunity, you can indicate the canall which is this opportunity source."),
+        'planned_revenue': fields.float('Planned Revenue'),
+        'planned_cost': fields.float('Planned Costs'),
+        'som': fields.many2one('res.partner.som', 'State of Mind', help="The minds states allow to define a value scale which represents" \
+                                                                       "the partner mentality in relation to our services.The scale has" \
+                                                                       "to be created with a factor for each level from 0 (Very dissatisfied) to 10 (Extremely satisfied)."),
         'categ_id': fields.many2one('crm.case.categ','Category', domain="[('object_id.model', '=', 'crm.project.bug')]"),
-        'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Severity'),
-        'type_id': fields.many2one('crm.case.resource.type', 'Version', domain="[('object_id.model', '=', 'project.issue')]"),
+        'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
+        'type_id': fields.many2one('crm.case.resource.type', 'Bug Type', domain="[('object_id.model', '=', 'project.issue')]"),
+
         'partner_name': fields.char("Employee's Name", size=64),
         'partner_mobile': fields.char('Mobile', size=32),
         'partner_phone': fields.char('Phone', size=32),
         'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('object_id.model', '=', 'project.issue')]"),
         'project_id':fields.many2one('project.project', 'Project'),
-        'duration': fields.float('Duration'),        
-        'task_id': fields.many2one('project.task', 'Task', domain="[('project_id','=',project_id)]")
+        'duration': fields.float('Duration'),
+        'probability': fields.float('Probability (%)'),
+        'task_id': fields.many2one('project.task', 'Task', domain="[('project_id','=',project_id)]"),
+        'day_open': fields.function(_compute_openday, string='Days to Open', \
+                                method=True, type="integer", store=True),
+        'day_close': fields.function(_compute_closeday, string='Days to Close', \
+                                method=True, type="integer", store=True),
     }
+
     def _get_project(self, cr, uid, context):
        user = self.pool.get('res.users').browse(cr,uid,uid, context=context)
        if user.context_project_id:
@@ -62,10 +111,10 @@ class project_issue(osv.osv):
 
     def _convert(self, cr, uid, ids, xml_id, context=None):
         data_obj = self.pool.get('ir.model.data')
-        id2 = data_obj._get_id(cr, uid, 'project_issue', xml_id)        
+        id2 = data_obj._get_id(cr, uid, 'project_issue', xml_id)
         categ_id = False
         if id2:
-            categ_id = data_obj.browse(cr, uid, id2, context=context).res_id    
+            categ_id = data_obj.browse(cr, uid, id2, context=context).res_id
         if categ_id:
             self.write(cr, uid, ids, {'categ_id': categ_id})
         return True
@@ -82,10 +131,14 @@ class project_issue(osv.osv):
         stage = self.pool.get('crm.case.stage').browse(cr, uid, stage_id, context)
         if not stage.on_change:
             return {'value':{}}
-        return {'value':{}}
+        return {'value':{'probability':stage.probability}}
 
     _defaults = {
-        'project_id':_get_project,
-    }
+           'project_id':_get_project,
+           'probability':lambda *a:0.0,
+           'planned_cost':lambda *a:0.0,
+           'planned_revenue':lambda *a:0.0,
+          }
+
 project_issue()
 
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 2a82ef783d3..8d6bbae0b5a 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -11,22 +11,22 @@
         <field name="name">Issue Categories</field>
         <field name="res_model">crm.case.categ</field>
         <field name="view_type">form</field>
-        <field name="view_id" ref="crm.crm_case_categ_tree-view"/>
-        <field name="domain">[('object_id.model', '=', 'project.issue')]</field>
-        <field name="context">{'object_id':'project.issue'}</field>
+ 		<field name="view_id" ref="crm.crm_case_categ_tree-view"/>
+       	<field name="domain">[('object_id.model', '=', 'project.issue')]</field>
+		<field name="context">{'object_id':'project.issue'}</field>
     </record>
     # ------------------------------------------------------
-    # Stage
-    # ------------------------------------------------------
-    <record id="project_issue_stage_act" model="ir.actions.act_window">
-        <field name="name">Issue Stages</field>
-        <field name="res_model">crm.case.stage</field>
-        <field name="view_type">form</field>
-        <field name="view_id" ref="crm.crm_case_stage_tree"/>
-        <field name="domain">[('object_id.model', '=', 'project.issue')]</field>
-        <field name="context">{'object_id':'project.issue'}</field>
-    </record>
-    <menuitem action="project_issue_stage_act" id="menu_project_issue_stage_act" parent="crm.menu_crm_case_stage"/>
+	    # Stage
+	 # ------------------------------------------------------
+	    <record id="project_issue_stage_act" model="ir.actions.act_window">
+	        <field name="name">Issue Stages</field>
+	        <field name="res_model">crm.case.stage</field>
+	        <field name="view_type">form</field>
+	        <field name="view_id" ref="crm.crm_case_stage_tree"/>
+       		<field name="domain">[('object_id.model', '=', 'project.issue')]</field>
+			<field name="context">{'object_id':'project.issue'}</field>
+	    </record>
+	  <menuitem action="project_issue_stage_act" id="menu_project_issue_stage_act" parent="crm.menu_crm_case_stage"/>
 
     <record model="ir.ui.view" id="project_issue_form_view">
         <field name="name">Project Issue Tracker Form</field>
@@ -34,38 +34,50 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Issue Tracker Form">
-                <group colspan="3" col="4">
-                    <field name="name"/>
-                    <field name="user_id"/>
-                    <field name="project_id" required="True"/>
+                <group colspan="4" col="6">
+                    <field name="name" string="Title" colspan="2"/>
+                  	<field name="project_id" required="True"/>
                     <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
-                </group>
-                <group colspan="1" col="3">
-                    <field name="task_id"/>
-                    <button string="Convert To Task"
-                        name="%(wizard_project_issue_task_set)d"
-                        icon="gtk-index" type="action"
-                        attrs="{'invisible':[('task_id','!=',False)]}"/>
-                    <newline/>
-                    <field name="stage_id" on_change="onchange_stage_id(stage_id)"  domain="[('object_id.model', '=', 'project.issue')]"/>
-                    <group colspan="1" col="2">
-                        <button icon="gtk-go-back" string="" name="stage_previous" type="object"/>
-                        <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
+                    <group col="3" colspan="2">
+                      	<field name="task_id"/>
+                        <button string="Convert To Task"
+                         	name="%(wizard_project_issue_task_set)d"
+                         	icon="gtk-index" type="action"
+                         	attrs="{'invisible':[('task_id','!=',False)]}" />
                     </group>
-                </group>
+
+                   </group>
+                   <!-- <group colspan="4" col="5">
+                         <label string="" colspan="2"/>
+                          <button string="Convert To Feature Request"
+                         	name="convert_to_feature"
+                         	icon="gtk-convert" type="object" attrs="{'invisible':[('categ_id','=',ref('bug_categ'))]}"/>
+                          <button string="Convert To Bug"
+                         	name="convert_to_bug"
+                         	icon="gtk-convert" type="object" attrs="{'invisible':[('categ_id','=',ref('feature_request_categ'))]}"/>
+
+
+                   </group> -->
+
                 <notebook colspan="4">
                 <page string="General">
-                    <group col="2" colspan="2">
-                        <separator colspan="2" string="Communication"/>
-                        <field name="partner_id"  on_change="onchange_partner_id(partner_id, email_from)"/>
-                        <field name="partner_address_id"  string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)"/>
-                        <field name="email_from"/>
-                    </group>
-                    <group col="2" colspan="2">
-                        <separator colspan="2" string="Status"/>
-                        <field name="type_id"/>
-                        <field name="priority"/>
+                	<separator colspan="4" string="Communication"/>
+                    <field name="partner_id"  on_change="onchange_partner_id(partner_id, email_from)" colspan="2"/>
+                    <field name="partner_address_id"  string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="1"/>
+                    <field name="email_from" colspan="2"/>
+                    <separator colspan="4" string="Status and Categorization"/>
+                    <group colspan="4" col="6">
+	                    <field name="type_id" string="Version"/>
+	                    <field name="priority" string="Severity"/>
+	                    <field name="user_id" />
+	                    <label string="Resolution: " align="1.0"/>
+	                    <group colspan="1" col="3">
+	                        <field name="stage_id"  select="1" nolabel="1" on_change="onchange_stage_id(stage_id)"  domain="[('object_id.model', '=', 'project.issue')]"/>
+	                        <button icon="gtk-go-back" string="" name="stage_previous" type="object"/>
+	                        <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
+	                    </group>
                     </group>
+                    <newline/>
                     <separator string= "Description" colspan="4"/>
                     <field name="description" nolabel="1" colspan="4"/>
                     <separator colspan="4"/>
@@ -80,27 +92,27 @@
                     </group>
                 </page>
                 <page string="History" groups="base.group_extended">
-                    <group col="2" colspan="2">
-                        <separator colspan="2" string="Dates"/>
-                        <field name="create_date"/>
-                        <field name="date_closed"/>
-                    </group>
-                    <group col="2" colspan="2">
-                        <separator string="References" colspan="2"/>
-                        <field name="id"/>
-                        <field name="active"/>
-                    </group>
-                    <group col="2" colspan="2">
-                        <separator string="References" colspan="2"/>
-                        <field name="ref" colspan="4"/>
-                        <field name="ref2" colspan="4"/>
-                    </group>
+                    <field name="id" select="1"/>
+                    <field name="active" />
+                    <separator colspan="4" string="Dates"/>
+                    <field name="create_date"/>
+                    <field name="date_closed"/>
+                    <field name="day_open"/>
+                    <field name="day_close"/>
+                    <separator colspan="4" string="Estimates"/>
+                    <field name="planned_revenue"/>
+                    <field name="planned_cost"/>
+                    <field name="probability"/>
+                    <separator colspan="4" string="References"/>
+                    <field name="ref" colspan="4"/>
+                    <field name="ref2" colspan="4"/>
                     <field name="log_ids" nolabel="1" colspan="4">
                         <form string="Actions">
                             <separator string="Action Information" colspan="4"/>
                             <field name="name" colspan="4"/>
                             <field name="date" />
                             <field name="user_id" />
+                            <field name="som" />
                             <field name="canal_id"/>
                         </form>
                     </field>
@@ -116,9 +128,9 @@
                                 <field name="email"/>
                                 <field name="canal_id"/>
                                 <button
-                                   string="Add a CC"
-                                    name="%(crm.action_view_crm_email_add_cc_wizard)d"
-                                    icon="gtk-add" type="action"/>
+								   string="Add a CC"
+								    name="%(crm.action_view_crm_email_add_cc_wizard)d"
+								    icon="gtk-add" type="action"/>
                             </group>
                             <newline/>
                             <field name="description" colspan="4" nolabel="1"/>
@@ -143,16 +155,16 @@
         <field name="arch" type="xml">
             <tree string="Issue Tracker Tree"  colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
                 <field name="id"/>
-                <field name="name"/>
+                <field name="name" string="Title"/>
                 <field name="partner_id"/>
                 <field name="priority" string="Severity"/>
                 <field name="stage_id" string="Resolution"/>
                 <button icon="gtk-go-back" string=""
-                    name="stage_previous" type="object"
-                    states="open,draft,pending,done,cancel" />
+                	name="stage_previous" type="object"
+                	states="open,draft,pending,done,cancel" />
                 <button icon="gtk-go-forward" string=""
-                    name="stage_next" type="object"
-                    states="open,draft,pending,done,cancel" />
+                	name="stage_next" type="object"
+                	states="open,draft,pending,done,cancel" />
                 <field name="type_id" string="Version"/>
                 <field name="user_id"/>
                 <field name="state"/>
@@ -174,29 +186,29 @@
             <search string="Issue Tracker Search">
                <group col="3" colspan="1">
                    <filter icon="gtk-home" string="   Today   "
-                       separator="1"
-                       domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]"
-                       help="Todays's bugs"
+                   	separator="1"
+                   	domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]"
+                   	help="Todays's bugs"
                    />
                    <filter icon="gtk-media-rewind"
-                       string="    7 Days    " separator="1"
-                       domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d')), ('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-                       help="Bugs during last 7 days"
+                   	string="    7 Days    " separator="1"
+                   	domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d')), ('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
+                   	help="Bugs during last 7 days"
                    />
 
                </group>
                <separator orientation="vertical"/>
                <group col="5" colspan="2">
-                   <field name="name" select='1' string="Subject"/>
+               		<field name="name" select='1' string="Subject"/>
                     <field name="user_id" select="1" widget="selection">
-                    <filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Bugs" default="1"/>
+                   	    <filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Bugs" default="1"/>
                     </field>
                     <field name="state" select="1">
                        <filter icon="gtk-new" domain="[('state','in',('open','draft'))]" help="Current Bugs" default="1"/>
                        <filter icon="gtk-yes" domain="[('state','=','open')]" help="Open Bugs"/>
                     </field>
-                    <field name="project_id" select="1" widget="selection" string="Project" default="context.get('project_id', False)">
-                            <filter icon="terp-crm"
+					<field name="project_id" select="1" widget="selection" string="Project" default="context.get('project_id', False)">
+							<filter icon="terp-crm"
                                domain="[('project_id','=',context.get('project_id',False))]"
                                help="My Project"
                            />
@@ -235,11 +247,11 @@
                 <field name="priority" string="Severity"/>
                 <field name="stage_id" string="Resolution"/>
                 <button icon="gtk-go-back" string=""
-                    name="stage_previous" type="object"
-                    states="open,draft,pending,done,cancel" />
+                	name="stage_previous" type="object"
+                	states="open,draft,pending,done,cancel" />
                 <button icon="gtk-go-forward" string=""
-                    name="stage_next" type="object"
-                    states="open,draft,pending,done,cancel" />
+                	name="stage_next" type="object"
+                	states="open,draft,pending,done,cancel" />
                 <field name="type_id" string="Version"/>
                 <field name="user_id"/>
                 <field name="state"/>
@@ -253,7 +265,7 @@
         </field>
     </record>
 
-    <record id="view_project_feature_filter" model="ir.ui.view">
+	<record id="view_project_feature_filter" model="ir.ui.view">
         <field name="name">Project Issue- Feature Tracker Search</field>
         <field name="model">project.issue</field>
         <field name="type">search</field>
@@ -261,28 +273,28 @@
             <search string="Feature Tracker Search">
                <group col="3" colspan="1">
                    <filter icon="gtk-home" string="   Today   "
-                       separator="1"
-                       domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]"
-                       help="Todays's features"
+                   	separator="1"
+                   	domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]"
+                   	help="Todays's features"
                    />
                    <filter icon="gtk-media-rewind"
-                       string="    7 Days    " separator="1"
-                       domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d')), ('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-                       help="Features during last 7 days"
+                   	string="    7 Days    " separator="1"
+                   	domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d')), ('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
+                   	help="Features during last 7 days"
                    />
                </group>
                <separator orientation="vertical"/>
                <group col="5" colspan="2">
-                    <field name="name" select='1' string="Feature description"/>
+               		<field name="name" select='1' string="Feature description"/>
                     <field name="user_id" select="1" widget="selection">
-                        <filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Features" default="1"/>
+                   	    <filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Features" default="1"/>
                     </field>
                     <field name="state" select="1">
                        <filter icon="gtk-new" domain="[('state','in',('open','draft'))]" help="Current Features" default="1"/>
                        <filter icon="gtk-yes" domain="[('state','=','open')]" help="Open Features"/>
                     </field>
-                    <field name="project_id" select="1" widget="selection" string="Project" default="context.get('project_id', False)">
-                            <filter icon="terp-crm"
+					<field name="project_id" select="1" widget="selection" string="Project" default="context.get('project_id', False)">
+							<filter icon="terp-crm"
                                domain="[('project_id','=',context.get('project_id',False))]"
                                help="My Project"
                            />
diff --git a/addons/survey/report/survey_analysis_report.py b/addons/survey/report/survey_analysis_report.py
index 44d42610e6f..a3a54bf4950 100755
--- a/addons/survey/report/survey_analysis_report.py
+++ b/addons/survey/report/survey_analysis_report.py
@@ -106,31 +106,31 @@ class survey_analysis(report_rml):
             
         for survey in surv_obj.browse(cr, uid, ids):
             rml += """<blockTable colWidths="280.0,100.0,120.0" style="Table_heading">
-                          <tr>
-                            <td>
-                              <para style="terp_tblheader_General_Centre">Survey Title </para>
-                            </td>
-                            <td>
-                              <para style="terp_tblheader_General_Centre">Total Started Survey </para>
-                            </td>
-                            <td>
-                              <para style="terp_tblheader_General_Centre">Total Completed Survey </para>
-                            </td>
-                          </tr>
-                          </blockTable>
-                          <blockTable colWidths="280.0,100.0,120.0" style="Table_head_2">
-                          <tr>
-                            <td>
-                              <para style="terp_default_Centre_8">""" + to_xml(tools.ustr(survey.title)) + """</para>
-                            </td>
-                            <td>
-                              <para style="terp_default_Centre_8">""" + str(survey.tot_start_survey) + """</para>
-                            </td>
-                            <td>
-                              <para style="terp_default_Centre_8">""" + str(survey.tot_comp_survey) + """</para>
-                            </td>
-                          </tr>
-                        </blockTable>"""
+                      <tr>
+                        <td>
+                          <para style="terp_tblheader_General_Centre">Survey Title </para>
+                        </td>
+                        <td>
+                          <para style="terp_tblheader_General_Centre">Total Started Survey </para>
+                        </td>
+                        <td>
+                          <para style="terp_tblheader_General_Centre">Total Completed Survey </para>
+                        </td>
+                      </tr>
+                      </blockTable>
+                      <blockTable colWidths="280.0,100.0,120.0" style="Table_head_2">
+                      <tr>
+                        <td>
+                          <para style="terp_default_Centre_8">""" + to_xml(tools.ustr(survey.title)) + """</para>
+                        </td>
+                        <td>
+                          <para style="terp_default_Centre_8">""" + str(survey.tot_start_survey) + """</para>
+                        </td>
+                        <td>
+                          <para style="terp_default_Centre_8">""" + str(survey.tot_comp_survey) + """</para>
+                        </td>
+                      </tr>
+                    </blockTable>"""
             for page in survey.page_ids:
                 rml += """ <blockTable colWidths="500" style="Table4">
 #                              <tr>
@@ -144,24 +144,27 @@ class survey_analysis(report_rml):
                               </tr>
                              </blockTable>"""
                     cols_widhts = []
+
                     if que.type in ['matrix_of_choices_only_one_ans','matrix_of_choices_only_multi_ans']:
                         cols_widhts.append(200)
                         for col in range(0, len(que.column_heading_ids) + 1):
                             cols_widhts.append(float(300 / (len(que.column_heading_ids) + 1)))
                         colWidths = ",".join(map(tools.ustr, cols_widhts))
                         matrix_ans = [(0,'')]
+
                         for col in que.column_heading_ids:
                             if col.title not in matrix_ans:
                                 matrix_ans.append((col.id,col.title))
-                        rml+="""<blockTable colWidths=" """ + colWidths + """ " style="Table1"><tr>"""
+                        rml += """<blockTable colWidths=" """ + colWidths + """ " style="Table1"><tr>"""
                         for mat_col in range(0, len(matrix_ans)):
                             rml+="""<td><para style="response">""" + to_xml(tools.ustr(matrix_ans[mat_col][1])) + """</para></td>"""
-                        rml+="""<td><para style="response-bold">Response Count</para></td>
+                        rml += """<td><para style="response-bold">Response Count</para></td>
                                 </tr>"""
                         last_col = cols_widhts[-1]
+
                         for ans in que.answer_choice_ids:
-                            rml+="""<tr><td><para style="answer">""" + to_xml(tools.ustr(ans.answer)) + """</para></td>"""
-                            cr.execute("select count(id) from survey_response_answer sra where sra.answer_id = %d"%(ans.id))
+                            rml += """<tr><td><para style="answer">""" + to_xml(tools.ustr(ans.answer)) + """</para></td>"""
+                            cr.execute("select count(id) from survey_response_answer sra where sra.answer_id = %d" % ans.id)
                             tot_res = cr.fetchone()[0]
                             cr.execute("select count(id) ,sra.column_id from survey_response_answer sra where sra.answer_id = %d group by sra.column_id" % ans.id)
                             calc_res = cr.dictfetchall()
@@ -177,25 +180,27 @@ class survey_analysis(report_rml):
                                     rml += """<td color="#FFF435"><para style="answer_bold">""" + tools.ustr(percantage) +"% (" + tools.ustr(cal_count) + """)</para></td>"""
                                 else:
                                     rml += """<td color="#FFF435"><para style="answer">""" + tools.ustr(percantage) +"% (" + tools.ustr(cal_count) + """)</para></td>"""
-                            rml+="""<td><para style="answer_right">""" + tools.ustr(tot_res) + """</para></td>
+                            rml += """<td><para style="answer_right">""" + tools.ustr(tot_res) + """</para></td>
                                 </tr>"""
-                        rml+="""</blockTable>"""
+                        rml += """</blockTable>"""
+
                         if que.is_comment_require:
                             cr.execute("select count(id) from survey_response_line where question_id = %d and comment != ''"% que.id)
                             tot_res = cr.fetchone()[0]
-                            rml+="""<blockTable colWidths=" """+ str(500 - last_col) +"," + str(last_col) + """ " style="Table1"><tr><td><para style="answer_right">""" + to_xml(tools.ustr(que.comment_label)) + """</para></td>
+                            rml += """<blockTable colWidths=" """+ str(500 - last_col) +"," + str(last_col) + """ " style="Table1"><tr><td><para style="answer_right">""" + to_xml(tools.ustr(que.comment_label)) + """</para></td>
                                     <td><para style="answer">""" + tools.ustr(tot_res) + """</para></td></tr></blockTable>"""
 
                     elif que.type in['multiple_choice_only_one_ans', 'multiple_choice_multiple_ans', 'multiple_textboxes','date_and_time','date','multiple_textboxes_diff_type']:
-                        rml +="""<blockTable colWidths="240.0,210,50.0" style="Table1">"""
+                        rml += """<blockTable colWidths="240.0,210,50.0" style="Table1">"""
                         rml += """ <tr>
                              <td> <para style="Standard"> </para></td>
                              <td> <para style="terp_default_Center_heading">Response Percentage</para></td>
                              <td> <para style="response-bold">Response Count</para></td>
                          </tr>"""
+
                         for ans in que.answer_choice_ids:
                             progress = ans.average * 7 / 100
-                            rml+="""<tr><td><para style="answer">""" + to_xml(tools.ustr(ans.answer)) + """</para></td>
+                            rml += """<tr><td><para style="answer">""" + to_xml(tools.ustr(ans.answer)) + """</para></td>
                                     <td>
                                     <illustration>
                                     <stroke color="lightslategray"/>
@@ -204,13 +209,14 @@ class survey_analysis(report_rml):
                             if progress:
                                 rml += """<fill color="lightsteelblue"/>
                                        <rect x="0.2cm" y="-0.35cm"  width='""" + tools.ustr(str(float(progress)) +'cm') + """' height="0.3cm" fill="yes" stroke="no"  round="0.1cm"/>"""
-                            rml +="""
+                            rml += """
                                 <fill color="black"/>
                                 <setFont name="Helvetica" size="9"/>
                                 <drawString x="3.2cm" y="-0.30cm">"""  + tools.ustr(ans.average) + """%</drawString></illustration>
                                     </td>
                                     <td><para style="answer_right">""" + tools.ustr(ans.response) + """</para></td></tr>"""
-                        rml+="""</blockTable>"""
+                        rml += """</blockTable>"""
+
                         if que.is_comment_require:
 #                            if que.make_comment_field:
 #                                cr.execute("select count(id) from survey_response_line where question_id = %d and comment != ''"% que.id)
@@ -224,12 +230,12 @@ class survey_analysis(report_rml):
 #                            else:
                             cr.execute("select count(id) from survey_response_line where question_id = %d and comment != ''"% que.id)
                             tot_res = cr.fetchone()[0]
-                            rml+="""<blockTable colWidths="450.0,50.0" style="Table1"><tr><td><para style="answer_right">""" + to_xml(tools.ustr(que.comment_label)) + """</para></td>
+                            rml += """<blockTable colWidths="450.0,50.0" style="Table1"><tr><td><para style="answer_right">""" + to_xml(tools.ustr(que.comment_label)) + """</para></td>
                                     <td><para style="answer_right">""" + tools.ustr(tot_res) + """</para></td></tr></blockTable>"""
 
                     elif que.type in['single_textbox']:
                         cr.execute("select count(id) from survey_response_line where question_id = %d and single_text!=''" % que.id)
-                        rml +="""<blockTable colWidths="400.0,100.0" style="Table1">
+                        rml += """<blockTable colWidths="400.0,100.0" style="Table1">
                              <tr>
                                  <td> <para style="Standard"> </para></td>
                                  <td> <para style="response-bold">Response Count</para></td>
@@ -237,9 +243,10 @@ class survey_analysis(report_rml):
                             <tr><td><para style="answer"></para></td>
                                 <td><para style="answer_right">""" + tools.ustr(cr.fetchone()[0]) + """ </para></td></tr>
                             </blockTable>"""
+
                     elif que.type in['comment']:
                         cr.execute("select count(id) from survey_response_line where question_id = %d and comment !=''" % que.id)
-                        rml +="""<blockTable colWidths="400.0,100.0" style="Table1">
+                        rml += """<blockTable colWidths="400.0,100.0" style="Table1">
                              <tr>
                                  <td> <para style="Standard"> </para></td>
                                  <td> <para style="response-bold">Response Count</para></td>
@@ -247,23 +254,26 @@ class survey_analysis(report_rml):
                             <tr><td><para style="answer"></para></td>
                                 <td><para style="answer_right">""" + tools.ustr(cr.fetchone()[0]) + """ </para></td></tr>
                             </blockTable>"""
+
                     elif que.type in['rating_scale']:
                         cols_widhts.append(200)
                         for col in range(0,len(que.column_heading_ids) + 2):
                             cols_widhts.append(float(300 / (len(que.column_heading_ids) + 2)))
                         colWidths = ",".join(map(tools.ustr, cols_widhts))
                         matrix_ans = [(0,'')]
+
                         for col in que.column_heading_ids:
                             if col.title not in matrix_ans:
                                 matrix_ans.append((col.id,col.title))
-                        rml+="""<blockTable colWidths=" """ + colWidths + """ " style="Table1"><tr>"""
+                        rml += """<blockTable colWidths=" """ + colWidths + """ " style="Table1"><tr>"""
                         for mat_col in range(0,len(matrix_ans)):
-                            rml+="""<td><para style="response">""" + to_xml(tools.ustr(matrix_ans[mat_col][1])) + """</para></td>"""
-                        rml+="""<td><para style="response-bold">Rating Average</para></td>
+                            rml += """<td><para style="response">""" + to_xml(tools.ustr(matrix_ans[mat_col][1])) + """</para></td>"""
+                        rml += """<td><para style="response-bold">Rating Average</para></td>
                                 <td><para style="response-bold">Response Count</para></td>
                                 </tr>"""
+
                         for ans in que.answer_choice_ids:
-                            rml+="""<tr><td><para style="answer">""" + to_xml(tools.ustr(ans.answer)) + """</para></td>"""
+                            rml += """<tr><td><para style="answer">""" + to_xml(tools.ustr(ans.answer)) + """</para></td>"""
                             res_count = 0
                             rating_weight_sum = 0
                             for mat_col in range(1, len(matrix_ans)):
@@ -275,11 +285,13 @@ class survey_analysis(report_rml):
                                         sqc.question_id = sr.question_id  and sra.answer_id = %d and sqc.title ='%s'\
                                         group by sra.answer_id,sqc.rating_weight" % (ans.id,matrix_ans[mat_col][1]))
                                 col_weight =  cr.fetchone()
+
                                 if not col_weight:
                                     col_weight= (0,0)
                                 elif not col_weight[1]:
                                     col_weight = (col_weight[0],0)
                                 res_count = col_weight[0]
+
                                 if tot_res and res_count:
                                     rating_weight_sum += int(col_weight[1]) * tot_res
                                     tot_per = round((float(tot_res) * 100) / int(res_count), 2)
@@ -290,12 +302,14 @@ class survey_analysis(report_rml):
                                     rml += """<td><para style="answer_bold">""" + tools.ustr(tot_per) + "%(" + tools.ustr(tot_res) + """)</para></td>"""
                                 else:
                                     rml += """<td><para style="answer">""" + tools.ustr(tot_per)+"%(" + tools.ustr(tot_res) + """)</para></td>"""
+
                             percantage = 0.00
                             if res_count:
                                 percantage = round((float(rating_weight_sum)/res_count), 2)
-                            rml+="""<td><para style="answer_right">""" + tools.ustr(percantage) + """</para></td>
+                            rml += """<td><para style="answer_right">""" + tools.ustr(percantage) + """</para></td>
                                 <td><para style="answer_right">""" + tools.ustr(res_count) + """</para></td></tr>"""
-                        rml+="""</blockTable>"""
+                        rml += """</blockTable>"""
+
                     elif que.type in['matrix_of_drop_down_menus']:
                         for column in que.column_heading_ids:
                             rml += """<blockTable colWidths="500" style="Table1"><tr>
@@ -306,8 +320,9 @@ class survey_analysis(report_rml):
                             for col in range(0, len(menu_choices) + 1):
                                 cols_widhts.append(float(300 / (len(menu_choices) + 1)))
                             colWidths = ",".join(map(tools.ustr, cols_widhts))
-                            rml +="""<blockTable colWidths=" """ + colWidths + """ " style="Table1"><tr>
+                            rml += """<blockTable colWidths=" """ + colWidths + """ " style="Table1"><tr>
                                 <td><para style="response"></para></td>"""
+
                             for menu in menu_choices:
                                 rml += """<td><para style="response">""" + to_xml(tools.ustr(menu)) + """</para></td>"""
                             rml += """<td><para style="response-bold">Response Count</para></td></tr>"""
@@ -317,8 +332,9 @@ class survey_analysis(report_rml):
                             cr.execute("select count(sra.id),sra.value_choice, sra.answer_id, sra.column_id from survey_response_answer sra \
                                  where sra.column_id='%s'  group by sra.value_choice ,sra.answer_id, sra.column_id" % (column.id))
                             calc_percantage = cr.dictfetchall()
+
                             for ans in que.answer_choice_ids:
-                                rml+="""<tr><td><para style="answer_right">""" + to_xml(tools.ustr(ans.answer)) + """</para></td>"""
+                                rml += """<tr><td><para style="answer_right">""" + to_xml(tools.ustr(ans.answer)) + """</para></td>"""
                                 for mat_col in range(0, len(menu_choices)):
                                     calc = 0
                                     response = 0
@@ -328,19 +344,22 @@ class survey_analysis(report_rml):
                                         if ans.id == per['answer_id'] and menu_choices[mat_col] == per['value_choice']:
                                             calc = per['count']
                                     percantage = 0.00
+
                                     if calc and response:
                                         percantage = round((float(calc)* 100) / response,2)
                                     if calc:
-                                        rml+="""<td><para style="answer_bold">""" +tools.ustr(percantage)+"% (" +  tools.ustr(calc) + """)</para></td>"""
+                                        rml += """<td><para style="answer_bold">""" +tools.ustr(percantage)+"% (" +  tools.ustr(calc) + """)</para></td>"""
                                     else:
-                                        rml+="""<td><para style="answer">""" +tools.ustr(percantage)+"% (" +  tools.ustr(calc) + """)</para></td>"""
+                                        rml += """<td><para style="answer">""" +tools.ustr(percantage)+"% (" +  tools.ustr(calc) + """)</para></td>"""
+
                                 response = 0
                                 for res in res_count:
                                     if res['answer_id'] == ans.id: response = res['count']
                                 rml += """<td><para style="answer_right">""" + tools.ustr(response) + """</para></td></tr>"""
                             rml += """</blockTable>"""
+
                     elif que.type in['numerical_textboxes']:
-                        rml +="""<blockTable colWidths="240.0,20,100.0,70,70.0" style="Table1">
+                        rml += """<blockTable colWidths="240.0,20,100.0,70,70.0" style="Table1">
                              <tr>
                              <td> <para style="Standard"> </para></td>
                              <td> <para style="Standard"> </para></td>
@@ -355,6 +374,7 @@ class survey_analysis(report_rml):
                             for  tot in tot_res:
                                 total += int(tot['answer'])
                             per = 0.00
+
                             if len(tot_res):
                                 per = round((float(total) / len(tot_res)),2)
                             rml+="""<tr><td><para style="answer">""" + to_xml(tools.ustr(ans.answer)) + """</para></td>
@@ -377,10 +397,12 @@ class survey_analysis(report_rml):
                         </tr>
                         </blockTable>"""
             rml += """<pageBreak/>"""
+
         rml += """</story></document>"""
         report_type = datas.get('report_type', 'pdf')
         create_doc = self.generators[report_type]
         pdf = create_doc(rml, title=self.title)
+
         return (pdf, report_type)
 
 survey_analysis('report.survey.analysis', 'survey','','')
diff --git a/addons/survey/report/survey_browse_response.py b/addons/survey/report/survey_browse_response.py
index ee58e9536be..25c9a32ce2b 100644
--- a/addons/survey/report/survey_browse_response.py
+++ b/addons/survey/report/survey_browse_response.py
@@ -31,19 +31,21 @@ class survey_browse_response(report_rml):
         _divide_columns_for_matrix = 0.7
         _display_ans_in_rows = 5
         _pageSize = ('29.7cm','21.1cm')
-        if datas.has_key('form') and datas['form']['orientation']=='vertical':
-            if datas['form']['paper_size']=='letter':
+
+        if datas.has_key('form') and datas['form'].get('orientation','') == 'vertical':
+            if datas['form'].get('paper_size','') == 'letter':
                 _pageSize = ('21.6cm','27.9cm')
-            elif datas['form']['paper_size']=='legal':
+            elif datas['form'].get('paper_size','') == 'legal':
                 _pageSize = ('21.6cm','35.6cm')
-            elif datas['form']['paper_size']=='a4':
+            elif datas['form'].get('paper_size','') == 'a4':
                 _pageSize = ('21.1cm','29.7cm')
-        elif datas.has_key('form') and datas['form']['orientation']=='horizontal':
-            if datas['form']['paper_size']=='letter':
+
+        elif datas.has_key('form') and datas['form'].get('orientation',False) == 'horizontal':
+            if datas['form'].get('paper_size','') == 'letter':
                 _pageSize = ('27.9cm','21.6cm')
-            elif datas['form']['paper_size']=='legal':
+            elif datas['form'].get('paper_size','') == 'legal':
                 _pageSize = ('35.6cm','21.6cm')
-            elif datas['form']['paper_size']=='a4':
+            elif datas['form'].get('paper_size') == 'a4':
                 _pageSize = ('29.7cm','21.1cm')
 
         _frame_width = tools.ustr(_pageSize[0])
@@ -190,9 +192,11 @@ class survey_browse_response(report_rml):
             response_id = [int(context['response_id'][0])]
         else:
             response_id = surv_resp_obj.search(cr, uid, [('survey_id', 'in', ids)])
+
         surv_resp_line_obj = pooler.get_pool(cr.dbname).get('survey.response.line')
         surv_obj = pooler.get_pool(cr.dbname).get('survey')
         surv_ans_obj = pooler.get_pool(cr.dbname).get('survey.answer')
+
         for response in surv_resp_obj.browse(cr, uid, response_id):
             for survey in surv_obj.browse(cr, uid, [response.survey_id.id]):
                 tbl_width = float(_tbl_widths.replace('cm', ''))
@@ -206,6 +210,7 @@ class survey_browse_response(report_rml):
                             <td><para style="terp_tblheader_General_right_simple">""" + to_xml(response.user_id.login) + """</para></td>
                           </tr>
                         </blockTable><para style="P2"></para>"""
+
                 status = "Not Finished"
                 if response.state == "done": status = "Finished"
                 colwidth =  str(tbl_width - 7) + "cm,"
@@ -216,10 +221,12 @@ class survey_browse_response(report_rml):
                             <td><para style="descriptive_text_heading">Status :- """ + to_xml(tools.ustr(status)) + """</para><para style="P2"><font></font></para></td>
                             </tr>
                         </blockTable>"""
+
                 if survey.note:
                     rml += """<blockTable colWidths='""" + _tbl_widths + """' style="note_table">
                             <tr><td><para style="response">""" + to_xml(tools.ustr(survey.note or '')) + """</para><para style="P2"><font></font></para></td></tr>
                         </blockTable>"""
+
                 for page in survey.page_ids:
                     rml += """<blockTable colWidths='""" + str(_tbl_widths) + """' style="page_tbl">
                                   <tr><td><para style="page">Page :- """ + to_xml(tools.ustr(page.title or '')) + """</para></td></tr>
@@ -229,16 +236,19 @@ class survey_browse_response(report_rml):
                                  <blockTable colWidths='""" + str(_tbl_widths) + """' style="note_table">
                                       <tr><td><para style="response">""" + to_xml(tools.ustr(page.note or '')) + """</para></td></tr>
                                  </blockTable>"""
+
                     for que in page.question_ids:
                         rml += """<para style="P2"></para>
                                 <blockTable colWidths='""" + str(_tbl_widths) + """' style="Table5">
                                   <tr><td><para style="question">""" + to_xml(to_xml(que.question)) + """</para></td></tr>
                                 </blockTable>"""
+
                         answer = surv_resp_line_obj.browse(cr ,uid, surv_resp_line_obj.search(cr, uid, [('question_id', '=', que.id),('response_id', '=', response.id)]))
                         if que.type in ['descriptive_text']:
                             rml +="""<blockTable colWidths='""" + str(_tbl_widths) + """' style="simple_table">
                                          <tr><td> <para style="response">""" + to_xml(tools.ustr(que.descriptive_text)) + """</para></td> </tr>
                                     </blockTable>"""
+
                         elif que.type in ['table']:
                             if len(answer) and answer[0].state == "done":
                                 col_heading = pooler.get_pool(cr.dbname).get('survey.tbl.column.heading')
@@ -250,18 +260,20 @@ class survey_browse_response(report_rml):
                                 colWidths = colWidths + 'cm'
                                 matrix_ans = []
                                 rml +="""<para style="P2"></para><blockTable colWidths=" """ + str(colWidths) + """ " style="Table41"><tr>"""
+
                                 for col in que.column_heading_ids:
                                     if col.title not in matrix_ans:
                                         matrix_ans.append(col.title)
                                         rml += """<td> <para style="terp_tblheader_Details">""" + to_xml(tools.ustr(col.title)) +"""</para></td>"""
                                 rml += """</tr></blockTable>"""
                                 i = 0
+
                                 for row in range(0, que.no_of_rows):
-                                    if i%2!=0:
-                                        style='tbl_white'
+                                    if i%2 != 0:
+                                        style = 'tbl_white'
                                     else:
-                                        style='tbl_gainsboro'
-                                    i+=1
+                                        style = 'tbl_gainsboro'
+                                    i +=1 
                                     rml += """<blockTable colWidths=" """ + str(colWidths) + """ " style='"""+style+"""'><tr>"""
                                     table_data = col_heading.browse(cr, uid, col_heading.search(cr, uid, [('response_table_id', '=', answer[0].id), ('name', '=', row)]))
                                     for column in matrix_ans:
@@ -274,16 +286,19 @@ class survey_browse_response(report_rml):
                                         else:
                                             rml += """<td><para style="terp_default_9"><font color ="white"> </font></para></td>"""
                                     rml += """</tr></blockTable>"""
+
                             else:
                                 rml +="""<blockTable colWidths='""" + str(_tbl_widths) + """' style="simple_table">
                                              <tr><td> <para style="response">No Response</para></td> </tr>
                                         </blockTable>"""
+
                         elif que.type in ['multiple_choice_only_one_ans','multiple_choice_multiple_ans']:
                             if len(answer) and answer[0].state == "done":
                                 ans_list = []
                                 for ans in answer[0].response_answer_ids:
                                     ans_list.append(to_xml(tools.ustr(ans.answer_id.answer)))
                                 answer_choice=[]
+
                                 for ans in que['answer_choice_ids']:
                                     answer_choice.append(to_xml(tools.ustr((ans.answer))))
 
@@ -297,6 +312,7 @@ class survey_browse_response(report_rml):
                                            lst.append('')
                                     if not lst:
                                        del divide_list[divide_list.index(lst):]
+
                                 for divide in divide_list:
                                     a = _divide_columns_for_matrix * len(divide)
                                     b = float(_tbl_widths.replace('cm', '')) - float(a)
@@ -307,6 +323,7 @@ class survey_browse_response(report_rml):
                                     colWidths = "cm,".join(map(tools.ustr, cols_widhts))
                                     colWidths = colWidths +'cm'
                                     rml += """<blockTable colWidths=" """ + colWidths + """ " style="simple_table"><tr>"""
+
                                     for div in range(0, len(divide)):
                                        if divide[div] != '':
                                            if que.type == 'multiple_choice_multiple_ans':
@@ -340,6 +357,7 @@ class survey_browse_response(report_rml):
                                        else:
                                            rml += """<td></td><td></td>"""
                                     rml += """</tr></blockTable>"""
+
                                 if que.is_comment_require and answer[0].comment:
                                     rml += """<blockTable colWidths='""" + str(_tbl_widths) + """' style="simple_table"><tr>
                                                 <td><para style="answer">""" + to_xml(tools.ustr(answer[0].comment)) + """</para></td></tr></blockTable>"""
@@ -347,6 +365,7 @@ class survey_browse_response(report_rml):
                                 rml += """<blockTable colWidths='""" + str(_tbl_widths) + """' style="simple_table">
                                              <tr><td> <para style="response">No Response</para></td> </tr>
                                           </blockTable>"""
+
                         elif que.type in ['multiple_textboxes_diff_type','multiple_textboxes','date','date_and_time','numerical_textboxes','multiple_textboxes_diff_type']:
                             if len(answer) and answer[0].state == "done":
                                 cols_widhts = []
@@ -355,6 +374,7 @@ class survey_browse_response(report_rml):
                                 colWidths = "cm,".join(map(tools.ustr, cols_widhts))
                                 colWidths = tools.ustr(colWidths) + 'cm'
                                 answer_list = {}
+
                                 for ans in answer[0].response_answer_ids:
                                     answer_list[ans.answer_id.answer] = ans.answer
                                 for que_ans in que['answer_choice_ids']:
@@ -372,6 +392,7 @@ class survey_browse_response(report_rml):
                                 rml += """<blockTable colWidths='""" + str(_tbl_widths) + """' style="simple_table">
                                          <tr>  <td> <para style="response">No Response</para></td> </tr>
                                         </blockTable>"""
+
                         elif que.type in ['single_textbox']:
                             if len(answer) and answer[0].state == "done":
                                 rml += """<blockTable colWidths='""" + str(_tbl_widths) + """' style="simple_table">
@@ -381,6 +402,7 @@ class survey_browse_response(report_rml):
                                 rml += """<blockTable colWidths='""" + str(_tbl_widths) + """' style="simple_table">
                                          <tr>  <td> <para style="response">No Response</para></td> </tr>
                                         </blockTable>"""
+
                         elif que.type in ['comment']:
                             if len(answer) and answer[0].state == "done":
                                 rml += """<blockTable colWidths='""" + str(_tbl_widths) + """' style="simple_table">
@@ -390,6 +412,7 @@ class survey_browse_response(report_rml):
                                 rml += """<blockTable colWidths='""" + str(_tbl_widths) + """' style="simple_table">
                                          <tr>  <td> <para style="response">No Response</para></td> </tr>
                                         </blockTable>"""
+
                         elif que.type in ['matrix_of_choices_only_one_ans','matrix_of_choices_only_multi_ans', 'rating_scale', 'matrix_of_drop_down_menus']:
                             if len(answer) and answer[0].state == "done":
                                 if que.type  in ['matrix_of_choices_only_one_ans', 'rating_scale'] and que.comment_column:
@@ -401,6 +424,7 @@ class survey_browse_response(report_rml):
                                         cols_widhts.append(float((float(_tbl_widths.replace('cm','')) / float(2.0)) / len(que.column_heading_ids)))
                                 else:
                                     cols_widhts.append(float(_tbl_widths.replace('cm','')))
+
                                 tmp = 0.0
                                 sum =  0.0
                                 i = 0
@@ -415,6 +439,7 @@ class survey_browse_response(report_rml):
                                 colWidths = "cm,".join(map(tools.ustr, cols_widhts))
                                 colWidths = colWidths + 'cm'
                                 matrix_ans = [(0, ''),]
+
                                 for col in que.column_heading_ids:
                                     if col.title not in matrix_ans:
                                         matrix_ans.append((col.id, col.title))
@@ -422,11 +447,13 @@ class survey_browse_response(report_rml):
                                 if que.type in ['matrix_of_choices_only_one_ans', 'rating_scale'] and que.comment_column:
                                     matrix_ans.append(que.column_name)
                                 rml += """<blockTable colWidths=" """ + colWidths + """ " style="simple_table"><tr>"""
+
                                 for mat_col in range(0, len(matrix_ans)):
-                                    rml+="""<td><para style="response">""" + to_xml(tools.ustr(matrix_ans[mat_col][1])) + """</para></td>"""
-                                rml +="""</tr>"""
-                                rml+="""</blockTable>"""
-                                i=0
+                                    rml += """<td><para style="response">""" + to_xml(tools.ustr(matrix_ans[mat_col][1])) + """</para></td>"""
+                                rml += """</tr>"""
+                                rml += """</blockTable>"""
+                                i = 0
+
                                 for ans in que.answer_choice_ids:
                                     if i%2 != 0:
                                         style = 'ans_tbl_white'
@@ -474,6 +501,7 @@ class survey_browse_response(report_rml):
                                             comment_value = ''
                                         rml += """<td><para style="response">""" + to_xml(tools.ustr(comment_value)) + """</para></td>"""
                                     rml += """</tr></blockTable>"""
+
                                 if que.is_comment_require:
                                     rml += """<blockTable colWidths='""" + str(_tbl_widths) + """' style="simple_table"><tr>
                                             <td><para style="answer">""" + to_xml(tools.ustr(answer[0].comment or '')) + """</para></td></tr></blockTable>"""
@@ -481,16 +509,19 @@ class survey_browse_response(report_rml):
                                 rml += """<blockTable colWidths='""" + str(_tbl_widths) + """' style="simple_table">
                                          <tr><td> <para style="response">No Response</para></td> </tr>
                                         </blockTable>"""
+
                 if datas.has_key('form') and not datas['form']['without_pagebreak']:
                     rml += """<pageBreak/>"""
                 elif not datas.has_key('form'):
                     rml += """<pageBreak/>"""
                 else:
                     rml += """<para style="P2"><font></font></para>"""
+
         rml += """</story></document>"""
         report_type = datas.get('report_type', 'pdf')
         create_doc = self.generators[report_type]
         pdf = create_doc(rml, title=self.title)
+
         return (pdf, report_type)
 
 survey_browse_response('report.survey.browse.response', 'survey','','')
diff --git a/addons/survey/report/survey_form.py b/addons/survey/report/survey_form.py
index ff1e0bc8424..2c1de9cc71d 100644
--- a/addons/survey/report/survey_form.py
+++ b/addons/survey/report/survey_form.py
@@ -30,39 +30,41 @@ class survey_form(report_rml):
         _divide_columns_for_matrix = 0.7
         _display_ans_in_rows = 5
         _pageSize = ('29.7cm','21.1cm')
-        if datas.has_key('form') and datas['form']['orientation']=='vertical':
-            if datas['form']['paper_size']=='letter':
+        if datas.has_key('form') and datas['form'].get('orientation','') == 'vertical':
+            if datas['form'].get('paper_size','') == 'letter':
                 _pageSize = ('21.6cm','27.9cm')
-            elif datas['form']['paper_size']=='legal':
+            elif datas['form'].get('paper_size','') == 'legal':
                 _pageSize = ('21.6cm','35.6cm')
-            elif datas['form']['paper_size']=='a4':
+            elif datas['form'].get('paper_size','') == 'a4':
                 _pageSize = ('21.1cm','29.7cm')
-        elif datas.has_key('form') and datas['form']['orientation']=='horizontal':
-            if datas['form']['paper_size']=='letter':
+        elif datas.has_key('form') and datas['form'].get('orientation','') == 'horizontal':
+            if datas['form'].get('paper_size','') == 'letter':
                 _pageSize = ('27.9cm','21.6cm')
-            elif datas['form']['paper_size']=='legal':
+            elif datas['form'].get('paper_size','') == 'legal':
                 _pageSize = ('35.6cm','21.6cm')
-            elif datas['form']['paper_size']=='a4':
+            elif datas['form'].get('paper_size','') == 'a4':
                 _pageSize = ('29.7cm','21.1cm')
 
         _frame_width = tools.ustr(_pageSize[0])
         _frame_height = tools.ustr(float(_pageSize[1].replace('cm','')) - float(1.90))+'cm'
         _tbl_widths = tools.ustr(float(_pageSize[0].replace('cm','')) - float(2.10))+'cm'
+
         rml="""<document filename="Survey Form.pdf">
             <template pageSize="("""+_pageSize[0]+""","""+_pageSize[1]+""")" title='Survey Form.pdf' author="Martin Simon" allowSplitting="20" >
                 <pageTemplate id="first">
                     <frame id="first" x1="0.0cm" y1="1.0cm" width='"""+_frame_width+"""' height='"""+_frame_height+"""'/>
                     <pageGraphics>
                         <lineMode width="1.0"/>
-                        <lines>1.0cm """+tools.ustr(float(_pageSize[1].replace('cm','')) - float(1.00))+'cm'+""" """+tools.ustr(float(_pageSize[0].replace('cm','')) - float(1.00))+'cm'+""" """+tools.ustr(float(_pageSize[1].replace('cm','')) - float(1.00))+'cm'+"""</lines>
-                        <lines>1.0cm """+tools.ustr(float(_pageSize[1].replace('cm','')) - float(1.00))+'cm'+""" 1.0cm 1.00cm</lines>
-                        <lines>"""+tools.ustr(float(_pageSize[0].replace('cm','')) - float(1.00))+'cm'+""" """+tools.ustr(float(_pageSize[1].replace('cm','')) - float(1.00))+'cm'+""" """+tools.ustr(float(_pageSize[0].replace('cm','')) - float(1.00))+'cm'+""" 1.00cm</lines>
-                        <lines>1.0cm 1.00cm """+tools.ustr(float(_pageSize[0].replace('cm','')) - float(1.00))+'cm'+""" 1.00cm</lines>"""
+                        <lines>1.0cm """ + tools.ustr(float(_pageSize[1].replace('cm','')) - float(1.00)) + 'cm' + """ """+tools.ustr(float(_pageSize[0].replace('cm','')) - float(1.00))+'cm'+""" """+tools.ustr(float(_pageSize[1].replace('cm','')) - float(1.00)) + 'cm' + """</lines>
+                        <lines>1.0cm """ + tools.ustr(float(_pageSize[1].replace('cm','')) - float(1.00)) +'cm'+ """ 1.0cm 1.00cm</lines>
+                        <lines>""" + tools.ustr(float(_pageSize[0].replace('cm','')) - float(1.00))+'cm' + """ """ + tools.ustr(float(_pageSize[1].replace('cm','')) - float(1.00))+'cm'+""" """+tools.ustr(float(_pageSize[0].replace('cm','')) - float(1.00)) + 'cm' + """ 1.00cm</lines>
+                        <lines>1.0cm 1.00cm """ + tools.ustr(float(_pageSize[0].replace('cm','')) - float(1.00))+'cm'+""" 1.00cm</lines>"""
+
         if datas.has_key('form') and datas['form']['page_number']:
             rml +="""
                     <fill color="gray"/>
                     <setFont name="Helvetica" size="10"/>
-                    <drawRightString x='"""+tools.ustr(float(_pageSize[0].replace('cm','')) - float(1.00))+'cm'+"""' y="0.6cm">Page : <pageNumber/> </drawRightString>"""
+                    <drawRightString x='""" + tools.ustr(float(_pageSize[0].replace('cm','')) - float(1.00)) + 'cm' + """' y="0.6cm">Page : <pageNumber/> </drawRightString>"""
         rml +="""</pageGraphics>
                 </pageTemplate>
             </template>
@@ -158,9 +160,10 @@ class survey_form(report_rml):
                     <blockTable colWidths='"""+_tbl_widths+"""' style="note_table">
                         <tr><td><para style="descriptive_text">""" + to_xml(tools.ustr(survey.note)) + """</para><para style="P2"><font></font></para></td></tr>
                     </blockTable>"""
+
             seq = 0
             for page in survey.page_ids:
-                seq+=1
+                seq += 1
                 rml += """
                 <blockTable colWidths='"""+_tbl_widths+"""' style="page_tbl">
                     <tr><td><para style="page">"""+ tools.ustr(seq) + """. """ + to_xml(tools.ustr(page.title)) + """</para></td></tr>
@@ -169,9 +172,10 @@ class survey_form(report_rml):
                     rml += """<para style="P2"></para><blockTable colWidths='"""+_tbl_widths+"""' style="note_table">
                                 <tr><td><para style="descriptive_text">""" + to_xml(tools.ustr(page.note or '')) + """</para></td></tr>
                             </blockTable>"""
+
                 for que in page.question_ids:
-                    cols_widhts=[]
-                    rml +="""
+                    cols_widhts = []
+                    rml += """
                     <para style="P2"><font></font></para>
                     <blockTable colWidths='"""+_tbl_widths+"""' style="question_tbl">
                         <tr><td><para style="question">"""  + to_xml(tools.ustr(que.question)) + """</para></td></tr>
@@ -180,8 +184,8 @@ class survey_form(report_rml):
                     if que.type in ['descriptive_text']:
                         cols_widhts.append(float(_tbl_widths.replace('cm','')))
                         colWidths = "cm,".join(map(tools.ustr, cols_widhts))
-                        colWidths = colWidths+'cm'
-                        rml+="""
+                        colWidths = colWidths + 'cm'
+                        rml += """
                         <blockTable colWidths=" """ + colWidths + """ " style="ans_tbl">
                             <tr>
                                 <td>
@@ -189,8 +193,9 @@ class survey_form(report_rml):
                                 </td>
                             </tr>
                         </blockTable>"""
+
                     elif que.type in ['multiple_choice_multiple_ans','multiple_choice_only_one_ans']:
-                        answer=[]
+                        answer = []
                         for ans in que.answer_choice_ids:
                             answer.append(to_xml(tools.ustr((ans.answer))))
 
@@ -207,18 +212,19 @@ class survey_form(report_rml):
                         for divide in divide_list:
                             a = _divide_columns_for_matrix*len(divide)
                             b = float(_tbl_widths.replace('cm','')) - float(a)
-                            cols_widhts=[]
+                            cols_widhts = []
+
                             for div in range(0,len(divide)):
                                 cols_widhts.append(float(a/len(divide)))
                                 cols_widhts.append(float(b/len(divide)))
                             colWidths = "cm,".join(map(tools.ustr, cols_widhts))
-                            colWidths = colWidths+'cm'
+                            colWidths = colWidths +'cm'
                             rml+="""<blockTable colWidths=" """ + colWidths + """ " style="ans_tbl">
                                         <tr>"""
                             for div in range(0,len(divide)):
-                               if divide[div]!='':
+                               if divide[div] != '':
                                    if que.type == 'multiple_choice_multiple_ans':
-                                           rml+="""
+                                           rml += """
                                            <td>
                                                <illustration>
                                                    <rect x="0.1cm" y="-0.4cm" width="0.5 cm" height="0.5cm" fill="no" stroke="yes"/>
@@ -226,7 +232,7 @@ class survey_form(report_rml):
                                            </td>
                                            <td><para style="answer">""" + divide[div] + """</para></td>"""
                                    else:
-                                       rml+="""
+                                       rml += """
                                        <td>
                                            <illustration>
                                                <circle x="0.3cm" y="-0.18cm" radius="0.23 cm" fill="no" stroke="yes"/>
@@ -234,11 +240,12 @@ class survey_form(report_rml):
                                        </td>
                                        <td><para style="answer">""" + divide[div] + """</para></td>"""
                                else:
-                                   rml+="""
+                                   rml += """
                                    <td></td>
                                    <td></td>"""
-                            rml+="""
+                            rml += """
                             </tr></blockTable>"""
+
                     elif que.type in ['matrix_of_choices_only_one_ans','rating_scale','matrix_of_choices_only_multi_ans','matrix_of_drop_down_menus']:
                         if len(que.column_heading_ids):
                             cols_widhts.append(float(_tbl_widths.replace('cm',''))/float(2.0))
@@ -246,42 +253,45 @@ class survey_form(report_rml):
                                 cols_widhts.append(float((float(_tbl_widths.replace('cm',''))/float(2.0))/len(que.column_heading_ids)))
                         else:
                             cols_widhts.append(float(_tbl_widths.replace('cm','')))
-                        tmp=0.0
+
+                        tmp = 0.0
                         sum = 0.0
                         i = 0
                         if que.comment_column:
                             for col in cols_widhts:
-                                if i==0:
+                                if i == 0:
                                     cols_widhts[i] = cols_widhts[i]/2.0
                                     tmp = cols_widhts[i]
                                 sum += col
-                                i+=1
+                                i += 1
                             cols_widhts.append(round(tmp,2))
                         colWidths = "cm,".join(map(tools.ustr, cols_widhts))
                         colWidths = colWidths+'cm'
                         matrix_ans = ['',]
+
                         for col in que.column_heading_ids:
                             if col.title not in matrix_ans:
                                 matrix_ans.append(col.title)
                         if que.comment_column:
                             matrix_ans.append(to_xml(tools.ustr(que.column_name)))
-                        rml+="""<blockTable colWidths=" """ + colWidths + """ " style="ans_tbl">
-                            <tr>"""
+                        rml+="""<blockTable colWidths=" """ + colWidths + """ " style="ans_tbl"><tr>"""
+
                         for mat_col in matrix_ans:
-                            rml+="""<td><para style="response">""" + to_xml(tools.ustr(mat_col)) + """</para></td>"""
-                        rml+="""</tr></blockTable>"""
-                        i=0
+                            rml += """<td><para style="response">""" + to_xml(tools.ustr(mat_col)) + """</para></td>"""
+                        rml += """</tr></blockTable>"""
+                        i = 0
                         for ans in que.answer_choice_ids:
-                            if i%2!=0:
+                            if i%2 != 0:
                                 style='ans_tbl_white'
                             else:
                                 style='ans_tbl_gainsboro'
-                            i+=1
-                            rml+="""
+                            i += 1
+                            rml += """
                             <blockTable colWidths=" """ + colWidths + """ " style='"""+style+"""'>
                             <tr><td><para style="answer">""" + to_xml(tools.ustr(ans.answer)) + """</para></td>"""
                             rec_width = float((sum-tmp)*10+100)
                             value = ""
+
                             if que.type in ['matrix_of_drop_down_menus']:
                                 value = """ <fill color="white"/>
                                     <rect x="-0.1cm" y="-0.45cm" width='""" + tools.ustr(cols_widhts[-1] - 0.5) +"cm" + """' height="0.5cm" fill="yes" stroke="yes" round="0.1cm"/>"""
@@ -292,22 +302,23 @@ class survey_form(report_rml):
                                 value = """ <fill color="white"/>
                                     <rect x="0.1cm" y="-0.4cm" width="0.5 cm" height="0.5cm" fill="yes" stroke="yes" round="0.1cm"/>"""
                             for mat_col in range(1,len(matrix_ans)):
-                                if matrix_ans[mat_col]==que.column_name:
-                                    if mat_col==1:
-                                        rml+="""
+                                if matrix_ans[mat_col] == que.column_name:
+                                    if mat_col == 1:
+                                        rml += """
                                             <td><para style="answer_left">""" + to_xml(tools.ustr(que.column_name)) + """</para></td>"""
                                     else:
-                                      rml+="""<td></td>"""
+                                      rml += """<td></td>"""
                                 else:
-                                    rml+="""<td><illustration>""" + value + """</illustration></td>"""
-                            rml+= """</tr></blockTable>"""
-                    elif que.type in ['multiple_textboxes','numerical_textboxes', 'date_and_time','date','multiple_textboxes_diff_type']:
+                                    rml += """<td><illustration>""" + value + """</illustration></td>"""
+                            rml += """</tr></blockTable>"""
+
+                    elif que.type in ['multiple_textboxes', 'numerical_textboxes', 'date_and_time','date','multiple_textboxes_diff_type']:
                         cols_widhts.append(float(_tbl_widths.replace('cm',''))/2)
                         cols_widhts.append(float(_tbl_widths.replace('cm',''))/2)
                         colWidths = "cm,".join(map(tools.ustr, cols_widhts))
                         colWidths = tools.ustr(colWidths) + 'cm'
                         for ans in que.answer_choice_ids:
-                            rml +="""<para style="P1"></para>
+                            rml += """<para style="P1"></para>
                             <blockTable colWidths=" """+ colWidths + """ " style="ans_tbl">
                                 <tr>
                                 <td><para style="answer">""" + to_xml(tools.ustr(ans.answer)) + """</para></td>
@@ -318,10 +329,11 @@ class survey_form(report_rml):
                                     </td>
                                 </tr>
                             </blockTable>"""
+
                     elif que.type in ['comment']:
                         cols_widhts.append(float(_tbl_widths.replace('cm','')))
                         colWidths = "cm,".join(map(tools.ustr, cols_widhts))
-                        rml+="""<blockTable colWidths=" """ + colWidths + """cm " style="ans_tbl">
+                        rml += """<blockTable colWidths=" """ + colWidths + """cm " style="ans_tbl">
                             <tr>
                                 <td><para style="comment"><font color="white"> </font></para>
                                     <illustration>
@@ -330,10 +342,11 @@ class survey_form(report_rml):
                                 </td>
                             </tr>
                         </blockTable>"""
+
                     elif que.type in ['single_textbox']:
                         cols_widhts.append(float(_tbl_widths.replace('cm','')))
                         colWidths = "cm,".join(map(tools.ustr, cols_widhts))
-                        rml+="""<para style="P2"><font color="white"> </font></para>
+                        rml += """<para style="P2"><font color="white"> </font></para>
                         <blockTable colWidths=" """ + colWidths + """cm " style="ans_tbl">
                             <tr>
                                 <td>
@@ -343,39 +356,44 @@ class survey_form(report_rml):
                                 </td>
                             </tr>
                         </blockTable>"""
+
                     elif que.type in ['table']:
                         tbl_width = float(_tbl_widths.replace('cm',''))
                         for i in range(0,len(que.column_heading_ids)):
                             cols_widhts.append(tbl_width/float(len(que.column_heading_ids)))
                         colWidths = "cm,".join(map(tools.ustr, cols_widhts))
                         colWidths = colWidths+'cm'
-                        rml+="""<blockTable colWidths=" """ + colWidths + """ " style="tbl"><tr>"""
+                        rml += """<blockTable colWidths=" """ + colWidths + """ " style="tbl"><tr>"""
                         for col in que.column_heading_ids:
                             rml+="""<td><para style="terp_tblheader_Details">""" + to_xml(tools.ustr(col.title)) + """</para></td>"""
-                        rml+="""</tr></blockTable>"""
-                        i=0
+                        rml += """</tr></blockTable>"""
+                        i = 0
                         for r in range(0,que.no_of_rows):
-                            if i%2!=0:
-                                style='tbl_white'
+                            if i%2 != 0:
+                                style = 'tbl_white'
                             else:
-                                style='tbl_gainsboro'
-                            i+=1
-                            rml+="""<blockTable colWidths=" """ + colWidths + """ " style='"""+style+"""'><tr>"""
+                                style = 'tbl_gainsboro'
+                            i += 1
+                            rml += """<blockTable colWidths=" """  + colWidths + """ " style='"""+style+"""'><tr>"""
                             for c in que.column_heading_ids:
-                               rml+="""
+                               rml += """
                                 <td><para style="terp_default_9"><font color="white"> </font></para></td>"""
-                            rml+="""</tr></blockTable>"""
+                            rml += """</tr></blockTable>"""
+
             if datas.has_key('form') and not datas['form']['without_pagebreak']:
-                rml+="""<pageBreak/>"""
+                rml += """<pageBreak/>"""
             elif not datas.has_key('form'):
-                rml+="""<pageBreak/>"""
+                rml += """<pageBreak/>"""
             else:
-                rml+="""<para style="P2"><font></font></para>"""
-        rml+="""</story></document>"""
+                rml += """<para style="P2"><font></font></para>"""
+
+        rml += """</story></document>"""
         report_type = datas.get('report_type', 'pdf')
         create_doc = self.generators[report_type]
         pdf = create_doc(rml, title=self.title)
+
         return (pdf, report_type)
+
 survey_form('report.survey.form', 'survey','','')
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index 101e1c563d3..555db5439ba 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -132,7 +132,7 @@ class survey_page(osv.osv):
 
     def default_get(self, cr, uid, fields, context={}):
         data = super(survey_page, self).default_get(cr, uid, fields, context)
-        if context.has_key('line_order') and context['line_order']:
+        if context.get('line_order',False):
             if len(context['line_order'][-1]) > 2 and type(context['line_order'][-1][2]) == type({}) and context['line_order'][-1][2].has_key('sequence'):
                 data['sequence'] = context['line_order'][-1][2]['sequence'] + 1
         if context.has_key('survey_id'):
@@ -143,7 +143,7 @@ class survey_page(osv.osv):
         search_obj = self.pool.get('ir.ui.view')
         search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
         surv_name_wiz = self.pool.get('survey.name.wiz')
-        surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'transfer':True, 'page_no' : context['page_number'] })
+        surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'transfer':True, 'page_no' : context.get('page_number',0) })
         return {
                 'view_type': 'form',
                 "view_mode": 'form',
@@ -177,6 +177,7 @@ class survey_question(osv.osv):
         for id in ids1:
             val[id] = 0
         return val
+
     _columns = {
         'page_id' : fields.many2one('survey.page', 'Survey Page', ondelete='cascade', required=1),
         'question' :  fields.char('Question', size=128, required=1),
@@ -274,18 +275,23 @@ class survey_question(osv.osv):
         val['is_comment_require'] = False
         val['is_validation_require'] = False
         val['comment_column'] = False
+
         if type in ['multiple_textboxes_diff_type']:
             val['in_visible_answer_type'] = False
             return {'value': val}
+
         if type in ['rating_scale']:
             val.update({'in_visible_rating_weight':False,'in_visible_menu_choice':True})
             return {'value': val}
+
         elif type in ['matrix_of_drop_down_menus']:
             val.update({'in_visible_rating_weight':True,'in_visible_menu_choice':False})
             return {'value': val}
+
         elif type in ['single_textbox']:
             val.update({'in_visible_rating_weight':True,'in_visible_menu_choice':True})
             return {'value': val}
+
         else:
             val.update({'in_visible_rating_weight':True,'in_visible_menu_choice':True,'in_visible_answer_type':True})
             return {'value': val}
@@ -300,28 +306,34 @@ class survey_question(osv.osv):
                         col_len += 1
                     else:
                         col_len -= 1
+
             if vals.has_key('type'):
                 que_type = vals['type']
             else:
                 que_type = question['type']
+
             if que_type in ['matrix_of_choices_only_one_ans', 'matrix_of_choices_only_multi_ans', 'matrix_of_drop_down_menus', 'rating_scale']:
                 if not col_len:
                     raise osv.except_osv(_('Error !'),_("You must enter one or more column heading."))
             ans_len = len(question['answer_choice_ids'])
+
             if vals.has_key('answer_choice_ids'):
                 for ans in vals['answer_choice_ids']:
                     if type(ans[2]) == type({}):
                         ans_len += 1
                     else:
                         ans_len -= 1
+
             if que_type not in ['descriptive_text', 'single_textbox', 'comment','table']:
                 if not ans_len:
                     raise osv.except_osv(_('Error !'),_("You must enter one or more Answer."))
             req_type = ""
+
             if vals.has_key('required_type'):
                 req_type = vals['required_type']
             else:
                 req_type = question['required_type']
+
             if que_type in ['multiple_choice_multiple_ans','matrix_of_choices_only_one_ans', 'matrix_of_choices_only_multi_ans', 'matrix_of_drop_down_menus', 'rating_scale','multiple_textboxes','numerical_textboxes','date','date_and_time']:
                 if req_type in ['at least', 'at most', 'exactly']:
                     if vals.has_key('req_ans'):
@@ -330,6 +342,7 @@ class survey_question(osv.osv):
                     else:
                         if not question['req_ans'] or  question['req_ans'] > ans_len:
                             raise osv.except_osv(_('Error !'),_("#Required Answer you entered is greater than the number of answer. Please use a number that is smaller than %d.") % (ans_len + 1))
+
                 if req_type == 'a range':
                     minimum_ans = 0
                     maximum_ans = 0
@@ -351,12 +364,14 @@ class survey_question(osv.osv):
                             raise osv.except_osv(_('Error !'),_("Maximum Required Answer you entered for your maximum is greater than the number of answer. Please use a number that is smaller than %d.") % (ans_len + 1))
                     if maximum_ans <= minimum_ans:
                         raise osv.except_osv(_('Error !'),_("Maximum Required Answer is greater than Minimum Required Answer"))
+
             if question['type'] ==  'matrix_of_drop_down_menus' and vals.has_key('column_heading_ids'):
                 for col in vals['column_heading_ids']:
                     if not col[2] or not col[2].has_key('menu_choice') or not col[2]['menu_choice']:
                         raise osv.except_osv(_('Error !'),_("You must enter one or more menu choices in column heading"))
                     elif not col[2] or not col[2].has_key('menu_choice') or col[2]['menu_choice'].strip() == '':
                         raise osv.except_osv(_('Error !'),_("You must enter one or more menu choices in column heading (white spaces not allowed)"))
+
         return super(survey_question, self).write(cr, uid, ids, vals, context=context)
 
     def create(self, cr, uid, vals, context):
@@ -365,13 +380,16 @@ class survey_question(osv.osv):
         if vals.has_key('answer_choice_ids') and  not len(vals['answer_choice_ids']):
             if vals.has_key('type') and vals['type'] not in ['descriptive_text', 'single_textbox', 'comment','table']:
                 raise osv.except_osv(_('Error !'),_("You must enter one or more answer."))
+
         if vals.has_key('column_heading_ids') and  not len(vals['column_heading_ids']):
             if vals.has_key('type') and vals['type'] in ['matrix_of_choices_only_one_ans', 'matrix_of_choices_only_multi_ans', 'matrix_of_drop_down_menus', 'rating_scale']:
                 raise osv.except_osv(_('Error !'),_("You must enter one or more column heading."))
+
         if vals['type'] in ['multiple_choice_multiple_ans','matrix_of_choices_only_one_ans', 'matrix_of_choices_only_multi_ans', 'matrix_of_drop_down_menus', 'rating_scale','multiple_textboxes','numerical_textboxes','date','date_and_time']:
             if vals.has_key('is_require_answer') and vals.has_key('required_type') and vals['required_type'] in ['at least', 'at most', 'exactly']:
                 if vals.has_key('answer_choice_ids') and vals['req_ans'] > len(vals['answer_choice_ids']) or not vals['req_ans']:
                     raise osv.except_osv(_('Error !'),_("#Required Answer you entered is greater than the number of answer. Please use a number that is smaller than %d.") % (len(vals['answer_choice_ids'])+1))
+
             if vals.has_key('is_require_answer') and vals.has_key('required_type') and vals['required_type'] == 'a range':
                 minimum_ans = vals['minimum_req_ans']
                 maximum_ans = vals['maximum_req_ans']
@@ -381,12 +399,14 @@ class survey_question(osv.osv):
                     raise osv.except_osv(_('Error !'),_("Maximum Required Answer you entered for your maximum is greater than the number of answer. Please use a number that is smaller than %d.") % (len(vals['answer_choice_ids'])+1))
                 if maximum_ans <= minimum_ans:
                     raise osv.except_osv(_('Error !'),_("Maximum Required Answer is greater than Minimum Required Answer"))
+
         if vals['type'] ==  'matrix_of_drop_down_menus':
             for col in vals['column_heading_ids']:
                 if not col[2] or not col[2].has_key('menu_choice') or not col[2]['menu_choice']:
                     raise osv.except_osv(_('Error !'),_("You must enter one or more menu choices in column heading"))
                 elif not col[2] or not col[2].has_key('menu_choice') or col[2]['menu_choice'].strip() == '':
                     raise osv.except_osv(_('Error !'),_("You must enter one or more menu choices in column heading (white spaces not allowed)"))
+
         res = super(survey_question, self).create(cr, uid, vals, context)
         return res
 
@@ -394,7 +414,7 @@ class survey_question(osv.osv):
         search_obj = self.pool.get('ir.ui.view')
         search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
         surv_name_wiz = self.pool.get('survey.name.wiz')
-        surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'transfer':True, 'page_no' : context['page_number'] })
+        surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'transfer':True, 'page_no' : context.get('page_number',False) })
         return {
                 'view_type': 'form',
                 "view_mode": 'form',
@@ -407,12 +427,12 @@ class survey_question(osv.osv):
 
     def default_get(self, cr, uid, fields, context={}):
         data = super(survey_question, self).default_get(cr, uid, fields, context)
-        if context.has_key('line_order') and context['line_order']:
-
+        if context.get('line_order',False):
             if len(context['line_order'][-1]) > 2 and type(context['line_order'][-1][2]) == type({}) and context['line_order'][-1][2].has_key('sequence'):
                 data['sequence'] = context['line_order'][-1][2]['sequence'] + 1
+
         if context.has_key('page_id'):
-            data['page_id']= context['page_id']
+            data['page_id']= context.get('page_id',False)
         return data
 
 survey_question()
@@ -475,7 +495,7 @@ class survey_answer(osv.osv):
 
     def _get_in_visible_answer_type(self,cr, uid, context={}):
         if context.get('in_visible_answer_type',False):
-            return context['in_visible_answer_type']
+            return context.get('in_visible_answer_type',False)
         return False
 
     _columns = {
@@ -496,7 +516,7 @@ class survey_answer(osv.osv):
 
     def default_get(self, cr, uid, fields, context={}):
         data = super(survey_answer, self).default_get(cr, uid, fields, context)
-        if context.has_key('line_order') and context['line_order']:
+        if context.get('line_order',False):
             if len(context['line_order'][-1]) > 2 and type(context['line_order'][-1][2]) == type({}) and context['line_order'][-1][2].has_key('sequence'):
                 data['sequence'] = context['line_order'][-1][2]['sequence'] + 1
         return data
@@ -591,14 +611,14 @@ class survey_name_wiz(osv.osv_memory):
             context = {}
         data = super(survey_name_wiz, self).default_get(cr, uid, fields, context)
         if context.has_key('survey_id'):
-            data['survey_id'] = context['survey_id']
+            data['survey_id'] = context.get('survey_id',False)
         return data
 
     def _get_survey(self, cr, uid, context=None):
         surv_obj = self.pool.get("survey")
         result = []
         if context.has_key('survey_id'):
-            for sur in surv_obj.browse(cr, uid, [context['survey_id']]):
+            for sur in surv_obj.browse(cr, uid, [context.get('survey_id',False)]):
                 result.append((sur.id, sur.title))
             return result
         group_id = self.pool.get('res.groups').search(cr, uid, [('name', '=', 'Survey / Manager')])
@@ -629,21 +649,26 @@ class survey_name_wiz(osv.osv_memory):
     }
 
     def action_next(self, cr, uid, ids, context=None):
+        survey_obj = self.pool.get('survey')
+        search_obj = self.pool.get('ir.ui.view')
+
         sur_id = self.read(cr, uid, ids, [])[0]
         survey_id = sur_id['survey_id']
         context.update({'survey_id' : survey_id, 'sur_name_id' : sur_id['id']})
         cr.execute('select count(id) from survey_history where user_id=%s\
                     and survey_id=%s' % (uid,survey_id))
+
         res = cr.fetchone()[0]
-        user_limit = self.pool.get('survey').read(cr, uid, survey_id, ['response_user'])['response_user']
+        user_limit = survey_obj.read(cr, uid, survey_id, ['response_user'])['response_user']
         if user_limit and res >= user_limit:
             raise osv.except_osv(_('Warning !'),_("You can not give response for this survey more than %s times") % (user_limit))
-        survey_obj = self.pool.get('survey')
+        
         sur_rec = survey_obj.read(cr,uid,self.read(cr,uid,ids)[0]['survey_id'])
         if sur_rec['max_response_limit'] and sur_rec['max_response_limit'] <= sur_rec['tot_start_survey']:
             raise osv.except_osv(_('Warning !'),_("You can not give more response. Please contact the author of this survey for further assistance."))
-        search_obj = self.pool.get('ir.ui.view')
+
         search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
+
         return {
             'view_type': 'form',
             "view_mode": 'form',
@@ -669,41 +694,55 @@ class survey_question_wiz(osv.osv_memory):
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False,submenu=False):
         result = super(survey_question_wiz, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar,submenu)
         surv_name_wiz = self.pool.get('survey.name.wiz')
+        survey_obj = self.pool.get('survey')
+        page_obj = self.pool.get('survey.page')
+        que_obj = self.pool.get('survey.question')
+        ans_obj = self.pool.get('survey.answer')
+        sur_response_obj = self.pool.get('survey.response')
+        que_col_head = self.pool.get('survey.question.column.heading')
+        user_obj = self.pool.get('res.users')
+
         if view_type in ['form']:
             wiz_id = 0
             if not context.has_key('sur_name_id'):
-                wiz_id = surv_name_wiz.create(cr,uid, {'survey_id' : context['survey_id'],'page_no' :-1,'page':'next','transfer' :1,'response':0})
+                res_data = {
+                        'survey_id' : context.get('survey_id', False),
+                        'page_no' :-1,
+                        'page':'next',
+                        'transfer' :1,
+                        'response':0
+                }
+                wiz_id = surv_name_wiz.create(cr, uid, res_data)
                 sur_name_rec = surv_name_wiz.read(cr, uid, wiz_id, [])
                 context.update({'sur_name_id' :wiz_id})
             else:
-                sur_name_rec = surv_name_wiz.read(cr, uid, context['sur_name_id'])
-            if context.has_key('active_id'): context.pop('active_id')
-            survey_id = context['survey_id']
-            survey_obj = self.pool.get('survey')
-            sur_rec = survey_obj.read(cr, uid, survey_id, [])
-            page_obj = self.pool.get('survey.page')
-            que_obj = self.pool.get('survey.question')
-            ans_obj = self.pool.get('survey.answer')
+                sur_name_rec = surv_name_wiz.read(cr, uid, context.get('sur_name_id',False))
 
-            sur_response_obj = self.pool.get('survey.response')
-            que_col_head = self.pool.get('survey.question.column.heading')
+            if context.has_key('active_id'):
+                context.pop('active_id')
+
+            survey_id = context.get('survey_id', False)
+            sur_rec = survey_obj.read(cr, uid, survey_id, [])
             p_id = sur_rec['page_ids']
             total_pages = len(p_id)
             pre_button = False
             readonly = 0
-            if context.has_key('response_id') and context['response_id'] and int(context['response_id'][0]) > 0:
+
+            if context.has_key('response_id') and context.get('response_id', False) and int(context['response_id'][0]) > 0:
                 readonly = 1
+
             if not sur_name_rec['page_no'] + 1 :
-                surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'store_ans':{}})
-            sur_name_read = surv_name_wiz.read(cr, uid, context['sur_name_id'])
+                surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'store_ans':{}})
+
+            sur_name_read = surv_name_wiz.read(cr, uid, context.get('sur_name_id',False))
             page_number = int(sur_name_rec['page_no'])
             if sur_name_read['transfer'] or not sur_name_rec['page_no'] + 1:
-                surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'transfer':False})
+                surv_name_wiz.write(cr, uid, [context.get('sur_name_id', False)], {'transfer':False})
                 flag = False
                 fields = {}
-                if sur_name_read['page'] == "next" or sur_name_rec['page_no'] == - 1 :
-                    if len(p_id) > sur_name_rec['page_no'] + 1 :
-                        if ((context.has_key('active') and not context['active']) or not context.has_key('active')) and not sur_name_rec['page_no'] + 1:
+                if sur_name_read['page'] == "next" or sur_name_rec['page_no'] == -1:
+                    if total_pages > sur_name_rec['page_no'] + 1:
+                        if ((context.has_key('active') and not context.get('active', False)) or not context.has_key('active')) and not sur_name_rec['page_no'] + 1:
                             if sur_rec['state'] != "open" :
                                 raise osv.except_osv(_('Warning !'),_("You can not give answer because of survey is not open for answer"))
                             cr.execute('select count(id) from survey_history where user_id=%s\
@@ -715,8 +754,9 @@ class survey_question_wiz(osv.osv_memory):
 
                         if sur_rec['max_response_limit'] and sur_rec['max_response_limit'] <= sur_rec['tot_start_survey'] and not sur_name_rec['page_no'] + 1:
                             survey_obj.write(cr, uid, survey_id, {'state':'close', 'date_close':strftime("%Y-%m-%d %H:%M:%S")})
+
                         p_id = p_id[sur_name_rec['page_no'] + 1]
-                        surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'page_no' : sur_name_rec['page_no'] + 1})
+                        surv_name_wiz.write(cr, uid, [context.get('sur_name_id', False)], {'page_no' : sur_name_rec['page_no'] + 1})
                         flag = True
                         page_number += 1
                     if sur_name_rec['page_no'] > - 1:
@@ -724,46 +764,49 @@ class survey_question_wiz(osv.osv_memory):
                 else:
                     if sur_name_rec['page_no'] != 0:
                         p_id = p_id[sur_name_rec['page_no'] - 1]
-                        surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'page_no' : sur_name_rec['page_no'] - 1})
+                        surv_name_wiz.write(cr, uid, [context.get('sur_name_id', False)], {'page_no' : sur_name_rec['page_no'] - 1})
                         flag = True
                         page_number -= 1
+
                     if sur_name_rec['page_no'] > 1:
                         pre_button = True
                 if flag:
                     pag_rec = page_obj.read(cr, uid, p_id)
                     xml_form = etree.Element('form', {'string': _(tools.ustr(pag_rec['title']))})
                     xml_group = etree.SubElement(xml_form, 'group', {'col': '1', 'colspan': '4'})
-                    if context.has_key('response_id') and context['response_id']  and int(context['response_id'][0]) > 0:
+                    if context.has_key('response_id') and context.get('response_id', False)  and int(context.get('response_id',0)[0]) > 0:
                         xml_group = etree.SubElement(xml_form, 'group', {'col': '40', 'colspan': '4'})
                         record = sur_response_obj.browse(cr, uid, context['response_id'][context['response_no']])
                         etree.SubElement(xml_group, 'label', {'string': to_xml(tools.ustr('Answer Of :- ' + record.user_id.name + ',  Date :- ' + record.date_create.split('.')[0]  )), 'align':"0.0"})
-                        etree.SubElement(xml_group, 'label', {'string': to_xml(tools.ustr(" Response :- " + str(context['response_no'] + 1) +"/" + str(len(context['response_id'])) )), 'align':"0.0"})
-                        if context['response_no'] > 0:
+                        etree.SubElement(xml_group, 'label', {'string': to_xml(tools.ustr(" Response :- " + str(context.get('response_no',0) + 1) +"/" + str(len(context.get('response_id',0))) )), 'align':"0.0"})
+                        if context.get('response_no',0) > 0:
                             etree.SubElement(xml_group, 'button', {'colspan':"1",'icon':"gtk-go-back",'name':"action_forward_previous",'string': tools.ustr("Previous Answer"),'type':"object"})
-                        if context['response_no'] + 1 == len(context['response_id']) and context['response_no'] != 0:
-                            etree.SubElement(xml_group, 'button', {'colspan':"1",'icon': "gtk-go-forward", 'special' : 'cancel','string': tools.ustr("Done") ,'context' : tools.ustr(context)})
-                        elif context['response_no'] + 1 < len(context['response_id']):
+                        if context.get('response_no',0) + 1 < len(context.get('response_id',0)):
                             etree.SubElement(xml_group, 'button', {'colspan':"1",'icon': "gtk-go-forward", 'name':"action_forward_next",'string': tools.ustr("Next Answer") ,'type':"object",'context' : tools.ustr(context)})
+
                     if wiz_id:
                         fields["wizardid_" + str(wiz_id)] = {'type':'char', 'size' : 255, 'string':"", 'views':{}}
                         etree.SubElement(xml_form, 'field', {'invisible':'1','name': "wizardid_" + str(wiz_id),'default':str(lambda *a: 0)})
+
                     if pag_rec['note']:
                         xml_group = etree.SubElement(xml_form, 'group', {'col': '1', 'colspan': '4'})
                         for que_test in pag_rec['note'].split('\n'):
                             etree.SubElement(xml_group, 'label', {'string': to_xml(tools.ustr(que_test)), 'align':"0.0"})
                     que_ids = pag_rec['question_ids']
                     qu_no = 0
+
                     for que in que_ids:
                         qu_no += 1
                         que_rec = que_obj.read(cr, uid, que)
                         descriptive_text = ""
                         separator_string = tools.ustr(qu_no) + "." + tools.ustr(que_rec['question'])
-                        if ((context.has_key('active') and not context['active']) or not context.has_key('active')) and que_rec['is_require_answer']:
+                        if ((context.has_key('active') and not context.get('active',False)) or not context.has_key('active')) and que_rec['is_require_answer']:
                             star = '*'
                         else:
                             star = ''
                         xml_group = etree.SubElement(xml_form, 'group', {'col': '2', 'colspan': '4'})
-                        if context.has_key('active') and context['active'] and context.has_key('edit'):
+
+                        if context.has_key('active') and context.get('active',False) and context.has_key('edit'):
                             xml_group = etree.SubElement(xml_form, 'group', {'col': '1', 'colspan': '2'})
                             etree.SubElement(xml_group, 'separator', {'string': star+to_xml(separator_string), 'colspan': '3'})
                             xml_group1 = etree.SubElement(xml_form, 'group', {'col': '2', 'colspan': '2'})
@@ -773,8 +816,10 @@ class survey_question_wiz(osv.osv_memory):
                         else:
                             xml_group = etree.SubElement(xml_form, 'group', {'col': '1', 'colspan': '4'})
                             etree.SubElement(xml_group, 'separator', {'string': star+to_xml(separator_string), 'colspan': '4'})
+
                         ans_ids = ans_obj.read(cr, uid, que_rec['answer_choice_ids'], [])
                         xml_group = etree.SubElement(xml_form, 'group', {'col': '1', 'colspan': '4'})
+
                         if que_rec['type'] == 'multiple_choice_only_one_ans':
                             selection = []
                             for ans in ans_ids:
@@ -782,11 +827,13 @@ class survey_question_wiz(osv.osv_memory):
                             xml_group = etree.SubElement(xml_group, 'group', {'col': '2', 'colspan': '2'})
                             etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que) + "_selection"})
                             fields[tools.ustr(que) + "_selection"] = {'type':'selection', 'selection' :selection, 'string':"Answer"}
+
                         elif que_rec['type'] == 'multiple_choice_multiple_ans':
                             xml_group = etree.SubElement(xml_group, 'group', {'col': '4', 'colspan': '4'})
                             for ans in ans_ids:
                                 etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que) + "_" + tools.ustr(ans['id'])})
                                 fields[tools.ustr(que) + "_" + tools.ustr(ans['id'])] = {'type':'boolean', 'string':ans['answer']}
+
                         elif que_rec['type'] in ['matrix_of_choices_only_one_ans', 'rating_scale']:
                             if que_rec['comment_column']:
                                 col = "4"
@@ -805,6 +852,7 @@ class survey_question_wiz(osv.osv_memory):
                                 if que_rec['comment_column']:
                                    fields[tools.ustr(que) + "_commentcolumn_"+tools.ustr(row['id']) + "_field"] = {'type':'char', 'size' : 255, 'string':tools.ustr(que_rec['column_name']), 'views':{}}
                                    etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que) + "_commentcolumn_"+tools.ustr(row['id'])+ "_field"})
+
                         elif que_rec['type'] == 'matrix_of_choices_only_multi_ans':
                             xml_group = etree.SubElement(xml_group, 'group', {'col': str(len(que_rec['column_heading_ids']) + 1), 'colspan': '4'})
                             etree.SubElement(xml_group, 'separator', {'string': '.','colspan': '1'})
@@ -815,6 +863,7 @@ class survey_question_wiz(osv.osv_memory):
                                 for col in que_col_head.read(cr, uid, que_rec['column_heading_ids']):
                                     etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que) + "_" + tools.ustr(row['id']) + "_" + tools.ustr(col['id']), 'nolabel':"1"})
                                     fields[tools.ustr(que) + "_" + tools.ustr(row['id'])  + "_" + tools.ustr(col['id'])] = {'type':'boolean', 'string': col['title']}
+
                         elif que_rec['type'] == 'matrix_of_drop_down_menus':
                             xml_group = etree.SubElement(xml_group, 'group', {'col': str(len(que_rec['column_heading_ids']) + 1), 'colspan': '4'})
                             etree.SubElement(xml_group, 'separator', {'string': '.','colspan': '1'})
@@ -829,6 +878,7 @@ class survey_question_wiz(osv.osv_memory):
                                             if item and not item.strip() == '': selection.append((item ,item))
                                     etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que) + "_" + tools.ustr(row['id']) + "_" + tools.ustr(col['id']),'nolabel':'1'})
                                     fields[tools.ustr(que) + "_" + tools.ustr(row['id'])  + "_" + tools.ustr(col['id'])] = {'type':'selection', 'string': col['title'], 'selection':selection}
+
                         elif que_rec['type'] == 'multiple_textboxes':
                             xml_group = etree.SubElement(xml_group, 'group', {'col': '4', 'colspan': '4'})
                             type = "char"
@@ -845,30 +895,37 @@ class survey_question_wiz(osv.osv_memory):
                                     fields[tools.ustr(que) + "_" + tools.ustr(ans['id']) + "_multi"] = {'type':'char', 'size':255, 'string':ans['answer']}
                                 else:
                                     fields[tools.ustr(que) + "_" + tools.ustr(ans['id']) + "_multi"] = {'type': str(type), 'string':ans['answer']}
+
                         elif que_rec['type'] == 'numerical_textboxes':
                             xml_group = etree.SubElement(xml_group, 'group', {'col': '4', 'colspan': '4'})
                             for ans in ans_ids:
                                 etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'width':"300",'colspan': '1','name': tools.ustr(que) + "_" + tools.ustr(ans['id']) + "_numeric"})
                                 fields[tools.ustr(que) + "_" + tools.ustr(ans['id']) + "_numeric"] = {'type':'integer', 'string':ans['answer']}
+
                         elif que_rec['type'] == 'date':
                             xml_group = etree.SubElement(xml_group, 'group', {'col': '4', 'colspan': '4'})
                             for ans in ans_ids:
                                 etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'width':"300",'colspan': '1','name': tools.ustr(que) + "_" + tools.ustr(ans['id'])})
                                 fields[tools.ustr(que) + "_" + tools.ustr(ans['id'])] = {'type':'date', 'string':ans['answer']}
+
                         elif que_rec['type'] == 'date_and_time':
                             xml_group = etree.SubElement(xml_group, 'group', {'col': '4', 'colspan': '4'})
                             for ans in ans_ids:
                                 etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'width':"300",'colspan': '1','name': tools.ustr(que) + "_" + tools.ustr(ans['id'])})
                                 fields[tools.ustr(que) + "_" + tools.ustr(ans['id'])] = {'type':'datetime', 'string':ans['answer']}
+
                         elif que_rec['type'] == 'descriptive_text':
                             for que_test in que_rec['descriptive_text'].split('\n'):
                                 etree.SubElement(xml_group, 'label', {'string': to_xml(tools.ustr(que_test)), 'align':"0.0"})
+
                         elif que_rec['type'] == 'single_textbox':
                             etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que) + "_single", 'nolabel':"1" ,'colspan':"4"})
                             fields[tools.ustr(que) + "_single"] = {'type':'char', 'size' : 255, 'string':"single_textbox", 'views':{}}
+
                         elif que_rec['type'] == 'comment':
                             etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que) + "_comment", 'nolabel':"1" ,'colspan':"4"})
                             fields[tools.ustr(que) + "_comment"] = {'type':'text', 'string':"Comment/Eassy Box", 'views':{}}
+
                         elif que_rec['type'] == 'table':
                             xml_group = etree.SubElement(xml_group, 'group', {'col': str(len(que_rec['column_heading_ids'])), 'colspan': '4'})
                             for col in que_col_head.read(cr, uid, que_rec['column_heading_ids']):
@@ -877,6 +934,7 @@ class survey_question_wiz(osv.osv_memory):
                                 for col in que_col_head.read(cr, uid, que_rec['column_heading_ids']):
                                     etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que) + "_table_" + tools.ustr(col['id']) +"_"+ tools.ustr(row), 'nolabel':"1"})
                                     fields[tools.ustr(que) + "_table_" + tools.ustr(col['id']) +"_"+ tools.ustr(row)] = {'type':'char','size':255,'views':{}}
+
                         elif que_rec['type'] == 'multiple_textboxes_diff_type':
                             xml_group = etree.SubElement(xml_group, 'group', {'col': '4', 'colspan': '4'})
                             for ans in ans_ids:
@@ -895,6 +953,7 @@ class survey_question_wiz(osv.osv_memory):
                                             for item in ans['menu_choice'].split('\n'):
                                                 if item and not item.strip() == '': selection.append((item ,item))
                                         fields[tools.ustr(que) + "_" + tools.ustr(ans['id']) + "_multi"] = {'type':'selection', 'selection' : selection, 'string':ans['answer']}
+
                         if que_rec['type'] in ['multiple_choice_only_one_ans', 'multiple_choice_multiple_ans', 'matrix_of_choices_only_one_ans', 'matrix_of_choices_only_multi_ans', 'matrix_of_drop_down_menus', 'rating_scale'] and que_rec['is_comment_require']:
                             if que_rec['type'] in ['multiple_choice_only_one_ans', 'multiple_choice_multiple_ans'] and que_rec['comment_field_type'] in ['char','text'] and que_rec['make_comment_field']:
                                 etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que) + "_otherfield", 'colspan':"4"})
@@ -914,27 +973,30 @@ class survey_question_wiz(osv.osv_memory):
                                     etree.SubElement(xml_group, 'label', {'string': to_xml(tools.ustr(que_rec['comment_label'])),'colspan':"4"})
                                     etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que) + "_other", 'nolabel':"1" ,'colspan':"4"})
                                     fields[tools.ustr(que) + "_other"] = {'type': 'text', 'string': '', 'views':{}}
+
                     etree.SubElement(xml_form, 'separator', {'colspan': '4'})
                     xml_group = etree.SubElement(xml_form, 'group', {'col': '6', 'colspan': '4'})
                     etree.SubElement(xml_group, 'field', {'name': 'progress_bar_' + tools.ustr(page_number) , 'widget':'progressbar'})
                     fields['progress_bar_' + tools.ustr(page_number)] = {'type':'float', 'string':"Progress", 'views':{}}
                     etree.SubElement(xml_group, 'label', {'string': tools.ustr(page_number+ 1) + "/" + tools.ustr(total_pages)})
                     etree.SubElement(xml_group, 'button', {'icon': "gtk-cancel", 'special': "cancel",'string':"Cancel"})
+
                     if pre_button:
                         etree.SubElement(xml_group, 'button', {'colspan':"1",'icon':"gtk-go-back",'name':"action_previous",'string':"Previous",'type':"object"})
                     but_string = "Next"
                     if int(page_number) + 1 == total_pages:
                         but_string = "Done"
 
-                    if context.has_key('active') and context['active'] and int(page_number) + 1 == total_pages and context.has_key('response_id') and context.has_key('response_no') and  context['response_no'] + 1 == len(context['response_id']):
+                    if context.has_key('active') and context.get('active',False) and int(page_number) + 1 == total_pages and context.has_key('response_id') and context.has_key('response_no') and  context.get('response_no',0) + 1 == len(context.get('response_id',0)):
                         etree.SubElement(xml_group, 'button', {'icon': "gtk-go-forward", 'special' : 'cancel','string': tools.ustr("Done") ,'context' : tools.ustr(context)})
-                    elif context.has_key('active') and context['active'] and int(page_number) + 1 == total_pages and context.has_key('response_id'):
+                    elif context.has_key('active') and context.get('active', False) and int(page_number) + 1 == total_pages and context.has_key('response_id'):
                         etree.SubElement(xml_group, 'button', {'icon': "gtk-go-forward", 'name':"action_forward_next",'string': tools.ustr("Next Answer") ,'type':"object",'context' : tools.ustr(context)})
-                    elif context.has_key('active') and context['active'] and int(page_number) + 1 == total_pages:
+                    elif context.has_key('active') and context.get('active',False) and int(page_number) + 1 == total_pages:
                         etree.SubElement(xml_group, 'button', {'icon': "gtk-go-forward", 'special': "cancel", 'string' : 'Done', 'context' : tools.ustr(context)})
                     else:
                         etree.SubElement(xml_group, 'button', {'icon': "gtk-go-forward", 'name':"action_next",'string': tools.ustr(but_string) ,'type':"object",'context' : tools.ustr(context)})
-                    if context.has_key('active') and context['active'] and context.has_key('edit'):
+
+                    if context.has_key('active') and context.get('active',False) and context.has_key('edit'):
                         etree.SubElement(xml_form, 'separator', {'string' : '','colspan': '4'})
                         context.update({'page_id' : tools.ustr(p_id),'page_number' : sur_name_rec['page_no'] , 'transfer' : sur_name_read['transfer']})
                         xml_group3 = etree.SubElement(xml_form, 'group', {'col': '4', 'colspan': '4'})
@@ -942,6 +1004,7 @@ class survey_question_wiz(osv.osv_memory):
                         etree.SubElement(xml_group3, 'button', {'string' :'Edit Page','icon': "gtk-edit", 'type' :'object','name':"action_edit_page", 'context' : tools.ustr(context)})
                         etree.SubElement(xml_group3, 'button', {'string' :'Delete Page','icon': "gtk-delete", 'type' :'object','name':"action_delete_page", 'context' : tools.ustr(context)})
                         etree.SubElement(xml_group3, 'button', {'string' :'Add Question','icon': "gtk-new", 'type' :'object','name':"action_new_question", 'context' : tools.ustr(context)})
+
                     root = xml_form.getroottree()
                     result['arch'] = etree.tostring(root)
                     result['fields'] = fields
@@ -949,10 +1012,10 @@ class survey_question_wiz(osv.osv_memory):
                 else:
                     survey_obj.write(cr, uid, survey_id, {'tot_comp_survey' : sur_rec['tot_comp_survey'] + 1})
                     sur_response_obj.write(cr, uid, [sur_name_read['response']], {'state' : 'done'})
+
                     if sur_rec['send_response']:
-                        user_obj = self.pool.get('res.users')
                         survey_data = survey_obj.browse(cr, uid, int(survey_id))
-                        response_id = surv_name_wiz.read(cr,uid,context['sur_name_id'])['response']
+                        response_id = surv_name_wiz.read(cr,uid,context.get('sur_name_id',False))['response']
                         context.update({'response_id':response_id})
                         report = self.create_report(cr, uid, [int(survey_id)], 'report.survey.browse.response', survey_data.title,context)
                         attachments = []
@@ -963,15 +1026,18 @@ class survey_question_wiz(osv.osv_memory):
                             file_data += line
                             if not line:
                                 break
+
                         attachments.append((survey_data.title + ".pdf",file_data))
                         file.close()
                         os.remove(tools.config['addons_path'] + '/survey/report/' + survey_data.title + ".pdf")
                         user_email = False
                         resp_email = False
+
                         if user_obj.browse(cr, uid, uid).address_id.id:
                             cr.execute("select email from res_partner_address where id =%d" % user_obj.browse(cr, uid, uid).address_id.id)
                             user_email = cr.fetchone()[0]
                         resp_id = survey_data.responsible_id.address_id
+
                         if resp_id:
                             cr.execute("select email from res_partner_address where id =%d" % resp_id.id)
                             resp_email = cr.fetchone()[0]
@@ -1000,23 +1066,28 @@ class survey_question_wiz(osv.osv_memory):
             fp = open(ret_file_name, 'wb+');
             fp.write(result);
             fp.close();
+
         except Exception,e:
             print 'Exception in create report:',e
             return (False, str(e))
+
         return (True, ret_file_name)
 
     def default_get(self, cr, uid, fields_list, context=None):
         value = {}
         for field in fields_list:
             if field.split('_')[0] == 'progress':
-                tot_page_id = self.pool.get('survey').browse(cr, uid, context['survey_id'])
+                tot_page_id = self.pool.get('survey').browse(cr, uid, context.get('survey_id',False))
                 tot_per = (float(100) * (int(field.split('_')[2]) + 1) / len(tot_page_id.page_ids))
                 value[field] = tot_per
         response_obj = self.pool.get('survey.response')
-        if context.has_key('response_id') and context['response_id'] and int(context['response_id'][0]) > 0:
+        surv_name_wiz = self.pool.get('survey.name.wiz')
+        
+        if context.has_key('response_id') and context.get('response_id') and int(context['response_id'][0]) > 0:
             data = super(survey_question_wiz, self).default_get(cr, uid, fields_list, context)
             response_ans = response_obj.browse(cr, uid, context['response_id'][context['response_no']])
             fields_list.sort()
+
             for que in response_ans.question_ids:
                 for field in fields_list:
                     if field.split('_')[0] != "progress" and field.split('_')[0] == str(que.question_id.id):
@@ -1024,20 +1095,26 @@ class survey_question_wiz(osv.osv_memory):
                             for ans in que.response_answer_ids:
                                 if str(field.split('_')[2]) == str(ans.answer_id.id):
                                     value[field] = ans.comment_field
+
                         if que.response_table_ids and len(field.split('_')) == 4 and field.split('_')[1] == "table":
                             for ans in que.response_table_ids:
                                 if str(field.split('_')[2]) == str(ans.column_id.id) and str(field.split('_')[3]) ==  str(ans.name):
                                     value[field] = ans.value
+
                         if que.comment and (field.split('_')[1] == "comment" or field.split('_')[1] == "other"):
                             value[field] = str(que.comment)
+
                         elif que.single_text and field.split('_')[1] == "single":
                             value[field] = str(que.single_text)
+
                         elif que.response_answer_ids and len(field.split('_')) == 3 and field.split('_')[1] == "selection":
                             for ans in que.response_answer_ids:
                                 if str(field.split('_')[2]) == str( ans.answer_id.id):
                                     value[field] = str(ans.column_id.id)
+
                         elif que.response_answer_ids and len(field.split('_')) == 2 and field.split('_')[1] == "selection":
                             value[field] = str(que.response_answer_ids[0].answer_id.id)
+
                         elif que.response_answer_ids and len(field.split('_')) == 3 and field.split('_')[2] != "multi" and field.split('_')[2] != "numeric":
                             for ans in que.response_answer_ids:
                                 if str(field.split('_')[1]) == str( ans.answer_id.id) and str(field.split('_')[2]) == str(ans.column_id.id):
@@ -1045,61 +1122,72 @@ class survey_question_wiz(osv.osv_memory):
                                         value[field] = ans.value_choice
                                     else:
                                         value[field] = True
+
                         else:
                             for ans in que.response_answer_ids:
                                 if str(field.split('_')[1]) == str( ans.answer_id.id):
                                     value[field] = ans.answer
+
         else:
             if not context.has_key('sur_name_id'):
                 return value
-            if context.has_key('active') and context['active']:
+            if context.has_key('active') and context.get('active',False):
                 return value
-            surv_name_wiz = self.pool.get('survey.name.wiz')
-            sur_name_read = surv_name_wiz.read(cr, uid, context['sur_name_id'])
+            
+            sur_name_read = surv_name_wiz.read(cr, uid, context.get('sur_name_id',False))
             ans_list = []
             for key,val in sur_name_read['store_ans'].items():
                 for field in fields_list:
                     if field in list(val):
                         value[field] = val[field]
+
         return value
 
     def create(self, cr, uid, vals, context=None):
-        if context.has_key('active') and context['active']:
+        if context.has_key('active') and context.get('active',False):
             return True
+
         for key,val in vals.items():
             if key.split('_')[0] == "progress":
                 vals.pop(key)
             if not context.has_key('sur_name_id') and key.split('_')[0] == "wizardid":
                 context.update({'sur_name_id': int(key.split('_')[1])})
                 vals.pop(key)
+
         click_state = True
         click_update = []
         surv_name_wiz = self.pool.get('survey.name.wiz')
         surv_all_resp_obj = self.pool.get('survey.response')
         surv_tbl_column_obj = self.pool.get('survey.tbl.column.heading')
-        sur_name_read = surv_name_wiz.read(cr, uid, context['sur_name_id'], [])
+        survey_obj = self.pool.get('survey')
+        resp_obj = self.pool.get('survey.response.line')
+        res_ans_obj = self.pool.get('survey.response.answer')
+        que_obj = self.pool.get('survey.question')
+        sur_name_read = surv_name_wiz.read(cr, uid, context.get('sur_name_id',False), [])
         response_id =  0
+
         if not sur_name_read['response']:
             response_id = surv_all_resp_obj.create(cr, uid, {'response_type':'link', 'user_id':uid, 'date_create':datetime.datetime.now(), 'survey_id' : context['survey_id']})
-            surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'response' : tools.ustr(response_id)})
+            surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'response' : tools.ustr(response_id)})
         else:
             response_id = int(sur_name_read['response'])
+
         if response_id not in surv_all_resp_obj.search(cr, uid, []):
-            response_id = surv_all_resp_obj.create(cr, uid, {'response_type':'link', 'user_id':uid, 'date_create':datetime.datetime.now(), 'survey_id' : context['survey_id']})
-            surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'response' : tools.ustr(response_id)})
+            response_id = surv_all_resp_obj.create(cr, uid, {'response_type':'link', 'user_id':uid, 'date_create':datetime.datetime.now(), 'survey_id' : context.get('survey_id',False)})
+            surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'response' : tools.ustr(response_id)})
+
         #click first time on next button then increemnet on total start suvey
         if not sur_name_read['store_ans']:
             his_id = self.pool.get('survey.history').create(cr, uid, {'user_id': uid, \
                                               'date': strftime('%Y-%m-%d %H:%M:%S'), 'survey_id': sur_name_read['survey_id']})
-            survey_obj = self.pool.get('survey')
             sur_rec = survey_obj.read(cr, uid, sur_name_read['survey_id'])
             survey_obj.write(cr, uid, sur_name_read['survey_id'],  {'tot_start_survey' : sur_rec['tot_start_survey'] + 1})
             if context.has_key('cur_id'):
-                if context.has_key('request') and context['request']:
-                    self.pool.get(context['object']).write(cr, uid, [int(context['cur_id'])], {'response' : response_id})
-                    self.pool.get(context['object']).survey_req_done(cr, uid, [int(context['cur_id'])], context)
+                if context.has_key('request') and context.get('request',False):
+                    self.pool.get(context.get('object',False)).write(cr, uid, [int(context.get('cur_id',False))], {'response' : response_id})
+                    self.pool.get(context.get('object',False)).survey_req_done(cr, uid, [int(context.get('cur_id'))], context)
                 else:
-                    self.pool.get(context['object']).write(cr, uid, [int(context['cur_id'])], {'response' : response_id})
+                    self.pool.get(context.get('object',False)).write(cr, uid, [int(context.get('cur_id',False))], {'response' : response_id})
 
         for key,val in sur_name_read['store_ans'].items():
             for field in vals:
@@ -1107,9 +1195,7 @@ class survey_question_wiz(osv.osv_memory):
                     click_state = False
                     click_update.append(key)
                     break
-        resp_obj = self.pool.get('survey.response.line')
-        res_ans_obj = self.pool.get('survey.response.answer')
-        que_obj = self.pool.get('survey.question')
+
         if click_state:
             que_li = []
             resp_id_list = []
@@ -1118,11 +1204,16 @@ class survey_question_wiz(osv.osv_memory):
                 if que_id not in que_li:
                     que_li.append(que_id)
                     que_rec = que_obj.read(cr, uid, [int(que_id)], [])[0]
-                    resp_id = resp_obj.create(cr, uid, {'question_id':que_id, 'date_create':datetime.datetime.now(), \
-                         'state':'done','response_id' : response_id })
+                    res_data =  {
+                        'question_id':que_id, 
+                        'date_create':datetime.datetime.now(),
+                        'state':'done',
+                        'response_id' : response_id
+                    }
+                    resp_id = resp_obj.create(cr, uid, res_data)
                     resp_id_list.append(resp_id)
                     sur_name_read['store_ans'].update({resp_id:{'question_id':que_id}})
-                    surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'store_ans':sur_name_read['store_ans']})
+                    surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'store_ans':sur_name_read['store_ans']})
                     select_count = 0
                     numeric_sum = 0
                     selected_value = []
@@ -1130,17 +1221,20 @@ class survey_question_wiz(osv.osv_memory):
                     comment_field = False
                     comment_value = False
                     response_list = []
+
                     for key1, val1 in vals.items():
                         if val1 and key1.split('_')[1] == "table" and key1.split('_')[0] == que_id:
                             surv_tbl_column_obj.create(cr, uid, {'response_table_id' : resp_id,'column_id':key1.split('_')[2], 'name':key1.split('_')[3], 'value' : val1})
                             sur_name_read['store_ans'][resp_id].update({key1:val1})
                             select_count += 1
+
                         elif val1 and key1.split('_')[1] == "otherfield" and key1.split('_')[0] == que_id:
                             comment_field = True
                             sur_name_read['store_ans'][resp_id].update({key1:val1})
                             select_count += 1
-                            surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'store_ans':sur_name_read['store_ans']})
+                            surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'store_ans':sur_name_read['store_ans']})
                             continue
+
                         elif val1 and key1.split('_')[1] == "selection" and key1.split('_')[0] == que_id:
                             if len(key1.split('_')) > 2:
                                 ans_create_id = res_ans_obj.create(cr, uid, {'response_id':resp_id, 'answer_id':key1.split('_')[-1], 'column_id' : val1})
@@ -1150,6 +1244,7 @@ class survey_question_wiz(osv.osv_memory):
                                 ans_create_id = res_ans_obj.create(cr, uid, {'response_id':resp_id, 'answer_id':val1})
                             sur_name_read['store_ans'][resp_id].update({key1:val1})
                             select_count += 1
+
                         elif key1.split('_')[1] == "other" and key1.split('_')[0] == que_id:
                             if not val1:
                                 comment_value = True
@@ -1183,12 +1278,15 @@ class survey_question_wiz(osv.osv_memory):
                                     for res in resp_id_list:
                                         sur_name_read['store_ans'].pop(res)
                                     raise osv.except_osv(_('Error !'), _("'" + que_rec['question'] + "'  \n" + tools.ustr(que_rec['comment_valid_err_msg'])))
+
                                 resp_obj.write(cr, uid, resp_id, {'comment':val1})
                                 sur_name_read['store_ans'][resp_id].update({key1:val1})
+
                         elif val1 and key1.split('_')[1] == "comment" and key1.split('_')[0] == que_id:
                             resp_obj.write(cr, uid, resp_id, {'comment':val1})
                             sur_name_read['store_ans'][resp_id].update({key1:val1})
                             select_count += 1
+
                         elif val1 and key1.split('_')[0] == que_id and (key1.split('_')[1] == "single"  or (len(key1.split('_')) > 2 and key1.split('_')[2] == 'multi')):
                             error = False
                             if que_rec['is_validation_require'] and que_rec['validation_type'] == 'must_be_specific_length':
@@ -1219,12 +1317,15 @@ class survey_question_wiz(osv.osv_memory):
                                 for res in resp_id_list:
                                     sur_name_read['store_ans'].pop(res)
                                 raise osv.except_osv(_('Error !'), _("'" + que_rec['question'] + "'  \n" + tools.ustr(que_rec['validation_valid_err_msg'])))
+
                             if key1.split('_')[1] == "single" :
                                 resp_obj.write(cr, uid, resp_id, {'single_text':val1})
                             else:
                                 ans_create_id = res_ans_obj.create(cr, uid, {'response_id':resp_id, 'answer_id':key1.split('_')[1], 'answer' : val1})
+
                             sur_name_read['store_ans'][resp_id].update({key1:val1})
                             select_count += 1
+
                         elif val1 and que_id == key1.split('_')[0] and len(key1.split('_')) > 2 and key1.split('_')[2] == 'numeric':
                             if not val1=="0":
                                 try:
@@ -1244,33 +1345,41 @@ class survey_question_wiz(osv.osv_memory):
                             else:
                                 ans_create_id = res_ans_obj.create(cr, uid, {'response_id':resp_id, 'answer_id':key1.split('_')[1], 'column_id' : key1.split('_')[2]})
                                 sur_name_read['store_ans'][resp_id].update({key1:True})
+
                             matrix_list.append(key1.split('_')[0] + '_' + key1.split('_')[1])
                             select_count += 1
+
                         elif val1 and que_id == key1.split('_')[0] and len(key1.split('_')) == 2:
                             ans_create_id = res_ans_obj.create(cr, uid, {'response_id':resp_id, 'answer_id':key1.split('_')[-1], 'answer' : val1})
                             sur_name_read['store_ans'][resp_id].update({key1:val1})
                             select_count += 1
-                        surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'store_ans':sur_name_read['store_ans']})
+                        surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'store_ans':sur_name_read['store_ans']})
+
                     for key,val in vals.items():
                         if val and key.split('_')[1] == "commentcolumn" and key.split('_')[0] == que_id:
                             for res_id in response_list:
                                 if key.split('_')[2] in res_id.split('_')[1]:
                                     a = res_ans_obj.write(cr, uid, [res_id.split('_')[0]], {'comment_field':val})
                                     sur_name_read['store_ans'][resp_id].update({key:val})
+
                     if comment_field and comment_value:
                         for res in resp_id_list:
                             sur_name_read['store_ans'].pop(res)
                         raise osv.except_osv(_('Error re !'), _("'" + que_rec['question']  + "' " + tools.ustr(que_rec['make_comment_field_err_msg'])))
+
                     if que_rec['type'] == "rating_scale" and que_rec['rating_allow_one_column_require'] and len(selected_value) > len(list(set(selected_value))):
                         for res in resp_id_list:
                             sur_name_read['store_ans'].pop(res)
                         raise osv.except_osv(_('Error re !'), _("'" + que_rec['question'] + "\n you cannot select same answer more than one times'"))
+
                     if not select_count:
                         resp_obj.write(cr, uid, resp_id, {'state':'skip'})
+
                     if que_rec['numeric_required_sum'] and numeric_sum > que_rec['numeric_required_sum']:
                         for res in resp_id_list:
                             sur_name_read['store_ans'].pop(res)
                         raise osv.except_osv(_('Error re !'), _("'" + que_rec['question'] + "' " + tools.ustr(que_rec['numeric_required_sum_err_msg'])))
+
                     if que_rec['type'] in ['multiple_textboxes_diff_type', 'multiple_choice_multiple_ans','matrix_of_choices_only_one_ans','matrix_of_choices_only_multi_ans','matrix_of_drop_down_menus','rating_scale','multiple_textboxes','numerical_textboxes','date','date_and_time'] and que_rec['is_require_answer']:
                         if matrix_list:
                             if (que_rec['required_type'] == 'all' and len(list(set(matrix_list))) < len(que_rec['answer_choice_ids'])) or \
@@ -1281,6 +1390,7 @@ class survey_question_wiz(osv.osv_memory):
                                 for res in resp_id_list:
                                     sur_name_read['store_ans'].pop(res)
                                 raise osv.except_osv(_('Error !'), _("'" + que_rec['question'] + "' " + tools.ustr(que_rec['req_error_msg'])))
+
                         elif (que_rec['required_type'] == 'all' and select_count < len(que_rec['answer_choice_ids'])) or \
                             (que_rec['required_type'] == 'at least' and select_count < que_rec['req_ans']) or \
                             (que_rec['required_type'] == 'at most' and select_count > que_rec['req_ans']) or \
@@ -1289,10 +1399,12 @@ class survey_question_wiz(osv.osv_memory):
                             for res in resp_id_list:
                                 sur_name_read['store_ans'].pop(res)
                             raise osv.except_osv(_('Error !'), _("'" + que_rec['question'] + "' " + tools.ustr(que_rec['req_error_msg'])))
+
                     if que_rec['type'] in ['multiple_choice_only_one_ans','single_textbox','comment'] and  que_rec['is_require_answer'] and select_count <= 0:
                         for res in resp_id_list:
                             sur_name_read['store_ans'].pop(res)
                         raise osv.except_osv(_('Error re !'), _("'" + que_rec['question'] + "' " + tools.ustr(que_rec['req_error_msg'])))
+
         else:
             resp_id_list = []
             for update in click_update:
@@ -1301,7 +1413,7 @@ class survey_question_wiz(osv.osv_memory):
                 surv_tbl_column_obj.unlink(cr, uid,surv_tbl_column_obj.search(cr, uid, [('response_table_id', '=', update)]))
                 resp_id_list.append(update)
                 sur_name_read['store_ans'].update({update:{'question_id':sur_name_read['store_ans'][update]['question_id']}})
-                surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'store_ans':sur_name_read['store_ans']})
+                surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'store_ans':sur_name_read['store_ans']})
                 select_count = 0
                 numeric_sum = 0
                 selected_value = []
@@ -1309,6 +1421,7 @@ class survey_question_wiz(osv.osv_memory):
                 comment_field = False
                 comment_value = False
                 response_list = []
+
                 for key, val in vals.items():
                     ans_id_len = key.split('_')
                     if ans_id_len[0] == sur_name_read['store_ans'][update]['question_id']:
@@ -1316,12 +1429,14 @@ class survey_question_wiz(osv.osv_memory):
                             surv_tbl_column_obj.create(cr, uid, {'response_table_id' : update,'column_id':key.split('_')[2], 'name':key.split('_')[3], 'value' : val})
                             sur_name_read['store_ans'][update].update({key:val})
                             resp_obj.write(cr, uid, update, {'state': 'done'})
+
                         elif val and key.split('_')[1] == "otherfield" :
                             comment_field = True
                             sur_name_read['store_ans'][update].update({key:val})
                             select_count += 1
-                            surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'store_ans':sur_name_read['store_ans']})
+                            surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'store_ans':sur_name_read['store_ans']})
                             continue
+
                         elif val and key.split('_')[1] == "selection":
                             if len(key.split('_')) > 2:
                                 ans_create_id = res_ans_obj.create(cr, uid, {'response_id':update, 'answer_id':key.split('_')[-1], 'column_id' : val})
@@ -1332,6 +1447,7 @@ class survey_question_wiz(osv.osv_memory):
                             resp_obj.write(cr, uid, update, {'state': 'done'})
                             sur_name_read['store_ans'][update].update({key:val})
                             select_count += 1
+
                         elif key.split('_')[1] == "other":
                             if not val:
                                 comment_value = True
@@ -1364,10 +1480,12 @@ class survey_question_wiz(osv.osv_memory):
                                     raise osv.except_osv(_('Error !'), _("'" + que_rec['question'] + "'  \n" + tools.ustr(que_rec['comment_valid_err_msg'])))
                                 resp_obj.write(cr, uid, update, {'comment':val,'state': 'done'})
                                 sur_name_read['store_ans'][update].update({key:val})
+
                         elif val and key.split('_')[1] == "comment":
                             resp_obj.write(cr, uid, update, {'comment':val,'state': 'done'})
                             sur_name_read['store_ans'][update].update({key:val})
                             select_count += 1
+
                         elif val and (key.split('_')[1] == "single"  or (len(key.split('_')) > 2 and key.split('_')[2] == 'multi')):
                             error = False
                             if que_rec['is_validation_require'] and que_rec['validation_type'] == 'must_be_specific_length':
@@ -1403,6 +1521,7 @@ class survey_question_wiz(osv.osv_memory):
                                 ans_create_id = res_ans_obj.create(cr, uid, {'response_id':update, 'answer_id':ans_id_len[1], 'answer' : val})
                             sur_name_read['store_ans'][update].update({key:val})
                             select_count += 1
+
                         elif val and len(key.split('_')) > 2 and key.split('_')[2] == 'numeric':
                             if not val=="0":
                                 try:
@@ -1424,26 +1543,33 @@ class survey_question_wiz(osv.osv_memory):
                                 sur_name_read['store_ans'][update].update({key:True})
                             matrix_list.append(key.split('_')[0] + '_' + key.split('_')[1])
                             select_count += 1
+
                         elif val and len(key.split('_')) == 2:
                             resp_obj.write(cr, uid, update, {'state': 'done'})
                             ans_create_id = res_ans_obj.create(cr, uid, {'response_id':update, 'answer_id':ans_id_len[-1], 'answer' : val})
                             sur_name_read['store_ans'][update].update({key:val})
                             select_count += 1
-                        surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'store_ans':sur_name_read['store_ans']})
+                        surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'store_ans':sur_name_read['store_ans']})
+
                 for key,val in vals.items():
                     if val and key.split('_')[1] == "commentcolumn" and key.split('_')[0] == sur_name_read['store_ans'][update]['question_id']:
                         for res_id in response_list:
                             if key.split('_')[2] in res_id.split('_')[1]:
                                 a = res_ans_obj.write(cr, uid, [res_id.split('_')[0]], {'comment_field':val})
                                 sur_name_read['store_ans'][update].update({key:val})
+
                 if comment_field and comment_value:
                     raise osv.except_osv(_('Error re !'), _("'" + que_rec['question']  + "' " + tools.ustr(que_rec['make_comment_field_err_msg'])))
+
                 if que_rec['type'] == "rating_scale" and que_rec['rating_allow_one_column_require'] and len(selected_value) > len(list(set(selected_value))):
                     raise osv.except_osv(_('Error re !'), _("'" + que_rec['question'] + "\n you cannot select same answer more than one times'"))
+
                 if que_rec['numeric_required_sum'] and numeric_sum > que_rec['numeric_required_sum']:
                     raise osv.except_osv(_('Error re !'), _("'" + que_rec['question'] + "' " + tools.ustr(que_rec['numeric_required_sum_err_msg'])))
+
                 if not select_count:
                     resp_obj.write(cr, uid, update, {'state': 'skip'})
+
                 if que_rec['type'] in ['multiple_textboxes_diff_type','multiple_choice_multiple_ans','matrix_of_choices_only_one_ans','matrix_of_choices_only_multi_ans','matrix_of_drop_down_menus','rating_scale','multiple_textboxes','numerical_textboxes','date','date_and_time'] and que_rec['is_require_answer']:
                     if matrix_list:
                         if (que_rec['required_type'] == 'all' and len(list(set(matrix_list))) < len(que_rec['answer_choice_ids'])) or \
@@ -1452,14 +1578,17 @@ class survey_question_wiz(osv.osv_memory):
                         (que_rec['required_type'] == 'exactly' and len(list(set(matrix_list))) != que_rec['req_ans']) or \
                         (que_rec['required_type'] == 'a range' and (len(list(set(matrix_list))) < que_rec['minimum_req_ans'] or len(list(set(matrix_list))) > que_rec['maximum_req_ans'])):
                             raise osv.except_osv(_('Error !'), _("'" + que_rec['question'] + "' " + tools.ustr(que_rec['req_error_msg'])))
+
                     elif (que_rec['required_type'] == 'all' and select_count < len(que_rec['answer_choice_ids'])) or \
                         (que_rec['required_type'] == 'at least' and select_count < que_rec['req_ans']) or \
                         (que_rec['required_type'] == 'at most' and select_count > que_rec['req_ans']) or \
                         (que_rec['required_type'] == 'exactly' and select_count != que_rec['req_ans']) or \
                         (que_rec['required_type'] == 'a range' and (select_count < que_rec['minimum_req_ans'] or select_count > que_rec['maximum_req_ans'])):
                             raise osv.except_osv(_('Error !'), _("'" + que_rec['question'] + "' " + tools.ustr(que_rec['req_error_msg'])))
+
                 if que_rec['type'] in ['multiple_choice_only_one_ans','single_textbox','comment'] and  que_rec['is_require_answer'] and select_count <= 0:
                     raise osv.except_osv(_('Error re !'), _("'" + que_rec['question'] + "' " + tools.ustr(que_rec['req_error_msg'])))
+
         return True
 
     def action_new_question(self,cr, uid, ids, context):
@@ -1503,7 +1632,7 @@ class survey_question_wiz(osv.osv_memory):
                 'res_model': 'survey.page',
                 'type': 'ir.actions.act_window',
                 'target': 'new',
-                'res_id' : int(context['page_id']),
+                'res_id' : int(context.get('page_id',0)),
                 'view_id': view_id,
                 'context': context
                 }
@@ -1512,10 +1641,11 @@ class survey_question_wiz(osv.osv_memory):
         for key,val in context.items():
             if type(key) == type(True):
                 context.pop(key)
-        self.pool.get('survey.page').unlink(cr, uid, [context['page_id']])
+
+        self.pool.get('survey.page').unlink(cr, uid, [context.get('page_id',False)])
         search_id = self.pool.get('ir.ui.view').search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
         surv_name_wiz = self.pool.get('survey.name.wiz')
-        surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'transfer':True, 'page_no' : context['page_number'] })
+        surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'transfer':True, 'page_no' : context.get('page_number',False) })
         return {
                 'view_type': 'form',
                 "view_mode": 'form',
@@ -1537,7 +1667,7 @@ class survey_question_wiz(osv.osv_memory):
                 'res_model': 'survey.question',
                 'type': 'ir.actions.act_window',
                 'target': 'new',
-                'res_id' : int(context['question_id']),
+                'res_id' : int(context.get('question_id',0)),
                 'view_id': view_id,
                 'context': context
                 }
@@ -1546,11 +1676,12 @@ class survey_question_wiz(osv.osv_memory):
         for key,val in context.items():
             if type(key) == type(True):
                 context.pop(key)
+
         que_obj = self.pool.get('survey.question')
-        que_obj.unlink(cr, uid, [context['question_id']])
+        que_obj.unlink(cr, uid, [context.get('question_id',False)])
         search_id = self.pool.get('ir.ui.view').search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
         surv_name_wiz = self.pool.get('survey.name.wiz')
-        surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'transfer':True, 'page_no' : context['page_number'] })
+        surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'transfer':True, 'page_no' : context.get('page_number',0) })
         return {
                 'view_type': 'form',
                 "view_mode": 'form',
@@ -1565,9 +1696,10 @@ class survey_question_wiz(osv.osv_memory):
         search_obj = self.pool.get('ir.ui.view')
         surv_name_wiz = self.pool.get('survey.name.wiz')
         search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
-        wiz_id = surv_name_wiz.create(cr,uid, {'survey_id' : context['survey_id'],'page_no' :-1,'page':'next','transfer' :1,'response':0})
-        context.update({'sur_name_id' :wiz_id, 'response_no' : context['response_no'] - 1})
-        if context['response_no'] + 1 > len(context['response_id']):
+        wiz_id = surv_name_wiz.create(cr,uid, {'survey_id' : context.get('survey_id',False),'page_no' :-1,'page':'next','transfer' :1,'response':0})
+        context.update({'sur_name_id' :wiz_id, 'response_no' : context.get('response_no',0) - 1})
+
+        if context.get('response_no',0) + 1 > len(context.get('response_id',0)):
             return {}
         return {
                 'view_type': 'form',
@@ -1583,9 +1715,10 @@ class survey_question_wiz(osv.osv_memory):
         search_obj = self.pool.get('ir.ui.view')
         surv_name_wiz = self.pool.get('survey.name.wiz')
         search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
-        wiz_id = surv_name_wiz.create(cr,uid, {'survey_id' : context['survey_id'],'page_no' :-1,'page':'next','transfer' :1,'response':0})
-        context.update({'sur_name_id' :wiz_id, 'response_no' : context['response_no'] + 1})
-        if context['response_no'] + 1 > len(context['response_id']):
+        wiz_id = surv_name_wiz.create(cr,uid, {'survey_id' : context.get('survey_id',False),'page_no' :-1,'page':'next','transfer' :1,'response':0})
+        context.update({'sur_name_id' :wiz_id, 'response_no' : context.get('response_no',0) + 1})
+
+        if context.get('response_no',0) + 1 > len(context.get('response_id',0)):
             return {}
         return {
                 'view_type': 'form',
@@ -1601,7 +1734,7 @@ class survey_question_wiz(osv.osv_memory):
         surv_name_wiz = self.pool.get('survey.name.wiz')
         search_obj = self.pool.get('ir.ui.view')
         search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
-        surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'transfer':True, 'page':'next'})
+        surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'transfer':True, 'page':'next'})
         return {
                 'view_type': 'form',
                 "view_mode": 'form',
@@ -1616,7 +1749,7 @@ class survey_question_wiz(osv.osv_memory):
         surv_name_wiz = self.pool.get('survey.name.wiz')
         search_obj = self.pool.get('ir.ui.view')
         search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
-        surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'transfer':True, 'page':'previous'})
+        surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'transfer':True, 'page':'previous'})
         return {
                 'view_type': 'form',
                 "view_mode": 'form',
diff --git a/addons/thunderbird/partner/partner.py b/addons/thunderbird/partner/partner.py
index d3aa9020444..3a0fa73abc9 100644
--- a/addons/thunderbird/partner/partner.py
+++ b/addons/thunderbird/partner/partner.py
@@ -83,11 +83,14 @@ class tinythunderbird_partner(osv.osv):
 
     def thunderbird_mailcreate(self,cr,user,vals):
         dictcreate = dict(vals)
+        for val in vals:
+            if val[0] == 'object':
+                object = val[1]
         import email
         header_name = email.Header.decode_header(dictcreate['name'])
         dictcreate['name'] = header_name and header_name[0] and header_name[0][0] 
         add_obj=self.pool.get('res.partner.address')
-        case_pool=self.pool.get('crm.case')
+        case_pool=self.pool.get(object)
         partner_ids=add_obj.search(cr,user,[('email','=',dictcreate['email_from'])])
         partner=add_obj.read(cr,user,partner_ids,['partner_id'])
         if partner:
@@ -95,7 +98,7 @@ class tinythunderbird_partner(osv.osv):
         search_id = self.pool.get('res.request.link').search(cr,user,[('object','=',dictcreate['ref'].split(',')[0])])
         if not search_id:
             create_link_id = self.pool.get('res.request.link').create(cr,user,{'name':dictcreate['ref'].split(',')[0],'object':dictcreate['ref'].split(',')[0]})
-        create_id = self.pool.get('crm.case').create(cr, user, dictcreate)
+        create_id = self.pool.get(object).create(cr, user, dictcreate)
         cases=case_pool.browse(cr,user,[create_id])
         case_pool._history(cr, user, cases, _('Archive'), history=True, email=False)
         return create_id
diff --git a/addons/thunderbird/plugin/tiny_plugin-2.0.xpi b/addons/thunderbird/plugin/tiny_plugin-2.0.xpi
index 7fb57818c15..d48a837cbbd 100755
Binary files a/addons/thunderbird/plugin/tiny_plugin-2.0.xpi and b/addons/thunderbird/plugin/tiny_plugin-2.0.xpi differ
diff --git a/addons/wiki/__terp__.py b/addons/wiki/__terp__.py
index cf792be226f..b15346dba39 100644
--- a/addons/wiki/__terp__.py
+++ b/addons/wiki/__terp__.py
@@ -33,10 +33,14 @@
     'depends': ['base'],
     'init_xml': [],
     'update_xml': [
+        'wizard/wizard_view.xml',
+        'wizard/wiki_wiki_page_open_view.xml',
+        'wizard/wiki_create_menu_view.xml',
+        'wizard/wiki_wiki_help_open_view.xml',
+        'wizard/wiki_make_index_view.xml',
         'wiki_view.xml',
         'data/wiki_quickstart.xml',
         'data/wiki_main.xml',
-        'wizard/wizard_view.xml',
         'security/ir.model.access.csv'
     ],
     'demo_xml': [],
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index d2fa06d4fd5..ec738a5a91f 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -6,18 +6,6 @@
         <menuitem name="Wiki" id="menu_wiki_configuration" parent="base.menu_document_configuration" sequence="2"/>
         <menuitem id="base.menu_document2" name="Collaborative Content" parent="base.menu_document"/>
 
-        <wizard
-            id="wizard_group_menu_create"
-            string="Create Menu"
-            menu="True"
-            name="wiki.create.menu"/>
-
-        <wizard
-            id="wizard_open_page"
-            string="Open Page"
-            menu="True"
-            name="wiki.wiki.page.open"/>
-
         <record model="ir.ui.view" id="wiki_group_tree">
             <field name="name">wiki.groups.tree</field>
             <field name="model">wiki.groups</field>
@@ -49,11 +37,11 @@
                         <field name="template" colspan="4" nolabel="1" widget="text_wiki"/>
                     </page>
                     </notebook>
-                    <button
-                        name="%(wizard_group_menu_create)d"
-                        string="Create a Menu"
-                        type="action"
-                        target="new" icon="gtk-justify-fill"/>
+                     <button
+			 	    	name="%(wiki.action_wiki_create_menu)d"
+			 	    	string="Create Menu"
+			 	     	type="action"
+			 	     	icon="gtk-justify-fill" />
                 </form>
             </field>
         </record>
@@ -234,12 +222,6 @@
             res_model="wiki.wiki"
             src_model="wiki.groups"/>
 
-        <wizard
-            id="wizard_open_page"
-            string="Open Wiki Pages"
-            name="wiki.wiki.page.open"
-            model="wiki.groups"/>
-
         <record id="ir_open_wiki_pages" model="ir.values">
             <field name="key2">tree_but_open</field>
             <field name="model">wiki.groups</field>
@@ -247,14 +229,5 @@
             <field eval="'ir.actions.wizard,%d'%wizard_open_page" name="value"/>
             <field eval="True" name="object"/>
         </record>
-
-        <!--record id="ir_open_account_account" model="ir.values">
-            <field eval="'tree_but_open'" name="key2"/>
-            <field eval="'wiki.groups'" name="model"/>
-            <field name="name">Search a Page</field>
-           <field eval="'ir.actions.act_window,%d'%act_wiki_group_open" name="value"/>
-            <field eval="True" name="object">
-        </record-->
-
     </data>
 </openerp>
diff --git a/addons/wiki/wizard/__init__.py b/addons/wiki/wizard/__init__.py
index 1777b053bca..739966e5557 100644
--- a/addons/wiki/wizard/__init__.py
+++ b/addons/wiki/wizard/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,13 +15,14 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
-import open_page
-import open_help
-import create_menu
+import wiki_wiki_page_open
+import wiki_create_menu
+import wiki_wiki_help_open
+import wiki_make_index
 import show_diff
-import make_index
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/wiki/wizard/create_menu.py b/addons/wiki/wizard/create_menu.py
deleted file mode 100644
index e31a9daa664..00000000000
--- a/addons/wiki/wizard/create_menu.py
+++ /dev/null
@@ -1,79 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import time
-import wizard
-import osv
-import pooler
-
-section_form = '''<?xml version="1.0"?>
-<form string="Create Menu">
-    <separator string="Menu Information" colspan="4"/>
-    <field name="menu_name"/>
-    <field name="menu_parent_id"/>
-    <field name="page" colspan="4"/>
-</form>'''
-
-section_fields = {
-    'menu_name': {'string':'Menu Name', 'type':'char', 'required':True, 'size':64},
-    'menu_parent_id': {'string':'Parent Menu', 'type':'many2one', 'relation':'ir.ui.menu', 'required':True},
-    'page': {'string':'Group Home Page', 'type':'many2one', 'relation':'wiki.wiki'},
-}
-
-def wiki_menu_create(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    group = pool.get('wiki.groups').browse(cr, uid, data['id'])
-    action_id = pool.get('ir.actions.wizard').search(cr, uid, [('wiz_name','=','wiki.wiki.page.open')])
-
-    menu_id = pool.get('ir.ui.menu').create(cr, uid, {
-        'name': data['form']['menu_name'],
-        'parent_id': data['form']['menu_parent_id'],
-        'icon': 'STOCK_DIALOG_QUESTION',
-        'action': 'ir.actions.wizard,'+str(action_id[0])
-    }, context)
-    
-    home = data['form']['page']
-    group_id = data['id']
-    res = {
-        'home':home,
-    }
-    pool.get('wiki.groups').write(cr, uid, [data['id']], res)
-    pool.get('wiki.groups.link').create(cr, uid, {'group_id':group_id, 'action_id':menu_id})
-    
-    return {}
-
-class wizard_create_menu(wizard.interface):
-    states = {
-        'init': {
-            'actions': [], 
-            'result': {'type':'form', 'arch':section_form, 'fields':section_fields, 'state':[('end','Cancel'),('create_menu','Create Menu')]}
-        },
-        'create_menu': {
-            'actions': [wiki_menu_create], 
-            'result': {
-                'type':'state', 
-                'state':'end'
-            }
-        }
-    }
-wizard_create_menu('wiki.create.menu')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/wiki/wizard/make_index.py b/addons/wiki/wizard/make_index.py
deleted file mode 100644
index 09a3b5de4ac..00000000000
--- a/addons/wiki/wizard/make_index.py
+++ /dev/null
@@ -1,98 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import time
-import wizard
-import osv
-import pooler
-
-section_form = '''<?xml version="1.0"?>
-<form string="Create Menu">
-    <separator string="Menu Information" colspan="4"/>
-    <label string="Want to create a Index on Selected Pages ? "/>
-</form>'''
-
-def wiki_do_index(self, cr, uid, data, context):
-    ids = data['ids']
-    pool = pooler.get_pool(cr.dbname)
-    wiki_pool = pool.get('wiki.wiki')
-    cr.execute("Select id, section from wiki_wiki where id = ANY(%s) order by section " ,(ids,))
-    lst0 = cr.fetchall()
-    lst = []
-    ids = {}
-    for l in lst0:
-        ids[l[1]] = l[0]
-        lst.append(l[1])
-
-    lst.sort()
-    val = None
-    def toint(x):
-        try:
-            return int(x)
-        except:
-            return 1
-
-    lst = map(lambda x: map(toint, x.split('.')), lst)
-
-    result = []
-    current = ['0']
-    current2 = []
-
-    for l in lst:
-        for pos in range(len(l)):
-            if pos >= len(current):
-                current.append('1')
-                continue
-            if (pos == len(l) - 1) or (pos >= len(current2)) or (toint(l[pos]) > toint(current2[pos])):
-                 current[pos] = str(toint(current[pos]) + 1)
-                 current = current[:pos + 1]
-            if pos == len(l) - 1:
-                 break
-
-        key = ('.'.join([str(x) for x in l]))
-        id = ids[key]
-        val = ('.'.join([str(x) for x in current[:]]), id)
-
-        if val:
-            result.append(val)
-        current2 = l
-
-    for rs in result:
-        wiki_pool.write(cr, uid, [rs[1]], {'section':rs[0]})
-    return {}
-
-class make_index(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type':'form', 'arch':section_form, 'fields':{}, 'state':[('end','Cancel'),('yes','Create Index')]}
-        },
-        'yes': {
-            'actions': [wiki_do_index],
-            'result': {
-                'type':'state',
-                'state':'end'
-            }
-        }
-    }
-make_index('wiki.make.index')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/wiki/wizard/show_diff.py b/addons/wiki/wizard/show_diff.py
index 376ed9885e4..d77130f2aed 100644
--- a/addons/wiki/wizard/show_diff.py
+++ b/addons/wiki/wizard/show_diff.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,16 +15,15 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
 from osv import fields,osv
-from tools.translate import _
 
 class showdiff(osv.osv_memory):
     _name = 'wizard.wiki.history.show_diff'
-    
+
     def _get_diff(self, cr, uid, ctx):
         history = self.pool.get('wiki.wiki.history')
         ids = ctx.get('active_ids')
diff --git a/addons/wiki/wizard/wiki_create_menu.py b/addons/wiki/wizard/wiki_create_menu.py
new file mode 100644
index 00000000000..b9b2d5563c4
--- /dev/null
+++ b/addons/wiki/wizard/wiki_create_menu.py
@@ -0,0 +1,65 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+
+class wiki_create_menu(osv.osv_memory):
+    _name = "wiki.create.menu"
+    _description = "Wizard Create Menu"
+    _columns = {
+        'menu_name': fields.char('Menu Name', size=256, select=True, required=True),
+        'menu_parent_id': fields.many2one('ir.ui.menu', 'Parent Menu', required=True),
+        'page': fields.many2one('wiki.wiki', 'Group Home Page'),
+    }
+
+    def wiki_menu_create(self, cr, uid, ids, context):
+        """ Create Menu On the base of Group id and Action id
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of create menu’s IDs
+
+        """
+
+        for group in self.pool.get('wiki.groups').browse(cr, uid, ids):
+            for menu in self.pool.get('wiki.create.menu').browse(cr, uid, ids):
+
+                mod_obj = self.pool.get('ir.model.data')
+                action_id = mod_obj._get_id(cr, uid, 'wiki', 'action_view_wiki_wiki_page_open')
+                menu_id = self.pool.get('ir.ui.menu').create(cr, uid, {
+                'name':menu.menu_name,
+                'parent_id':menu.menu_parent_id.id,
+                'icon': 'STOCK_DIALOG_QUESTION',
+                'action': 'ir.actions.act_window,'+ str(action_id)
+                }, context)
+                home = menu.page.id
+                group_id = menu.id
+                res = {
+                'home':home,
+                }
+                self.pool.get('wiki.groups').write(cr, uid, ids, res)
+                self.pool.get('wiki.groups.link').create(cr, uid,
+                                    {'group_id': group_id, 'action_id':menu_id})
+
+                return {}
+
+wiki_create_menu()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/wiki/wizard/wiki_create_menu_view.xml b/addons/wiki/wizard/wiki_create_menu_view.xml
new file mode 100644
index 00000000000..7acd1e2a70d
--- /dev/null
+++ b/addons/wiki/wizard/wiki_create_menu_view.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+		<record id="view_wiki_create_menu" model="ir.ui.view">
+            <field name="name">Create Menu</field>
+            <field name="model">wiki.create.menu</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+              <form string="Create Menu">
+             		<separator string="Menu Information" colspan="4" />
+                	<field name="menu_name" />
+                	<field name="menu_parent_id" />
+                	<field name="page" colspan="4" />
+	                <separator string="" colspan="4" />
+    	            <label string="" colspan="2" />
+        	        <button special="cancel" string="Cancel" />
+            	    <button name="wiki_menu_create" string="Create Menu" type="object"/>
+             </form>
+            </field>
+		</record>
+
+		<record id="action_wiki_create_menu" model="ir.actions.act_window">
+            <field name="name">Create Menu</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">wiki.create.menu</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/wiki/wizard/wiki_make_index.py b/addons/wiki/wizard/wiki_make_index.py
new file mode 100644
index 00000000000..78964743a8b
--- /dev/null
+++ b/addons/wiki/wizard/wiki_make_index.py
@@ -0,0 +1,87 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+
+class wiki_make_index(osv.osv_memory):
+    _name = "wiki.make.index"
+    _description = "Create Index"
+    _columns = {
+    }
+
+    def wiki_do_index(self, cr, uid, ids, context):
+        """ Makes Index according to page hierarchy
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of wiki index’s IDs
+
+        """
+        for index_obj in self.browse(cr,uid,ids):
+            wiki_pool = self.pool.get('wiki.wiki')
+            cr.execute("Select id, section from wiki_wiki where id = ANY(%s) \
+                            order by section " ,(context['active_ids'],))
+            lst0 = cr.fetchall()
+            lst = []
+            s_ids = {}
+            for l in lst0:
+                s_ids[l[1]] = l[0]
+                lst.append(l[1])
+
+            lst.sort()
+            val = None
+            def toint(x):
+                try:
+                    return int(x)
+                except:
+                    return 1
+
+            lst = map(lambda x: map(toint, x.split('.')), lst)
+
+            result = []
+            current = ['0']
+            current2 = []
+
+            for l in lst:
+                for pos in range(len(l)):
+                    if pos >= len(current):
+                        current.append('1')
+                        continue
+                    if (pos == len(l) - 1) or (pos >= len(current2)) or (toint(l[pos]) > toint(current2[pos])):
+                        current[pos] = str(toint(current[pos]) + 1)
+                        current = current[:pos + 1]
+                        if pos == len(l) - 1:
+                            break
+
+                key = ('.'.join([str(x) for x in l]))
+                id = s_ids[key]
+                val = ('.'.join([str(x) for x in current[:]]), id)
+
+            if val:
+                result.append(val)
+            current2 = l
+
+            for rs in result:
+                wiki_pool.write(cr, uid, [rs[1]], {'section':rs[0]})
+        return {}
+
+wiki_make_index()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/wiki/wizard/wiki_make_index_view.xml b/addons/wiki/wizard/wiki_make_index_view.xml
new file mode 100644
index 00000000000..1138afc908a
--- /dev/null
+++ b/addons/wiki/wizard/wiki_make_index_view.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    	<record id="view_wiki_make_index" model="ir.ui.view">
+            <field name="name">Create Index</field>
+            <field name="model">wiki.make.index</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+              <form string="Create Menu">
+    			<separator string="Menu Information" colspan="4"/>
+    			<label string="Want to create a Index on Selected Pages ? "/>
+    			<separator string="" colspan="4" />
+    	        <label string="" colspan="2" />
+        	    <button special="cancel" string="Cancel" />
+            	<button name="wiki_do_index" string="Create Index" type="object"/>
+			</form>
+            </field>
+		</record>
+
+		<record id="action_view_wiki_make_index" model="ir.actions.act_window">
+            <field name="name">Create Index</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">wiki.make.index</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+            <field name="context">{'record_id' : active_id}</field>
+    	</record>
+
+		<act_window id="action_view_wiki_make_index_values"
+    		key2="client_action_multi" name="Create Index"
+    		res_model="wiki.make.index" src_model="wiki.wiki"
+    		view_mode="form" target="new" view_type="form" />
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/wiki/wizard/open_help.py b/addons/wiki/wizard/wiki_wiki_help_open.py
similarity index 66%
rename from addons/wiki/wizard/open_help.py
rename to addons/wiki/wizard/wiki_wiki_help_open.py
index 6be88349a81..934d5fdccb7 100644
--- a/addons/wiki/wizard/open_help.py
+++ b/addons/wiki/wizard/wiki_wiki_help_open.py
@@ -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,22 +20,23 @@
 #
 ##############################################################################
 
+from osv import fields, osv
 
-import wizard
-import netsvc
-import time
-import pooler
-from osv import osv
-from tools.translate import _
+class wiki_wiki_help_open(osv.osv_memory):
+    _name = "wiki.wiki.help.open"
+    _description = "Basic Wiki Editing"
+    _columns = {
+    }
+    def open_wiki_page(self, cr, uid, ids, context):
+        """ Opens Wiki Page for Editing
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of wiki page’s IDs
+
+        """
+        pages = self.pool.get('wiki.wiki').search(cr, uid, [('name','=','Basic Wiki Editing')])
 
-class wiz_open_help(wizard.interface):
-    
-    def _open_wiki_page(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        pages = pool.get('wiki.wiki').search(cr, uid, [('name','=','Basic Wiki Editing')])
-        
         value = {
-            'name': 'Basic Wiki Editing',
             'view_type': 'form',
             'view_mode': 'form,tree',
             'res_model': 'wiki.wiki',
@@ -43,16 +44,10 @@ class wiz_open_help(wizard.interface):
             'res_id': pages[0],
             'type': 'ir.actions.act_window',
         }
-                    
+
         return value
 
-    states = {
-        'init' : {
-            'actions' : [],
-            'result' : {'type':'action', 'action':_open_wiki_page, 'state':'end'}
-        }
-    }
-wiz_open_help('wiki.wiki.help.open')
+wiki_wiki_help_open()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/wiki/wizard/wiki_wiki_help_open_view.xml b/addons/wiki/wizard/wiki_wiki_help_open_view.xml
new file mode 100644
index 00000000000..76e96664f3d
--- /dev/null
+++ b/addons/wiki/wizard/wiki_wiki_help_open_view.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    	<record id="view_wiki_wiki_help_open" model="ir.ui.view">
+            <field name="name">Basic Wiki Editing</field>
+            <field name="model">wiki.wiki.help.open</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+              <form string="Open Help">
+             	 <separator string="" colspan="6" />
+              	 <label string="" colspan="2" />
+                 <button name="open_wiki_page" string="Basic Wiki Editing" type="object"/>
+             </form>
+            </field>
+		</record>
+
+		<record id="action_view_wiki_wiki_help_open" model="ir.actions.act_window">
+            <field name="name">Basic Wiki Editing</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">wiki.wiki.help.open</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+        <act_window id="action_view_wiki_wiki_help_open_vals"
+    		key2="client_action_multi" name="Basic Wiki Editing"
+    		res_model="wiki.wiki.help.open" src_model="wiki.wiki"
+    		view_mode="form" target="new" view_type="form" />
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/wiki/wizard/open_page.py b/addons/wiki/wizard/wiki_wiki_page_open.py
similarity index 59%
rename from addons/wiki/wizard/open_page.py
rename to addons/wiki/wizard/wiki_wiki_page_open.py
index df015f5c5a0..37b31a10ead 100644
--- a/addons/wiki/wizard/open_page.py
+++ b/addons/wiki/wizard/wiki_wiki_page_open.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,33 +15,37 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
+from osv import fields, osv
 
-import wizard
-import netsvc
-import time
-import pooler
-from osv import osv
-from tools.translate import _
+class wiki_wiki_page_open(osv.osv_memory):
+    _name = "wiki.wiki.page.open"
+    _description = "wiz open page"
+    _columns = {
 
-class wiz_open_page(wizard.interface):
-    
-    def _open_wiki_page(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        group = pool.get('wiki.groups').browse(cr, uid, data['id'])
-        
-        value = {
-            'context': "{'group_id':%d, 'section':%s}" % (group.id, group.section),
-            'domain': "[('group_id','=',%d)]" % (group.id),
-            'name': 'Wiki Page',
-            'view_type': 'form',
-            'view_mode': 'form,tree',
-            'res_model': 'wiki.wiki',
-            'view_id': False,
-            'type': 'ir.actions.act_window',
+    }
+    def open_wiki_page(self, cr, uid, ids, context):
+        """ Opens Wiki Page of Group
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of open wiki page’s IDs
+        @return : dictionay of open wiki window on give group id
+        """
+        for group in self.pool.get('wiki.groups').browse(cr, uid,ids):
+
+         for openpage in self.pool.get('wiki.wiki.page.open').browse(cr, uid,ids):
+
+            value = {
+                'domain': "[('group_id','=',%d)]" % (group.id),
+                'name': 'Wiki Page',
+                'view_type': 'form',
+                'view_mode': 'form,tree',
+                'res_model': 'wiki.wiki',
+                'view_id': False,
+                'type': 'ir.actions.act_window',
         }
         if group.method == 'page':
             value['res_id'] = group.home.id
@@ -52,17 +56,10 @@ class wiz_open_page(wizard.interface):
             view_id = pool.get('ir.ui.view').search(cr, uid, [('name','=','wiki.wiki.tree.childs')])
             value['view_id'] = view_id
             value['domain'] = [('group_id','=',group.id),('parent_id','=',False)]
-            value['view_type'] = 'tree'            
+            value['view_type'] = 'tree'
 
         return value
 
-    states = {
-        'init' : {
-            'actions' : [],
-            'result' : {'type':'action', 'action':_open_wiki_page, 'state':'end'}
-        }
-    }
-wiz_open_page('wiki.wiki.page.open')
-
+wiki_wiki_page_open()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/wiki/wizard/wiki_wiki_page_open_view.xml b/addons/wiki/wizard/wiki_wiki_page_open_view.xml
new file mode 100644
index 00000000000..6df047882a4
--- /dev/null
+++ b/addons/wiki/wizard/wiki_wiki_page_open_view.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    	<record id="view_wiki_wiki_page_open" model="ir.ui.view">
+            <field name="name">Open Page</field>
+            <field name="model">wiki.wiki.page.open</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+              <form string="Open Page">
+             	<separator string="" colspan="6" />
+              	<label string="" colspan="2" />
+               	<button name="open_wiki_page" string="Open Wiki Page" type="object"/>
+             </form>
+            </field>
+		</record>
+
+		<record id="action_view_wiki_wiki_page_open" model="ir.actions.act_window">
+            <field name="name">Open Page</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">wiki.wiki.page.open</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+    	</record>
+
+    	<act_window id="action_view_wiki_wiki_page_open_vals"
+    		key2="client_action_multi" name="Open Wiki Page"
+    		res_model="wiki.wiki.page.open" src_model="wiki.groups"
+    		view_mode="form" target="new" view_type="form" />
+    </data>
+</openerp>
diff --git a/addons/wiki/wizard/wizard_view.xml b/addons/wiki/wizard/wizard_view.xml
index cbc5f020731..2374d22e2dc 100644
--- a/addons/wiki/wizard/wizard_view.xml
+++ b/addons/wiki/wizard/wizard_view.xml
@@ -12,24 +12,13 @@
                 </form>
             </field>
         </record>
-        <act_window
-            id="act_view_diff" 
-            name="Differences" 
-            res_model="wizard.wiki.history.show_diff" 
+       <act_window
+            id="act_view_diff"
+            name="Differences"
+            res_model="wizard.wiki.history.show_diff"
             src_model="wiki.wiki.history"
             target="new"
             view_mode="form"
         />
-<!--        <wizard
-            id="wizard_make_index"
-            string="Create Index"
-            name="wiki.make.index"
-            model="wiki.wiki"/-->
-        <wizard
-            id="wizard_open_help"
-            string="Basic Wiki Editing"
-            name="wiki.wiki.help.open"
-            model="wiki.wiki"/>
-
     </data>
 </openerp>