diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 35870801ae6..0b170a85924 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -86,6 +86,7 @@ Create dashboard for CRM that includes:
         'wizard/crm_send_email_view.xml',
         'wizard/crm_forward_to_partner_view.xml',
         'wizard/crm_custom_create_menu_view.xml',
+        'wizard/crm_merge_opportunities_view.xml',
 
         'crm_view.xml',
 
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 3ccfb1b1e18..411ae9ec58d 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -35,6 +35,8 @@
                             <field name="date_action"/>
                             <field name="title_action"/>
                             <field name="priority" string="Priority"/>
+                            <button string="Merge with Other Opportunity"
+                                name="%(merge_opportunity_act)d" icon="gtk-add" type="action" />
                             <newline/>
                             <field name="type" invisible="1"/>
                         </group>
diff --git a/addons/crm/wizard/__init__.py b/addons/crm/wizard/__init__.py
index 8c6a650b8da..70dd08a23cf 100644
--- a/addons/crm/wizard/__init__.py
+++ b/addons/crm/wizard/__init__.py
@@ -31,6 +31,8 @@ import crm_phonecall_to_opportunity
 import crm_partner_to_opportunity
 
 import crm_custom_create_menu
+import crm_merge_opportunities
+
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/crm/wizard/crm_merge_opportunities.py b/addons/crm/wizard/crm_merge_opportunities.py
new file mode 100644
index 00000000000..a086bae028f
--- /dev/null
+++ b/addons/crm/wizard/crm_merge_opportunities.py
@@ -0,0 +1,135 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv, fields
+from tools.translate import _
+
+class crm_merge_opportunity(osv.osv_memory):
+    """Merge two Opportunities"""
+
+    _name = 'crm.merge.opportunity'
+    _description = 'Merge two Opportunities'
+
+    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
+
+        """
+        record_id = context and context.get('active_id', False) or False
+        if record_id:
+            opp_obj = self.pool.get('crm.lead')
+            opp = opp_obj.browse(cr, uid, record_id, context=context)
+            if opp.type != 'opportunity':
+                raise osv.except_osv(_('Warning!'), _('Can only perform this Operation for "Opportunities".'))
+            if not opp.partner_id:
+                raise osv.except_osv(_('Warning!'), _('Opportunity must have Partner assigned before merging with other Opportunity.'))
+            #Search for Opportunity for the same partner
+            opp_ids = opp_obj.search(cr, uid, [('partner_id', '=', opp.partner_id.id), ('type', '=', 'opportunity')])
+            if not len(opp_ids) > 1:
+                raise osv.except_osv(_('Warning!'), _("There are no other Opportunities for the partner '%s'.") % (opp.partner_id.name))
+        pass
+
+
+    def action_merge(self, cr, uid, ids, context=None):
+        """
+        This function merges two opportunities
+        @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 Opportunity IDs
+        @param context: A standard dictionary for contextual values
+
+        @return : Dictionary value for created Opportunity form
+        """
+        record_id = context and context.get('active_id', False) or False
+        if record_id:
+            opp_obj = self.pool.get('crm.lead')
+            message_obj = self.pool.get('mailgate.message')
+            current_opp = opp_obj.browse(cr, uid, record_id, context=context)
+
+            for this in self.browse(cr, uid, ids, context=context):
+                for opp in this.opportunity_ids:
+                    opp_obj.write(cr, uid, opp.id, {
+                                    'stage_id': opp.stage_id.id or current_opp.stage_id.id or False,
+                                    'priority': opp.priority or current_opp.priority,
+                                    'email_from': opp.email_from or current_opp.email_from,
+                                    'phone': opp.phone or current_opp.phone,
+                                    'section_id': opp.section_id.id or current_opp.section_id.id or False,
+                                    'categ_id': opp.categ_id.id or current_opp.categ_id.id or False,
+                                    'description': (opp.description or '') + '\n' + (current_opp.description or ''),
+                                    'partner_name': opp.partner_name or current_opp.partner_name,
+                                    'title': opp.title.id or current_opp.title.id or False,
+                                    'function': opp.function or current_opp.function,
+                                    'street': opp.street or current_opp.street,
+                                    'street2': opp.street2 or current_opp.street2,
+                                    'zip': opp.zip or current_opp.zip,
+                                    'city': opp.city or current_opp.city,
+                                    'country_id': opp.country_id.id or current_opp.country_id.id or False,
+                                    'state_id': opp.state_id.id or current_opp.state_id.id or False,
+                                    'fax': opp.fax or current_opp.fax,
+                                    'mobile': opp.mobile or current_opp.mobile,
+                                    'email_cc': ','.join(filter(lambda x: x, [opp.email_cc, current_opp.email_cc]))
+                                })
+                    for history in current_opp.message_ids:
+                        if history.history:
+                            new_history = message_obj.copy(cr, uid, history.id, default={'res_id': opp.id})
+                    opp_obj._history(cr, uid, [current_opp], _('Merged into Opportunity: %s') % (opp.id))
+        opp_obj.case_cancel(cr, uid, [record_id])
+
+        return {}
+
+    _columns = {
+        'opportunity_ids' : fields.many2many('crm.lead',  'merge_opportunity_rel', 'merge_id', 'opportunity_id', 'Opportunities', domain=[('type', '=', 'opportunity')]),
+    }
+
+    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_merge_opportunity, self).default_get(cr, uid, fields, context=context)
+
+        if record_id:
+            opp_obj = self.pool.get('crm.lead')
+            opp = opp_obj.browse(cr, uid, record_id, context=context)
+            opp_ids = opp_obj.search(cr, uid, [('partner_id', '=', opp.partner_id.id), ('type', '=', 'opportunity')])
+            # Removing current opportunity
+            opp_ids.remove(record_id)
+
+            if 'opportunity_ids' in fields:
+                res.update({'opportunity_ids': opp_ids})
+        return res
+
+crm_merge_opportunity()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/wizard/crm_merge_opportunities_view.xml b/addons/crm/wizard/crm_merge_opportunities_view.xml
new file mode 100644
index 00000000000..56d336cf629
--- /dev/null
+++ b/addons/crm/wizard/crm_merge_opportunities_view.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+        <!-- Merge Opportunities  -->
+
+        <record model="ir.ui.view" id="merge_opportunity_form">
+            <field name="name">crm.merge.opportunity.form</field>
+            <field name="model">crm.merge.opportunity</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Merge Opportunities">
+                    <separator string="Select Opportunities" colspan="4"/>
+                    <field name="opportunity_ids" nolabel="1" colspan="4" width="550" height="300"/>
+                    <separator colspan="4"/>
+                    <group col="4" colspan="4">
+                        <label string="" colspan="2"/>
+                        <button string="_Cancel" icon="gtk-cancel" special="cancel" />
+                        <button name="action_merge" type="object"
+                                string="_Merge" icon="gtk-ok" />
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <!--  Merge Opportunities action -->
+
+        <record model="ir.actions.act_window" id="merge_opportunity_act">
+            <field name="name">Merge Opportunities</field>
+            <field name="res_model">crm.merge.opportunity</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="merge_opportunity_form"/>
+            <field name="target">new</field>
+        </record>
+
+        <!--    This will also come in Leads Form as Lead and Opportunity are same object-->
+        <!-- <record id="merge_opportunity_act_value" model="ir.values">
+            <field name="model_id" ref="model_crm_lead" />
+            <field name="object" eval="1" />
+            <field name="name">Merge Opportunities</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('merge_opportunity_act'))"/>
+            <field name="key">action</field>
+            <field name="model">crm.lead</field>
+        </record> -->
+
+    </data>
+</openerp>
\ No newline at end of file