diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index db815e39540..2c89b467576 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -52,7 +52,7 @@
                         <h2>
                             <field name="date" string="Start Date" required="1"
                             class="oe_edit_only oe_inline"/>
-                            at <field name="location" class="oe_inline" />
+                            <label string="at" class="oe_edit_only oe_inline"/> <field name="location" class="oe_edit_only oe_inline" />
                         </h2>
                     </group>
                     <group>
diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index fa605a99b8e..c12a62f2bc0 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -101,7 +101,7 @@
                         name="%(crm.crm_case_categ_phone_create_partner)d" 
                         context="{'search_default_partner_id': [active_id], 'default_duration': 1.0, 'default_partner_id': active_id}" />
                     <button type="action" string="Opportunity"
-                        name="%(crm.action_tree_view_crm_partner2opportunity)d" />
+                        name="%(crm.crm_case_category_act_oppor11)d" context="{'search_default_partner_id': [active_id]}"/>
                 </xpath>
             </field>
         </record>
diff --git a/addons/crm/wizard/crm_partner_to_opportunity_view.xml b/addons/crm/wizard/crm_partner_to_opportunity_view.xml
index 94a1995a407..c7641d8f64d 100644
--- a/addons/crm/wizard/crm_partner_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_partner_to_opportunity_view.xml
@@ -33,36 +33,6 @@
             <field name="target">new</field>
      </record>
 
-
-        <!-- partner To Opportunity tree -->
-
-          <record id="tree_view_crm_partner2opportunity" model="ir.ui.view">
-          <field name="name">crm.crm.partner2opportunity.tree</field>
-          <field name="model">crm.partner2opportunity</field>
-          <field name="type">tree</field>
-          <field name="arch" type="xml">
-              <tree string="Create Opportunity">
-                    <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                    <button name="make_opportunity" string="Create Opportunity" type="object" icon="gtk-ok"/>
-                    <field name="name"/>
-                    <field name="partner_id"/>
-                    <field name="planned_revenue"/>
-                    <field name="probability"/>
-              </tree>
-          </field>
-       </record>
-
-<!-- partner To Opportunity Action  tree view-->
-
-      <record model="ir.actions.act_window" id="action_tree_view_crm_partner2opportunity">
-            <field name="name">Opportunity</field>
-            <field name="res_model">crm.lead</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="context">{'default_partner_id': active_id, 'default_type': 'opportunity'}</field>
-     </record>
-
-
         <!-- partner To Opportunity wizard -->
 
      <act_window id="crm_partner2opportunity"