[MERGE] merged with trunk-development-branch

bzr revid: hmo@tinyerp.com-20111214122924-izzibrz1yz67rt7g

50 files changed, 1241 insertions, 2319 deletions

diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 54dfc335a2b..83b0354912a 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Customer & Supplier Relationship Management',
+    'name': 'CRM',
     'version': '1.0',
     'category': 'Customer Relationship Management',
     'complexity': "easy",
@@ -61,7 +61,8 @@ Creates a dashboard for CRM that includes:
         'mail',
         'base_calendar',
         'resource',
-        'board'
+        'board',
+        'fetchmail'
     ],
     'init_xml': [
         'crm_data.xml',
@@ -118,20 +119,17 @@ Creates a dashboard for CRM that includes:
         'crm_phonecall_demo.xml',
     ],
     'test': [
-            'test/test_crm_lead.yml',
-            'test/test_crm_meeting.yml',
-            'test/test_crm_opportunity.yml',
-            'test/test_crm_phonecall.yml',
-            'test/test_crm_recurrent_meeting.yml',
-            'test/test_crm_stage_changes.yml',
-            'test/test_crm_recurrent_meeting_case2.yml',
-            'test/test_crm_lead_case2.yml',
-            'test/test_crm_opportunity_case2.yml',
-            'test/test_crm_phonecall_case2.yml',
-            'test/test_crm_partner2opportunity.yml',
-            'test/test_crm_segmentation.yml',
+            'test/process/communication_with_customer.yml',
+            'test/process/lead2opportunity2win.yml',
+            'test/process/merge_opportunity.yml',
+            'test/process/cancel_lead.yml',
+            'test/process/segmentation.yml',
+            'test/ui/crm_demo.yml',
+            'test/ui/duplicate_lead.yml',
+            'test/ui/delete_lead.yml'
              ],
     'installable': True,
+    'application': True,
     'active': False,
     'certificate': '0079056041421',
     'images': ['images/sale_crm_crm_dashboard.png', 'images/crm_dashboard.jpeg','images/leads.jpeg','images/meetings.jpeg','images/opportunities.jpeg','images/outbound_calls.jpeg','images/stages.jpeg'],
diff --git a/addons/crm/board_crm_view.xml b/addons/crm/board_crm_view.xml
index 7b80feffd30..5d64bf20093 100644
--- a/addons/crm/board_crm_view.xml
+++ b/addons/crm/board_crm_view.xml
@@ -83,54 +83,30 @@
             <field name="act_window_id" ref="act_my_oppor"/>
         </record>
 
-          <record model="ir.actions.act_window" id="act_my_meetings">
-               <field name="name">My Meetings</field>
-               <field name="res_model">crm.meeting</field>
-               <field name="view_type">form</field>
-               <field name="view_mode">tree,form</field>
-               <field name="view_id" ref="crm.crm_case_tree_view_meet"/>
-               <field name="domain">[('user_id','=',uid),('state','not in',('cancel','done'))]</field>
-               <field name="context">{'default_user_id': uid}</field>
-          </record>
-
           <record model="ir.actions.act_window" id="act_my_oppor_stage">
                <field name="name">Planned Revenue By 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_report_crm_oppor_graph"/>
-               <field name="domain">['&amp;', '&amp;', ('user_id','=',uid), ('type', '=', 'opportunity'), '!' , '&amp;', ('state', '=', 'done'),  ('date_closed','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%Y-%m-%d'))]</field>
+               <field name="domain">[('user_id','=',uid), ('type', '=', 'opportunity'), ('state','in',('draft','open','done','pending')), '!', '&amp;', ('state', '=', 'done'), ('date_closed','&gt;=',datetime.date.today().strftime('%Y-%m-01'))]</field>
                <field name="context">{'search_default_Stage':1}</field>
           </record>
 
