diff --git a/addons/crm/crm_opportunity_menu.xml b/addons/crm/crm_opportunity_menu.xml
index 0d81a3bc3ec..cb24990416f 100644
--- a/addons/crm/crm_opportunity_menu.xml
+++ b/addons/crm/crm_opportunity_menu.xml
@@ -25,11 +25,10 @@
      <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</field>
-          <field name="domain">['|',('type','=','opportunity'),('state','=','draft')]</field>
-          <field name="context">{'search_default_user_id':uid,'search_default_current':1}</field>
+          <field name="view_mode">tree,form,graph,calendar</field>
+          <field name="domain">[('type','=','opportunity')]</field>
+          <field name="context">{'search_default_user_id':uid,'search_default_current':1, 'default_type': 'opportunity'}</field>
           <field name="view_id" ref="crm_case_tree_view_oppor"/>
-          <field name="context">{'search_default_current':1, 'default_type': 'opportunity'}</field>
           <field name="search_view_id" ref="crm.view_crm_case_opportunities_filter"/>
      </record>
 
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 95ab6a1d0df..9f1b7904448 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -32,7 +32,7 @@
             id="menu_crm_opportunity_stage_act" name="Stages"
             parent="menu_crm_config_opportunity" />
 
-		<!-- Opportunity Resource Type Form View -->
+        <!-- Opportunity Resource Type Form View -->
 
         <record id="crm_opportunity_resource_act" model="ir.actions.act_window">
             <field name="name">Opportunity Resource Type</field>
@@ -183,10 +183,10 @@
                                     icon="gtk-undo" type="action" />
                                 </form>
                                 <tree string="Communication history">
-		                            <field name="date"/>
-		                            <field name="email_from" />
-		                            <field name="email_to"/>
-		                            <field name="description"/>
+                                    <field name="date"/>
+                                    <field name="email_from" />
+                                    <field name="email_to"/>
+                                    <field name="description"/>
                                 </tree>
                             </field>
                             <button colspan="2" string="Send New Email"
@@ -246,8 +246,8 @@
                         <field name="create_date"/>
                         <field name="name" string="Opportunity"/>
                         <field name="partner_id"/>
+                        <field name="date_action"/>
                         <field name="stage_id"/>
-                        <field name="categ_id" invisible="1" groups="base.group_extended"/>
                         <button name="stage_previous" string="Previous"
                             states="open,pending" type="object" icon="gtk-go-back" />
                         <button name="stage_next" string="Next"
@@ -255,10 +255,7 @@
                             icon="gtk-go-forward" />
                         <field name="planned_revenue" sum="Total of Planned Revenue"/>
                         <field name="probability" widget="progressbar" avg="Avg. of Probability"/>
-                        <field name="date_action"/>
-                        <field name="section_id" groups="base.group_extended"/>
                         <field name="user_id"/>
-                        <field name="priority"/>
                         <field name="state"/>
                         <button name="case_open" string="Open"
                             states="draft,pending" type="object"