diff --git a/addons/crm/__terp__.py b/addons/crm/__terp__.py
index ee02b30bd66..d01f083c2d9 100644
--- a/addons/crm/__terp__.py
+++ b/addons/crm/__terp__.py
@@ -81,8 +81,8 @@ between mails and Open ERP.""",
         'crm_claims_menu.xml', 
 
 #        'crm_report_view.xml', 
-      #  'crm_helpdesk_view.xml',
-       # 'crm_helpdesk_menu.xml', 
+        'crm_helpdesk_view.xml',
+        'crm_helpdesk_menu.xml', 
         #'crm_report.xml', 
         'security/crm_security.xml', 
         #'security/ir.model.access.csv', 
diff --git a/addons/crm/crm_helpdesk_view.xml b/addons/crm/crm_helpdesk_view.xml
index c8fb0bc3c07..112440cef68 100644
--- a/addons/crm/crm_helpdesk_view.xml
+++ b/addons/crm/crm_helpdesk_view.xml
@@ -7,7 +7,7 @@
     # ------------------------------------------------------
     <record id="crm_helpdesk_categ_action" model="ir.actions.act_window">
         <field name="name">Helpdesk Categories</field>
-        <field name="res_model">crm.helpdesk.categ</field>
+        <field name="res_model">crm.case.categ</field>
         <field name="view_type">form</field>
  		<field name="view_id" ref="crm.crm_case_categ_tree-view"/>        
         <field name="domain">[('object_id.model', '=', 'crm.helpdesk')]</field>	
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 05572e8ef89..d8fcf059254 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -56,7 +56,7 @@
                         <field name="phonecall_id" select="1"/>
                     </group>
 					 <button string="Schedule a Phone Call"
-                        name="%(wizard_crm_opportunity_reschedule_phone_call)d" icon="gtk-redo" type="action" />                        
+                        name="%(wizard_crm_opportunity_reschedule_phone_call)d" icon="gtk-redo" type="action"  attrs="{'invisible':[('phonecall_id','!=',False)]}" />                        
                 </group>
                 <notebook colspan="4">
                 <page string="Description">
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 5d9208a887b..606b8d81b8e 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -45,7 +45,7 @@
                 <field name="partner_id" string="Partner"/>
                 <field name="partner_address_id" string="Contact"/>
                 <field name="opportunity_id"/>
-                <button string="Opportunity" name="%(wizard_crm_phonecall_opportunity_set)d"  type="action"/>
+                <button string="Opportunity" name="%(wizard_crm_phonecall_opportunity_set)d"  type="action" attrs="{'invisible':[('opportunity_id','!=',False)]}" />                       
                 <button string="Meeting"
                         name="%(wizard_crm_phonecall_meeting_set)d"  type="action" />
             </tree>
@@ -64,7 +64,7 @@
                 <field name="partner_address_id" string="Contact"/>
                 <group col="2">    
                 <field name="opportunity_id"/>
-                <button string="Opportunity" name="%(wizard_crm_phonecall_opportunity_set)d"  type="action"/>
+                <button string="Opportunity" name="%(wizard_crm_phonecall_opportunity_set)d"  type="action" attrs="{'invisible':[('opportunity_id','!=',False)]}" />            
                 <button string="Meeting"
                         name="%(wizard_crm_phonecall_meeting_set)d"  type="action" />
                 </group>        
@@ -82,7 +82,7 @@
                     <field name="name" string="Subject"/>
                     <field name="section_id" colspan="1" widget="selection"/>
                     <field name="user_id" string="Assigned to" select="2"/>
-                    <button string="Convert to Opportunity" name="%(wizard_crm_phonecall_opportunity_set)d" icon="gtk-index" type="action"/>
+                    <button string="Convert to Opportunity" name="%(wizard_crm_phonecall_opportunity_set)d" icon="gtk-index" type="action" attrs="{'invisible':[('opportunity_id','!=',False)]}" />   
                     <newline/>
                     <field name="date" string="Planned Date"/>
                     <field name="duration"/>
@@ -102,7 +102,7 @@
                     <field name="active" string="Reminder"/>                    
                     <group colspan="2" col="3">
                         <field name="partner_id" string="Partner"/>
-                        <button string="Convert to Partner" icon="terp-crm" name="%(wizard_crm_phonecall_partner_create)d" type="action" attrs="{'invisible':[('partner_id','!=',False)]}"/>
+                        <button string="Convert to Partner" icon="terp-crm" name="%(wizard_crm_phonecall_partner_create)d" type="action" attrs="{'invisible':[('partner_id','!=',False)]}"  />   
                     </group>
                     <field name="partner_address_id" string="Contact"/>
                     <field name="partner_phone"/>