-          <record model="ir.actions.act_window" id="act_sales_pipeline">
-               <field name="name">My Win/Lost Ratio for The Last Year</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_opportunity_user_graph1"/>
-               <field name="domain">['&amp;', ('user_id', '=', uid),'&amp;', ('state', '=', 'done') , '&amp;', ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%Y-%m-%d')), ('type', '=', 'opportunity')]</field>
-          </record>
-
           <record model="ir.ui.view" id="board_crm_form">
                <field name="name">Sales Dashboard Form</field>
                <field name="model">board.board</field>
                <field name="type">form</field>
                <field name="arch" type="xml">
                     <form string="Sales Dashboard">
-                         <board style="1-1">
+                         <board style="2-1">
                             <column>
-                                <action string="My Open Opportunities"
-                                    name="%(act_my_oppor)d"/>
-                                <action
-                                    string="My Meetings"
-                                    name="%(act_my_meetings)d"/>
+                                <action string="My Opportunities"
+                                    name="%(act_my_oppor)d" creatable="true"/>
                             </column>
                             <column>
                                 <action string="My Planned Revenues by Stage"
                                     name="%(act_my_oppor_stage)d"/>
-                                <action string="My Win/Lost Ratio"
-                                    name="%(act_sales_pipeline)d"/>
                             </column>
                     </board>
                 </form>
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 03cdb31832d..bee1e48ada2 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -468,10 +468,12 @@ class crm_case(crm_base):
         self._action(cr, uid, cases, state)
         return True
 
+    #DEAD Code
     def remind_partner(self, cr, uid, ids, context=None, attach=False):
         return self.remind_user(cr, uid, ids, context, attach,
                 destination=False)
 
+    #DEAD Code
     def remind_user(self, cr, uid, ids, context=None, attach=False, destination=True):
         mail_message = self.pool.get('mail.message')
         for case in self.browse(cr, uid, ids, context=context):
diff --git a/addons/crm/crm_demo.xml b/addons/crm/crm_demo.xml
index 16ae0e73129..f345d86d030 100644
--- a/addons/crm/crm_demo.xml
+++ b/addons/crm/crm_demo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="1">
+    <data>
         <record id="base.user_demo" model="res.users">
             <field name="groups_id" eval="[(4,ref('base.group_sale_salesman'))]"/> 
         </record>
@@ -12,5 +12,17 @@
         <field name="res_id" ref="crm.menu_crm_case_categ_meet"/>
     </record>
 
+    <record model="crm.case.section" id="section_sales_marketing_department">
+            <field name="name">Sales Marketing Department</field>
+            <field name="code">Sales Marketing</field>
+            <field name="parent_id" ref="crm.section_sales_department"></field>
+    </record>
+
+    <record model="crm.segmentation" id="crm_segmentation0">
+		<field name="name">OpenERP partners</field>
+		<field name="exclusif">True</field>
+		<field name="categ_id" ref="base.res_partner_category_2"/>
+	</record>
+
     </data>
 </openerp>
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 3a5c411993d..216a898bc88 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -27,7 +27,7 @@ from tools.translate import _
 from crm import crm_case
 import binascii
 import tools
-
+from mail.mail_message import to_email
 
 CRM_LEAD_PENDING_STATES = (
     crm.AVAILABLE_STATES[2][0], # Cancelled
@@ -352,36 +352,380 @@ class crm_lead(crm_case, osv.osv):
         """
         return self.set_priority(cr, uid, ids, '3')
 
-    def convert_opportunity(self, cr, uid, ids, context=None):
-        """ Precomputation for converting lead to opportunity
-        """
+    
+    def _merge_data(self, cr, uid, ids, oldest, fields, context=None):
+        # prepare opportunity data into dictionary for merging
+        opportunities = self.browse(cr, uid, ids, context=context)
+        def _get_first_not_null(attr):
+            if hasattr(oldest, attr):
+                return getattr(oldest, attr)
+            for opportunity in opportunities:
+                if hasattr(opportunity, attr):
+                    return getattr(opportunity, attr)
+            return False
+
+        def _get_first_not_null_id(attr):
+            res = _get_first_not_null(attr)
+            return res and res.id or False
+    
+        def _concat_all(attr):
+            return ', '.join(filter(lambda x: x, [getattr(opportunity, attr) or '' for opportunity in opportunities if hasattr(opportunity, attr)]))
+
+        data = {}
+        for field_name in fields:
+            field_info = self._all_columns.get(field_name)
+            if field_info is None:
+                continue
+            field = field_info.column
+            if field._type in ('many2many', 'one2many'):
+                continue  
+            elif field._type == 'many2one':
+                data[field_name] = _get_first_not_null_id(field_name)  # !!
+            elif field._type == 'text':
+                data[field_name] = _concat_all(field_name)  #not lost
+            else:
+                data[field_name] = _get_first_not_null(field_name)  #not lost
+        return data
+
+    def _merge_find_oldest(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
-        context.update({'active_ids': ids})
-
-        data_obj = self.pool.get('ir.model.data')
-        value = {}
+        #TOCHECK: where pass 'convert' in context ?
+        if context.get('convert'):
+            ids = list(set(ids) - set(context.get('lead_ids', False)) )
+
+        #search opportunities order by create date
+        opportunity_ids = self.search(cr, uid, [('id', 'in', ids)], order='create_date' , context=context)
+        oldest_id = opportunity_ids[0]
+        return self.browse(cr, uid, oldest_id, context=context)
+
+    def _mail_body_text(self, cr, uid, lead, fields, title=False, context=None):
+        body = []
+        if title:
+            body.append("%s\n" % (title))
+        for field_name in fields:
+            field_info = self._all_columns.get(field_name)
+            if field_info is None:
+                continue
+            field = field_info.column
+            value = None
+
+            if field._type == 'selection':
+                if hasattr(field.selection, '__call__'):
+                    key = field.selection(self, cr, uid, context=context)
+                else:
+                    key = field.selection
+                value = dict(key).get(lead[field_name], lead[field_name])
+            elif field._type == 'many2one':
+                if lead[field_name]:
+                    value = lead[field_name].name_get()[0][1]
+            else:
+                value = lead[field_name]
+
+            body.append("%s: %s" % (field.string, value or ''))
+        return "\n".join(body + ['---'])
+
+    def _merge_notification(self, cr, uid, opportunity_id, opportunities, context=None):
+        #TOFIX: mail template should be used instead of fix body, subject text
+        details = []
+        merge_message = _('Merged opportunities')
+        subject = [merge_message]
+        fields = ['name', 'partner_id', 'stage_id', 'section_id', 'user_id', 'categ_id', 'channel_id', 'company_id', 'contact_name',
+                  'email_from', 'phone', 'fax', 'mobile', 'state_id', 'description', 'probability', 'planned_revenue',
+                  'country_id', 'city', 'street', 'street2', 'zip']
+        for opportunity in opportunities:
+            subject.append(opportunity.name)
+            title = "%s : %s" % (merge_message, opportunity.name)
+            details.append(self._mail_body_text(cr, uid, opportunity, fields, title=title, context=context))
+            
+        subject = subject[0] + ", ".join(subject[1:])
+        details = "\n\n".join(details)
+        return self.message_append(cr, uid, [opportunity_id], subject, body_text=details, context=context)
+        
+    def _merge_opportunity_history(self, cr, uid, opportunity_id, opportunities, context=None):
+        message = self.pool.get('mail.message')
+        for opportunity in opportunities:
+            for history in opportunity.message_ids:
+                message.write(cr, uid, history.id, {
+                        'res_id': opportunity_id, 
+                        'subject' : _("From %s : %s") % (opportunity.name, history.subject) 
+                }, context=context)
+
+        return True
+
+    def _merge_opportunity_attachments(self, cr, uid, opportunity_id, opportunities, context=None):
+        attachment = self.pool.get('ir.attachment')
+
+        # return attachments of opportunity
+        def _get_attachments(opportunity_id):
+            attachment_ids = attachment.search(cr, uid, [('res_model', '=', self._name), ('res_id', '=', opportunity_id)], context=context)
+            return attachment.browse(cr, uid, attachment_ids, context=context)
+
+        count = 1
+        first_attachments = _get_attachments(opportunity_id)
+        for opportunity in opportunities:
+            attachments = _get_attachments(opportunity.id)
+            for first in first_attachments:
+                for attachment in attachments:
+                    if attachment.name == first.name:
+                        values = dict(
+                            name = "%s (%s)" % (attachment.name, count,),
+                            res_id = opportunity_id,
+                        )
+                        attachment.write(values)
+                        count+=1
+                    
+        return True    
 
+    def merge_opportunity(self, cr, uid, ids, context=None):
+        """
+        To merge opportunities
+            :param ids: list of opportunities ids to merge
+        """
+        if context is None: context = {}
+        
+        #TOCHECK: where pass lead_ids in context?
+        lead_ids = context and context.get('lead_ids', []) or []
+
+        if len(ids) <= 1:
+            raise osv.except_osv(_('Warning !'),_('Please select more than one opportunities.'))
+
+        ctx_opportunities = self.browse(cr, uid, lead_ids, context=context)
+        opportunities = self.browse(cr, uid, ids, context=context)
+        opportunities_list = list(set(opportunities) - set(ctx_opportunities))
+        oldest = self._merge_find_oldest(cr, uid, ids, context=context)
+        if ctx_opportunities :
+            first_opportunity = ctx_opportunities[0]
+            tail_opportunities = opportunities_list
+        else:
+            first_opportunity = opportunities_list[0]
+            tail_opportunities = opportunities_list[1:]
+
+        fields = ['partner_id', 'title', 'name', 'categ_id', 'channel_id', 'city', 'company_id', 'contact_name', 'country_id', 
+            'partner_address_id', 'type_id', 'user_id', 'section_id', 'state_id', 'description', 'email', 'fax', 'mobile',
+            'partner_name', 'phone', 'probability', 'planned_revenue', 'street', 'street2', 'zip', 'create_date', 'date_action_last',
+            'date_action_next', 'email_from', 'email_cc', 'partner_name']
+        
+        data = self._merge_data(cr, uid, ids, oldest, fields, context=context)
+
+        # merge data into first opportunity
+        self.write(cr, uid, [first_opportunity.id], data, context=context)
+
+        #copy message and attachements into the first opportunity
+        self._merge_opportunity_history(cr, uid, first_opportunity.id, tail_opportunities, context=context)
+        self._merge_opportunity_attachments(cr, uid, first_opportunity.id, tail_opportunities, context=context)        
+        
+        #Notification about loss of information
+        self._merge_notification(cr, uid, first_opportunity, opportunities, context=context)
+        #delete tail opportunities
+        self.unlink(cr, uid, [x.id for x in tail_opportunities], context=context)
+
+        #open first opportunity
+        self.case_open(cr, uid, [first_opportunity.id])
+        return first_opportunity.id
+
+    def _convert_opportunity_data(self, cr, uid, lead, customer, section_id=False, context=None):
+        crm_stage = self.pool.get('crm.case.stage')
+        contact_id = False
+        if customer:
+            contact_id = self.pool.get('res.partner').address_get(cr, uid, [customer.id])['default']
+        if not section_id:
+            section_id = lead.section_id and lead.section_id.id or False
+        if section_id:
+            stage_ids = crm_stage.search(cr, uid, [('sequence','>=',1), ('section_ids','=', section_id)])
+        else:
+            stage_ids = crm_stage.search(cr, uid, [('sequence','>=',1)])            
+        stage_id = stage_ids and stage_ids[0] or False
+        return {
+                'planned_revenue': lead.planned_revenue,
+                'probability': lead.probability,
+                'name': lead.name,
+                'partner_id': customer and customer.id or False,
+                'user_id': (lead.user_id and lead.user_id.id),
+                'type': 'opportunity',
+                'stage_id': stage_id or False,
+                'date_action': time.strftime('%Y-%m-%d %H:%M:%S'),
+                'partner_address_id': contact_id
+        }
+    def _convert_opportunity_notification(self, cr, uid, lead, context=None):
+        success_message = _("Lead '%s' has been converted to an opportunity.") % lead.name
+        self.message_append(cr, uid, [lead.id], success_message, body_text=success_message, context=context)
+        self.log(cr, uid, lead.id, success_message)
+        self._send_mail_to_salesman(cr, uid, lead, context=context)
+        return True
+
+    def convert_opportunity(self, cr, uid, ids, partner_id, user_ids=False, section_id=False, context=None):
+        partner = self.pool.get('res.partner')
+        mail_message = self.pool.get('mail.message')
+        customer = False
+        if partner_id:
+            customer = partner.browse(cr, uid, partner_id, context=context)
+        for lead in self.browse(cr, uid, ids, context=context):
+            if lead.state in ('done', 'cancel'):
+                continue
+            if user_ids or section_id:
+                self.allocate_salesman(cr, uid, [lead.id], user_ids, section_id, context=context)
+            
+            vals = self._convert_opportunity_data(cr, uid, lead, customer, section_id, context=context)
+            self.write(cr, uid, [lead.id], vals, context=context)
+            
+            self._convert_opportunity_notification(cr, uid, lead, context=context)
+            #TOCHECK: why need to change partner details in all messages of lead ?
+            if lead.partner_id:
+                msg_ids = [ x.id for x in lead.message_ids]
+                mail_message.write(cr, uid, msg_ids, {
+                        'partner_id': lead.partner_id.id
+                    }, context=context)
+        return True
+
+    def _lead_create_partner(self, cr, uid, lead, context=None):
+        partner = self.pool.get('res.partner')
+        partner_id = partner.create(cr, uid, {
+                    'name': lead.partner_name or lead.contact_name or lead.name,
+                    'user_id': lead.user_id.id,
+                    'comment': lead.description,
+                    'section_id': lead.section_id.id or False,
+                    'address': []
+        })
+        return partner_id
+
+    def _lead_set_partner(self, cr, uid, lead, partner_id, context=None):
+        res = False
+        res_partner = self.pool.get('res.partner')
+        if partner_id:
+            res_partner.write(cr, uid, partner_id, {'section_id': lead.section_id.id or False})
+            contact_id = res_partner.address_get(cr, uid, [partner_id])['default']
+            res = lead.write({'partner_id' : partner_id, 'partner_address_id': contact_id}, context=context)
+            
+        return res
 
-        for case in self.browse(cr, uid, ids, context=context):
-            context.update({'active_id': case.id})
-            data_id = data_obj._get_id(cr, uid, 'crm', 'view_crm_lead2opportunity_partner')
-            view_id1 = False
-            if data_id:
-                view_id1 = data_obj.browse(cr, uid, data_id, context=context).res_id
-            value = {
-                    'name': _('Create Partner'),
-                    'view_type': 'form',
-                    'view_mode': 'form,tree',
-                    'res_model': 'crm.lead2opportunity.partner',
-                    'view_id': False,
-                    'context': context,
-                    'views': [(view_id1, 'form')],
-                    'type': 'ir.actions.act_window',
-                    'target': 'new',
-                    'nodestroy': True
+    def _lead_create_partner_address(self, cr, uid, lead, partner_id, context=None):
+        address = self.pool.get('res.partner.address')
+        return address.create(cr, uid, {
+                    'partner_id': partner_id,
+                    'name': lead.contact_name,
+                    'phone': lead.phone,
+                    'mobile': lead.mobile,
+                    'email': lead.email_from and to_email(lead.email_from)[0],
+                    'fax': lead.fax,
+                    'title': lead.title and lead.title.id or False,
+                    'function': lead.function,
+                    '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,
+                })
+
+    def convert_partner(self, cr, uid, ids, action='create', partner_id=False, context=None):
+        """
+        This function convert partner based on action.
+        if action is 'create', create new partner with contact and assign lead to new partner_id.
+        otherwise assign lead to specified partner_id
+        """
+        if context is None:
+            context = {}
+        partner_ids = {}
+        for lead in self.browse(cr, uid, ids, context=context):
+            if action == 'create': 
+                if not partner_id:
+                    partner_id = self._lead_create_partner(cr, uid, lead, context=context)
+                self._lead_create_partner_address(cr, uid, lead, partner_id, context=context)
+            self._lead_set_partner(cr, uid, lead, partner_id, context=context)
+            partner_ids[lead.id] = partner_id
+        return partner_ids
+
+    def _send_mail_to_salesman(self, cr, uid, lead, context=None):
+        """
+        Send mail to salesman with updated Lead details.
+        @ lead: browse record of 'crm.lead' object.
+        """
+        #TOFIX: mail template should be used here instead of fix subject, body text. 
+        message = self.pool.get('mail.message')
+        email_to = lead.user_id and lead.user_id.user_email
+        if not email_to:
+            return False
+        
+        email_from = lead.section_id and lead.section_id.user_id and lead.section_id.user_id.user_email or email_to
+        partner = lead.partner_id and lead.partner_id.name or lead.partner_name
+        subject = "lead %s converted into opportunity" % lead.name
+        body = "Info \n Id : %s \n Subject: %s \n Partner: %s \n Description : %s " % (lead.id, lead.name, lead.partner_id.name, lead.description)
+        return message.schedule_with_attach(cr, uid, email_from, [email_to], subject, body)
+
+
+    def allocate_salesman(self, cr, uid, ids, user_ids, team_id=False, context=None):
+        index = 0
+        for lead_id in ids:
+            value = {}
+            if team_id:
+                value['section_id'] = team_id
+            if index < len(user_ids):
+                value['user_id'] = user_ids[index]
+                index += 1
+            if value:
+                self.write(cr, uid, [lead_id], value, context=context)
+        return True
+
+    def schedule_phonecall(self, cr, uid, ids, schedule_time, call_summary, desc, phone, contact_name, user_id=False, section_id=False, categ_id=False, action='schedule', context=None):
+        """
+        action :('schedule','Schedule a call'), ('log','Log a call')
+        """
+        phonecall = self.pool.get('crm.phonecall')
+        model_data = self.pool.get('ir.model.data')
+        phonecall_dict = {}
+        if not categ_id:
+            res_id = model_data._get_id(cr, uid, 'crm', 'categ_phone2')
+            if res_id:
+                categ_id = model_data.browse(cr, uid, res_id, context=context).res_id
+        for lead in self.browse(cr, uid, ids, context=context):
+            if not section_id:
+                section_id = lead.section_id and lead.section_id.id or False
+            if not user_id:
+                user_id = lead.user_id and lead.user_id.id or False
+            vals = {
+                    'name' : call_summary,
+                    'opportunity_id' : lead.id,
+                    'user_id' : user_id or False,
+                    'categ_id' : categ_id or False,
+                    'description' : desc or '',
+                    'date' : schedule_time,
+                    'section_id' : section_id or False,
+                    'partner_id': lead.partner_id and lead.partner_id.id or False,
+                    'partner_address_id': lead.partner_address_id and lead.partner_address_id.id or False,
+                    'partner_phone' : phone or lead.phone or (lead.partner_address_id and lead.partner_address_id.phone or False),
+                    'partner_mobile' : lead.partner_address_id and lead.partner_address_id.mobile or False,
+                    'priority': lead.priority,
             }
-        return value
+            
+            new_id = phonecall.create(cr, uid, vals, context=context)
+            phonecall.case_open(cr, uid, [new_id])
+            if action == 'log':
+                phonecall.case_close(cr, uid, [new_id])
+            phonecall_dict[lead.id] = new_id
+        return phonecall_dict
+
+
+    def redirect_opportunity_view(self, cr, uid, opportunity_id, context=None):
+        models_data = self.pool.get('ir.model.data')
+
+        # Get Opportunity views
+        form_view = models_data.get_object_reference(cr, uid, 'crm', 'crm_case_form_view_oppor')
+        tree_view = models_data.get_object_reference(cr, uid, 'crm', 'crm_case_tree_view_oppor')
+        return {
+                'name': _('Opportunity'),
+                'view_type': 'form',
+                'view_mode': 'tree, form',
+                'res_model': 'crm.lead',
+                'domain': [('type', '=', 'opportunity')],
+                'res_id': int(opportunity_id),
+                'view_id': False,
+                'views': [(form_view and form_view[1] or False, 'form'),
+                          (tree_view and tree_view[1] or False, 'tree'),
+                          (False, 'calendar'), (False, 'graph')],
+                'type': 'ir.actions.act_window',
+        }
+
 
     def message_new(self, cr, uid, msg, custom_values=None, context=None):
         """Automatically calls when new email message arrives"""
@@ -404,10 +748,11 @@ class crm_lead(crm_case, osv.osv):
         self.write(cr, uid, [res_id], vals, context)
         return res_id
 
-    def message_update(self, cr, uid, ids, msg, vals={}, default_act='pending', context=None):
+    def message_update(self, cr, uid, ids, msg, vals=None, default_act='pending', context=None):
         if isinstance(ids, (str, int, long)):
             ids = [ids]
-
+        if vals == None:
+            vals = {}
         super(crm_lead, self).message_update(cr, uid, ids, msg, context=context)
 
         if msg.get('priority') in dict(crm.AVAILABLE_PRIORITIES):
@@ -447,17 +792,10 @@ class crm_lead(crm_case, osv.osv):
         data_obj = self.pool.get('ir.model.data')
         for opp in self.browse(cr, uid, ids, context=context):
             # Get meeting views
-            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
+            tree_view = data_obj.get_object_reference(cr, uid, 'crm', 'crm_case_tree_view_meet')
+            form_view = data_obj.get_object_reference(cr, uid, 'crm', 'crm_case_form_view_meet')
+            calander_view = data_obj.get_object_reference(cr, uid, 'crm', 'crm_case_calendar_view_meet')
+            search_view = data_obj.get_object_reference(cr, uid, 'crm', 'view_crm_case_meetings_filter')
             context.update({
                 'default_opportunity_id': opp.id,
                 'default_partner_id': opp.partner_id and opp.partner_id.id or False,
@@ -474,9 +812,9 @@ class crm_lead(crm_case, osv.osv):
                 'view_mode': 'calendar,form,tree',
                 'res_model': 'crm.meeting',
                 'view_id': False,
-                'views': [(id1, 'calendar'), (id2, 'form'), (id3, 'tree')],
+                'views': [(calander_view and calander_view[1] or False, 'calendar'), (form_view and form_view[1] or False, 'form'), (tree_view and tree_view[1] or False, 'tree')],
                 'type': 'ir.actions.act_window',
-                'search_view_id': res['res_id'],
+                'search_view_id': search_view and search_view[1] or False,
                 'nodestroy': True
             }
         return value
diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml
index 576f258facc..830b572676d 100644
--- a/addons/crm/crm_lead_demo.xml
+++ b/addons/crm/crm_lead_demo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
-    <data noupdate="1">
+    <data>
         <!-- Demo Leads -->
         <record id="crm_case_itisatelesalescampaign0" model="crm.lead">
             <field name="type_id" ref="crm.type_lead1"/>
@@ -9,8 +9,8 @@
             <field name="user_id" ref="base.user_root"/>
             <field eval="'The Oil Company'" name="partner_name"/>
             <field eval="'draft'" name="state"/>
-            <field name="section_id" ref="crm.section_sales_department"/>
-        <field eval="'Luc Latour'" name="contact_name"/>
+            <field name="section_id" ref="crm.section_sales_marketing_department"/>
+            <field eval="'Luc Latour'" name="contact_name"/>
             <field name="title" ref="base.res_partner_title_sir"/>
         <field eval="'Training Manager'" name="function"/>
         <field eval="'Paris'" name="city"/>
@@ -92,7 +92,7 @@
         <field eval="'Bruxelles'" name="city"/>
         <field name="country_id" ref="base.be"/>
             <field eval="'draft'" name="state"/>
-            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="section_id" ref="crm.section_sales_marketing_department"/>
             <field eval="'(333) 715-1450'" name="mobile"/>
             <field eval="1" name="active"/>
             <field name="categ_id" ref="crm.categ_oppor1"/>
diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index 9b0581844a5..2ec2db18509 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -31,7 +31,6 @@
         parent="base.menu_base_partner" sequence="1" />
 
     <menuitem parent="base.menu_sales" name="Leads"
-        groups="base.group_extended"
         id="menu_crm_case_categ0_act_leads"
         action="crm_case_category_act_leads_all" sequence="1" />
 
@@ -60,16 +59,23 @@
      <record model="ir.actions.act_window" id="crm_case_category_act_oppor11">
           <field name="name">Opportunities</field>
           <field name="res_model">crm.lead</field>
-          <field name="view_mode">tree,form,graph,calendar,kanban</field>
+          <field name="view_mode">kanban,tree,form,graph,calendar</field>
           <field name="domain">[('type','=','opportunity')]</field>
           <field name="context">{'search_default_user_id':uid,'search_default_new':1, 'search_default_open':1, 'search_default_section_id':section_id, 'stage_type': 'opportunity', 'default_type': 'opportunity'}</field>
-          <field name="view_id" ref="crm_case_tree_view_oppor"/>
+          <field name="view_id" eval="False"/>
           <field name="search_view_id" ref="crm.view_crm_case_opportunities_filter"/>
           <field name="help">With opportunities you can manage and keep track of your sales pipeline by creating specific customer- or prospect-related sales documents to follow up potential sales. Information such as expected revenue, opportunity stage, expected closing date, communication history and much more can be stored. Opportunities can be connected to the email gateway: new emails may create opportunities, each of them automatically gets the history of the conversation with the customer.
 
 You and your team(s) will be able to plan meetings and phone calls from opportunities, convert them into quotations, manage related documents, track all customer related activities, and much more.</field>
      </record>
 
+     <record model="ir.actions.act_window.view" id="action_crm_tag_kanban_view_oppor11">
+          <field name="sequence" eval="0"/>
+          <field name="view_mode">kanban</field>
+          <field name="view_id" ref="crm_case_kanban_view_leads"/>
+          <field name="act_window_id" ref="crm_case_category_act_oppor11"/>
+     </record>
+
      <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_oppor11">
           <field name="sequence" eval="1"/>
           <field name="view_mode">tree</field>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 9a6aaea66b4..e9c77b3bdc6 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -59,10 +59,11 @@
                         widget="selection"
                         domain="[('object_id.model','=','crm.lead')]"/>
                     <button
-                         name="convert_opportunity"
+                         name="%(crm.action_crm_lead2opportunity_partner)d"
                          string="Convert to Opportunity"
                          help="Convert to Opportunity" icon="gtk-go-forward"
-                         type="object"/>
+                         type="action"
+                         />
                     <newline />
                     <field name="user_id" />
                     <field name="section_id" widget="selection" />
@@ -142,6 +143,29 @@
                             type="object" icon="gtk-convert" />
                     </group>
                  </page>
+                 <page string="Communication &amp; History" groups="base.group_extended">
+                   <group colspan="4">
+                       <field colspan="4" name="email_cc" widget="char" size="512"/>
+                   </group>
+                    <field name="message_ids" colspan="4" nolabel="1" mode="tree" readonly="1">
+                        <tree string="History">
+                            <field name="display_text" string="History Information"/>
+                            <field name="email_from" invisible="1"/>
+                            <button
+                                string="Reply" attrs="{'invisible': [('email_from', '=', False)]}"
+                                name="%(mail.action_email_compose_message_wizard)d"
+                                context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
+                                icon="terp-mail-replied" type="action" />
+                        </tree>
+                    </field>
+                    <button string="Add Internal Note"
+                        name="%(crm.action_crm_add_note)d"
+                        context="{'model': 'crm.lead' }"
+                        icon="terp-document-new" type="action" />
+                    <button string="Send New Email"
+                        name="%(mail.action_email_compose_message_wizard)d"
+                        icon="terp-mail-message-new" type="action"/>
+                 </page>
                  <page string="Extra Info" groups="base.group_extended">
                     <group colspan="2" col="2">
                         <separator string="Categorization" colspan="2" col="2"/>
@@ -170,58 +194,6 @@
                         <field name="day_close"/>
                     </group>
                  </page>
-                 <page string="Communication &amp; History" groups="base.group_extended">
-                   <group colspan="4">
-                       <field colspan="4" name="email_cc" widget="char" size="512"/>
-                   </group>
-                    <field name="message_ids" colspan="4" nolabel="1" mode="tree,form" readonly="1">
-                        <tree string="History">
-                            <field name="display_text" string="History Information"/>
-                            <field name="email_from" invisible="1"/>
-                            <button
-                                string="Reply" attrs="{'invisible': [('email_from', '=', False)]}"
-                                name="%(mail.action_email_compose_message_wizard)d"
-                                context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
-                                icon="terp-mail-replied" type="action" />
-                        </tree>
-                        <form string="History">
-                            <group col="4" colspan="4">
-                                <group col="2" colspan="2" attrs="{'invisible': [('email_from', '=', False)]}">
-                                    <field name="email_from"/>
-                                    <field name="email_to" size="512"/>
-                                </group>
-                                <group col="2" colspan="2">
-                                    <field name="date"/>
-                                    <field name="email_cc" size="512" attrs="{'invisible': [('email_from', '=', False)]}"/>
-                                </group>
-                                <field name="subject" colspan="4" widget="char" attrs="{'invisible': [('email_from', '=', False)]}" size="512"/>
-                                <field name="display_text" colspan="4" attrs="{'invisible': [('email_from', '!=', False)]}"/>
-                            </group>
-                            <notebook colspan="4">
-                                <page string="Details" attrs="{'invisible': [('email_from', '=', False)]}">
-                                    <field name="body_text" colspan="4" nolabel="1"/>
-                                    <group attrs="{'invisible': [('email_from', '=', False)]}">
-                                        <button colspan="4" string="Reply"
-                                            name="%(mail.action_email_compose_message_wizard)d"
-                                            context="{'mail.compose.message.mode':'reply'}"
-                                            icon="terp-mail-replied" type="action"/>
-                                        </group>
-
-                                </page>
-                                <page string="Attachments" attrs="{'invisible': [('email_from', '=', False)]}">
-                                    <field name="attachment_ids" colspan="4" readonly="1" nolabel="1"/>
-                                </page>
-                                </notebook>
-                        </form>
-                    </field>
-                    <button string="Add Internal Note"
-                        name="%(crm.action_crm_add_note)d"
-                        context="{'model': 'crm.lead' }"
-                        icon="terp-document-new" type="action" />
-                    <button string="Send New Email"
-                        name="%(mail.action_email_compose_message_wizard)d"
-                        icon="terp-mail-message-new" type="action"/>
-                 </page>
                 </notebook>
             </form>
         </field>
@@ -325,7 +297,7 @@
                                         <a t-if="record.priority.raw_value == 1" icon="star-on" type="object" name="set_normal_priority"/>
                                         <a t-if="record.priority.raw_value != 1" icon="star-off" type="object" name="set_high_priority" style="opacity:0.6; filter:alpha(opacity=60);"/>
                                     </td>
-                                    <td align="left" valign="middle" class="oe_kanban_title3" tooltip="lead_details">
+                                    <td align="left" valign="middle" class="oe_kanban_title" tooltip="lead_details">
                                         <field name="partner_id"/>
                                         <t t-if="record.planned_revenue.raw_value">
                                             - <t t-esc="Math.round(record.planned_revenue.value)"/>
@@ -459,7 +431,7 @@
         <field name="name">Opportunities</field>
         <field name="model">crm.lead</field>
         <field name="type">form</field>
-        <field name="priority">10</field>
+        <field name="priority">20</field>
         <field name="arch" type="xml">
             <form string="Opportunities">
                 <group colspan="4" col="7">
@@ -577,7 +549,7 @@
                   <group colspan="4">
                       <field colspan="4" name="email_cc" widget="char" size="512"/>
                   </group>
-                   <field name="message_ids" colspan="4" nolabel="1" mode="tree,form" readonly="1">
+                   <field name="message_ids" colspan="4" nolabel="1" mode="tree" readonly="1">
                        <tree string="History">
                            <field name="display_text" string="History Information"/>
                            <field name="email_from" invisible="1"/>
@@ -587,34 +559,6 @@
                                context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
                                icon="terp-mail-replied" type="action" />
                        </tree>
-                       <form string="History">
-                           <group col="4" colspan="4">
-                               <group col="2" colspan="2" attrs="{'invisible': [('email_from', '=', False)]}">
-                                   <field name="email_from"/>
-                                   <field name="email_to" size="512"/>
-                               </group>
-                               <group col="2" colspan="2">
-                                   <field name="date"/>
-                                   <field name="email_cc" size="512" attrs="{'invisible': [('email_from', '=', False)]}"/>
-                               </group>
-                               <field name="subject" colspan="4" widget="char" attrs="{'invisible': [('email_from', '=', False)]}" size="512"/>
-                               <field name="display_text" colspan="4" attrs="{'invisible': [('email_from', '!=', False)]}"/>
-                           </group>
-                           <notebook colspan="4">
-                               <page string="Details" attrs="{'invisible': [('email_from', '=', False)]}">
-                                   <field name="body_text" colspan="4" nolabel="1"/>
-                                   <group attrs="{'invisible': [('email_from', '=', False)]}">
-                                       <button colspan="4" string="Reply"
-                                           name="%(mail.action_email_compose_message_wizard)d"
-                                           context="{'mail.compose.message.mode':'reply'}"
-                                           icon="terp-mail-replied" type="action"/>
-                                       </group>
-                                </page>
-                               <page string="Attachments" attrs="{'invisible': [('email_from', '=', False)]}">
-                                   <field name="attachment_ids" colspan="4" readonly="1" nolabel="1"/>
-                               </page>
-                               </notebook>
-                       </form>
                    </field>
                    <button string="Add Internal Note"
                        name="%(crm.action_crm_add_note)d"
@@ -705,6 +649,7 @@
                     domain="[('state','=','pending')]"/>
                 <separator orientation="vertical"/>
                 <field name="name" string="Opportunity / Customer" filter_domain="['|','|','|',('partner_id','ilike',self),('partner_name','ilike',self),('email_from','ilike',self),('name', 'ilike', self)]"/>
+                <field name="partner_id" string="Customer / Email" filter_domain="['|','|',('partner_id','ilike',self),('partner_name','ilike',self),('email_from','ilike',self)]"/>
                 <field name="user_id">
                     <filter icon="terp-personal-"
                         domain="[('user_id','=', False)]"
diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml
index 19ca9266332..338579af88f 100644
--- a/addons/crm/crm_meeting_menu.xml
+++ b/addons/crm/crm_meeting_menu.xml
@@ -51,7 +51,7 @@
         <field name="res_model">crm.meeting</field>
         <field name="view_mode">calendar,tree,form,gantt</field>
         <field name="view_id" ref="crm_case_calendar_view_meet"/>
-        <field name="context">{"search_default_user_id":uid, 'search_default_section_id': section_id, 'virtual_id' : True}</field>
+        <field name="context">{"search_default_user_id":uid, 'search_default_section_id': section_id}</field>
         <field name="search_view_id" ref="view_crm_case_meetings_filter"/>
         <field name="help">The meeting calendar is shared between the sales teams and fully integrated with other applications such as the employee holidays or the business opportunities. You can also synchronize meetings with your mobile phone using the caldav interface.
         </field>
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index d35300b62b5..c04e00e5fcc 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -45,7 +45,6 @@
                         widget="selection" />
                     <group colspan="2" col="4" attrs="{'readonly': ['|', ('recurrent_uid','!=',False), ('state','=','done')]}">
                            <field name="recurrency"/>
-                           <field name="edit_all" attrs="{'invisible':[('recurrency','=', False)]}" />
                     </group>
                 </group>
                 <notebook colspan="4">
@@ -67,7 +66,7 @@
                             <field name="email_from"/>
                         </group><group col="2" colspan="2">
                             <separator colspan="2" string="Visibility"/>
-                            <field name="class" string="Privacy"/>
+                            <field name="class" string="Privacy" groups="base.group_extended"/>
                             <field name="show_as" string="Show time as" groups="base.group_extended"/>
                             <field name="rrule" invisible="1" readonly="1"/>
                             <field name="recurrent_id" invisible="1"/>
@@ -231,24 +230,11 @@
             <tree string="Meetings"
                 colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
                 <field name="name" string="Subject" />
-                <field name="date" string="Start Date" />
+                <field name="user_id"/>
+                <field name="date"/>
                 <field name="duration" />
                 <field name="partner_id" string="Partner" />
                 <field name="location" />
-                <field name="categ_id" string="Meeting Type"/>
-                <field name="class" string="Privacy"/>
-                <field name="state" groups="base.group_extended"/>
-                <field name="user_id" invisible="1"/>
-                <field name="show_as" invisible="1" string="Show time as"/>
-                <button name="case_reset" string="Reset to Unconfirmed"
-                   states="open,done" type="object"
-                   icon="gtk-convert" />
-                <button name="case_open" string="Confirm"
-                   states="draft" type="object"
-                   icon="gtk-go-forward" />
-                <button name="case_close" string="Done"
-                            states="open" type="object"
-                            icon="gtk-jump-to" />
             </tree>
         </field>
     </record>
@@ -294,14 +280,18 @@
         <field name="arch" type="xml">
                 <search string="Search Meetings">
                        <group>
-                           <field name="name" string="Subject"/>
-                           <field name="partner_id"/>
-                           <field name="section_id" widget="selection">
+                           <field name="name" string="Meeting / Partner"
+                               filter_domain="['|', ('name','ilike',self), ('partner_id','ilike', self)]"/>
+                           <field name="user_id" groups="base.group_extended">
+                               <filter icon="terp-personal" groups="base.group_extended"
+                                   domain="[('user_id','=',uid)]"
+                                   help="My Meetings" />
+                           </field>
+                           <field name="section_id" widget="selection" groups="base.group_extended">
                                <filter icon="terp-personal+" groups="base.group_extended"
-                                   domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
+                                   domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                                    help="My Sales Team(s)" />
                            </field>
-                           <field name="user_id"/>
                        </group>
                 </search>
             </field>
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index 9cfdddf159c..b9bb6d359b1 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -102,11 +102,6 @@ class crm_phonecall(crm_base, osv.osv):
 
     def case_close(self, cr, uid, ids, *args):
         """Overrides close for crm_case for setting close date
-        @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 case Ids
-        @param *args: Tuple Value for additional Params
         """
         res = True
         for phone in self.browse(cr, uid, ids):
@@ -121,11 +116,6 @@ class crm_phonecall(crm_base, osv.osv):
 
     def case_reset(self, cr, uid, ids, *args):
         """Resets case as Todo
-        @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 case Ids
-        @param *args: Tuple Value for additional Params
         """
         res = super(crm_phonecall, self).case_reset(cr, uid, ids, args, 'crm.phonecall')
         self.write(cr, uid, ids, {'duration': 0.0})
@@ -134,25 +124,147 @@ class crm_phonecall(crm_base, osv.osv):
 
     def case_open(self, cr, uid, ids, *args):
         """Overrides cancel for crm_case for setting Open Date
-        @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 case's Ids
-        @param *args: Give Tuple Value
         """
         res = super(crm_phonecall, self).case_open(cr, uid, ids, *args)
         self.write(cr, uid, ids, {'date_open': time.strftime('%Y-%m-%d %H:%M:%S')})
         return res
 
+    def schedule_another_phonecall(self, cr, uid, ids, schedule_time, call_summary, \
+                    user_id=False, section_id=False, categ_id=False, action='schedule', context=None):
+        """
+        action :('schedule','Schedule a call'), ('log','Log a call')
+        """
+        model_data = self.pool.get('ir.model.data')
+        phonecall_dict = {}
+        if not categ_id:
+            res_id = model_data._get_id(cr, uid, 'crm', 'categ_phone2')
+            if res_id:
+                categ_id = model_data.browse(cr, uid, res_id, context=context).res_id
+        for call in self.browse(cr, uid, ids, context=context):
+            if not section_id:
+                section_id = call.section_id and call.section_id.id or False
+            if not user_id:
+                user_id = call.user_id and call.user_id.id or False
+            vals = {
+                    'name' : call_summary,
+                    'user_id' : user_id or False,
+                    'categ_id' : categ_id or False,
+                    'description' : call.description or False,
+                    'date' : schedule_time,
+                    'section_id' : section_id or False,
+                    'partner_id': call.partner_id and call.partner_id.id or False,
+                    'partner_address_id': call.partner_address_id and call.partner_address_id.id or False,
+                    'partner_phone' : call.partner_phone,
+                    'partner_mobile' : call.partner_mobile,
+                    'priority': call.priority,
+            }
+            
+            new_id = self.create(cr, uid, vals, context=context)
+            self.case_open(cr, uid, [new_id])
+            if action == 'log':
+                self.case_close(cr, uid, [new_id])
+            phonecall_dict[call.id] = new_id
+        return phonecall_dict
+
+    def _call_create_partner(self, cr, uid, phonecall, context=None):
+        partner = self.pool.get('res.partner')
+        partner_id = partner.create(cr, uid, {
+                    'name': phonecall.name,
+                    'user_id': phonecall.user_id.id,
+                    'comment': phonecall.description,
+                    'address': []
+        })
+        return partner_id
+
+    def _call_set_partner(self, cr, uid, ids, partner_id, context=None):
+        return self.write(cr, uid, ids, {'partner_id' : partner_id}, context=context)
+
+    def _call_create_partner_address(self, cr, uid, phonecall, partner_id, context=None):
+        address = self.pool.get('res.partner.address')
+        return address.create(cr, uid, {
+                    'partner_id': partner_id,
+                    'name': phonecall.name,
+                    'phone': phonecall.partner_phone,
+        })
+
+    def convert_partner(self, cr, uid, ids, action='create', partner_id=False, context=None):
+        """
+        This function convert partner based on action.
+        if action is 'create', create new partner with contact and assign lead to new partner_id.
+        otherwise assign lead to specified partner_id
+        """
+        if context is None:
+            context = {}
+        partner_ids = {}
+        for call in self.browse(cr, uid, ids, context=context):
+            if action == 'create':
+               if not partner_id:
+                   partner_id = self._call_create_partner(cr, uid, call, context=context)
+               self._call_create_partner_address(cr, uid, call, partner_id, context=context)
+            self._call_set_partner(cr, uid, [call.id], partner_id, context=context)
+            partner_ids[call.id] = partner_id
+        return partner_ids
+
+
+    def redirect_phonecall_view(self, cr, uid, phonecall_id, context=None):
+        model_data = self.pool.get('ir.model.data')
+        # Select the view
+        tree_view = model_data.get_object_reference(cr, uid, 'crm', 'crm_case_phone_tree_view')
+        form_view = model_data.get_object_reference(cr, uid, 'crm', 'crm_case_phone_form_view')
+        search_view = model_data.get_object_reference(cr, uid, 'crm', 'view_crm_case_phonecalls_filter')
+        value = {
+                'name': _('Phone Call'),
+                'view_type': 'form',
+                'view_mode': 'tree,form',
+                'res_model': 'crm.phonecall',
+                'res_id' : int(phonecall_id),
+                'views': [(form_view and form_view[1] or False, 'form'), (tree_view and tree_view[1] or False, 'tree'), (False, 'calendar')],
+                'type': 'ir.actions.act_window',
+                'search_view_id': search_view and search_view[1] or False,
+        }
+        return value
+
+
+    def convert_opportunity(self, cr, uid, ids, opportunity_summary=False, partner_id=False, planned_revenue=0.0, probability=0.0, context=None):
+        partner = self.pool.get('res.partner')
+        address = self.pool.get('res.partner.address')
+        opportunity = self.pool.get('crm.lead')
+        opportunity_dict = {}
+        default_contact = False
+        for call in self.browse(cr, uid, ids, context=context):
+            if not partner_id:
+                partner_id = call.partner_id and call.partner_id.id or False
+            if partner_id:
+                address_id = partner.address_get(cr, uid, [partner_id])['default']
+                if address_id:
+                    default_contact = address.browse(cr, uid, address_id, context=context)
+            opportunity_id = opportunity.create(cr, uid, {
+                            'name': opportunity_summary or call.name,
+                            'planned_revenue': planned_revenue,
+                            'probability': probability,
+                            'partner_id': partner_id or False,
+                            'partner_address_id': default_contact and default_contact.id, 
+                            'phone': default_contact and default_contact.phone,
+                            'mobile': default_contact and default_contact.mobile,
+                            'section_id': call.section_id and call.section_id.id or False,
+                            'description': call.description or False,
+                            'priority': call.priority,
+                            'type': 'opportunity', 
+                            'phone': call.partner_phone or False,
+                        })
+            vals = {
+                    'partner_id': partner_id,
+                    'opportunity_id' : opportunity_id,
+            }
+            self.write(cr, uid, [call.id], vals)
+            self.case_close(cr, uid, [call.id])
+            opportunity.case_open(cr, uid, [opportunity_id])
+            opportunity_dict[call.id] = opportunity_id
+        return opportunity_dict   
+
     def action_make_meeting(self, cr, uid, ids, context=None):
         """
         This opens Meeting's calendar view to schedule meeting on current Phonecall
-        @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 Phonecall to Meeting IDs
-        @param context: A standard dictionary for contextual values
-
         @return : Dictionary value for created Meeting view
         """
         value = {}
diff --git a/addons/crm/crm_phonecall_demo.xml b/addons/crm/crm_phonecall_demo.xml
index 8f0661ab8be..e80930284f4 100644
--- a/addons/crm/crm_phonecall_demo.xml
+++ b/addons/crm/crm_phonecall_demo.xml
@@ -83,9 +83,6 @@
 			<field eval="2.08" name="duration"/>
 		</record>
 		<record id="crm_case_phone06" model="crm.phonecall">
-			<field name="partner_address_id" ref="base.res_partner_address_1"/>
-			<field eval="1" name="active"/>
-			<field name="partner_id" ref="base.res_partner_9"/>
 			<field eval="&quot;3&quot;" name="priority"/>
 			<field name="user_id" ref="base.user_root"/>
 			<field eval="&quot;Bad time&quot;" name="name"/>
diff --git a/addons/crm/res_partner.py b/addons/crm/res_partner.py
index cbb05ee3e74..e2016f6d8aa 100644
--- a/addons/crm/res_partner.py
+++ b/addons/crm/res_partner.py
@@ -33,6 +33,44 @@ class res_partner(osv.osv):
         'phonecall_ids': fields.one2many('crm.phonecall', 'partner_id',\
             'Phonecalls'),
     }
+
+    def redirect_partner_form(self, cr, uid, partner_id, context=None):
+        search_view = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'view_res_partner_filter')
+        value = {
+            'domain': "[]",
+            'view_type': 'form',
+            'view_mode': 'form,tree',
+            'res_model': 'res.partner',
+            'res_id': int(partner_id),
+            'view_id': False,
+            'context': context,
+            'type': 'ir.actions.act_window',
+            'search_view_id': search_view and search_view[1] or False
+        }
+        return value
+
+    def make_opportunity(self, cr, uid, ids, opportunity_summary, planned_revenue=0.0, probability=0.0, partner_id=None, context=None):
+        categ = self.pool.get('crm.case.categ')
+        address = self.address_get(cr, uid, ids)
+        categ_ids = categ.search(cr, uid, [('object_id.model','=','crm.lead')])
+        lead = self.pool.get('crm.lead')
+        opportunity_ids = {}
+        for partner in self.browse(cr, uid, ids, context=context):
+            address = self.address_get(cr, uid, [partner.id])['default']
+            if not partner_id:
+                partner_id = partner.id
+            opportunity_id = lead.create(cr, uid, {
+                'name' : opportunity_summary,
+                'planned_revenue' : planned_revenue,
+                'probability' : probability,
+                'partner_id' : partner_id,
+                'partner_address_id' : address,
+                'categ_id' : categ_ids and categ_ids[0] or '',
+                'state' :'draft',
+                'type': 'opportunity'
+            })
+            opportunity_ids[partner_id] = opportunity_id
+        return opportunity_ids
 res_partner()
 
 
diff --git a/addons/crm/security/crm_security.xml b/addons/crm/security/crm_security.xml
index 8ac32086cfd..ed3d86bf9b8 100644
--- a/addons/crm/security/crm_security.xml
+++ b/addons/crm/security/crm_security.xml
@@ -3,16 +3,19 @@
 <data noupdate="0">
 
     <record id="base.group_sale_salesman" model="res.groups">
-        <field name="name">Sales / User - Own Leads Only</field>
+        <field name="name">User - Own Leads Only</field>
+        <field name="category_id" ref="base.module_category_sales_management"/>
     </record>
 
     <record id="base.group_sale_salesman_all_leads" model="res.groups">
-        <field name="name">Sales / User - All Leads</field>
+        <field name="name">User - All Leads</field>
+        <field name="category_id" ref="base.module_category_sales_management"/>
         <field name="implied_ids" eval="[(4, ref('base.group_sale_salesman'))]"/>
     </record>
 
     <record id="base.group_sale_manager" model="res.groups">
-        <field name="name">Sales / Manager</field>
+        <field name="name">Manager</field>
+        <field name="category_id" ref="base.module_category_sales_management"/>
         <field name="implied_ids" eval="[(4, ref('base.group_sale_salesman_all_leads'))]"/>
     </record>
 
@@ -40,6 +43,13 @@
     <record model="ir.ui.menu" id="base.menu_base_config">
         <field eval="[(4, ref('base.group_sale_manager'))]" name="groups_id"/>
     </record>
-    
+
+    <record id="crm_meeting_global" model="ir.rule">
+        <field name="name">Hide Private Meetings</field>
+        <field ref="model_crm_meeting" name="model_id"/>
+        <field eval="1" name="global"/>
+        <field name="domain_force">['|',('user_id','=',user.id),('show_as','=','busy')]</field>
+    </record>
+
     </data>
 </openerp>
diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv
index 4ea07252276..c893ed6aad7 100644
--- a/addons/crm/security/ir.model.access.csv
+++ b/addons/crm/security/ir.model.access.csv
@@ -1,48 +1,45 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_crm_segmentation_user","crm.segmentation user","model_crm_segmentation","base.group_sale_salesman",1,0,0,0
-"access_crm_segmentation_line_user","crm.segmentation.line user","model_crm_segmentation_line","base.group_sale_salesman",1,0,0,0
-"access_crm_segmentation","crm.segmentation","model_crm_segmentation","base.group_sale_manager",1,1,1,1
-"access_crm_segmentation_line","crm.segmentation.line","model_crm_segmentation_line","base.group_sale_manager",1,1,1,1
-"access_crm_case_channel_user","crm.case.channel user","model_crm_case_channel","base.group_sale_salesman",1,0,0,0
-"access_crm_case_channel_manager","crm.case.channel manager","model_crm_case_channel","base.group_sale_manager",1,1,1,1
-"access_crm_case_section","crm.case.section","model_crm_case_section","base.group_sale_salesman",1,1,1,0
-"access_crm_case_categ","crm.case.categ","model_crm_case_categ","base.group_sale_salesman",1,1,1,0
-"access_crm_meeting_manager","crm.meeting.manager","model_crm_meeting","base.group_sale_manager",1,1,1,1
-"access_crm_lead_manager","crm.lead.manager","model_crm_lead","base.group_sale_manager",1,1,1,1
-"access_crm_phonecall_manager","crm.phonecall.manager","model_crm_phonecall","base.group_sale_manager",1,1,1,1
-"access_crm_case_categ","crm.case.categ","model_crm_case_categ","base.group_user",1,0,0,0
-"access_crm_meeting","crm.meeting","model_crm_meeting","base.group_sale_salesman",1,1,1,0
-"access_crm_meeting_all","crm.meeting_allll","model_crm_meeting","base.group_user",1,0,0,0
-"access_crm_lead","crm.lead","model_crm_lead","base.group_sale_salesman",1,1,1,0
-"access_crm_lead.all","crm.lead.all","model_crm_lead","base.group_user",1,0,0,0
-"access_crm_phonecall","crm.phonecall","model_crm_phonecall","base.group_sale_salesman",1,1,1,0
-"access_crm_phonecall.all","crm.phonecall.all","model_crm_phonecall","base.group_user",1,0,0,0
-"access_crm_case_section_user","crm.case.section.user","model_crm_case_section","base.group_sale_salesman",1,1,1,0
-"access_crm_case_section_manager","crm.case.section.manager","model_crm_case_section","base.group_sale_manager",1,1,1,1
-"access_crm_case_stage","crm.case.stage","model_crm_case_stage","base.group_user",1,0,0,0
-"access_crm_case_stage_manager","crm.case.stage","model_crm_case_stage","base.group_sale_manager",1,1,1,1
-"access_crm_case_resource_type_user","crm_case_resource_type user","model_crm_case_resource_type","base.group_sale_salesman",1,1,1,0
-"access_crm_case_resource_type_manager","crm_case_resource_type manager","model_crm_case_resource_type","base.group_sale_manager",1,1,1,1
-"access_crm_phonecall_report_user","crm.phonecall.report.user","model_crm_phonecall_report","base.group_sale_salesman",1,0,0,0
-"access_crm_lead_report_manager","crm.lead.report","model_crm_lead_report","base.group_sale_manager",1,1,1,1
-"access_crm_phonecall_report_manager","crm.phonecall.report","model_crm_phonecall_report","base.group_sale_manager",1,1,1,1
-"access_res_partner_manager","res.partner.crm.manager","base.model_res_partner","base.group_sale_manager",1,0,0,0
-"access_res_partner_address_manager","res.partner.address.crm.user.manager","base.model_res_partner_address","base.group_sale_manager",1,0,0,0
-"access_res_partner_category_manager","res.partner.category.crm.manager","base.model_res_partner_category","base.group_sale_manager",1,0,0,0
-"mail_mail_message_manager","mail.message.manager","mail.model_mail_message","base.group_sale_manager",1,0,0,0
-"mail_thread_manager","mail.thread.manager","mail.model_mail_thread","base.group_sale_manager",1,1,1,1
-"access_calendar_attendee_crm_user","calendar.attendee.crm.user","model_calendar_attendee","base.group_sale_salesman",1,1,1,0
-"access_calendar_attendee_crm_manager","calendar.attendee.crm.manager","model_calendar_attendee","base.group_sale_manager",1,1,1,1
-"access_res_partner","res.partner.crm.user","base.model_res_partner","base.group_sale_salesman",1,1,1,0
-"access_res_partner_address","res.partner.address.crm.user","base.model_res_partner_address","base.group_sale_salesman",1,1,1,0
-"access_res_partner_category","res.partner.category.crm.user","base.model_res_partner_category","base.group_sale_salesman",1,1,1,0
-"mail_mailgate_thread","mail.thread","mail.model_mail_thread","base.group_sale_salesman",1,1,1,1
-"mail_gateway_mail_message_user","mail.message.user","mail.model_mail_message","base.group_sale_salesman",1,1,1,1
-"access_crm_case_categ_manager","crm.case.categ manager","model_crm_case_categ","base.group_sale_manager",1,1,1,1
-"access_base_action_rule_manager","base.action.rule manager","model_base_action_rule","base.group_sale_manager",1,1,1,1
-"access_crm_lead_report_user","crm.lead.report user","model_crm_lead_report","base.group_sale_salesman",1,1,1,1
-"access_res_partner_bank_type_crm_user","res.partner.bank.type.crm.user","base.model_res_partner_bank_type","base.group_sale_salesman",1,0,0,0
-"access_res_partner_bank_type_crm_manager","res.partner.bank.type.crm.manager","base.model_res_partner_bank_type","base.group_sale_manager",1,0,0,0
-"access_crm_lead_partner_manager","crm.lead.partner.manager","model_crm_lead","base.group_partner_manager",1,0,0,0
-"access_crm_phonecall_partner_manager","crm.phonecall.partner.manager","model_crm_phonecall","base.group_partner_manager",1,1,1,1
-"access_crm_meeting_partner_manager","crm.meeting.partner.manager","model_crm_meeting","base.group_partner_manager",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink

+access_crm_segmentation_user,crm.segmentation user,model_crm_segmentation,base.group_sale_salesman,1,0,0,0

+access_crm_segmentation_line_user,crm.segmentation.line user,model_crm_segmentation_line,base.group_sale_salesman,1,0,0,0

+access_crm_segmentation,crm.segmentation,model_crm_segmentation,base.group_sale_manager,1,1,1,1

+access_crm_segmentation_line,crm.segmentation.line,model_crm_segmentation_line,base.group_sale_manager,1,1,1,1

+access_crm_case_channel_user,crm.case.channel user,model_crm_case_channel,base.group_sale_salesman,1,0,0,0

+access_crm_case_channel_manager,crm.case.channel manager,model_crm_case_channel,base.group_sale_manager,1,1,1,1

+access_crm_case_section,crm.case.section,model_crm_case_section,base.group_sale_salesman,1,1,1,0

+access_crm_case_categ,crm.case.categ,model_crm_case_categ,base.group_sale_salesman,1,1,1,0

+access_crm_meeting_manager,crm.meeting.manager,model_crm_meeting,base.group_sale_manager,1,1,1,1

+access_crm_lead_manager,crm.lead.manager,model_crm_lead,base.group_sale_manager,1,1,1,1

+access_crm_phonecall_manager,crm.phonecall.manager,model_crm_phonecall,base.group_sale_manager,1,1,1,1

+access_crm_case_categ,crm.case.categ,model_crm_case_categ,base.group_user,1,0,0,0

+access_crm_meeting,crm.meeting,model_crm_meeting,base.group_sale_salesman,1,1,1,0

+access_crm_meeting_all,crm.meeting_allll,model_crm_meeting,base.group_user,1,0,0,0

+access_crm_lead,crm.lead,model_crm_lead,base.group_sale_salesman,1,1,1,0

+access_crm_lead.all,crm.lead.all,model_crm_lead,base.group_user,1,0,0,0

+access_crm_phonecall,crm.phonecall,model_crm_phonecall,base.group_sale_salesman,1,1,1,0

+access_crm_phonecall.all,crm.phonecall.all,model_crm_phonecall,base.group_user,1,0,0,0

+access_crm_case_section_user,crm.case.section.user,model_crm_case_section,base.group_sale_salesman,1,1,1,0

+access_crm_case_section_manager,crm.case.section.manager,model_crm_case_section,base.group_sale_manager,1,1,1,1

+access_crm_case_stage,crm.case.stage,model_crm_case_stage,base.group_user,1,0,0,0

+access_crm_case_stage_manager,crm.case.stage,model_crm_case_stage,base.group_sale_manager,1,1,1,1

+access_crm_case_resource_type_user,crm_case_resource_type user,model_crm_case_resource_type,base.group_sale_salesman,1,1,1,0

+access_crm_case_resource_type_manager,crm_case_resource_type manager,model_crm_case_resource_type,base.group_sale_manager,1,1,1,1

+access_crm_phonecall_report_user,crm.phonecall.report.user,model_crm_phonecall_report,base.group_sale_salesman,1,0,0,0

+access_crm_phonecall_report_manager,crm.phonecall.report,model_crm_phonecall_report,base.group_sale_manager,1,1,1,1

+access_res_partner_manager,res.partner.crm.manager,base.model_res_partner,base.group_sale_manager,1,0,0,0

+access_res_partner_address_manager,res.partner.address.crm.user.manager,base.model_res_partner_address,base.group_sale_manager,1,0,0,0

+access_res_partner_category_manager,res.partner.category.crm.manager,base.model_res_partner_category,base.group_sale_manager,1,0,0,0

+mail_mail_message_manager,mail.message.manager,mail.model_mail_message,base.group_sale_manager,1,0,0,0

+access_calendar_attendee_crm_user,calendar.attendee.crm.user,model_calendar_attendee,base.group_sale_salesman,1,1,1,0

+access_calendar_attendee_crm_manager,calendar.attendee.crm.manager,model_calendar_attendee,base.group_sale_manager,1,1,1,1

+access_res_partner,res.partner.crm.user,base.model_res_partner,base.group_sale_salesman,1,1,1,0

+access_res_partner_address,res.partner.address.crm.user,base.model_res_partner_address,base.group_sale_salesman,1,1,1,0

+access_res_partner_category,res.partner.category.crm.user,base.model_res_partner_category,base.group_sale_salesman,1,1,1,0

+mail_mailgate_thread,mail.thread,mail.model_mail_thread,base.group_sale_salesman,1,1,1,1

+mail_gateway_mail_message_user,mail.message.user,mail.model_mail_message,base.group_sale_salesman,1,1,1,1

+access_crm_case_categ_manager,crm.case.categ manager,model_crm_case_categ,base.group_sale_manager,1,1,1,1

+access_base_action_rule_manager,base.action.rule manager,model_base_action_rule,base.group_sale_manager,1,1,1,1

+access_crm_lead_report_user,crm.lead.report user,model_crm_lead_report,base.group_sale_salesman,1,1,1,1

+access_res_partner_bank_type_crm_user,res.partner.bank.type.crm.user,base.model_res_partner_bank_type,base.group_sale_salesman,1,0,0,0

+access_crm_lead_partner_manager,crm.lead.partner.manager,model_crm_lead,base.group_partner_manager,1,0,0,0

+access_crm_phonecall_partner_manager,crm.phonecall.partner.manager,model_crm_phonecall,base.group_partner_manager,1,1,1,1

+access_crm_meeting_partner_manager,crm.meeting.partner.manager,model_crm_meeting,base.group_partner_manager,1,1,1,1

diff --git a/addons/crm/test/customer_request.eml b/addons/crm/test/customer_request.eml
new file mode 100644
index 00000000000..2c6c5e8110d
--- /dev/null
+++ b/addons/crm/test/customer_request.eml
@@ -0,0 +1,30 @@
+Return-Path: <info@customer.com>

+X-Original-To: info@customer.com

+Delivered-To: sales@my.com

+Received: by mail.my.com (Postfix, from userid xxx)

+	id 822ECBFB67; Mon, 24 Oct 2011 07:36:51 +0200 (CEST)

+X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.my.com

+X-Spam-Level: 

+X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=ham

+	version=3.3.1

+Received: from [192.168.1.146] 

+	(Authenticated sender: info@mail.customer.com)

+	by mail.customer.com (Postfix) with ESMTPSA id 07A30BFAB4

+	for <sales@my.com>; Mon, 24 Oct 2011 07:36:50 +0200 (CEST)

+Message-ID: <4EA4F95D.904@customer.com>

+Date: Mon, 24 Oct 2011 11:06:29 +0530

+From: Mr. John Right <info@customer.com>

+User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.14) Gecko/20110223 Lightning/1.0b2 Thunderbird/3.1.8

+MIME-Version: 1.0

+To: sales@my.com

+Subject: Fournir votre devis avec le meilleur prix.

+Content-Type: text/plain; charset=ISO-8859-1; format=flowed

+Content-Transfer-Encoding: 8bit

+

+Bonjour l'équipe de vente,

+

+Je veux acheter vos produits et services.

+

+S'il vous plaît fournir votre cotation avec le meilleur prix.

+

+Merci

diff --git a/addons/crm/test/process/cancel_lead.yml b/addons/crm/test/process/cancel_lead.yml
new file mode 100644
index 00000000000..a5f85a14058
--- /dev/null
+++ b/addons/crm/test/process/cancel_lead.yml
@@ -0,0 +1,53 @@
+-
+  I cancel unqualified lead.
+-
+  !python {model: crm.lead}: |
+    self.case_cancel(cr, uid, [ref("crm_case_itisatelesalescampaign0")])
+-
+  I check cancelled lead.
+-
+  !assert {model: crm.lead, id: crm.crm_case_itisatelesalescampaign0, string: Lead is in cancel state}:
+    - state == "cancel"
+-
+  I reset cancelled lead into unqualified lead.
+-
+  !python {model: crm.lead}: |
+    self.case_reset(cr, uid, [ref("crm_case_itisatelesalescampaign0")])
+-
+  I check unqualified lead after reset.
+-
+  !assert {model: crm.lead, id: crm.crm_case_itisatelesalescampaign0, string: Lead is in draft state}:
+    - state == "draft"
+-
+  I put unqualified lead into pending.
+-
+  !python {model: crm.lead}: |
+    self.case_pending(cr, uid, [ref("crm_case_itisatelesalescampaign0")])
+-
+  I check status of pending lead.
+-
+  !assert {model: crm.lead, id: crm.crm_case_itisatelesalescampaign0, string: Lead is in pending state}:
+    - state == "pending"
+-
+  I Escalate the Lead to Parent Team.
+-
+  !python {model: crm.lead}: |
+    self.case_escalate(cr, uid, [ref("crm_case_itisatelesalescampaign0")])
+-
+  I check lead escalate to Parent Team.
+-
+  !assert {model: crm.lead, id: crm.crm_case_itisatelesalescampaign0, string: Escalate lead to parent team}:
+    - section_id.name == "Sales Department"
+-
+  I mark as lost the opportunity.
+-
+  !python {model: crm.lead}: |
+    self.case_mark_lost(cr, uid, [ref("crm_case_itisatelesalescampaign0")])
+-
+  I check opportunity after lost.
+-
+  !python {model: crm.lead}: |
+    lead = self.browse(cr, uid, ref('crm_case_itisatelesalescampaign0'))
+    assert lead.state == 'done', "lead is not done state"
+    assert lead.stage_id.id == ref('crm.stage_lead6'), 'Stage is not changed!'
+    assert lead.probability == 0.0, 'Probability is wrong!'
diff --git a/addons/crm/test/process/communication_with_customer.yml b/addons/crm/test/process/communication_with_customer.yml
new file mode 100644
index 00000000000..92e711ce016
--- /dev/null
+++ b/addons/crm/test/process/communication_with_customer.yml
@@ -0,0 +1,56 @@
+-
+  Customer interested in our product. so He send request by email to get more details.
+-
+  Mail script will be fetched him request from mail server. so I process that mail after read EML file 
+-
+  !python {model: mail.thread}: |
+    import addons
+    request_file = open(addons.get_module_resource('crm','test', 'customer_request.eml'),'rb')
+    request_message = request_file.read()
+    self.message_process(cr, uid, 'crm.lead', request_message)
+-
+  After getting the mail, I check details of new lead of that customer.
+-
+  !python {model: crm.lead}: |
+    lead_ids = self.search(cr, uid, [('email_from','=', 'Mr. John Right <info@customer.com>')])
+    assert lead_ids and len(lead_ids), "Lead is not created after getting request"
+    lead = self.browse(cr, uid, lead_ids[0], context=context)
+    assert not lead.partner_id, "Customer should be a new"
+    assert lead.name == "Fournir votre devis avec le meilleur prix.", "Subject does not match"
+-
+  I reply him request with welcome message.
+-
+  !python {model: mail.compose.message}: |
+    lead_ids = self.pool.get('crm.lead').search(cr, uid, [('email_from','=', 'Mr. John Right <info@customer.com>')])
+    context.update({'active_model': 'crm.lead','active_id': lead_ids[0]})
+    id = self.create(cr, uid, {'body_text': "Merci à l'intérêt pour notre produit.nous vous contacterons bientôt. Merci", 'email_from': 'sales@mycompany.com'}, context=context)
+    try:
+        self.send_mail(cr, uid, [id], context=context)
+    except:
+        pass
+-
+  Now, I convert him into customer and put into regular customer list.
+-
+  !python {model: crm.lead}: |
+    lead_ids = self.search(cr, uid, [('email_from','=', 'Mr. John Right <info@customer.com>')])
+    self.convert_partner(cr, uid, lead_ids, context=context)
+-
+  Now, I search customer in regular customer list.
+-
+  !python {model: crm.lead}: |
+    partner_ids = self.message_partner_by_email(cr, uid, 'Mr. John Right <info@customer.com>')
+    assert partner_ids.get('partner_id'), "Customer is not found in regular customer list."
+-
+  I convert one phonecall request as a customer and put into regular customer list.
+-
+  !python {model: crm.phonecall}: |
+    self.convert_partner(cr, uid, [ref('crm.crm_case_phone06')], context=context)
+-
+  I check converted phonecall to partner.
+-
+  !python {model: res.partner}: |
+    partner_id = self.search(cr, uid, [('phonecall_ids', '=', ref('crm.crm_case_phone06'))])
+    assert partner_id, "Customer is not found in regular customer list."
+    data = self.browse(cr, uid, partner_id, context=context)[0]
+    assert data.user_id.id == ref("base.user_root"), "User not assign properly"
+    assert data.name == "Bad time", "User not assign properly"
diff --git a/addons/crm/test/process/lead2opportunity2win.yml b/addons/crm/test/process/lead2opportunity2win.yml
new file mode 100644
index 00000000000..dbc04abae19
--- /dev/null
+++ b/addons/crm/test/process/lead2opportunity2win.yml
@@ -0,0 +1,90 @@
+-
+  In order to test convert customer lead into opportunity, 
+-
+  I open customer lead.
+-
+   !python {model: crm.lead}: |
+     self.case_open(cr, uid, [ref("crm_case_qrecorp0")])
+- 
+  I check lead state is "Open".
+-
+  !assert {model: crm.lead, id: crm.crm_case_qrecorp0, string: Lead in open state}:
+     - state == "open"
+-
+  I convert lead into opportunity for exiting customer.
+-
+  !python {model: crm.lead}: |
+    self.convert_opportunity(cr, uid ,[ref("crm_case_qrecorp0")], ref("base.res_partner_agrolait"))
+-
+  I check details of converted opportunity. 
+-
+  !python {model: crm.lead}: |
+    lead = self.browse(cr, uid, ref('crm_case_qrecorp0'))
+    assert lead.type == 'opportunity', 'Lead is not converted to opportunity!'
+    assert lead.partner_id.id == ref("base.res_partner_agrolait"), 'Partner missmatch!'
+    assert lead.stage_id.id == ref("stage_lead1"), 'Stage of opportunity is incorrect!'
+-
+  Now I begin communication and schedule a phone call with the customer.
+-
+  !python {model: crm.opportunity2phonecall}: |
+    import time
+    context.update({'active_model': 'crm.lead', 'active_ids': [ref('crm_case_qrecorp0')]})
+    call_id = self.create(cr, uid, {'date': time.strftime('%Y-%m-%d %H:%M:%S'), 
+                'name': "Bonjour M. Jean, Comment êtes-vous? J'ai obtenu votre demande. peut-on parler au sujet de ce pour quelques minutes?"}, context=context)
+    self.action_schedule(cr, uid, [call_id], context=context)
+-
+  I check that phonecall is scheduled for that opportunity.
+-
+  !python {model: crm.phonecall}: |
+    ids = self.search(cr, uid, [('opportunity_id', '=', ref('crm_case_qrecorp0'))])
+    assert len(ids), 'phonecall is not scheduled'
+-
+  Now I schedule Meeting with Customer.
+-
+  !python {model: crm.lead}: |
+    self.action_makeMeeting(cr, uid, [ref('crm_case_qrecorp0')])
+
+-
+  After communicated  with customer, I put some notes with Contract details.
+-
+  !python {model: crm.add.note}: |
+    context.update({'active_model': 'crm.lead', 'active_id': ref('crm_case_qrecorp0')})
+    note_id = self.create(cr, uid, {'body': "ces détails envoyés par le client sur ​​le FAX pour la qualité"})
+    self.action_add(cr, uid, [note_id], context=context)
+-
+  Finally, I won this opportunity, so I close this opportunity.
+-
+  !python {model: crm.lead}: |
+    self.case_mark_won(cr, uid, [ref("crm_case_qrecorp0")])
+-
+  I check details of the opportunity After won the opportunity.
+-
+  !python {model: crm.lead}: |
+    lead = self.browse(cr, uid, ref('crm_case_qrecorp0'))
+    assert lead.state == 'done', 'Opportunity is not in done state!'
+    assert lead.stage_id.name == 'Won', ' Stage of Opportunity is not win!'
+    assert lead.probability == 100.0, 'probability revenue should not  be 100.0!'
+-
+  I convert mass lead into opportunity customer.
+-
+  !python {model: crm.lead2opportunity.partner.mass}: |
+    context.update({'active_model': 'crm.lead', 'active_ids': [ref("crm_case_employee0"), ref("crm_case_electonicgoodsdealer0")], 'active_id': ref("crm_case_qrecorp0")}) 
+    id = self.create(cr, uid, {'user_ids': [ref('base.user_root')], 'section_id': ref('crm.section_sales_department')}, context=context)
+    self.mass_convert(cr, uid, [id], context=context)
+-
+  Now I check First lead converted on opportunity.
+-
+  !python {model: crm.lead}: |
+    opp = self.browse(cr, uid, ref('crm_case_employee0'))
+    assert opp.name == "Need Info about Onsite Intervention", "Opportunity name not correct"
+    assert opp.type == 'opportunity', 'Lead is not converted to opportunity!'
+    assert opp.partner_id.name == "Agrolait", 'Partner missmatch!'
+    assert opp.stage_id.id == ref("stage_lead1"), 'Stage of probability is incorrect!'
+-
+  Then check for Second lead converted on opportunity.
+-
+  !python {model: crm.lead}: |
+    opp = self.browse(cr, uid, ref('crm_case_electonicgoodsdealer0'))
+    assert opp.name == "Interest in Your New Product", "Opportunity name not correct"
+    assert opp.type == 'opportunity', 'Lead is not converted to opportunity!'
+    assert opp.stage_id.id == ref("stage_lead1"), 'Stage of probability is incorrect!'
\ No newline at end of file
diff --git a/addons/crm/test/process/merge_opportunity.yml b/addons/crm/test/process/merge_opportunity.yml
new file mode 100644
index 00000000000..463e330fc10
--- /dev/null
+++ b/addons/crm/test/process/merge_opportunity.yml
@@ -0,0 +1,51 @@
+-
+  I make direct opportunity for Customer.
+-
+  !python {model: crm.partner2opportunity}: |
+    context.update({'active_model': 'res.partner', 'active_ids': [ref("base.res_partner_9")]})
+    res_id = self.create(cr, uid, {'name': "enquête pour l'achat de services"}, context=context)
+    self.make_opportunity(cr, uid, [res_id], context=context)
+-
+  I make another opportunity from phonecall for same customer.
+-
+  !python {model: crm.phonecall2opportunity}: |
+    context.update({'active_model': 'crm.phonecall', 'active_ids': [ref("crm.crm_case_phone06")]})
+    res_id = self.create(cr, uid, {'name': "Quoi de prix de votre autre service?", 'partner_id': ref("base.res_partner_9")}, context=context)
+    self.make_opportunity(cr, uid, [res_id], context=context)
+-
+ Now I merge all opportunities of customer.
+-
+  !python {model: crm.lead}: |
+    opportunity_ids = self.search(cr, uid, [('partner_id','=', ref("base.res_partner_9"))])
+    self.merge_opportunity(cr, uid, opportunity_ids, context=context)
+-
+  I check for merged opportunities for customer.
+-
+  !python {model: crm.lead}: |
+    merge_id = self.search(cr, uid, [('partner_id','=', ref("base.res_partner_9"))])
+    assert merge_id, 'Fail to create Merge opportunity'
+    merge_data = self.browse(cr, uid, merge_id)[0]
+    assert merge_data.type == 'opportunity', 'Merged opportunity type not change!'
+    assert merge_data.partner_id.id == ref("base.res_partner_9"), 'Partner missmatch!'
+-
+  Now I schedule another phonecall to customer after merged.
+-
+  !python {model: crm.phonecall2phonecall}: |
+    context.update({'active_model': 'crm.phonecall', 'active_ids': [ref("crm.crm_case_phone06")]})
+    res_id = self.create(cr, uid, {'name': "vos chances sont fusionnés en un seul"}, context=context)
+    self.action_schedule(cr, uid, [res_id], context=context)
+- 
+  I schedule Meeting on this phonecall.
+-
+  !python {model: crm.phonecall}: |
+    self.action_make_meeting(cr, uid, [ref("crm.crm_case_phone06")])
+-
+  I setting Phone call to Held (Done).
+-
+  !python {model: crm.phonecall}: |
+    self.case_close(cr, uid, [ref("crm.crm_case_phone06")])
+-
+  I check that the phone call is in 'Held' state.
+-
+  !assert {model: crm.phonecall, id: crm.crm_case_phone06, string: Phone call Helded}:
+    - state == "done"
diff --git a/addons/crm/test/process/segmentation.yml b/addons/crm/test/process/segmentation.yml
new file mode 100644
index 00000000000..74500049290
--- /dev/null
+++ b/addons/crm/test/process/segmentation.yml
@@ -0,0 +1,16 @@
+- 
+  In order to test segmentation process which create specific partner categories criteria,
+- 
+  I start the process.
+-
+  !python {model: crm.segmentation}: |
+    self.process_start(cr, uid, [ref("crm_segmentation0")],context)
+    #Todo: Need to check after segmentation started
+
+-
+  I create rule Segmentation line record for partner .
+-
+  !python {model: crm.segmentation.line}: |
+    id = self.create(cr, uid, {'name': "OpenERP partners",'expr_value': 25})
+    self.test(cr, uid, [id],partner_id=0)
+    #Todo: Need to test segmantation line record
\ No newline at end of file
diff --git a/addons/crm/test/test_crm_lead.yml b/addons/crm/test/test_crm_lead.yml
deleted file mode 100644
index d5d3c6b933b..00000000000
--- a/addons/crm/test/test_crm_lead.yml
+++ /dev/null
@@ -1,154 +0,0 @@
--
-   In order to test the CRM in OpenERP, I will do a customer qualification
-   process that starts with a fist contact with a customer (a lead), which will
-   be converted to a business opportunity and a partner.
--
-   I create a two new users "user_crm" and I assign the group "salesman".
--
-   !record {model: res.users, id: res_users_usercrm0}:
-     company_id: base.main_company
-     context_lang: en_US
-     context_section_id: crm.section_sales_department
-     groups_id:
-       - base.group_sale_salesman
-     login: user_crm
-     name: user_crm
-     password: user_crm
-
--  |
-   I start by creating a new lead "New Customer" and I provide an address to this
-   new customer, as well as an email "info@mycustomer.com".
--
-   !record {model: crm.lead, id: crm_lead_newcustomer0}:
-     email_from: info@mycustomer.com
-     name: New Customer
-     partner_name: Capegemini
-     partner_id: base.res_partner_9
-     phone: (855) 924-4364
-     mobile: (333) 715-1450
-     section_id: crm.section_sales_department
-     referred: False
--  |
-   I check that the lead is in 'draft' state.
--
-   !assert {model: crm.lead, id: crm_lead_newcustomer0, string: Lead in Draft}:
-     - state == "draft"
--
-   I open lead by click on "Open" button.
--
-   !python {model: crm.lead}: |
-     self.case_open(cr, uid, [ref("crm_lead_newcustomer0")])
-     fields={
-            'day_open': 0.0,
-            'day_close': 0.0
-            }
-     self._compute_day(cr, uid, [ref("crm_lead_newcustomer0")], fields, context)
-- |
-  I check that lead is now in 'open' state.
--
-  !assert {model: crm.lead, id: crm_lead_newcustomer0, string: Lead in open state}:
-     - state == "open"
--
-   I search id for case object.
--
-   !python {model: crm.case.categ}: |
-     self._find_object_id(cr, uid, context)
--  |
-   As the lead seems to be a real business opportunity, I will convert it to a
-   partner
-   and a business opportunity by clicking on the "Convert" button.
--
-   !python {model: crm.lead}: |
-     lead = self.browse(cr, uid, ref('crm_lead_newcustomer0'))
-     action = self.convert_opportunity(cr, uid, [ref("crm_lead_newcustomer0")], {'active_ids': [ref("crm_lead_newcustomer0")]})
-     assert action['res_model'] == 'crm.lead2opportunity.partner'
--
-   |
-   I select "create a new partner" option.
--
-   !record {model: crm.lead2opportunity.partner, id: crm_lead2opportunity_partner_create_0}:
-      action: 'create'
-      name: 'convert'
--
-  Then, Click on "Create Opportunity" button.
--
-   !python {model: crm.lead2opportunity.partner}: |
-      self.action_apply(cr, uid, [ref("crm_lead2opportunity_partner_create_0")], {'active_ids': [ref("crm_lead_newcustomer0")], 'active_id': ref("crm_lead_newcustomer0")})
--
-   |
-   I select "Link to an existing partner" option.
--
-   !record {model: crm.lead2opportunity.partner, id: crm_lead2opportunity_partner_create_1}:
-      action: 'exist'
--
-  Then, Click on "Create Opportunity" button.
--
-   !python {model: crm.lead2opportunity.partner}: |
-      self.action_apply(cr, uid, [ref("crm_lead2opportunity_partner_create_1")], {'active_ids': [ref("crm_lead_newcustomer0")], 'active_id': ref("crm_lead_newcustomer0")})
--
-   |
-   I select "Do not link to a partner" option.
--
-   !record {model: crm.lead2opportunity.partner, id: crm_lead2opportunity_partner_create_2}:
-      action: 'nothing'
--
-  Then, Click on "Create Opportunity" button.
--
-   !python {model: crm.lead2opportunity.partner}: |
-      self.action_apply(cr, uid, [ref("crm_lead2opportunity_partner_create_2")], {'active_ids': [ref("crm_lead_newcustomer0")], 'active_id': ref("crm_lead_newcustomer0")})
--  |
-   In order to check the opportunity is created or not, I check type.
--
-  !python {model: crm.lead}: |
-    lead = self.browse(cr, uid, ref("crm_lead_newcustomer0"))
-    assert lead.type == 'opportunity'
-
--
-  I create mass report of lead to opprtunity partner.
--
-  !record {model: crm.lead2opportunity.partner.mass, id: crm_lead2opportunity_partner_mass0}:
-    user_ids:
-      - base.user_root
-    section_id: crm.section_sales_department
--
-  Then, execute that mass wizard.
--
-   !python {model: crm.lead2opportunity.partner.mass}: |
-      self.mass_convert(cr, uid, [ref("crm_lead2opportunity_partner_mass0")],{'active_ids': [ref("crm_lead_newcustomer0")], 'active_id': ref("crm_lead_newcustomer0")})
--
-   I close lead by click on "close" button.
--
-   !python {model: crm.lead}: |
-     self.case_close(cr, uid, [ref("crm_lead_newcustomer0")])
-- |
-  I check that lead is now in 'done' state.
--
-  !assert {model: crm.lead, id: crm_lead_newcustomer0, string: Lead in done state}:
-     - state == "done"
--
-  I cancel lead by click on "cancel" button.
--
-   !python {model: crm.lead}: |
-     self.case_cancel(cr, uid, [ref("crm_lead_newcustomer0")])
-- |
-  I check that lead is now in 'cancel' state.
--
-  !assert {model: crm.lead, id: crm_lead_newcustomer0, string: Lead in cancel state}:
-     - state == "cancel"
-
-#-
-#  |
-#  yaml is also not working with smtp server and send new email.
-
-- |
-  I configure with smtp server.
-- |
-  And I communicate with lead through send New mail to Lead using its email address from the user who is logged in.
-- |
-  I check that communication history generated when send email to lead.
-- |
-  Then, I add a cc which receive copy of future communication between partner and users by mail.
-
-- |
-  I Reply to last Email to lead with some document attached.and check that communication history generated or not.
-
diff --git a/addons/crm/test/test_crm_lead_case2.yml b/addons/crm/test/test_crm_lead_case2.yml
deleted file mode 100644
index 23a654d31a8..00000000000
--- a/addons/crm/test/test_crm_lead_case2.yml
+++ /dev/null
@@ -1,151 +0,0 @@
--
-   In order to do complete test the CRM in OpenERP,
-   I will create new full configured record and carry test on it.
--  |
-   I Start by creating "Test Sales Team" with No Unlink.
-   I create a crm.case.section record.
--
-  !record {model: crm.case.section, id: crm_case_section_demosalesteam}:
-    code: DEMO
-    complete_name: Test Sales Team
-    name: Test Sales Team
-    allow_unlink: False
-    member_ids:
-      - base.user_admin
-    stage_ids:
-      - crm.stage_lead1
-      - crm.stage_lead2
-      - crm.stage_lead3
-      - crm.stage_lead4
-      - crm.stage_lead5
-      - crm.stage_lead6
-    working_hours: 0.0
-    resource_calendar_id: resource.timesheet_group1
-    parent_id: crm.section_sales_department
--
-   I assign segmentation.
--
-   !record {model: res.users, id: res_users_usercrm0}:
-     context_section_id: crm_case_section_demosalesteam
--  |
-   I create a new lead "Test Customer" and I provide an address to this
-   demo customer and email "info@democustomer.com" and Also "Test Sales Team".
--
-   !record {model: crm.lead, id: crm_lead_democustomer}:
-     email_from: info@democustomer.com
-     name: Test Customer
-     partner_name: NotSoTinySARL
-     phone: (+32).81.81.37.00
-     mobile: (+32).81.81.37.00
-     section_id: crm_case_section_demosalesteam
-     referred: False
-     type: lead
--
-   I check that the lead is in 'draft' state.
--
-   !assert {model: crm.lead, id: crm_lead_democustomer, string: Lead in Draft}:
-     - state == "draft"
--
-   I create categories.
--
-   !record {model: crm.case.categ, id: crm_case_categ0}:
-     name: crm_case_section_demosalesteam
-     section_id: crm_case_section_demosalesteam
--
-  I assigning contact detail to the Lead "Test Customer" without address.
--
-  !python {model: crm.lead}: |
-    self.onchange_partner_address_id(cr, uid, ref("crm_lead_democustomer"), None, email=False)
-
--
-  I assigning contact detail to the Lead "Test Customer" with address.
--
-  !python {model: crm.lead}: |
-    self.onchange_partner_address_id(cr, uid, ref("crm_lead_democustomer"), ref("base.res_partner_address_notsotinysarl0"), email=False)
-
--
-  I selecting email "Opt-out" option for the "Test Customer" Lead.
--
-  !python {model: crm.lead}: |
-    self.on_change_optout(cr, uid, ref("crm_lead_democustomer"), True)
-
--
-  I change the Opt-out to Opt-in to show email receive preference.
--
-  !python {model: crm.lead}: |
-    self.on_change_optin(cr, uid, ref("crm_lead_democustomer"), True)
--
-   I open lead by click on "Open" button.
--
-   !python {model: crm.lead}: |
-     self.case_open(cr, uid, [ref("crm_lead_democustomer")])
--
-  I check that lead "Test Customer" is now in 'open' state.
--
-  !assert {model: crm.lead, id: crm_lead_democustomer, string: Lead in open state}:
-     - state == "open"
--
-  I reset the lead "Test Customer".
--
-    !python {model: crm.lead}: |
-      self.case_reset(cr, uid, [ref("crm_lead_democustomer")])
--
-   I again opening lead by click on "Open" button.
--
-   !python {model: crm.lead}: |
-     self.case_open(cr, uid, [ref("crm_lead_democustomer")])
--
-  I setting stage "New" for the lead "Test Customer".
--
-   !python {model: crm.lead}: |
-     self.stage_next(cr, uid, [ref("crm_lead_democustomer")], context={'stage_type': 'lead'})
--
-  I try to Unlink the Lead "Test Customer" demo Lead.
--
-   !python {model: crm.lead}: |
-    try:
-      self.unlink(cr, uid, [ref("crm_lead_democustomer")])
-    except:
-      pass
--
-   I setting Lead "Test Customer" to Pending State.
--
-    !python {model: crm.lead}: |
-      self.case_pending(cr, uid, [ref("crm_lead_democustomer")])
--
-  I check that lead "Test Customer" is now in 'Pending' state.
--
-  !assert {model: crm.lead, id: crm_lead_democustomer, string: Lead in Pending state}:
-     - state == "pending"
--
-  I Escalate the Lead "Test Customer" Parent "Sales Team".
--
-    !python {model: crm.lead}: |
-      self.case_escalate(cr, uid, [ref("crm_lead_democustomer")])
--
-  I add Internal Note Saying Escalated Reason.
--
-  !record {model: crm.add.note, id: crm_add_note_0}:
-    body: Sales Lead Has Been Escalated Due to Some Technical reason to the parent  'Sales
-      Team'
-    state: unchanged
--
-  I click a note button to attach the record.
--
-  !python {model: crm.add.note}: |
-    context['active_model'] = "crm.lead"
-    context['active_ids'] = [ref("crm_lead_democustomer")]
-    self.action_add(cr, uid, [ref("crm_add_note_0")], context=context)
-
--
-  I Copying this lead "Test Customer" to New Lead.
--
-    !python {model: crm.lead}: |
-      self.copy(cr, uid, ref("crm_lead_democustomer"))
--
-  I checking the Lead Copied or Not.
--
-    !python {model: crm.lead}: |
-      sid = self.search(cr, uid, [('name', '=', 'Test Customer'),('state', '=', 'draft')])
-      if not sid:
-        raise AssertionError("Lead is not copied Successfully")
diff --git a/addons/crm/test/test_crm_meeting.yml b/addons/crm/test/test_crm_meeting.yml
deleted file mode 100644
index 1aee11463dd..00000000000
--- a/addons/crm/test/test_crm_meeting.yml
+++ /dev/null
@@ -1,97 +0,0 @@
-- |
-  I will test Meetings which may be customer meeting or phonecall meeting or
-  internal Meeting.
-- |
-  I start by creating a new Meeting.
--
-  !record {model: crm.meeting, id: crm_meeting_regardingpresentation0}:
-    categ_id: crm.categ_meet2
-    date: !eval time.strftime('%Y-%m-%d 16:04:00')
-    date_deadline: !eval "(datetime.now() + timedelta(1)).strftime('%Y-%m-%d 00:04:00')"
-    duration: 8.0
-    email_from: info@balmerinc.be
-    location: Ahmedabad
-    name: Regarding Presentation
-    partner_address_id: base.res_partner_address_1
-    partner_id: base.res_partner_9
-    rrule_type: weekly
-    section_id: crm.section_sales_department
-- |
-  I check that the Meetings is in 'UnConfirmed' state.
--
-  !assert {model: crm.meeting, id: crm_meeting_regardingpresentation0}:
-     - state == "draft"
-- |
-  I can set reminder on meeting if I put reminder "40 minutes before" .
-- |
-  For that, I first create alarm.
--
-  !record {model: res.alarm, id: res_alarm_minituesbefore0}:
-    name: 40 minutes before
-    trigger_duration: 40
-    trigger_interval: minutes
-    trigger_occurs: before
-    trigger_related: start
-- |
-  I will assign this reminder.
-
-- !python {model: crm.meeting}: |
-     self.write(cr, uid, [ref('crm_meeting_regardingpresentation0')], {'alarm_id': ref("res_alarm_minituesbefore0")})
-- |
-  In order to check recurrence on meetings I will set Recurrency to Custom
-  and I set the fields so that the meeting will occur weekly on Monday and Friday 10 times.
--
-  !python {model: crm.meeting}: |
-     self.write(cr, uid, [ref("crm_meeting_regardingpresentation0")], {'fr': 1, 'mo': 1, 'th': 1, 'tu': 1, 'we':1,   'count':10, 'interval': 1, 'rrule_type': 'weekly', 'recurrency' : True})
-
-- |
-  I can see from the calendar view that the meeting is scheduled on Monday and Friday
-  for 10 times.
-
--
-  !python {model: crm.meeting}: |
-    self.fields_view_get(cr, uid, False, 'calendar', context)
-- |
-  I will search for one of the recurrent event and count the number of meeting.
--
-  !python {model: crm.meeting}: |
-     import time
-     from datetime import datetime, date, timedelta
-     ids = self.search(cr, uid, [('date', '>=', time.strftime('%Y-%m-%d 00:00:00')), ('date', '<=', (datetime.now()+timedelta(31)).strftime('%Y-%m-%d 00:00:00')), ('name', '=', 'Regarding Presentation')], context={'virtual_id': True})
-     assert len(ids) == 10
-
-- |
-  If I want to edit meetings information for all occurrence I click on "Edit All" button.
--
-  !python {model: crm.meeting}: |
-     self.write(cr, uid, [ref('crm_meeting_regardingpresentation0')], {'edit_all':'True'},context)
-- |
-  I can see that new meeting form is opened with same value.
-  I change some data for meeting and save it.
-  I can see from meeting's calendar view that all meeting occurrences are changed accordingly.
--
-  !record {model: crm.meeting, id: crm.crm_meeting_regardingpresentation0}:
-    alarm_id: base_calendar.alarm9
-    rrule_type: weekly
-
-- |
-  In order to invite people for this meetings, I click on "Invite People" button
-  I can invite internal user.
--
-  !record {model: base_calendar.invite.attendee, id: base_calendar_invite_attendee_0}:
-    type: internal
-    send_mail: False
-    partner_id: base.res_partner_9
-    user_ids:
-      - base.user_demo
--
-  I click on "Invite" button of "Invite attendee" wizard.
--
-  !python {model: base_calendar.invite.attendee}: |
-    self.do_invite(cr, uid, [ref('base_calendar_invite_attendee_0')], {'active_id': ref('crm_meeting_regardingpresentation0'), 'model' : 'crm.meeting', 'attendee_field':'attendee_ids'})
-
-- |
-  After direct/indirect confirmation for meetings I can confirm meeting.
--
-  !python {model: crm.meeting}: |
-    self.case_open(cr, uid, [ref('crm_meeting_regardingpresentation0')])
diff --git a/addons/crm/test/test_crm_opportunity.yml b/addons/crm/test/test_crm_opportunity.yml
deleted file mode 100644
index 734a1cae46c..00000000000
--- a/addons/crm/test/test_crm_opportunity.yml
+++ /dev/null
@@ -1,113 +0,0 @@
--  |
-   I start by creating a new Opportunity. And I select partner for opportunity.
-   I can see that after selecting partner his contact and email is automatically filled.
--
-   !record {model: crm.lead, id: crm_opportunity_abcfuelcounits0}:
-    email_from: info@balmerinc.be
-    name: 'ABC FUEL CO 829264 - 10002 units'
-    partner_address_id: base.res_partner_address_1
-    partner_id: base.res_partner_9
-    probability: 1.0
-    stage_id: crm.stage_lead1
-    categ_id: crm.categ_oppor2
-    section_id: crm.section_sales_department
--  |
-   I check that the opportunity is in 'New' state.
--
-   !assert {model: crm.lead, id: crm_opportunity_abcfuelcounits0}:
-     - state == "draft"
-
-- |
-  I  check that phonecall record is created for that opportunity.
--
-  !python {model: crm.phonecall}: |
-    phone_obj = self.pool.get('crm.phonecall')
--  |
-   I schedule Meeting on this current opportunity by clicking on "schedule
-   Meeting".
--
-   !python {model: crm.lead}: |
-    self.action_makeMeeting(cr, uid, [ref("crm_opportunity_abcfuelcounits0")])
-
--  |
-   I can see that Meeting's calendar view is shown.
-   then I click on the date on which I want to schedule meeting.
-   I fill proper data for that meeting and save it.
--
-  !record {model: crm.meeting, id: crm_meeting_abcfuelcounits0}:
-    date: !eval time.strftime('%Y-%m-%d 00:00:00')
-    date_deadline: !eval time.strftime('%Y-%m-%d 08:00:00')
-    duration: 8.0
-    email_from: info@balmerinc.be
-    name: 'ABC FUEL CO 829264 - 10002 units'
-    opportunity_id: 'crm_opportunity_abcfuelcounits0'
-    partner_address_id: base.res_partner_address_1
-    partner_id: base.res_partner_9
-    section_id: crm.section_sales_department
-    state: open
-- |
-  In order to schedule a phonecall to the partner
-  I click on "schedule call" button and select planned date for the call.
--
-  !record {model: crm.opportunity2phonecall, id: crm_opportunity2phonecall_abcfuelcounits0}:
-    date: !eval "(datetime.now() + timedelta(1)).strftime('%Y-%m-%d 11:15:00')"
-    name: 'ABC FUEL CO 829264 - 10002 units'
-    section_id: crm.section_sales_department
-    user_id: base.user_demo
-    categ_id: crm.categ_phone1
-- |
-  schedule phonecall by opportunity2phoncall wizard.
--
-  !python {model: crm.opportunity2phonecall}: |
-      self.action_apply(cr, uid, [ref('crm_opportunity2phonecall_abcfuelcounits0')], {'active_ids': [ref("crm_opportunity_abcfuelcounits0")]})
-- |
-  I  check that phonecall record is created for that opportunity.
--
-  !python {model: crm.phonecall}: |
-    phone_obj = self.pool.get('crm.phonecall')
-    ids = phone_obj.search(cr, uid, [('name', '=', 'ABC FUEL CO 829264 - 10002 units')])
-    assert len(ids)
-- |
-  I can see phonecall record after click on "Schedule call" wizard.
--
-  !record {model: crm.phonecall, id: crm_phonecall_abcfuelcounits0}:
-    date: !eval "(datetime.now() + timedelta(1)).strftime('%Y-%m-%d 11:15:00')"
-    duration: 3.0
-    name: 'ABC FUEL CO 829264 - 10002 units'
-    partner_address_id:  base.res_partner_address_1
-    partner_id:  base.res_partner_9
-    section_id: crm.section_sales_department
-- |
-  I Merge the opportunities.
--
-  for that create two opportunities first opportunity 'Test FUEL CO'.
--
-   !record {model: crm.lead, id: crm_opportunity_1}:
-    email_from: info@balmerinc.be
-    name: 'Test FUEL CO 829264 - 10002 units'
-    partner_address_id: base.res_partner_address_1
-    partner_id: base.res_partner_9
-    probability: 1.0
-    stage_id: crm.stage_lead1
-    categ_id: crm.categ_oppor2
-    section_id: crm.section_sales_department
--
-  I create the opportunity 'FUEL CO'.
--
-   !record {model: crm.lead, id: crm_opportunity_2}:
-    email_from: info@balmerinc.be
-    name: 'FUEL CO 829264 - 10002 units'
-    partner_address_id: base.res_partner_address_1
-    partner_id: base.res_partner_9
-    probability: 1.0
-    stage_id: crm.stage_lead1
-    categ_id: crm.categ_oppor2
-    section_id: crm.section_sales_department
--  |
-   I Merge two Opportunities.
--
-   !python {model: crm.merge.opportunity}: |
-    op_list = [ref('crm_opportunity_1'),ref('crm_opportunity_2')]
-    op_ids=self.pool.get('crm.lead').browse(cr,uid,op_list)
-    lead_ids = [ref('crm_lead_newcustomer0')]
-    self.merge(cr, uid, op_ids, {'lead_ids': lead_ids})
diff --git a/addons/crm/test/test_crm_opportunity_case2.yml b/addons/crm/test/test_crm_opportunity_case2.yml
deleted file mode 100644
index dc0dbe517f1..00000000000
--- a/addons/crm/test/test_crm_opportunity_case2.yml
+++ /dev/null
@@ -1,45 +0,0 @@
--  |
-  I start by creating a new Opportunity. And I select partner for opportunity.
-  I can see that after selecting partner his contact and email is automatically filled.
--
-  !record {model: crm.lead, id: crm_opportunity_demotestopportunity}:
-    email_from: info@balmerinc.be
-    name: 'Demo Test Opportunity'
-    partner_address_id: base.res_partner_address_1
-    partner_id: base.res_partner_9
-    probability: 1.0
-    categ_id: crm.categ_oppor2
-    section_id: crm.section_sales_department
-    type: opportunity
--
-  I check that the opportunity is in 'New' state.
--
-  !assert {model: crm.lead, id: crm_opportunity_demotestopportunity, string: Opportunity in Draft}:
-    - state == "draft"
--
-  I open opportunity by click on "Open" button.
--
-  !python {model: crm.lead}: |
-    self.case_open(cr, uid, [ref("crm_opportunity_demotestopportunity")])
--
-  I change partner of the  opportunity.
--
-  !python {model: crm.lead}: |
-    self.onchange_partner_id(cr, uid, [ref("crm_opportunity_demotestopportunity")], ref("base.res_partner_agrolait"))
-
--
-  I change Contact Detail of the  opportunity.
--
-  !python {model: crm.lead}: |
-    self.onchange_partner_address_id(cr, uid,[ref("crm_opportunity_demotestopportunity")], ref("base.res_partner_address_8invoice"))
-
--
-  I change Opportunity to Won State.
--
-  !python {model: crm.lead}: |
-    self.case_mark_won(cr, uid, [ref("crm_opportunity_demotestopportunity")])
--
-  I check that the opportunity is in 'Done' state.
--
-  !assert {model: crm.lead, id: crm_opportunity_demotestopportunity, string: Opportunity is Won}:
-    - state == "done"
diff --git a/addons/crm/test/test_crm_partner2opportunity.yml b/addons/crm/test/test_crm_partner2opportunity.yml
deleted file mode 100644
index fe026074f4f..00000000000
--- a/addons/crm/test/test_crm_partner2opportunity.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-- |
-  I start by creating a new opportunity from partner.
--
-  !record {model: crm.partner2opportunity, id: crm_partner2opportunity_id_0}:
-    name: test
-    planned_revenue: 0.0
-    partner_id:  base.res_partner_9
-    probability: 0.0
--
-  I click on "Create Opportunity" button of this wizard.
--
-  !python {model: crm.partner2opportunity}: |
-    fields = {
-             'name': 'test',
-             'planned_revenue': '0.0',
-             'partner_id': ref('base.res_partner_9'),
-             'probability': '0.0' 
-             }
-    self.default_get(cr, uid, fields, {"active_ids": [ref("crm_partner2opportunity_id_0")]})
-- |
-  In order to check the opportunity is created or not, I check type.
--
-  !python {model: crm.partner2opportunity}: |
-    opportunity = self.make_opportunity(cr, uid, [ref("crm_partner2opportunity_id_0")], {"active_ids": [ref("crm_partner2opportunity_id_0")]})
-    assert True
diff --git a/addons/crm/test/test_crm_phonecall.yml b/addons/crm/test/test_crm_phonecall.yml
deleted file mode 100644
index 0754a5b9544..00000000000
--- a/addons/crm/test/test_crm_phonecall.yml
+++ /dev/null
@@ -1,116 +0,0 @@
-- |
-  I start by creating a new phonecall.
--
-  !record {model: crm.phonecall, id: crm_phonecall_interviewcall0}:
-    date: !eval time.strftime('%Y-%m-%d 08:00:00')
-    name: Interview call
-    duration: 2.0
-    section_id: crm.section_sales_department
--
-  I select partner by click on "Create a Partner" button.
--
-  !record {model: crm.phonecall2partner, id: crm_phonecall2partner_1}:
-    action: exist
-    partner_id: base.res_partner_9
-
--
-  I click on "Continue" button of this wizard and make partner.
--
-  !python {model: crm.phonecall2partner}: |
-
-    self._select_partner(cr, uid,{"active_ids": [ref("crm_phonecall_interviewcall0")]})
-    self.open_create_partner(cr, uid, [ref("crm_phonecall2partner_1")], {"active_ids": [ref("crm_phonecall_interviewcall0")]})
-    self.make_partner(cr, uid, [ref("crm_phonecall2partner_1")], {"active_ids": [ref("crm_phonecall_interviewcall0")]})
-
-- |
-  As the success of phonecall seems to be a real business opportunity, I will convert
-  it to opportunity by clicking on the "Convert to Opportunity" button.
--
-  !record {model: crm.phonecall2opportunity, id: crm_phonecall2opportunity_interviewcall0}:
-    name: Interview call
-    partner_id: base.res_partner_9
-    planned_revenue: 0.0
-    probability: 0.0
-- |
-  I can see that a business opportunity is now assigned to this phonecall
--
-  !assert {model: crm.phonecall, id: crm_phonecall_interviewcall0}:
-     - opportunity_id != False
--
-   I click on "Convert" button of this wizard.
--
-  !python {model: crm.phonecall2opportunity}: |
-     self.action_apply(cr, uid, [ref("crm_phonecall2opportunity_interviewcall0")], {"active_id": ref("crm_phonecall_interviewcall0")})
-- |
-  And I check that the phonecall and the newly created business opportunity is linked
-  to same  partner.
--
-  !python {model:  crm.phonecall}: |
-    obj_phonecall = self.browse(cr, uid, ref('crm_phonecall_interviewcall0'))
-    ids = self.pool.get('crm.lead').search(cr, uid, [('name', '=', obj_phonecall.opportunity_id.name)])
-    obj_opp = self.pool.get('crm.lead').browse(cr, uid, ids)[0]
-    assert obj_phonecall.partner_id == obj_opp.partner_id
-- |
-  I schedule Meeting on this current phonecall by clicking on "schedule
-  Meeting".
--
-   !python {model: crm.phonecall}: |
-     self.action_make_meeting(cr, uid, [ref('crm_phonecall_interviewcall0')])
-
--  |
-   I can see that Meeting's calendar view is shown.
-   then I click on the date on which I want schedule meeting.
-   I fill proper data for that meeting and save it.
--
-  !record {model: crm.meeting, id: crm_meeting_interviewcall0}:
-    alarm_id: base_calendar.alarm3
-    date: !eval "'%s-%s-%s 09:00:00' %(datetime.now().year,datetime.now().month,datetime.now().day)"
-    date_deadline: !eval "'%s-%s-%s 17:00:00' %(datetime.now().year,datetime.now().month,datetime.now().day)"
-    duration: 8.0
-    email_from: info@balmerinc.be
-    name: Interview call
-    partner_address_id: base.res_partner_address_1
-    partner_id: base.res_partner_9
-    phonecall_id: 'crm_phonecall_interviewcall0'
-    state: open
-
-- |
-  In order to schedule other phonecall to the partner
-  I click on "schedule other call" button. and plan for other call
-  I can see that it will open other phonecall view with some data same as current
-  phonecall.
--
-  !record {model: crm.phonecall2phonecall, id: crm_phonecall2phonecall_interviewcall0}:
-    date: !eval "'%s-%s-%s 19:49:00' %(datetime.now().year,datetime.now().month,datetime.now().day)"
-    name: Interview call
-    section_id: crm.section_sales_department
-    user_id: base.user_root
-    action: schedule
-    categ_id: crm.categ_phone1
--
-  I click on "schedule other call" button. and plan for other call.
--
-  !record {model: crm.phonecall2phonecall, id: crm_phonecall2phonecall_interviewcall1}:
-    date: !eval "'%s-%s-%s 19:49:00' %(datetime.now().year,datetime.now().month,datetime.now().day)"
-    name: Interview call
-    section_id: crm.section_sales_department
-    user_id: base.user_root
-    action: log
-    categ_id: crm.categ_phone1
-- |
-  I click on "Schedule" button of this  wizard.
--
-  !python {model: crm.phonecall2phonecall}: |
-    fields = {
-              'name': 'Interview call',
-              'section_id': ref('crm.section_sales_department'),
-              'user_id': ref('base.user_root'),
-              'categ_id': ref('crm.categ_phone1')
-             }
-    self.default_get(cr, uid, fields,{'active_id': ref('crm_phonecall_interviewcall0')})
-    self.action_apply(cr, uid, [ref('crm_phonecall2phonecall_interviewcall0')], {'active_id': ref('crm_phonecall_interviewcall0')})
-- |
-  I click on "Schedule" button of this  wizard with log option.
--
-  !python {model: crm.phonecall2phonecall}: |
-        self.action_apply(cr, uid, [ref('crm_phonecall2phonecall_interviewcall1')], {'active_id': ref('crm_phonecall_interviewcall0')})
diff --git a/addons/crm/test/test_crm_phonecall_case2.yml b/addons/crm/test/test_crm_phonecall_case2.yml
deleted file mode 100644
index 1b07121183c..00000000000
--- a/addons/crm/test/test_crm_phonecall_case2.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-- |
-  I start by creating a new phonecall.
--
-  !record {model: crm.phonecall, id: crm_phonecall_dummycall}:
-    date: !eval time.strftime('%Y-%m-%d 08:00:00')
-    name: Dummy call
-    duration: 0.0
-    section_id: crm.section_sales_department
-    partner_id: base.res_partner_agrolait
-    state: open
--
-  I change Contact Detail of the Partner.
--
-  !python {model: crm.phonecall}: |
-    self.onchange_partner_address_id(cr, uid,[ref("crm_phonecall_dummycall")], ref("base.res_partner_address_8invoice"))
-
--
-  I setting Phone call to Held (Done).
--
-  !python {model: crm.phonecall}: |
-    self.case_close(cr, uid, [ref("crm_phonecall_dummycall")])
--
-  I check that the hone call is in 'Held' state.
--
-  !assert {model: crm.phonecall, id: crm_phonecall_dummycall, string: Phone call Helded}:
-    - state == "done"
diff --git a/addons/crm/test/test_crm_recurrent_meeting.yml b/addons/crm/test/test_crm_recurrent_meeting.yml
deleted file mode 100644
index 297ca8d5e4e..00000000000
--- a/addons/crm/test/test_crm_recurrent_meeting.yml
+++ /dev/null
@@ -1,106 +0,0 @@
--
-  In order to test recurrent meetings in OpenERP, I create meetings with different recurrency.
--
-  I create a customer meeting record with daily recurrency.
-- 
-  !record {model: crm.meeting, id: crm_meeting_pricelistdiscussion0}:
-    categ_id: crm.categ_meet1
-    count: 0.0
-    date: '2011-01-05 00:00:00'
-    date_deadline: '2011-01-05 01:00:00'
-    day: 0.0
-    duration: 1.0
-    end_date: '2011-01-12'
-    end_type: end_date
-    name: Pricelist Discussion
-    recurrency: true
-    recurrent_uid: 0.0
-    rrule: FREQ=DAILY;INTERVAL=1;UNTIL=20110112T235959Z
-    rrule_type: daily
-    sequence: 0.0
-- 
-  I create another meeting record with weekly recurrency.
-- 
-  !record {model: crm.meeting, id: crm_meeting_changesindesigning0}:
-    categ_id: crm.categ_meet2
-    count: 15
-    date: '2011-01-22 11:05:05'
-    date_deadline: '2011-01-22 16:05:05'
-    day: 0.0
-    duration: 5.0
-    email_from: info@opensides.be
-    end_type: count
-    fr: true
-    mo: true
-    name: Changes in Designing
-    partner_address_id: base.res_partner_address_1
-    partner_id: base.res_partner_9
-    recurrency: true
-    recurrent_uid: 0.0
-    rrule: FREQ=WEEKLY;BYDAY=FR,TU,TH,WE,MO;INTERVAL=1;COUNT=15
-    rrule_type: weekly
-    section_id: crm.section_sales_department
-    sequence: 0.0
-    th: true
-    tu: true
-    user_id: base.user_demo
-    we: true
--
-  I create a meeting record with monthly recurrency.
-- 
-  !record {model: crm.meeting, id: crm_meeting_reviewneeds0}:
-    categ_id: crm.categ_meet3
-    count: 0.0
-    date: '2011-01-20 10:02:02'
-    date_deadline: '2011-01-20 16:02:02'
-    day: 15
-    duration: 6.0
-    end_date: '2011-05-31'
-    end_type: end_date
-    name: Review needs
-    partner_address_id: base.res_partner_address_15
-    partner_id: base.res_partner_11
-    recurrency: true
-    recurrent_uid: 0.0
-    rrule: FREQ=MONTHLY;INTERVAL=1;UNTIL=20110531T235959Z;BYMONTHDAY=15
-    rrule_type: monthly
-    section_id: crm.section_sales_department
-    sequence: 0.0
-    user_id: base.user_demo
-- 
-  I create a record for daily scrum meeting.
-- 
-  !record {model: crm.meeting, id: crm_meeting_scrummeeting0}:
-    categ_id: crm.categ_meet2
-    count: 0.0
-    date: '2011-01-06 00:00:00'
-    date_deadline: '2011-01-06 01:00:00'
-    day: 0.0
-    duration: 1.0
-    name: Scrum meeting
-    recurrency: true
-    recurrent_uid: 0.0
-    rrule: FREQ=DAILY;INTERVAL=1
-    rrule_type: daily
-    sequence: 0.0    
--
-  I create a meeting record for yearly recurrency.
-- 
-  !record {model: crm.meeting, id: crm_meeting_updatethedata0}:
-    categ_id: crm.categ_meet2
-    count: 0.0
-    date: '2011-01-18 13:12:49'
-    date_deadline: '2011-01-19 02:30:49'
-    day: 0.0
-    duration: 13.300000000000001
-    end_date: '2015-01-06'
-    end_type: end_date
-    name: Update the data
-    partner_address_id: base.res_partner_address_7
-    partner_id: base.res_partner_4
-    recurrency: true
-    recurrent_uid: 0.0
-    rrule: FREQ=YEARLY;INTERVAL=1;UNTIL=20150106T235959Z
-    rrule_type: yearly
-    section_id: crm.section_sales_department
-    sequence: 0.0
diff --git a/addons/crm/test/test_crm_recurrent_meeting_case2.yml b/addons/crm/test/test_crm_recurrent_meeting_case2.yml
deleted file mode 100644
index b6afeb6906e..00000000000
--- a/addons/crm/test/test_crm_recurrent_meeting_case2.yml
+++ /dev/null
@@ -1,97 +0,0 @@
--
-  In order to test recurrent meetings in OpenERP, I create meetings with different recurrency using different test cases.
--
-  I create a recurrent meeting with daily recurrency and fixed amount of time.
-- 
-  !record {model: crm.meeting, id: crm_meeting_testmeeting0}:
-    count: 5
-    date: '2011-04-13 11:04:00'
-    date_deadline: '2011-04-13 12:04:00'
-    day: 0.0
-    duration: 1.0
-    name: Test Meeting
-    recurrency: true
-    recurrent_uid: 0.0
-    rrule_type: daily
-    sequence: 0.0
--
-  I search for all the recurrent meetings.
--
-  !python {model: crm.meeting}: |
-     meeting_ids = self.search(cr, uid, [('id', 'in', [ref('crm_meeting_testmeeting0')]),('date','>=','2011-03-13'), ('date_deadline', '<=', '2011-05-13')], context={'virtual_id': True})
-     assert len(meeting_ids) == 5, 'Recurrent daily meetings are not created !'
--
-  I create a weekly meeting till a particular end date.
--
-  !record {model: crm.meeting, id: crm_meeting_reviewcodewithprogrammer0}:
-    date: '2011-04-18 11:47:00'
-    date_deadline: '2011-04-18 12:47:00'
-    day: 0.0
-    duration: 1.0
-    end_date: '2011-04-30'
-    end_type: end_date
-    fr: true
-    mo: true
-    th: true
-    tu: true
-    we: true
-    name: Review code with programmer
-    recurrency: true
-    recurrent_uid: 0.0
-    rrule_type: weekly
-    sequence: 0.0
--
-  I search for all the recurrent weekly meetings.
--
-  !python {model: crm.meeting}: |
-     meeting_ids = self.search(cr, uid, [('id', 'in', [ref('crm_meeting_reviewcodewithprogrammer0')]),('date','>=','2011-03-13'), ('date_deadline', '<=', '2011-05-13')], context={'virtual_id': True})
-     assert len(meeting_ids) == 10, 'Recurrent weekly meetings are not created !'
--
-  I want to schedule a meeting every month for Sprint review.
-- 
-  !record {model: crm.meeting, id: crm_meeting_sprintreview0}:
-    count: 12
-    date: '2011-04-01 12:01:00'
-    date_deadline: '2011-04-01 13:01:00'
-    day: 1
-    duration: 1.0
-    name: Sprint Review
-    recurrency: true
-    recurrent_uid: 0.0
-    rrule_type: monthly
-    sequence: 0.0
--
-  I search for all the recurrent monthly meetings.
--
-  !python {model: crm.meeting}: |
-     meeting_ids = self.search(cr, uid, [('id', 'in', [ref('crm_meeting_sprintreview0')]),('date','>=','2011-03-01'), ('date_deadline', '<=', '2012-05-13')], context={'virtual_id': True})
-     assert len(meeting_ids) == 12, 'Recurrent monthly meetings are not created !'
--
-  I change name of my monthly Sprint Review meeting.
--
-  !python {model: crm.meeting}: |
-     from base_calendar import base_calendar
-     base_cal_id = base_calendar.real_id2base_calendar_id(ref('crm_meeting_sprintreview0'), '2011-09-01 13:01:00')
-     self.write(cr, uid, [base_cal_id], {'name': 'Sprint Review for google modules', 'edit_all': True})
--
-  I check whether all the records are edited or not.
--
-  !python {model: crm.meeting}: |
-     meeting_ids = self.search(cr, uid, [('id', 'in', [ref('crm_meeting_sprintreview0')]),('date','>=','2011-03-01'), ('date_deadline', '<=', '2012-05-13')], context={'virtual_id': True})
-     meetings = self.browse(cr, uid, meeting_ids, context)
-     for meeting in meetings:
-        assert meeting.name == 'Sprint Review for google modules', 'Name not changed for id: %s' %meeting.id
--
-  I change description of my weekly meeting Review code with programmer.
--
-  !python {model: crm.meeting}: |
-     from base_calendar import base_calendar
-     base_cal_id = base_calendar.real_id2base_calendar_id(ref('crm_meeting_reviewcodewithprogrammer0'), '2011-04-25 12:47:00')
-     self.write(cr, uid, [base_cal_id], {'description': 'Review code of the module: sync_google_calendar.'})
--
-  I check whether the record is edited perfectly or not.
--
-  !python {model: crm.meeting}: |
-     meeting_ids = self.search(cr, uid, [('recurrent_uid', '=', ref('crm_meeting_reviewcodewithprogrammer0')), ('recurrent_id','=','2011-04-25 12:47:00')], context)
-     assert meeting_ids, 'Meeting is not edited !'
-
diff --git a/addons/crm/test/test_crm_segmentation.yml b/addons/crm/test/test_crm_segmentation.yml
deleted file mode 100644
index 5563f1ce52f..00000000000
--- a/addons/crm/test/test_crm_segmentation.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-- |
-  I will test segmentation which create specific partner categories criteria.
--
-  I create a new segmentation record.
--
-  !record {model: crm.segmentation, id: crm_segmentation_id_0}:
-    categ_id: base.res_partner_category_5
-    exclusif: true
-    name: segment
-    som_interval: 0.0
-    sales_purchase_active : True
--
-  I start the process.
--
-  !python {model: crm.segmentation}: |
-    self.process_start(cr, uid, [ref("crm_segmentation_id_0")],context)
--
-  I continue the segmentation process.
--
-  !python {model: crm.segmentation}: |
-    context.update({'start': True})
-    self.process_continue(cr, uid, [ref("crm_segmentation_id_0")], context)
--
-  I create the segmentation line.
--
-  !record {model: crm.segmentation.line, id: crm_segmentation_line_id_0}:
-    expr_name: sale
-    expr_operator: '>'
-    expr_value: 1000.0
-    name: Rule1
-    operator: or
-    segmentation_id: crm_segmentation_id_0
-
--
-  I check the Segmentation line record.
--
-  !python {model: crm.segmentation.line}: |
-    self.test(cr, uid, [ref("crm_segmentation_line_id_0")],partner_id=0)
diff --git a/addons/crm/test/test_crm_stage_changes.yml b/addons/crm/test/test_crm_stage_changes.yml
deleted file mode 100644
index 391a328bffe..00000000000
--- a/addons/crm/test/test_crm_stage_changes.yml
+++ /dev/null
@@ -1,96 +0,0 @@
--
-  In order to test the changes on stage of a lead or an opportunity with OpenERP,
-  I create some leads and test the stage changes.
--
-  I want to change the probability to 0.0 when the opportunity is marked as lost.
-  So I set its Change probability automatically true.
--
-  !record {model: crm.case.stage, id: crm.stage_lead6}:
-    name: Lost
-    on_change: true
-    probability: 0.0
-    section_ids:
-      - crm.section_sales_department
-    sequence: 0
--
-  I create a lead 'Test Lead1'.
--
-  !record {model: crm.lead, id: crm_lead_openerppresentation0}:
-    categ_id: crm.categ_oppor4
-    day_close: 0.0
-    day_open: 0.0
-    name: Test Lead1
-    planned_revenue: 0.0
-    probability: 10.0
-    section_id: crm.section_sales_department
--
-  I open the lead.
--
-  !python {model: crm.lead}: |
-    self.case_open(cr, uid, [ref('crm_lead_openerppresentation0')])
--
-  I assigning stage.
--
-  !python {model: crm.lead}: |
-    self.onchange_stage_id(cr, uid, [ref('crm_lead_openerppresentation0')], [], context)
--
-  I assigning percent.
--
-  !python {model: crm.lead}: |
-    self.stage_find_percent(cr, uid, 10.0, [])
--
-  I find that this lead can be converted to opportunity.
--
-  !record {model: crm.lead2opportunity.partner, id: crm_lead2opportunity_partner0}:
-    action: 'create'
-    name: 'convert'
--
-  So I convert the lead to opportunity.
--
-  !python {model: crm.lead2opportunity.partner}: |
-    self.action_apply(cr, uid, [ref('crm_lead2opportunity_partner0')], context={'active_ids': [ref('crm_lead_openerppresentation0')]})
--
-  I check that lead is now converted to opportunity.
--
-  !python {model: crm.lead}: |
-    lead = self.browse(cr, uid, ref('crm_lead_openerppresentation0'))
-    assert lead.type == 'opportunity', 'Lead is not converted to opportunity!'
--
-  I mark this opportunity as lost.
--
-  !python {model: crm.lead}: |
-    self.case_mark_lost(cr, uid, [ref('crm_lead_openerppresentation0')])
--
-  I check whether the probability is set according to stage change or not.
--
-  !python {model: crm.lead}: |
-    opportunity = self.browse(cr, uid, ref('crm_lead_openerppresentation0'))
-    assert opportunity.stage_id.id == ref('crm.stage_lead6'), 'Stage is not changed!'
-    assert opportunity.probability == 0.0, 'Probability is wrong!'
--
-  I create one more opportunity.
--
-  !record {model: crm.lead, id: crm_lead_test2}:
-    name: Partner Demo
-    type: opportunity
-    categ_id: crm.categ_oppor3
-    planned_revenue: 50000.0
-    probability: 100.0
-    section_id: crm.section_sales_department
--
-  I open this opportunity.
--
-  !python {model: crm.lead}: |
-    self.case_open(cr, uid, [ref('crm_lead_test2')])
--
-  I mark this opportunity as won.
--
-  !python {model: crm.lead}: |
-    self.case_mark_won(cr, uid, [ref('crm_lead_test2')])
--
-  I check whether the stage is changed to 'Won' and probability is 100.0 or not.
--
-  !python {model: crm.lead}: |
-    opportunity = self.browse(cr, uid, ref('crm_lead_test2'))
-    assert opportunity.stage_id.id == ref('crm.stage_lead5'), 'Stage is not changed!'
-    assert opportunity.probability == 100.0, 'Probability is wrong!'
diff --git a/addons/crm/test/ui/crm_demo.yml b/addons/crm/test/ui/crm_demo.yml
new file mode 100644
index 00000000000..5ef40838466
--- /dev/null
+++ b/addons/crm/test/ui/crm_demo.yml
@@ -0,0 +1,29 @@
+-
+  I create lead record to call of partner onchange, stage onchange and Mailing opt-in onchange method.
+-
+  !record {model: crm.lead, id: crm_case_shelvehouse}:
+    name: 'Need more info about your pc2'
+    partner_id: base.res_partner_theshelvehouse0
+    type: opportunity
+    stage_id: crm.stage_lead1
+    state: draft
+    optin: True
+-
+  I create lead record to call Mailing opt-out onchange method.
+-
+  !record {model: crm.lead, id: crm_case_mediapoleunits0}:
+    name: 'Need 20 Days of Consultancy'
+    type: opportunity
+    state: draft
+    optout: True
+-
+  I create phonecall record to call partner onchange method.
+-
+  !record {model: crm.phonecall, id: crm_case_phone05}:
+    name: 'Bad time'
+    partner_id: base.res_partner_5
+-
+  I setting next stage "New" for the lead.
+-
+  !python {model: crm.lead}: |
+    self.stage_next(cr, uid, [ref("crm_case_qrecorp0")], context={'stage_type': 'lead'})
diff --git a/addons/crm/test/ui/delete_lead.yml b/addons/crm/test/ui/delete_lead.yml
new file mode 100644
index 00000000000..472b22d0d2d
--- /dev/null
+++ b/addons/crm/test/ui/delete_lead.yml
@@ -0,0 +1,5 @@
+-
+  I Unlink the Lead.
+-
+  !python {model: crm.lead}: |
+     self.unlink(cr, uid, [ref("crm_case_qrecorp0")])
diff --git a/addons/crm/test/ui/duplicate_lead.yml b/addons/crm/test/ui/duplicate_lead.yml
new file mode 100644
index 00000000000..6b349ca350c
--- /dev/null
+++ b/addons/crm/test/ui/duplicate_lead.yml
@@ -0,0 +1,5 @@
+-
+  I make duplicate the Lead.
+-
+  !python {model: crm.lead}: |
+    self.copy(cr, uid, ref("crm_case_qrecorp0"))
diff --git a/addons/crm/wizard/__init__.py b/addons/crm/wizard/__init__.py
index 3ebdceda437..2fc39c51505 100644
--- a/addons/crm/wizard/__init__.py
+++ b/addons/crm/wizard/__init__.py
@@ -24,11 +24,11 @@ import crm_add_note
 
 import crm_lead_to_partner
 import crm_lead_to_opportunity
-import crm_opportunity_to_phonecall
 import crm_phonecall_to_phonecall
+import crm_opportunity_to_phonecall
 import crm_phonecall_to_partner
-import crm_phonecall_to_opportunity
 import crm_partner_to_opportunity
+import crm_phonecall_to_opportunity
 
 import crm_merge_opportunities
 
diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index 87ab9229d26..52a79e4514c 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -54,6 +54,8 @@ class crm_lead2opportunity_partner(osv.osv_memory):
         email = False
         for lead in lead_obj.browse(cr, uid, opportunities, context=context):
             partner_id = lead.partner_id and lead.partner_id.id or False
+
+            #TOFIX: use mail.mail_message.to_mail
             email = re.findall(r'([^ ,<@]+@[^> ,]+)', lead.email_from or '')
             email = map(lambda x: "'" + x + "'", email)
 
@@ -93,139 +95,51 @@ class crm_lead2opportunity_partner(osv.osv_memory):
     def view_init(self, cr, uid, fields, context=None):
         """
         This function checks for precondition before wizard executes
-        @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
         """
         if context is None:
             context = {}
         lead_obj = self.pool.get('crm.lead')
-
         for lead in lead_obj.browse(cr, uid, context.get('active_ids', []), context=context):
             if lead.state in ['done', 'cancel']:
                 raise osv.except_osv(_("Warning !"), _("Closed/Cancelled Leads can not be converted into Opportunity"))
         return False
 
-    def _convert(self, cr, uid, ids, lead, partner_id, stage_ids, context=None):
-        leads = self.pool.get('crm.lead')
-        address_id = False
-        if partner_id:
-            address_id = self.pool.get('res.partner.address').search(cr, uid,
-                                                                 [('partner_id', '=', partner_id)],
-                                                                 order='create_date desc',
-                                                                 limit=1)
-        vals = {
-            'planned_revenue': lead.planned_revenue,
-            'probability': lead.probability,
-            'name': lead.name,
-            'partner_id': partner_id,
-            'user_id': (lead.user_id and lead.user_id.id),
-            'type': 'opportunity',
-            'stage_id': stage_ids and stage_ids[0] or False,
-            'date_action': time.strftime('%Y-%m-%d %H:%M:%S'),
-        }
-        if partner_id and address_id:
-            vals['partner_address_id'] = address_id[0]
-        else:
-            vals['partner_address_id'] = False
-
-        lead.write(vals, context=context)
-        text = _('Converted to opportunity')
-        leads.message_append(cr, uid, [lead], text, body_text=text, context=context)
-        if lead.partner_id:
-            msg_ids = [ x.id for x in lead.message_ids]
-            self.pool.get('mail.message').write(cr, uid, msg_ids, {
-                        'partner_id': lead.partner_id.id
-                    }, context=context)
-            leads.log(cr, uid, lead.id, _("Lead '%s' has been converted to an opportunity.") % lead.name)
-
-    def send_mail_to_salesman(self, cr, uid, lead):
-        email_to = lead.user_id and lead.user_id.user_email
-        if not email_to:
-            return False
-        message_pool = self.pool.get('mail.message')
-        email_from = lead.section_id and lead.section_id.user_id and lead.section_id.user_id.user_email or email_to
-        partner = lead.partner_id and lead.partner_id.name or lead.partner_name
-        subject = "lead %s converted into opportunity" % lead.name
-        body = "Info \n Id : %s \n Subject: %s \n Partner: %s \n Description : %s " % (lead.id, lead.name, lead.partner_id.name, lead.description)
-        return message_pool.schedule_with_attach(cr, uid, email_from, [email_to], subject, body)
+    def _convert_opportunity(self, cr, uid, ids, vals, context=None):
+        if context is None:
+            context = {}
+        lead = self.pool.get('crm.lead')
+        partner_id = self._create_partner(cr, uid, ids, context=context)
+        lead_ids = vals.get('lead_ids', [])
+        user_ids = vals.get('user_ids', False)
+        team_id = vals.get('section_id', False)
+        return lead.convert_opportunity(cr, uid, lead_ids, partner_id, user_ids, team_id, context=context) 
+
+    def _merge_opportunity(self, cr, uid, ids, opportunity_ids, action='merge', context=None):
+        #TOFIX: is it usefully ?
+        if context is None:
+            context = {}
+        merge_opportunity = self.pool.get('crm.merge.opportunity')
+        res = False
+        #If we convert in mass, don't merge if there is no other opportunity but no warning
+        if action == 'merge' and (len(opportunity_ids) > 1 or not context.get('mass_convert') ):
+            self.write(cr, uid, ids, {'opportunity_ids' : [(6,0, [opportunity_ids[0].id])]}, context=context)
+            context.update({'lead_ids' : record_id, "convert" : True})
+            res = merge_opportunity.merge(cr, uid, data.opportunity_ids, context=context)
+        return res
 
     def action_apply(self, cr, uid, ids, context=None):
         """
         This converts lead to opportunity and opens Opportunity view
-        @param ids: ids of the leads to convert to opportunities
-
-        @return : View dictionary opening the Opportunity form view
         """
         if not context:
             context = {}
-
-        record_id = context and context.get('active_ids') or False
-        if not record_id:
-            return {'type': 'ir.actions.act_window_close'}
-
-        leads = self.pool.get('crm.lead')
-        models_data = self.pool.get('ir.model.data')
-
-        # Get Opportunity views
-        result = models_data._get_id(
-            cr, uid, 'crm', 'view_crm_case_opportunities_filter')
-        opportunity_view_search = models_data.browse(
-            cr, uid, result, context=context).res_id
-        opportunity_view_form = models_data._get_id(
-            cr, uid, 'crm', 'crm_case_form_view_oppor')
-        opportunity_view_tree = models_data._get_id(
-            cr, uid, 'crm', 'crm_case_tree_view_oppor')
-        if opportunity_view_form:
-            opportunity_view_form = models_data.browse(
-                cr, uid, opportunity_view_form, context=context).res_id
-        if opportunity_view_tree:
-            opportunity_view_tree = models_data.browse(
-                cr, uid, opportunity_view_tree, context=context).res_id
-
-        for lead in leads.browse(cr, uid, record_id, context=context):
-            if lead.section_id:
-                stage_ids = self.pool.get('crm.case.stage').search(cr, uid, [('sequence','>=',1), ('section_ids','=', lead.section_id.id)])
-            else:
-                stage_ids = self.pool.get('crm.case.stage').search(cr, uid, [('sequence','>=',1)])
-
-            data = self.browse(cr, uid, ids[0], context=context)
-
-
-            if data.action == 'create':
-                partner_ids = []
-                partner_ids = self._create_partner(cr, uid, ids, context=context)
-                partner_id = partner_ids and partner_ids[0]
-            elif data.action == 'exist':
-                partner_id = data.partner_id and data.partner_id.id
-            else:
-                partner_id = False
-
-            self._convert(cr, uid, ids, lead, partner_id, stage_ids, context=context)
-            self.send_mail_to_salesman(cr, uid, lead)
-            #If we convert in mass, don't merge if there is no other opportunity but no warning
-            if data.name == 'merge' and (len(data.opportunity_ids) > 1 or not context.get('mass_convert') ):
-                merge_obj = self.pool.get('crm.merge.opportunity')
-                self.write(cr, uid, ids, {'opportunity_ids' : [(6,0, [data.opportunity_ids[0].id])]}, context=context)
-                context.update({'lead_ids' : record_id, "convert" : True})
-                return merge_obj.merge(cr, uid, data.opportunity_ids, context=context)
-
-        return {
-            'name': _('Opportunity'),
-            'view_type': 'form',
-            'view_mode': 'form,tree',
-            'res_model': 'crm.lead',
-            'domain': [('type', '=', 'opportunity')],
-            'res_id': int(lead.id),
-            'view_id': False,
-            'views': [(opportunity_view_form, 'form'),
-                      (opportunity_view_tree, 'tree'),
-                      (False, 'calendar'), (False, 'graph')],
-            'type': 'ir.actions.act_window',
-            'search_view_id': opportunity_view_search
-        }
+        
+        lead = self.pool.get('crm.lead')
+        lead_ids = context.get('active_ids', [])
+        data = self.browse(cr, uid, ids, context=context)[0]
+        self._convert_opportunity(cr, uid, ids, {'lead_ids': lead_ids}, context=context)
+        self._merge_opportunity(cr, uid, ids, data.opportunity_ids, data.action, context=context)
+        return lead.redirect_opportunity_view(cr, uid, lead_ids[0], context=context)
 
 crm_lead2opportunity_partner()
 
@@ -240,55 +154,19 @@ class crm_lead2opportunity_mass_convert(osv.osv_memory):
             'section_id': fields.many2one('crm.case.section', 'Sales Team'),
 
     }
-
-    def mass_convert(self, cr, uid, ids, context=None):
-        lead_obj = self.pool.get('crm.lead')
-        if not context:
-            context = {}
-
-        active_ids = context.get('active_ids')
+    def _convert_opportunity(self, cr, uid, ids, vals, context=None):
         data = self.browse(cr, uid, ids, context=context)[0]
-
-        salesteam = data.section_id and data.section_id.id
+        salesteam_id = data.section_id and data.section_id.id or False
+        salesman = []
         if data.user_ids:
-            salesmans = map(lambda x : x.id, data.user_ids)
-            index = 0
-        else:
-            salesmans = False
-
-        for lead_id in active_ids:
-            value = {}
-            if salesteam:
-                value['section_id'] = salesteam
-            if salesmans:
-                value['user_id'] = salesmans[index]
-                index += 1
-                index = index < len(salesmans) and index or 0
-            if value:
-                lead_obj.write(cr, uid, [lead_id], value, context=context)
-
-            context['active_ids'] = [lead_id]
-            value = self.default_get(cr, uid, ['partner_id', 'opportunity_ids'], context=context)
-            value['opportunity_ids'] = [(6, 0, value['opportunity_ids'])]
-            self.write(cr, uid, ids, value, context=context)
-
-            self.action_apply(cr, uid, ids, context=context)
-
-
-
-        models_data = self.pool.get('ir.model.data')
-        result = models_data._get_id(cr, uid, 'crm', 'view_crm_case_opportunities_filter')
-        opportunity_view_search = models_data.browse(cr, uid, result, context=context).res_id
-
-        return {
-            'name': _('Opportunity'),
-            'view_type': 'form',
-            'view_mode': 'tree,form',
-            'res_model': 'crm.lead',
-            'domain': [('type', '=', 'opportunity'), ('id', 'in', active_ids)],
-            'type': 'ir.actions.act_window',
-            'search_view_id': opportunity_view_search,
-        }
+            salesman = [x.id for x in data.user_ids]
+        vals.update({'user_ids': salesman, 'section_id': salesteam_id})
+        return super(crm_lead2opportunity_mass_convert, self)._convert_opportunity(cr, uid, ids, vals, context=context)
 
+    def mass_convert(self, cr, uid, ids, context=None):
+        value = self.default_get(cr, uid, ['partner_id', 'opportunity_ids'], context=context)
+        value['opportunity_ids'] = [(6, 0, value['opportunity_ids'])]
+        self.write(cr, uid, ids, value, context=context)
+        return self.action_apply(cr, uid, ids, context=context)
 crm_lead2opportunity_mass_convert()
 # 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
index 833c04c3575..5f8453768c0 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
@@ -65,6 +65,15 @@
 	              </form>
 	          </field>
 	       </record>
+
+        <record id="action_crm_lead2opportunity_partner" 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.lead2opportunity.partner</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="view_crm_lead2opportunity_partner"/>
+            <field name="target">new</field>
+        </record>
 	       
 	      <act_window id="action_crm_send_mass_convert"
             multi="True"
diff --git a/addons/crm/wizard/crm_lead_to_partner.py b/addons/crm/wizard/crm_lead_to_partner.py
index 861472949e2..c424d511639 100644
--- a/addons/crm/wizard/crm_lead_to_partner.py
+++ b/addons/crm/wizard/crm_lead_to_partner.py
@@ -21,11 +21,9 @@
 
 from osv import osv, fields
 from tools.translate import _
-import re
 
 class crm_lead2partner(osv.osv_memory):
     """ Converts lead to partner """
-
     _name = 'crm.lead2partner'
     _description = 'Lead to Partner'
 
@@ -35,171 +33,89 @@ class crm_lead2partner(osv.osv_memory):
                                     'Action', required=True),
         'partner_id': fields.many2one('res.partner', 'Partner'),
     }
-
     def view_init(self, cr, uid, fields, context=None):
         """
         This function checks for precondition before wizard executes
-        @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
-
         """
-
-        lead_obj = self.pool.get('crm.lead')
+        if context is None:
+            context = {}
+        model = context.get('active_model')
+        model = self.pool.get(model)
         rec_ids = context and context.get('active_ids', [])
-        for lead in lead_obj.browse(cr, uid, rec_ids, context=context):
-            if lead.partner_id:
+        for this in model.browse(cr, uid, rec_ids, context=context):
+            if this.partner_id:
                 raise osv.except_osv(_('Warning !'),
-                        _('A partner is already defined on this lead.'))
+                        _('A partner is already defined.'))
+
+    def _select_partner(self, cr, uid, context=None):
+        if context is None:
+            context = {}
+        lead = self.pool.get('crm.lead')
+        partner = self.pool.get('res.partner')
+        lead_ids = list(context and context.get('active_ids', []) or [])
+        if not len(lead_ids):
+            return False
+        this = lead.browse(cr, uid, lead_ids[0], context=context)
+        # Find partner address matches the email_from of the lead
+        res = lead.message_partner_by_email(cr, uid, this.email_from, context=context)
+        partner_id = res.get('partner_id', False)      
+        # Find partner name that matches the name of the lead
+        if not partner_id and this.partner_name:
+            partner_ids = partner.search(cr, uid, [('name', '=', this.partner_name)], context=context)
+            if partner_ids and len(partner_ids):
+               partner_id = partner_ids[0]
+        return partner_id
 
     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')
-        partner_obj = self.pool.get('res.partner')
-        partner_id = False
-
-        data = list(context and context.get('active_ids', []) or [])
-        res = super(crm_lead2partner, self).default_get(cr, uid, fields, context=context)
-        for lead in lead_obj.browse(cr, uid, data, context=context):
-            partner_ids = []
-            # Find partner address matches the email_from of the lead
-            email = re.findall(r'([^ ,<@]+@[^> ,]+)', lead.email_from or '')
-            email = map(lambda x: "'" + x + "'", email)
-            if email:
-                cr.execute("""select partner_id from res_partner_address
-                                where
-                                substring(email from '([^ ,<@]+@[^> ,]+)') in (%s)""" % (','.join(email)))
-                partner_ids = map(lambda x: x[0], cr.fetchall())
-
-            # Find partner name that matches the name of the lead
-            if not partner_ids and lead.partner_name:
-                partner_ids = partner_obj.search(cr, uid, [('name', '=ilike', lead.partner_name)], context=context)
-
-            partner_id = partner_ids and partner_ids[0] or False
-            if 'partner_id' in fields:
-                res.update({'partner_id': partner_id})
-            if 'action' in fields:
-                res.update({'action': partner_id and 'exist' or 'create'})
-            if 'opportunity_ids' in fields:
-                res.update({'opportunity_ids': data})
-
+        res = super(crm_lead2partner, self).default_get(cr, uid, fields, context=context)        
+        partner_id = self._select_partner(cr, uid, context=context)
+
+        if 'partner_id' in fields:
+            res.update({'partner_id': partner_id})
+        if 'action' in fields:
+            res.update({'action': partner_id and 'exist' or 'create'})
+            
         return res
 
     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 context is None:
-            context = {}
-
         view_obj = self.pool.get('ir.ui.view')
-        view_id = view_obj.search(cr, uid, [('model', '=', 'crm.lead2partner'), \
-                                     ('name', '=', 'crm.lead2partner.view')])
+        view_id = view_obj.search(cr, uid, [('model', '=', self._name), \
+                                     ('name', '=', self._name+'.view')])
         return {
             'view_mode': 'form',
             'view_type': 'form',
             'view_id': view_id or False,
-            'res_model': 'crm.lead2partner',
+            'res_model': self._name,
             '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 context is None:
             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
-        rec_ids = context and context.get('active_ids', [])
-
-        for data in self.browse(cr, uid, ids, context=context):
-            for lead in lead_obj.browse(cr, uid, rec_ids, context=context):
-                if data.action == 'create':
-                    partner_id = partner_obj.create(cr, uid, {
-                        'name': lead.partner_name or lead.contact_name or lead.name,
-                        'user_id': lead.user_id.id,
-                        'comment': lead.description,
-                        'address': []
-                    })
-                    contact_obj.create(cr, uid, {
-                        'partner_id': partner_id,
-                        'name': lead.contact_name,
-                        'phone': lead.phone,
-                        'mobile': lead.mobile,
-                        'email': lead.email_from,
-                        'fax': lead.fax,
-                        'title': lead.title and lead.title.id or False,
-                        'function': lead.function,
-                        '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
-                self.assign_partner(cr, uid, lead.id, partner_id)
-                partner_ids.append(partner_id)
-        return partner_ids
-
-
-    def assign_partner(self, cr, uid, lead_id, partner_id):
-        self.pool.get("crm.lead").write(cr, uid, [lead_id], {'partner_id' : partner_id})
-
+        lead = self.pool.get('crm.lead')
+        lead_ids = context and context.get('active_ids') or []
+        data = self.browse(cr, uid, ids, context=context)[0]
+        partner_id = data.partner_id and data.partner_id.id or False
+        partner_ids = lead.convert_partner(cr, uid, lead_ids, data.action, partner_id, context=context)
+        return partner_ids[lead_ids[0]]
 
     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 context is None:
-            context = {}
-
-        partner_ids = self._create_partner(cr, uid, ids, context=context)
-        return {'type': 'ir.actions.act_window_close'}
+        partner_id = self._create_partner(cr, uid, ids, context=context)
+        return self.pool.get('res.partner').redirect_partner_form(cr, uid, partner_id, context=context)
 
 crm_lead2partner()
 
diff --git a/addons/crm/wizard/crm_merge_opportunities.py b/addons/crm/wizard/crm_merge_opportunities.py
index f092d6ad0b6..381bb9871ea 100644
--- a/addons/crm/wizard/crm_merge_opportunities.py
+++ b/addons/crm/wizard/crm_merge_opportunities.py
@@ -26,195 +26,16 @@ class crm_merge_opportunity(osv.osv_memory):
     _name = 'crm.merge.opportunity'
     _description = 'Merge two Opportunities'
 
-    def _get_first_not_null_id(self, attr, ops, oldest):
-        if hasattr(oldest, attr) and getattr(oldest, attr):
-            return getattr(oldest, attr).id
-        
-        for op in ops:
-            if hasattr(op, attr) and getattr(op, attr):
-                return getattr(op, attr).id
-        return False
-
-    def _get_first_not_null(self, attr, ops, oldest):
-        if hasattr(oldest, attr) and getattr(oldest, attr):
-            return getattr(oldest, attr)
-        
-        for op in ops:
-            if hasattr(op, attr) and getattr(op, attr):
-                return getattr(op, attr)
-        return False
-
-    def _concat_all(self, attr, ops):
-        return ', '.join([getattr(op, attr) for op in ops if hasattr(op, attr) and getattr(op, attr)])
-
-
-    def get_attachments(self, cr, uid, id, context=None):
-        proxy = self.pool.get('ir.attachment')
-        ids = proxy.search(cr, uid, [('res_model', '=', 'crm.lead'), ('res_id', '=', id)], context=context)
-        return proxy.browse(cr, uid, ids, context=context)
-
-    def find_oldest(self, cr, uid, op_ids, context=None):
-        if not context:
-            context = {}
-        ids = [op_id.id for op_id in op_ids]
-        if context.get('convert'):
-            ids = list(set(ids) - set(context.get('lead_ids', False)) )
-        lead_obj = self.pool.get('crm.lead')
-        op_id = lead_obj.search(cr, uid, [('id', 'in', ids)], order='create_date' , context=context)
-        if not op_id:
-            return False
-        opps = lead_obj.browse(cr, uid, [op_id[0]], context=context)
-        return opps[0]
-
-    def _update_data(self, op_ids, oldest_opp):
-        data = {
-                'partner_id': self._get_first_not_null_id('partner_id', op_ids, oldest_opp),  # !!
-                'title': self._get_first_not_null_id('title', op_ids, oldest_opp),
-                'name' : self._get_first_not_null('name', op_ids, oldest_opp),  #not lost
-                'categ_id' : self._get_first_not_null_id('categ_id', op_ids, oldest_opp), # !!
-                'channel_id' : self._get_first_not_null_id('channel_id', op_ids, oldest_opp), # !!
-                'city' : self._get_first_not_null('city', op_ids, oldest_opp),  # !!
-                'company_id' : self._get_first_not_null_id('company_id', op_ids, oldest_opp), #!!
-                'contact_name' : self._get_first_not_null('contact_name', op_ids, oldest_opp), #not lost
-                'country_id' : self._get_first_not_null_id('country_id', op_ids, oldest_opp), #!!
-                'partner_address_id' : self._get_first_not_null_id('partner_address_id', op_ids, oldest_opp), #!!
-                'type_id' : self._get_first_not_null_id('type_id', op_ids, oldest_opp), #!!
-                'user_id' : self._get_first_not_null_id('user_id', op_ids, oldest_opp), #!!
-                'section_id' : self._get_first_not_null_id('section_id', op_ids, oldest_opp), #!!
-                'state_id' : self._get_first_not_null_id('state_id', op_ids, oldest_opp),
-                'description' : self._concat_all('description', op_ids),  #not lost
-                'email' : self._get_first_not_null('email', op_ids, oldest_opp), # !!
-                'fax' : self._get_first_not_null('fax', op_ids, oldest_opp),
-                'mobile' : self._get_first_not_null('mobile', op_ids, oldest_opp),
-                'partner_name' : self._get_first_not_null('partner_name', op_ids, oldest_opp),
-                'phone' : self._get_first_not_null('phone', op_ids, oldest_opp),
-                'probability' : self._get_first_not_null('probability', op_ids, oldest_opp),
-                'planned_revenue' : self._get_first_not_null('planned_revenue', op_ids, oldest_opp),
-                'street' : self._get_first_not_null('street', op_ids, oldest_opp),
-                'street2' : self._get_first_not_null('street2', op_ids, oldest_opp),
-                'zip' : self._get_first_not_null('zip', op_ids, oldest_opp),
-                'state' : 'open',
-                'create_date' : self._get_first_not_null('create_date', op_ids, oldest_opp),
-                'date_action_last': self._get_first_not_null('date_action_last', op_ids, oldest_opp),
-                'date_action_next': self._get_first_not_null('date_action_next', op_ids, oldest_opp),
-                'email_from' : self._get_first_not_null('email_from', op_ids, oldest_opp),
-                'email_cc' : self._get_first_not_null('email_cc', op_ids, oldest_opp),
-                'partner_name' : self._get_first_not_null('partner_name', op_ids, oldest_opp),
-        }
-        return data
-
-    def merge(self, cr, uid, op_ids, context=None):
-        """
-            :param opp_ids: list of opportunities ids to merge
-        """
-        opp_obj = self.pool.get('crm.lead')
-        message_obj = self.pool.get('mail.message')
-
-        lead_ids = context and context.get('lead_ids', []) or []
-
-        if len(op_ids) <= 1:
-            raise osv.except_osv(_('Warning !'),_('Please select more than one opportunities.'))
-
-        opportunities = opp_obj.browse(cr, uid, lead_ids, context=context)
-        opportunities_list = list(set(op_ids) - set(opportunities))
-        oldest_opp = self.find_oldest(cr, uid, op_ids, context=context)
-        if opportunities :
-            first_opportunity = opportunities[0]
-            tail_opportunities = opportunities_list
-        else:
-            first_opportunity = opportunities_list[0]
-            tail_opportunities = opportunities_list[1:]
-        data = self._update_data(op_ids, oldest_opp)
-
-        #copy message into the first opportunity + merge attachement
-        count = 1
-        first_attachments = self.get_attachments(cr, uid, first_opportunity, context=context)
-        for opp in tail_opportunities:
-            attachments = self.get_attachments(cr, uid, opp, context=context)
-            for first in first_attachments:
-                for attachment in attachments:
-                    if attachment.name == first.name:
-                        values = dict(
-                            name = "%s (%s)" % (attachment.name, count,),
-                            res_id = first_opportunity.id,
-                        )
-                        attachment.write(values)
-                        count+=1
-                    
-            for history in opp.message_ids:
-                message_obj.write(cr, uid, history.id, {'res_id': first_opportunity.id, 'subject' : _("From %s : %s") % (opp.name, history.subject) }, context=context)
-
-        #Notification about loss of information
-        details = []
-        subject = ['Merged opportunities :']
-        for opp in op_ids:
-            subject.append(opp.name)
-            details.append(_('Merged Opportunity: %s\n  Partner: %s\n  Stage: %s\n  Section: %s\n   Salesman: %s\n   Category: %s\n   Channel: %s\n   Company: %s\n   Contact name: %s\n   Email: %s\n   Phone number: %s\n   Fax: %s\n   Mobile: %s\n   State: %s\n   Description: %s\n   Probability: %s\n   Planned revennue: %s\n   Country: %s\n   City: %s\n   Street: %s\n   Street 2: %s\n   Zip 2: %s')  % ( opp.name, opp.partner_id.name or '',
-                        opp.stage_id.name or '',
-                        opp.section_id.name or '',
-                        opp.user_id.name or '',
-                        opp.categ_id.name or '',
-                        opp.channel_id.name or '',
-                        opp.company_id.name or '',
-                        opp.contact_name or '',
-                        opp.email_from or '',
-                        opp.phone or '',
-                        opp.fax or '',
-                        opp.mobile or '',
-                        opp.state_id.name or '',
-                        opp.description or '',
-                        opp.probability or '',
-                        opp.planned_revenue or '',
-                        opp.country_id.name or '',
-                        opp.city or '',
-                        opp.street or '',
-                        opp.street2 or '',
-                        opp.zip or '',
-                        ))
-        subject = subject[0] + ", ".join(subject[1:])
-        details = "\n\n".join(details)
-
-        opp_obj.message_append(cr, uid, [first_opportunity], subject, body_text=details)
-        #data.update({'message_ids' : [(6, 0 ,self._concat_o2m('message_ids', op_ids))]})
-        opp_obj.write(cr, uid, [first_opportunity.id], data, context=context)
-        unlink_ids = map(lambda x: x.id, tail_opportunities)
-        opp_obj.unlink(cr, uid, unlink_ids, context=context)
-
-        models_data = self.pool.get('ir.model.data')
-
-        # Get Opportunity views
-        opportunity_view_form = models_data._get_id(
-            cr, uid, 'crm', 'crm_case_form_view_oppor')
-        opportunity_view_tree = models_data._get_id(
-            cr, uid, 'crm', 'crm_case_tree_view_oppor')
-        if opportunity_view_form:
-            opportunity_view_form = models_data.browse(
-                cr, uid, opportunity_view_form, context=context).res_id
-        if opportunity_view_tree:
-            opportunity_view_tree = models_data.browse(
-                cr, uid, opportunity_view_tree, context=context).res_id
-
-        return {
-                'name': _('Opportunity'),
-                'view_type': 'form',
-                'view_mode': 'tree, form',
-                'res_model': 'crm.lead',
-                'domain': [('type', '=', 'opportunity')],
-                'res_id': int(first_opportunity.id),
-                'view_id': False,
-                'views': [(opportunity_view_form, 'form'),
-                          (opportunity_view_tree, 'tree'),
-                          (False, 'calendar'), (False, 'graph')],
-                'type': 'ir.actions.act_window',
-        }
-
-
     def action_merge(self, cr, uid, ids, context=None):
-        obj_opportunity = self.browse(cr, uid, ids[0], context=context)
-        op_ids = obj_opportunity.opportunity_ids
-        self.write(cr, uid, ids, {'opportunity_ids' : [(6,0, [op_ids[0].id])]}, context=context)
-        context['lead_ids'] = [op_ids[0].id]
-        return self.merge(cr, uid, op_ids, context)
+        lead = self.pool.get('crm.lead')
+        record = self.browse(cr, uid, ids[0], context=context)
+        opportunities = record.opportunity_ids
+        #TOFIX: why need to check lead_ids here
+        lead_ids = [opportunities[0].id]
+        self.write(cr, uid, ids, {'opportunity_ids' : [(6,0, lead_ids)]}, context=context)
+        context['lead_ids'] = lead_ids
+        merge_id = lead.merge_opportunity(cr, uid, [x.id for x in opportunities], context=context)
+        return lead.redirect_opportunity_view(cr, uid, merge_id, context=context)
 
     _columns = {
         'opportunity_ids' : fields.many2many('crm.lead',  'merge_opportunity_rel', 'merge_id', 'opportunity_id', 'Opportunities', domain=[('type', '=', 'opportunity')]),
@@ -223,13 +44,6 @@ class crm_merge_opportunity(osv.osv_memory):
     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 users 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.
         """
         record_ids = context and context.get('active_ids', False) or False
         res = super(crm_merge_opportunity, self).default_get(cr, uid, fields, context=context)
diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall.py b/addons/crm/wizard/crm_opportunity_to_phonecall.py
index b0bfbf3b817..630f9a7e889 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall.py
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall.py
@@ -21,43 +21,16 @@
 
 from osv import osv, fields
 from tools.translate import _
-import pprint
-pp = pprint.PrettyPrinter(indent=4)
 
 import time
 
 class crm_opportunity2phonecall(osv.osv_memory):
     """Converts Opportunity to Phonecall"""
-
+    _inherit = 'crm.phonecall2phonecall'
     _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"),
-        'contact_name':fields.char('Contact', size=64),
-        'phone':fields.char('Phone', size=64),
-        'partner_id' : fields.many2one('res.partner', "Partner"),
-        'date': fields.datetime('Date'),
-        'section_id': fields.many2one('crm.case.section', 'Sales Team'),
-        'categ_id': fields.many2one('crm.case.categ', 'Category',  \
-                        domain="['|',('section_id','=',False),('section_id','=',section_id),\
-                        ('object_id.model', '=', 'crm.phonecall')]"),
-        'action': fields.selection([('schedule','Schedule a call'), ('log','Log a call')], 'Action', required=True),
-        'note':fields.text('Note'), 
-    }
-
     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.lead')
         categ_id = False
         data_obj = self.pool.get('ir.model.data')
@@ -66,8 +39,8 @@ class crm_opportunity2phonecall(osv.osv_memory):
             categ_id = data_obj.browse(cr, uid, res_id, context=context).res_id
 
         record_ids = context and context.get('active_ids', []) or []
-        res = super(crm_opportunity2phonecall, self).default_get(cr, uid, fields, context=context)
-        res.update({'action': 'log', 'date': time.strftime('%Y-%m-%d %H:%M:%S')})
+        res = {}
+        res.update({'action': 'schedule', 'date': time.strftime('%Y-%m-%d %H:%M:%S')})
         for opp in opp_obj.browse(cr, uid, record_ids, context=context):
             if 'name' in fields:
                 res.update({'name': opp.name})
@@ -87,84 +60,20 @@ class crm_opportunity2phonecall(osv.osv_memory):
                 res.update({'phone': opp.phone or (opp.partner_address_id and opp.partner_address_id.phone 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
-        """
+    def action_schedule(self, cr, uid, ids, context=None):
         value = {}
-        record_ids = context and context.get('active_ids', []) or []
-
-        phonecall_obj = self.pool.get('crm.phonecall')
-        opp_obj = self.pool.get('crm.lead')
-        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'])
-
-        data_obj = self.pool.get('ir.model.data')
-
-        # Select the view
-        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):
-                vals = {
-                        'name' : opp.name,
-                        'case_id' : opp.id,
-                        'user_id' : this.user_id and this.user_id.id or False,
-                        'categ_id' : this.categ_id.id,
-                        'description' : opp.description or False,
-                        'date' : this.date,
-                        'section_id' : this.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,
-                        'opportunity_id': opp.id,
-                        'date_open': time.strftime('%Y-%m-%d %H:%M:%S')
-                }
-                
-                new_case = phonecall_obj.create(cr, uid, vals, context=context)
-               
-                if this.action == 'log':
-                    phonecall_obj.case_close(cr, uid, [new_case])
-                    return {'type': 'ir.actions.act_window_close'}
-
-            value = {
-                'name': _('Phone Call'),
-                'domain': "[('user_id','=',%s),('opportunity_id','=',%s)]" % (uid,opp.id),
-                'view_type': 'form',
-                'view_mode': 'tree,form',
-                'res_model': 'crm.phonecall',
-                'res_id' : new_case,
-                'views': [(id3, 'form'), (id2, 'tree'), (False, 'calendar')],
-                'type': 'ir.actions.act_window',
-                'search_view_id': res['res_id'],
-            }
-        return value
+        if context is None:
+            context = {}
+        phonecall = self.pool.get('crm.phonecall')
+        opportunity_ids = context and context.get('active_ids') or []
+        opportunity = self.pool.get('crm.lead')
+        data = self.browse(cr, uid, ids, context=context)[0]
+        call_ids = opportunity.schedule_phonecall(cr, uid, opportunity_ids, data.date, data.name, \
+                data.note, data.phone, data.contact_name, data.user_id and data.user_id.id or False, \
+                data.section_id and data.section_id.id or False, \
+                data.categ_id and data.categ_id.id or False, \
+                action=data.action, context=context)
+        return phonecall.redirect_phonecall_view(cr, uid, call_ids[opportunity_ids[0]], context=context)
 
 crm_opportunity2phonecall()
 
diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
index 980b93500d2..a12bd92115c 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
@@ -16,24 +16,19 @@
                     <field name="name"/>
                     <field name="date" string="Planned Date" attrs="{'invisible': [('action','=','log')]}"/>
                     <newline/>
-                    <group colspan="4">
-                        <field name="partner_id" readonly="True"/>
-                        <field name="categ_id" string="Type" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>
-                        <field name="contact_name"/>
-                        <field name="phone"/>
-                    </group>
-                    <group colspan="4">
-                        <field name="user_id" attrs="{'invisible': [('action','=','log')]}"/>                    
-                        <field name="section_id" widget="selection" attrs="{'invisible': [('action','=','log')]}"/>
-                    </group>
-                    <group colspan="4">
-                        <field name="note"/>
-                    </group>
+                    <field name="partner_id" readonly="True"/>
+                    <field name="categ_id" string="Type" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>
+                    <field name="contact_name"/>
+                    <field name="phone"/>
+                    <field name="user_id" attrs="{'invisible': [('action','=','log')]}"/>                    
+                    <field name="section_id" widget="selection" attrs="{'invisible': [('action','=','log')]}"/>
+                    <separator string="Notes" colspan="4"/>
+                    <field name="note" colspan="4" nolabel="1"/>
                     <separator string="" colspan="4"/>
                     <group colspan="4" col="3">
                         <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
-                       	<button name="action_apply" type="object" string="Log call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'log')]}" />
-                        <button name="action_apply" type="object" string="Schedule call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'schedule')]}" />
+                       	<button name="action_schedule" type="object" string="Log call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'log')]}" />
+                        <button name="action_schedule" type="object" string="Schedule call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'schedule')]}" />
                     </group>
                 </form>
             </field>
diff --git a/addons/crm/wizard/crm_partner_to_opportunity.py b/addons/crm/wizard/crm_partner_to_opportunity.py
index 4d24bd5b78f..6322d0341c1 100644
--- a/addons/crm/wizard/crm_partner_to_opportunity.py
+++ b/addons/crm/wizard/crm_partner_to_opportunity.py
@@ -35,16 +35,15 @@ class crm_partner2opportunity(osv.osv_memory):
         'partner_id': fields.many2one('res.partner', 'Partner'),
     }
 
+    def action_cancel(self, cr, uid, ids, context=None):
+        """
+        Closes Partner 2 Opportunity
+        """
+        return {'type':'ir.actions.act_window_close'}
+
     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.
         """
         partner_obj = self.pool.get('res.partner')
         data = context and context.get('active_ids', []) or []
@@ -58,56 +57,17 @@ class crm_partner2opportunity(osv.osv_memory):
         return res
 
     def make_opportunity(self, cr, uid, ids, context=None):
-        """
-        @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 context: A standard dictionary for contextual values
-        """
-
-        data = context and context.get('active_ids', []) or []
-        make_opportunity = self.pool.get('crm.partner2opportunity')
-        data_obj = self.pool.get('ir.model.data')
-        part_obj = self.pool.get('res.partner')
-        categ_obj = self.pool.get('crm.case.categ')
-        case_obj = self.pool.get('crm.lead')
-        
-        for make_opportunity_obj in make_opportunity.browse(cr, uid, ids, context=context):
-            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
-
-            address = part_obj.address_get(cr, uid, data)
-            categ_ids = categ_obj.search(cr, uid, [('object_id.model','=','crm.lead')])
-
-            opp_id = case_obj.create(cr, uid, {
-                'name' : make_opportunity_obj.name,
-                'planned_revenue' : make_opportunity_obj.planned_revenue,
-                'probability' : make_opportunity_obj.probability,
-                'partner_id' : make_opportunity_obj.partner_id.id,
-                'partner_address_id' : address['default'],
-                'categ_id' : categ_ids and categ_ids[0] or '',
-                'state' :'draft',
-                'type': 'opportunity'
-            })
-            value = {
-                'name' : _('Opportunity'),
-                'view_type' : 'form',
-                'view_mode' : 'form,tree',
-                'res_model' : 'crm.lead',
-                'res_id' : opp_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
+        partner_ids = context and context.get('active_ids', []) or []
+        partner = self.pool.get('res.partner')
+        lead = self.pool.get('crm.lead')
+        data = self.browse(cr, uid, ids, context=context)[0]
+        opportunity_ids = partner.make_opportunity(cr, uid, partner_ids,
+            data.name,
+            data.planned_revenue,
+            data.probability,
+        )
+        opportunity_id = opportunity_ids[partner_ids[0]]
+        return lead.redirect_opportunity_view(cr, uid, opportunity_id, context=context)
 
 crm_partner2opportunity()
 
diff --git a/addons/crm/wizard/crm_partner_to_opportunity_view.xml b/addons/crm/wizard/crm_partner_to_opportunity_view.xml
index 1111bbbbc50..f75f3d5b90e 100644
--- a/addons/crm/wizard/crm_partner_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_partner_to_opportunity_view.xml
@@ -16,7 +16,7 @@
             <field name="probability"/>
                 <separator string="" colspan="4" />
                   <group col="4" colspan="4">
-                      <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
+                      <button special="cancel" string="Cancel" icon="gtk-cancel"/>
                       <button name="make_opportunity" string="Create Opportunity" type="object" icon="gtk-ok"/>
                   </group>
               </form>
diff --git a/addons/crm/wizard/crm_phonecall_to_opportunity.py b/addons/crm/wizard/crm_phonecall_to_opportunity.py
index ffab1867ebb..7305cbd8b5f 100644
--- a/addons/crm/wizard/crm_phonecall_to_opportunity.py
+++ b/addons/crm/wizard/crm_phonecall_to_opportunity.py
@@ -26,97 +26,31 @@ class crm_phonecall2opportunity(osv.osv_memory):
     """ Converts Phonecall to Opportunity"""
 
     _name = 'crm.phonecall2opportunity'
+    _inherit = 'crm.partner2opportunity'
     _description = 'Phonecall To Opportunity'
 
-    def action_cancel(self, cr, uid, ids, context=None):
-        """
-        Closes Phonecall to Opportunity form
-        """
-
-        return {'type':'ir.actions.act_window_close'}
-
-
-    def action_apply(self, cr, uid, ids, context=None):
+    def make_opportunity(self, cr, uid, ids, context=None):
         """
         This converts Phonecall to Opportunity and opens Phonecall view
         """
-        record_id = context and context.get('active_id', False) or False
-        if record_id:
-            opp_obj = self.pool.get('crm.lead')
-            phonecall_obj = self.pool.get('crm.phonecall')
-            case = phonecall_obj.browse(cr, uid, record_id, context=context)
-            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):
-                address = None
-                if this.partner_id:
-                    address_id = self.pool.get('res.partner').address_get(cr, uid, [this.partner_id.id])
-                    if address_id['default']:
-                        address = self.pool.get('res.partner.address').browse(cr, uid, address_id['default'], context=context)
-                new_opportunity_id = opp_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,
-                                'partner_address_id': address and address.id, 
-                                'phone': address and address.phone,
-                                'mobile': address and address.mobile,
-                                'section_id': case.section_id and case.section_id.id or False,
-                                'description': case.description or False,
-                                'phonecall_id': case.id,
-                                'priority': case.priority,
-                                'type': 'opportunity', 
-                                'phone': case.partner_phone or False,
-                            })
-                vals = {
-                            'partner_id': this.partner_id.id,
-                            'opportunity_id' : new_opportunity_id,
-                            }
-                phonecall_obj.write(cr, uid, [case.id], vals)
-                phonecall_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.lead',
-            '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'),
-    }
+        if not len(ids):
+            return False
+        call_ids = context and context.get('active_ids', False) or False
+        this = self.browse(cr, uid, ids[0], context=context)
+        if not call_ids:
+            return {}
+        opportunity = self.pool.get('crm.lead')
+        phonecall = self.pool.get('crm.phonecall')
+        opportunity_ids = phonecall.convert_opportunity(cr, uid, call_ids, this.name, this.partner_id and this.partner_id.id or False, \
+            this.planned_revenue, this.probability, context=context)
+        return opportunity.redirect_opportunity_view(cr, uid, opportunity_ids[call_ids[0]], context=context)
 
     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.
         """
         record_id = context and context.get('active_id', False) or False
-        res = super(crm_phonecall2opportunity, self).default_get(cr, uid, fields, context=context)
+        res = {}
 
         if record_id:
             phonecall = self.pool.get('crm.phonecall').browse(cr, uid, record_id, context=context)
diff --git a/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml b/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml
index ea024831b54..d3c59f89433 100644
--- a/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml
@@ -19,7 +19,7 @@
                     <group colspan="4" col="3" >
                     	<label string=" " />
                         <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
-                        <button name="action_apply" type="object" string="_Convert" icon="gtk-convert" />
+                        <button name="make_opportunity" type="object" string="_Convert" icon="gtk-convert" />
                     </group>
                 </form>
             </field>
diff --git a/addons/crm/wizard/crm_phonecall_to_partner.py b/addons/crm/wizard/crm_phonecall_to_partner.py
index 38e673108e4..0fa077bbf42 100644
--- a/addons/crm/wizard/crm_phonecall_to_partner.py
+++ b/addons/crm/wizard/crm_phonecall_to_partner.py
@@ -26,42 +26,12 @@ class crm_phonecall2partner(osv.osv_memory):
     """ Converts phonecall to partner """
 
     _name = 'crm.phonecall2partner'
+    _inherit = 'crm.lead2partner'
     _description = 'Phonecall 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 view_init(self, cr, uid, fields, context=None):
-        """
-        This function checks for precondition before wizard executes
-        @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
-
-        """
-        phonecall_obj = self.pool.get('crm.phonecall')
-        rec_ids = context and context.get('active_ids', [])
-        for phonecall in phonecall_obj.browse(cr, uid, rec_ids, context=context):
-            if phonecall.partner_id:
-                 raise osv.except_osv(_('Warning !'),
-                    _('A partner is already defined on this phonecall.'))
-
+    
     def _select_partner(self, cr, uid, context=None):
         """
         This function Searches for Partner from selected phonecall.
-        @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 phonecall.
         """
         if context is None:
             context = {}
@@ -75,7 +45,7 @@ class crm_phonecall2partner(osv.osv_memory):
         for phonecall in phonecall_obj.browse(cr, uid, rec_ids, context=context):
             partner_ids = partner_obj.search(cr, uid, [('name', '=', phonecall.name or phonecall.name)])
             if not partner_ids and phonecall.email_from:
-                address_ids = contact_obj.search(cr, uid, [('email', '=', phonecall.email_from)])
+                address_ids = contact_obj.search(cr, uid, ['|', ('phone', '=', phonecall.partner_phone), ('mobile','=',phonecall.partner_mobile)])
                 if address_ids:
                     addresses = contact_obj.browse(cr, uid, address_ids)
                     partner_ids = addresses and [addresses[0].partner_id.id] or False
@@ -83,117 +53,20 @@ class crm_phonecall2partner(osv.osv_memory):
             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 Phonecall to Partner's IDs
-        @param context: A standard dictionary for contextual values
-
-        @return : Dictionary value for next form.
-        """
-
-        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',
-            '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 Phonecall to Partner's IDs
-        @param context: A standard dictionary for contextual values
-
-        @return : Dictionary {}.
         """
         if context is None:
             context = {}
+        phonecall = self.pool.get('crm.phonecall')
 
-        phonecall_obj = self.pool.get('crm.phonecall')
-        partner_obj = self.pool.get('res.partner')
-        contact_obj = self.pool.get('res.partner.address')
-        partner_ids = []
-        contact_id = False
-
-        rec_ids = context and context.get('active_ids', [])
-
-        for data in self.browse(cr, uid, ids, context=context):
-            for phonecall in phonecall_obj.browse(cr, uid, rec_ids, context=context):
-                if data.action == 'create':
-                    partner_id = partner_obj.create(cr, uid, {
-                        'name': phonecall.name or phonecall.name,
-                        'user_id': phonecall.user_id.id,
-                        'comment': phonecall.description,
-                    })
-                    contact_id = contact_obj.create(cr, uid, {
-                        'partner_id': partner_id,
-                        'name': phonecall.name,
-                        'phone': phonecall.partner_phone,
-                    })
-
-                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})
-                phonecall_obj.write(cr, uid, [phonecall.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 Phonecall to Partner's IDs
-        @param context: A standard dictionary for contextual values
-
-        @return : Dictionary value for created Partner form.
-        """
-
-        partner_ids = self._create_partner(cr, uid, ids, context=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
+        data = self.browse(cr, uid, ids, context=context)[0]
+        call_ids = context and context.get('active_ids') or []
+        partner_id = data.partner_id and data.partner_id.id or False
+        partner_ids = phonecall.convert_partner(cr, uid, call_ids, data.action, partner_id, context=context)
+        return partner_ids[call_ids[0]]
 
 crm_phonecall2partner()
 
diff --git a/addons/crm/wizard/crm_phonecall_to_phonecall.py b/addons/crm/wizard/crm_phonecall_to_phonecall.py
index 2872acad4eb..d68591ab0b7 100644
--- a/addons/crm/wizard/crm_phonecall_to_phonecall.py
+++ b/addons/crm/wizard/crm_phonecall_to_phonecall.py
@@ -25,108 +25,50 @@ from tools.translate import _
 import time
 
 class crm_phonecall2phonecall(osv.osv_memory):
-    """ Converts Phonecall to Phonecall"""
-
     _name = 'crm.phonecall2phonecall'
     _description = 'Phonecall To Phonecall'
 
+    _columns = {
+        'name' : fields.char('Call summary', size=64, required=True, select=1),
+        'user_id' : fields.many2one('res.users',"Assign To"),
+        'contact_name':fields.char('Contact', size=64),
+        'phone':fields.char('Phone', size=64),
+        'categ_id': fields.many2one('crm.case.categ', 'Category', \
+                domain="['|',('section_id','=',False),('section_id','=',section_id),\
+                ('object_id.model', '=', 'crm.phonecall')]"), 
+        'date': fields.datetime('Date'),
+        'section_id':fields.many2one('crm.case.section','Sales Team'),
+        'action': fields.selection([('schedule','Schedule a call'), ('log','Log a call')], 'Action', required=True),
+        'partner_id' : fields.many2one('res.partner', "Partner"),
+        'note':fields.text('Note')
+    }
+
+
     def action_cancel(self, cr, uid, ids, context=None):
         """
         Closes Phonecall 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 Phonecall 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 Phonecall 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 Phonecall to Phonecall IDs
-        @param context: A standard dictionary for contextual values
-
-        @return : Dictionary value for created Opportunity form
-        """
-        res = {}
-        record_id = context and context.get('active_id', False) or False
-        phonecall_obj = self.pool.get('crm.phonecall')
-
-        if record_id:
-            data_obj = self.pool.get('ir.model.data')
-
-            # Get Phonecall views
-            result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_phonecalls_filter')
-            res = data_obj.read(cr, uid, result, ['res_id'])
-            id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_phone_form_view')
-            id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_phone_tree_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
-
-            phonecall = phonecall_obj.browse(cr, uid, record_id, context=context)
-
-            for this in self.browse(cr, uid, ids, context=context):
-                values = {
-                        'name': this.name,
-                        'user_id': this.user_id and this.user_id.id,
-                        'categ_id': this.categ_id.id,
-                        'section_id': this.section_id.id or (phonecall.section_id and phonecall.section_id.id),
-                        'description': phonecall.description or '',
-                        'partner_id': phonecall.partner_id.id,
-                        'partner_address_id': phonecall.partner_address_id.id,
-                        'partner_mobile': phonecall.partner_mobile or False,
-                        'priority': phonecall.priority,
-                        'partner_phone': phonecall.partner_phone or False,
-                        'date': this.date
-                          }
-                phonecall_id = phonecall_obj.create(cr, uid, values, context=context)
-                if this.action == 'schedule':
-                    phonecall_obj.case_open(cr, uid, [phonecall_id])
-                elif this.action == 'log':
-                    phonecall_obj.case_close(cr, uid, [phonecall_id])
-            
-            res = {
-                'name': _('Phone Call'),
-                'view_type': 'form',
-                'view_mode': 'form',
-                'res_model': 'crm.phonecall',
-                'view_id': False,
-                'views': [(id2, 'form'), (id3, 'tree'), (False, 'calendar'), (False, 'graph')],
-                'type': 'ir.actions.act_window',
-                'res_id': phonecall_id, 
-                'domain': [('id', '=', phonecall_id)], 
-                'search_view_id': res['res_id']
-                }
-        return res
-
-    _columns = {
-                'name' : fields.char('Call summary', size=64, required=True, select=1),
-                'user_id' : fields.many2one('res.users',"Assign To"),
-                'categ_id': fields.many2one('crm.case.categ', 'Category', \
-                        domain="['|',('section_id','=',False),('section_id','=',section_id),\
-                        ('object_id.model', '=', 'crm.phonecall')]"), 
-                'date': fields.datetime('Date'),
-                'section_id':fields.many2one('crm.case.section','Sales Team'),
-                'action': fields.selection([('schedule','Schedule a call'), ('log','Log a call')], 'Action', required=True),
-                'partner_id' : fields.many2one('res.partner', "Partner"),
-                }
-
+    def action_schedule(self, cr, uid, ids, context=None):
+        value = {}
+        if context is None:
+            context = {}
+        phonecall = self.pool.get('crm.phonecall')
+        phonecall_ids = context and context.get('active_ids') or []
+        for this in self.browse(cr, uid, ids, context=context):
+            phocall_ids = phonecall.schedule_another_phonecall(cr, uid, phonecall_ids, this.date, this.name, \
+                    this.user_id and this.user_id.id or False, \
+                    this.section_id and this.section_id.id or False, \
+                    this.categ_id and this.categ_id.id or False, \
+                    action=this.action, context=context)
+
+        return phonecall.redirect_phonecall_view(cr, uid, phocall_ids[phonecall_ids[0]], context=context)
+    
     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.
+        
         """
         res = super(crm_phonecall2phonecall, self).default_get(cr, uid, fields, context=context)
         record_id = context and context.get('active_id', False) or False
diff --git a/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml b/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
index 794634da4f1..572fbb8b9a1 100644
--- a/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
@@ -22,8 +22,8 @@
                         <separator string=" " colspan="4"/>
                         <group colspan="4" col="3" >
                             <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
-                            <button name="action_apply" type="object" string="Log call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'log')]}" />
-                            <button name="action_apply" type="object" string="Schedule call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'schedule')]}" />
+                            <button name="action_schedule" type="object" string="Log call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'log')]}" />
+                            <button name="action_schedule" type="object" string="Schedule call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'schedule')]}" />
                         </group>
                 </form>
             </field>