diff --git a/addons/crm/__terp__.py b/addons/crm/__terp__.py
index 8b317e532f9..0e3fef9603a 100644
--- a/addons/crm/__terp__.py
+++ b/addons/crm/__terp__.py
@@ -47,9 +47,9 @@ between mails and Open ERP.""",
     'depends': ['base'],
     'init_xml': ['crm_data.xml'],
     'update_xml': [
-       'crm_wizard.xml',
         'crm_view.xml',
         'crm_report.xml',
+        'crm_wizard.xml',
         'security/crm_security.xml',
         'security/ir.model.access.csv'
     ],
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 11fe6569ccc..b0f85a9e52a 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -42,8 +42,8 @@ MAX_LEVEL = 15
 AVAILABLE_STATES = [
     ('draft','Draft'),
     ('open','Open'),
-    ('cancel', 'Cancelled'),
-    ('done', 'Closed'),
+    ('cancel', 'Cancel'),
+    ('done', 'Close'),
     ('pending','Pending')
 ]
 
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 1a4a9f76546..e9b23b8b50d 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -380,14 +380,10 @@
                            </group>
                            <field name="history_line" colspan="4" nolabel="1" mode="form,tree">
                                <form string="Communication history">
-                                   <group col="7" colspan="4">
+                                   <group col="6" colspan="4">
                                        <field name="date"/>
                                        <field name="email"/>
                                        <field name="canal_id"/>
-                                       <button
-                                   	string="Add a CC"
-		                                   	name="%(wizard_crm_case_email_add_cc)d"
-		                                   	icon="gtk-add" type="action"/>
                                    </group>
                                    <newline/>
                                    <field name="description" colspan="4" nolabel="1"/>
diff --git a/addons/crm/crm_wizard.xml b/addons/crm/crm_wizard.xml
index f4873431789..9e96530a782 100644
--- a/addons/crm/crm_wizard.xml
+++ b/addons/crm/crm_wizard.xml
@@ -10,11 +10,5 @@
 
         <menuitem action="wizard_case_section_menu" id="menu_wizard_case_section_menu" parent="crm.menu_crm_configuration" type="wizard"/>
         
-        <wizard string="Add a CC"
-           model="crm.case"
-           menu = "False"
-           name="crm.case.email.add_cc"
-           id="wizard_crm_case_email_add_cc"/> 
-
     </data>
 </openerp>
diff --git a/addons/crm/wizard/__init__.py b/addons/crm/wizard/__init__.py
index 55f1d9a3a7c..b29cbe06375 100644
--- a/addons/crm/wizard/__init__.py
+++ b/addons/crm/wizard/__init__.py
@@ -23,7 +23,6 @@ import crm_wizard
 import wizard_crm_send_email
 import wizard_crm_new_send_email
 import wizard_fetch_mail
-import wizard_add_cc
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/crm/wizard/wizard_crm_new_send_email.py b/addons/crm/wizard/wizard_crm_new_send_email.py
index 9cb3d87466c..b905d31aa8e 100644
--- a/addons/crm/wizard/wizard_crm_new_send_email.py
+++ b/addons/crm/wizard/wizard_crm_new_send_email.py
@@ -28,7 +28,7 @@ import ir
 import pooler
 import tools
 from tools.translate import _
-import base64
+
 
 email_send_form = '''<?xml version="1.0"?>
 <form string="Mass Mailing">
@@ -39,30 +39,17 @@ email_send_form = '''<?xml version="1.0"?>
     <field name="subject"/>
     <newline/>
     <field name="text" />
-    <newline/>
-    <field name="doc1" />
-    <newline/>
-    <field name="doc2" />
-    <newline/>
-    <field name="doc3" />
 </form>'''
 
 email_send_fields = {
     'to': {'string':"To", 'type':'char', 'size':64, 'required':True},
     'cc': {'string':"CC", 'type':'char', 'size':128,},
     'subject': {'string':'Subject', 'type':'char', 'size':128, 'required':True},
-    'text': {'string':'Message', 'type':'text_tag', 'required':True},
-    'doc1' :  {'string':"Attachment1", 'type':'binary'},
-    'doc2' :  {'string':"Attachment2", 'type':'binary'},
-    'doc3' :  {'string':"Attachment3", 'type':'binary'},
+    'text': {'string':'Message', 'type':'text_tag', 'required':True}
 }
 
 # this sends an email to ALL the addresses of the selected partners.
 def _mass_mail_send(self, cr, uid, data, context):
-    
-    attach = filter(lambda x: x, [data['form']['doc1'],  data['form']['doc2'],  data['form']['doc3']])
-    attach = map(lambda x: x and ('Attachment'+str(attach.index(x)+1), base64.decodestring(x)), attach)
-
     pool = pooler.get_pool(cr.dbname)
     case_pool=pool.get('crm.case')
 
@@ -77,19 +64,14 @@ def _mass_mail_send(self, cr, uid, data, context):
     body = data['form']['text']
     if case.user_id.signature:
         body += '\n\n%s' % (case.user_id.signature)
-    flag = tools.email_send(
+    tools.email_send(
         case.user_id.address_id.email,
         emails,
         data['form']['subject'],
-        body,
-        attach=attach,
+        case_pool.format_body(body),
         reply_to=case.section_id.reply_to,
         tinycrm=str(case.id)
     )
-    if flag:
-        raise wizard.except_wizard(_('Message!'),("Email Successfully Sent..!!"))   
-    else:
-        raise wizard.except_wizard(_('Warning!'),("Email is not sent Successfully"))   
     return {}
 
 def _get_info(self, cr, uid, data, context):
diff --git a/addons/crm_configuration/__terp__.py b/addons/crm_configuration/__terp__.py
index dd50d455600..ad223e81625 100644
--- a/addons/crm_configuration/__terp__.py
+++ b/addons/crm_configuration/__terp__.py
@@ -48,7 +48,8 @@ meetings, eso.
         'crm_fund_view.xml',
         'crm_claims_view.xml',
         'crm_phonecall_view.xml',
-        'crm_report_view.xml'
+        'crm_report_view.xml',
+        'crm_helpdesk_view.xml'
     ],
     'update_xml': ['security/ir.model.access.csv', 'process/crm_configuration_process.xml'],
     'demo_xml': [],
diff --git a/addons/crm_configuration/crm_bugs_menu.xml b/addons/crm_configuration/crm_bugs_menu.xml
index 0b5922e1407..218acd0e420 100644
--- a/addons/crm_configuration/crm_bugs_menu.xml
+++ b/addons/crm_configuration/crm_bugs_menu.xml
@@ -34,7 +34,7 @@
         ALL BUGS
     -->
     <record model="ir.actions.act_window" id="crm_case_categ_act0">
-        <field name="name">Bugs</field>
+        <field name="name">All Bugs</field>
         <field name="res_model">crm.case</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,calendar</field>
@@ -62,7 +62,7 @@
         <field name="act_window_id" ref="crm_case_categ_act0"/>
     </record>
     <menuitem name="Bug Tracking" id="menu_crm_case_bug_track"  parent="menu_aftersale" action="crm_case_categ_act0"/>
-<!--    <menuitem  id="menu_crm_case_categ_act0" action="crm_case_categ_act0" parent="menu_crm_case_bug_track"/>-->
+    <menuitem  id="menu_crm_case_categ_act0" action="crm_case_categ_act0" parent="menu_crm_case_bug_track"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_all1">
         <field name="name">Bugs Waiting Approval</field>
@@ -93,7 +93,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_all1"/>
     </record>
-<!--    <menuitem  id="menu_crm_case_categ0_act_all1" action="crm_case_category_act_all1" parent="menu_crm_case_categ_act0" groups="base.group_extended_menu"/>-->
+    <menuitem  id="menu_crm_case_categ0_act_all1" action="crm_case_category_act_all1" parent="menu_crm_case_categ_act0" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_all2">
         <field name="name">Open Bugs</field>
@@ -124,7 +124,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_all2"/>
     </record>
-<!--    <menuitem  id="menu_crm_case_categ0_act_all2" action="crm_case_category_act_all2" parent="menu_crm_case_categ_act0" groups="base.group_extended_menu"/>-->
+    <menuitem  id="menu_crm_case_categ0_act_all2" action="crm_case_category_act_all2" parent="menu_crm_case_categ_act0" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_all3">
         <field name="name">Bugs With Patches Waiting Approval</field>
@@ -155,7 +155,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_all3"/>
     </record>
-<!--    <menuitem  id="menu_crm_case_categ0_act_all3" action="crm_case_category_act_all3" parent="menu_crm_case_categ0_act_all2" groups="base.group_extended_menu"/>-->
+    <menuitem  id="menu_crm_case_categ0_act_all3" action="crm_case_category_act_all3" parent="menu_crm_case_categ0_act_all2" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_all4">
         <field name="name">Bugs Not Fixed</field>
@@ -186,7 +186,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_all4"/>
     </record>
-<!--    <menuitem  id="menu_crm_case_categ0_act_all4" action="crm_case_category_act_all4" parent="menu_crm_case_categ0_act_all2" groups="base.group_extended_menu"/>-->
+    <menuitem  id="menu_crm_case_categ0_act_all4" action="crm_case_category_act_all4" parent="menu_crm_case_categ0_act_all2" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_all5">
         <field name="name">Pending Bugs</field>
@@ -217,7 +217,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_all5"/>
     </record>
-<!--    <menuitem  id="menu_crm_case_categ0_act_all5" action="crm_case_category_act_all5" parent="menu_crm_case_categ_act0" groups="base.group_extended_menu"/>-->
+    <menuitem  id="menu_crm_case_categ0_act_all5" action="crm_case_category_act_all5" parent="menu_crm_case_categ_act0" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_all6">
         <field name="name">Planned For Future Release</field>
@@ -248,7 +248,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_all6"/>
     </record>
-<!--    <menuitem  id="menu_crm_case_categ0_act_all6" action="crm_case_category_act_all6" parent="menu_crm_case_categ0_act_all5" groups="base.group_extended_menu"/>-->
+    <menuitem  id="menu_crm_case_categ0_act_all6" action="crm_case_category_act_all6" parent="menu_crm_case_categ0_act_all5" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_all7">
         <field name="name">Waiting For Reporter Response</field>
@@ -279,7 +279,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_all7"/>
     </record>
-<!--    <menuitem  id="menu_crm_case_categ0_act_all7" action="crm_case_category_act_all7" parent="menu_crm_case_categ0_act_all5" groups="base.group_extended_menu"/>-->
+    <menuitem  id="menu_crm_case_categ0_act_all7" action="crm_case_category_act_all7" parent="menu_crm_case_categ0_act_all5" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_all8">
         <field name="name">Old Bugs</field>
@@ -310,8 +310,9 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_all8"/>
     </record>
-<!--    <menuitem  id="menu_crm_case_categ0_act_all8" action="crm_case_category_act_all8" parent="menu_crm_case_categ_act0" groups="base.group_extended_menu"/>     -->
-<!--        MY BUGS-->
+    <menuitem  id="menu_crm_case_categ0_act_all8" action="crm_case_category_act_all8" parent="menu_crm_case_categ_act0" groups="base.group_extended_menu"/>    <!-- 
+        MY BUGS
+    -->
     <record model="ir.actions.act_window" id="crm_case_category_act_my0">
         <field name="name">My Bugs</field>
         <field name="res_model">crm.case</field>
@@ -341,7 +342,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_my0"/>
     </record>
-<!--    <menuitem parent="menu_crm_case_bug_track" id="menu_crm_case_categ0_act_my0" action="crm_case_category_act_my0" groups="base.group_extended_menu"/>-->
+    <menuitem parent="menu_crm_case_bug_track" id="menu_crm_case_categ0_act_my0" action="crm_case_category_act_my0" groups="base.group_extended_menu"/>
     
     <record model="ir.actions.act_window" id="crm_case_categ_act_new">
         <field name="name">New Bug</field>
@@ -364,7 +365,7 @@
         <field name="view_id" ref="crm_case_tree_view"/>
         <field name="act_window_id" ref="crm_case_categ_act_new"/>
     </record>    
-<!--    <menuitem  id="menu_crm_case_categ_act_new" action="crm_case_categ_act_new" parent="menu_crm_case_bug_track" sequence="50"/>-->
+    <menuitem  id="menu_crm_case_categ_act_new" action="crm_case_categ_act_new" parent="menu_crm_case_bug_track" sequence="50"/>
     
     <record model="ir.actions.act_window" id="crm_case_category_act_my1">
         <field name="name">My Open Bugs</field>
@@ -395,7 +396,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_my1"/>
     </record>
-<!--    <menuitem parent="menu_crm_case_categ0_act_my0" id="menu_crm_case_categ0_act_my1" action="crm_case_category_act_my1" groups="base.group_extended_menu"/>-->
+    <menuitem parent="menu_crm_case_categ0_act_my0" id="menu_crm_case_categ0_act_my1" action="crm_case_category_act_my1" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_my2">
         <field name="name">My Bugs With Patches</field>
@@ -426,7 +427,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_my2"/>
     </record>
-<!--    <menuitem parent="menu_crm_case_categ0_act_my1" id="menu_crm_case_categ0_act_my2" action="crm_case_category_act_my2" groups="base.group_extended_menu"/>-->
+    <menuitem parent="menu_crm_case_categ0_act_my1" id="menu_crm_case_categ0_act_my2" action="crm_case_category_act_my2" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_my3">
         <field name="name">My Bugs Not Fixed</field>
@@ -457,7 +458,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_my3"/>
     </record>
-<!--    <menuitem parent="menu_crm_case_categ0_act_my1" id="menu_crm_case_categ0_act_my3" action="crm_case_category_act_my3" groups="base.group_extended_menu"/>-->
+    <menuitem parent="menu_crm_case_categ0_act_my1" id="menu_crm_case_categ0_act_my3" action="crm_case_category_act_my3" groups="base.group_extended_menu"/>
 
     <!-- 
         ALL FEATURE REQUESTS 
@@ -490,7 +491,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_f0"/>
     </record>
-<!--    <menuitem parent="menu_crm_case_bug_track" id="menu_crm_case_category_act_f0" action="crm_case_category_act_f0"/>-->
+    <menuitem parent="menu_crm_case_bug_track" id="menu_crm_case_category_act_f0" action="crm_case_category_act_f0"/>
     
     <record model="ir.actions.act_window" id="crm_case_category_act_f1">
         <field name="name">New Feature Request</field>
@@ -513,7 +514,7 @@
         <field name="view_id" ref="crm_case_tree_view"/>
         <field name="act_window_id" ref="crm_case_category_act_f1"/>
     </record>
-<!--    <menuitem parent="menu_crm_case_category_act_f0" id="menu_crm_case_category_act_f1" action="crm_case_category_act_f1" sequence="50"/>-->
+    <menuitem parent="menu_crm_case_category_act_f0" id="menu_crm_case_category_act_f1" action="crm_case_category_act_f1" sequence="50"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_f2">
         <field name="name">Feature Requests Waiting Approval</field>
@@ -544,7 +545,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_f2"/>
     </record>
-<!--    <menuitem parent="menu_crm_case_category_act_f0" id="menu_crm_case_categ0_act_f2" action="crm_case_category_act_f2" groups="base.group_extended_menu"/>-->
+    <menuitem parent="menu_crm_case_category_act_f0" id="menu_crm_case_categ0_act_f2" action="crm_case_category_act_f2" groups="base.group_extended_menu"/>
     <record model="ir.actions.act_window" id="crm_case_category_act_f3">
         <field name="name">Open Feature Requests</field>
         <field name="res_model">crm.case</field>
@@ -574,7 +575,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_f3"/>
     </record>
-<!--    <menuitem parent="menu_crm_case_category_act_f0" id="menu_crm_case_categ0_act_f3" action="crm_case_category_act_f3" groups="base.group_extended_menu"/>-->
+    <menuitem parent="menu_crm_case_category_act_f0" id="menu_crm_case_categ0_act_f3" action="crm_case_category_act_f3" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_f4">
         <field name="name">Pending Feature Requests</field>
@@ -605,7 +606,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_f4"/>
     </record>
-<!--    <menuitem parent="menu_crm_case_category_act_f0" id="menu_crm_case_categ0_act_f4" action="crm_case_category_act_f4" groups="base.group_extended_menu"/>-->
+    <menuitem parent="menu_crm_case_category_act_f0" id="menu_crm_case_categ0_act_f4" action="crm_case_category_act_f4" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_f5">
         <field name="name">Planned For Future Release</field>
@@ -636,7 +637,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_f5"/>
     </record>
-<!--    <menuitem parent="menu_crm_case_categ0_act_f4" id="menu_crm_case_categ0_act_f5" action="crm_case_category_act_f5" groups="base.group_extended_menu"/>-->
+    <menuitem parent="menu_crm_case_categ0_act_f4" id="menu_crm_case_categ0_act_f5" action="crm_case_category_act_f5" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_f6">
         <field name="name">Waiting For Reporter Response</field>
@@ -667,7 +668,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_f6"/>
     </record>
-<!--    <menuitem parent="menu_crm_case_categ0_act_f4" id="menu_crm_case_categ0_act_f6" action="crm_case_category_act_f6" groups="base.group_extended_menu"/>-->
+    <menuitem parent="menu_crm_case_categ0_act_f4" id="menu_crm_case_categ0_act_f6" action="crm_case_category_act_f6" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_f7">
         <field name="name">Old Feature Requests</field>
@@ -698,7 +699,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_f7"/>
     </record>
-<!--    <menuitem parent="menu_crm_case_category_act_f0" id="menu_crm_case_categ0_act_f7" action="crm_case_category_act_f7" groups="base.group_extended_menu"/>-->
+    <menuitem parent="menu_crm_case_category_act_f0" id="menu_crm_case_categ0_act_f7" action="crm_case_category_act_f7" groups="base.group_extended_menu"/>
     
 </data>
 </openerp>
diff --git a/addons/crm_configuration/crm_bugs_view.xml b/addons/crm_configuration/crm_bugs_view.xml
index a48c54de94c..212503482ab 100644
--- a/addons/crm_configuration/crm_bugs_view.xml
+++ b/addons/crm_configuration/crm_bugs_view.xml
@@ -23,14 +23,17 @@
                             <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
                         </group>
                     <field name="date"/>
-                    <field name="email_from" colspan="2"/>
+                    <group colspan="2">
+                        <field name="case_id" select="1"/>
+                        <button string="Assign" name="%(crm_generic_wizard_act)d"  type="action" />
+                    </group>    
                     <field name="user_id" />
                 </group>
                 <notebook colspan="4">
                 <page string="General">
                     <field name="partner_id"  on_change="onchange_partner_id(partner_id, email_from)" colspan="2"/>
                     <field name="partner_address_id"  string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="1"/>
-                    <newline/>
+                    <field name="email_from" colspan="2"/>
                     <separator colspan="4"/>
                     <field name="category2_id" string="Version"/>
                     <field name="categ_id"  on_change="onchange_categ_id(categ_id)"/>
@@ -76,6 +79,19 @@
                         </form>
                     </field>
                 </page>
+                <page string="Events">
+                   <field name="child_ids" colspan="4" nolabel="1">
+                       <tree string="Related Cases">
+                           <field name="id"/>
+                           <field name="date"/>
+                           <field name="name"/>
+                           <field name="partner_id"/>
+                           <field name="user_id"/>
+                           <field name="section_id" widget="selection"/>
+                           <field name="state"/>
+                       </tree>
+                    </field>
+                 </page>
                 <page string="Emails">
                    <group colspan="4">
                        <field colspan="4" name="email_cc" string="CC"/>
diff --git a/addons/crm_configuration/crm_claims_menu.xml b/addons/crm_configuration/crm_claims_menu.xml
index 3f3d8c32592..9f98aaeffcd 100644
--- a/addons/crm_configuration/crm_claims_menu.xml
+++ b/addons/crm_configuration/crm_claims_menu.xml
@@ -63,7 +63,7 @@
         <field name="view_id" ref="crm_case_claims_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_claim_my1"/>
     </record>
-<!--    <menuitem name="My Claims" id="menu_crm_case_category_act_claim_my1" action="crm_case_category_act_claim_my1"  parent="menu_crm_case_claims" groups="base.group_extended_menu"/>-->
+    <menuitem name="My Claims" id="menu_crm_case_category_act_claim_my1" action="crm_case_category_act_claim_my1"  parent="menu_crm_case_claims" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_claim1">
         <field name="name">Claims</field>
@@ -79,7 +79,7 @@
         <field name="view_id" ref="crm_case_claims_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_claim1"/>
     </record>
-<!--    <menuitem name="New Claim" id="menu_crm_case_categ0_act_claim" action="crm_case_category_act_claim1" parent="menu_crm_case_claims" sequence="50"/>-->
+    <menuitem name="New Claim" id="menu_crm_case_categ0_act_claim" action="crm_case_category_act_claim1" parent="menu_crm_case_claims" sequence="50"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_claim_my2">
         <field name="name">My Unclosed Claims</field>
@@ -109,7 +109,7 @@
         <field name="view_id" ref="crm_case_claims_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_claim_my2"/>
     </record>
-<!--    <menuitem name="My Unclosed Claims" id="menu_crm_case_categ0_act_claim_my2" action="crm_case_category_act_claim_my2" parent="menu_crm_case_category_act_claim_my1" groups="base.group_extended_menu"/>-->
+    <menuitem name="My Unclosed Claims" id="menu_crm_case_categ0_act_claim_my2" action="crm_case_category_act_claim_my2" parent="menu_crm_case_category_act_claim_my1" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_claim_my2_open">
         <field name="name">My Open Claims</field>
@@ -137,10 +137,10 @@
         <field name="view_id" ref="crm_case_claims_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_claim_my2_open"/>
     </record>
-<!--    <menuitem name="My Open Claims" id="menu_crm_case_categ0_act_claim_my2_open" action="crm_case_category_act_claim_my2_open" parent="menu_crm_case_categ0_act_claim_my2" groups="base.group_extended_menu"/>-->
+    <menuitem name="My Open Claims" id="menu_crm_case_categ0_act_claim_my2_open" action="crm_case_category_act_claim_my2_open" parent="menu_crm_case_categ0_act_claim_my2" groups="base.group_extended_menu"/>
 
     <!-- All Claims -->
-<!--    <menuitem  name="All Claims" id="menu_crm_case_categ_claim0" action="crm_case_categ_claim0" parent="menu_crm_case_claims" groups="base.group_extended_menu"/>-->
+    <menuitem  name="All Claims" id="menu_crm_case_categ_claim0" action="crm_case_categ_claim0" parent="menu_crm_case_claims" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_claim_all2">
         <field name="name">All Unclosed Claims</field>
@@ -170,7 +170,7 @@
         <field name="view_id" ref="crm_case_claims_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_claim_all2"/>
     </record>
-<!--    <menuitem name="All Unclosed Claims" id="menu_crm_case_categ0_act_claim_all2" action="crm_case_category_act_claim_all2" parent="menu_crm_case_categ_claim0" groups="base.group_extended_menu"/>-->
+    <menuitem name="All Unclosed Claims" id="menu_crm_case_categ0_act_claim_all2" action="crm_case_category_act_claim_all2" parent="menu_crm_case_categ_claim0" groups="base.group_extended_menu"/>
 
 </data>
 </openerp>
diff --git a/addons/crm_configuration/crm_claims_view.xml b/addons/crm_configuration/crm_claims_view.xml
index 730072228fa..1f09f71967a 100644
--- a/addons/crm_configuration/crm_claims_view.xml
+++ b/addons/crm_configuration/crm_claims_view.xml
@@ -41,12 +41,15 @@
                     <field name="section_id" widget="selection"/>
                     <field name="date" string="Date of Claim"/>
                     <field name="categ_id" string="Type of claim" select="1" on_change="onchange_categ_id(categ_id)"/>
-                        <label string="Stage: " align="1.0"/>
-                        <group colspan="1" col="2">
-                            <field name="stage_id" select="1" nolabel="1"/>
-                            <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
-                        </group>
-                    <field name="case_id"/>                        
+                    <label string="Stage: " align="1.0"/>
+                    <group colspan="1" col="2">
+                        <field name="stage_id" select="1" nolabel="1"/>
+                        <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
+                    </group>
+                    <group colspan="2">
+                        <field name="case_id" select="1"/>
+                        <button string="Assign" name="%(crm_generic_wizard_act)d"  type="action" />
+                    </group>                       
                 </group>
                 <notebook>
                 <page string="Claims Info">
diff --git a/addons/crm_configuration/crm_config.py b/addons/crm_configuration/crm_config.py
index 10805576844..f4873bb1735 100644
--- a/addons/crm_configuration/crm_config.py
+++ b/addons/crm_configuration/crm_config.py
@@ -23,6 +23,9 @@ import tools
 from osv import fields, osv
 import os
 import pooler
+import netsvc
+from tools.translate import _
+from osv.orm import except_orm
 
 #AVAILABLE_STATES = [
 #    ('draft','Unreviewed'),
@@ -184,5 +187,45 @@ class crm_menu_config_wizard(osv.osv_memory):
 
 crm_menu_config_wizard()
 
+
+class crm_generic_wizard(osv.osv_memory):
+    _name = 'crm.generic_wizard'
+    
+    _columns = {        
+        'section_id': fields.many2one('crm.case.section', 'Section', required=True),
+        'user_id': fields.many2one('res.users', 'Responsible'),
+    }
+    
+    def _get_default_section(self, cr, uid, context):
+        case_id = context.get('active_id',False)
+        if not case_id:
+            return False
+        case_obj = self.pool.get('crm.case')    
+        case = case_obj.read(cr, uid, case_id, ['state','section_id'])
+        if case['state'] in ('done'):
+            raise osv.except_osv(_('Error !'), _('You can not assign Closed Case.'))              
+        return case['section_id']
+        
+        
+    _defaults = {
+        'section_id': _get_default_section
+    }    
+    def action_create(self, cr, uid, ids, context=None):
+        case_obj = self.pool.get('crm.case')        
+        case_id = context.get('active_id',[])
+        res = self.read(cr, uid, ids)[0]
+        case = case_obj.read(cr, uid, case_id, ['state'])
+        if case['state'] in ('done'):
+            raise osv.except_osv(_('Error !'), _('You can not assign Closed Case.')) 
+        new_case_id = case_obj.copy(cr, uid, case_id, default=
+                                            {
+                                                'section_id':res.get('section_id',False),
+                                                'user_id':res.get('user_id',False)
+                                            }, context=context)
+        case_obj.write(cr, uid, case_id, {'case_id':new_case_id}, context=context) 
+        case_obj.case_close(cr, uid, [case_id])       
+        return {} 
+        
+crm_generic_wizard()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/crm_configuration/crm_config_view.xml b/addons/crm_configuration/crm_config_view.xml
index 87ee5c2524e..c65344fbcb8 100644
--- a/addons/crm_configuration/crm_config_view.xml
+++ b/addons/crm_configuration/crm_config_view.xml
@@ -111,6 +111,36 @@
         <field name="view_id" ref="crm_case_stage_tree"/>
     </record>
     <menuitem action="crm_case_stage_act" id="menu_crm_case_stage_act" parent="crm.next_id_51"/>
+    
+    
+     <record model="ir.ui.view" id="crm_generic_wizard">
+        <field name="name">crm.generic_wizard.form</field>
+        <field name="model">crm.generic_wizard</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Generic Wizard">
+                <group col="2">            	
+                    <field name="section_id" select="1" widget="selection"/>
+                    <field name="user_id"/>
+                </group>
+                <newline/>                    
+                <separator colspan="4"/>                             
+                <group col="2" colspan="2">
+                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    <button icon="gtk-execute" name="action_create" string="Assign" type="object"/>
+                </group>
+            </form>
+        </field>
+    </record>
+    <record id="crm_generic_wizard_act" model="ir.actions.act_window">
+        <field name="name">Generic Wizard</field>
+        <field name="res_model">crm.generic_wizard</field>
+        <field name="view_type">form</field>
+        <field name="view_id" ref="crm_generic_wizard"/>
+        <field name="view_mode">form</field>
+        <field name="target">new</field>
+    </record>
+    
         
     </data>
 </openerp>
diff --git a/addons/crm_configuration/crm_configuration_wizard.xml b/addons/crm_configuration/crm_configuration_wizard.xml
index 3c52bfec7e2..8bacfa6b68d 100644
--- a/addons/crm_configuration/crm_configuration_wizard.xml
+++ b/addons/crm_configuration/crm_configuration_wizard.xml
@@ -31,14 +31,6 @@
             name="crm.case.opportunity_set"
             multi="True"
             string="Convert To Opportunity"/>
-            
-	<wizard
-          id="wizard_partner_create_opportunity"
-            keyword="client_action_multi"
-            model="res.partner"
-            name="crm.case.partner.opportunity_create"
-            menu="False"
-            string="Create Opportunity"/>
 
         <wizard
             id="wizard_crm_reschedule_phone_call"
diff --git a/addons/crm_configuration/crm_fund_menu.xml b/addons/crm_configuration/crm_fund_menu.xml
index 15c56b24d69..44df34c9f06 100644
--- a/addons/crm_configuration/crm_fund_menu.xml
+++ b/addons/crm_configuration/crm_fund_menu.xml
@@ -61,7 +61,7 @@
         <field name="view_id" ref="crm_configuration.crm_case_form_view_fund"/>
         <field name="act_window_id" ref="crm_case_category_act_fund_my1"/>
     </record>
-<!--    <menuitem name="My Funds" id="menu_crm_case_category_act_fund_my1" action="crm_case_category_act_fund_my1"  parent="menu_crm_case_fund_raise" groups="base.group_extended_menu"/>-->
+    <menuitem name="My Funds" id="menu_crm_case_category_act_fund_my1" action="crm_case_category_act_fund_my1"  parent="menu_crm_case_fund_raise" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_fund1">
         <field name="name">Funds</field>
@@ -83,7 +83,7 @@
         <field name="view_id" ref="crm_configuration.crm_case_form_view_fund"/>
         <field name="act_window_id" ref="crm_case_category_act_fund1"/>
     </record>
-<!--    <menuitem name="New Fund Opportunity" id="menu_crm_case_categ0_act_fund" action="crm_case_category_act_fund1" parent="menu_crm_case_fund_raise" sequence="50"/>-->
+    <menuitem name="New Fund Opportunity" id="menu_crm_case_categ0_act_fund" action="crm_case_category_act_fund1" parent="menu_crm_case_fund_raise" sequence="50"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_fund_my2">
         <field name="name">My Funds Waiting Validation</field>
@@ -113,7 +113,7 @@
         <field name="view_id" ref="crm_configuration.crm_case_graph_view_fund"/>
         <field name="act_window_id" ref="crm_case_category_act_fund_my2"/>
     </record>
-<!--    <menuitem name="My Funds Waiting Validation" id="menu_crm_case_categ0_act_fund_my2" action="crm_case_category_act_fund_my2" parent="menu_crm_case_category_act_fund_my1" groups="base.group_extended_menu"/>-->
+    <menuitem name="My Funds Waiting Validation" id="menu_crm_case_categ0_act_fund_my2" action="crm_case_category_act_fund_my2" parent="menu_crm_case_category_act_fund_my1" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_fund_my3">
         <field name="name">My Funds To Be Processed</field>
@@ -143,10 +143,10 @@
         <field name="view_id" ref="crm_configuration.crm_case_graph_view_fund"/>
         <field name="act_window_id" ref="crm_case_category_act_fund_my3"/>
     </record>
-<!--    <menuitem name="My Funds To Be Processed" id="menu_crm_case_categ0_act_fund_my3" action="crm_case_category_act_fund_my3" parent="menu_crm_case_category_act_fund_my1" groups="base.group_extended_menu"/>-->
+    <menuitem name="My Funds To Be Processed" id="menu_crm_case_categ0_act_fund_my3" action="crm_case_category_act_fund_my3" parent="menu_crm_case_category_act_fund_my1" groups="base.group_extended_menu"/>
 
     <!-- All Funds -->
-<!--    <menuitem name="All Funds" id="menu_crm_case_categ0_act_fund_all1" action="crm_case_category_act_fund_all1" parent="menu_crm_case_fund_raise" groups="base.group_extended_menu"/>-->
+    <menuitem name="All Funds" id="menu_crm_case_categ0_act_fund_all1" action="crm_case_category_act_fund_all1" parent="menu_crm_case_fund_raise" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_fund_all2">
         <field name="name">All Funds Waiting Validation</field>
@@ -176,7 +176,7 @@
         <field name="view_id" ref="crm_configuration.crm_case_graph_view_fund"/>
         <field name="act_window_id" ref="crm_case_category_act_fund_all2"/>
     </record>
-<!--    <menuitem name="All Funds Waiting Validation" id="menu_crm_case_categ0_act_fund_all2" action="crm_case_category_act_fund_all2" parent="menu_crm_case_categ0_act_fund_all1" groups="base.group_extended_menu"/>-->
+    <menuitem name="All Funds Waiting Validation" id="menu_crm_case_categ0_act_fund_all2" action="crm_case_category_act_fund_all2" parent="menu_crm_case_categ0_act_fund_all1" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_fund_all3">
         <field name="name">All Funds To Be Processed</field>
@@ -206,7 +206,7 @@
         <field name="view_id" ref="crm_configuration.crm_case_graph_view_fund"/>
         <field name="act_window_id" ref="crm_case_category_act_fund_all3"/>
     </record>
-<!--    <menuitem name="All Funds To Be Processed" id="menu_crm_case_categ0_act_fund_all3" action="crm_case_category_act_fund_all3" parent="menu_crm_case_categ0_act_fund_all1" groups="base.group_extended_menu"/>-->
+    <menuitem name="All Funds To Be Processed" id="menu_crm_case_categ0_act_fund_all3" action="crm_case_category_act_fund_all3" parent="menu_crm_case_categ0_act_fund_all1" groups="base.group_extended_menu"/>
 
 </data>
 </openerp>
diff --git a/addons/crm_configuration/crm_helpdesk_menu.xml b/addons/crm_configuration/crm_helpdesk_menu.xml
index 05ad8197280..683207727b2 100644
--- a/addons/crm_configuration/crm_helpdesk_menu.xml
+++ b/addons/crm_configuration/crm_helpdesk_menu.xml
@@ -8,7 +8,7 @@
         <field name="name">All Helpdesk Requests</field>
         <field name="res_model">crm.case</field>
         <field name="view_mode">tree,calendar,form</field>
-        <field name="view_id" ref="crm.crm_case_tree-view"/>
+        <field name="view_id" ref="crm_case_tree_view_helpdesk"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_help'))+')]'"/>
         <field name="context" eval="{'default_state':'open'}"/>
         <field name="search_view_id" ref="crm.view_crm_case_filter"/>        
@@ -16,7 +16,7 @@
     <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_act111">
         <field name="sequence" eval="1"/>
         <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm.crm_case_tree-view"/>
+        <field name="view_id" ref="crm_case_tree_view_helpdesk"/>
         <field name="act_window_id" ref="crm_case_helpdesk_act111"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_act111">
@@ -28,7 +28,7 @@
     <record model="ir.actions.act_window.view" id="action_crm_sec_form_view_act111">
         <field name="sequence" eval="3"/>
         <field name="view_mode">form</field>
-        <field name="view_id" ref="crm.crm_case-view"/>
+        <field name="view_id" ref="crm_case_form_view_helpdesk"/>
         <field name="act_window_id" ref="crm_case_helpdesk_act111"/>
     </record>
     <menuitem name="Helpdesk and Support" id="menu_help_support_main" parent="menu_aftersale" action="crm_case_helpdesk_act111"/>    
@@ -37,7 +37,7 @@
         <field name="name">My Helpdesk</field>
         <field name="res_model">crm.case</field>
         <field name="view_mode">tree,calendar,form</field>
-        <field name="view_id" ref="crm.crm_case_tree-view"/>
+        <field name="view_id" ref="crm_case_tree_view_helpdesk"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_help'))+'),(\'user_id\',\'=\',uid)]'"/>
         <field name="context" eval="{'default_state':'open'}"/>
         <field name="filter" eval="True"/>
@@ -46,7 +46,7 @@
     <record model="ir.actions.act_window.view" id="action_crm_helpdesk_tree_view1">
         <field name="sequence" eval="1"/>
         <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm.crm_case_tree-view"/>
+        <field name="view_id" ref="crm_case_tree_view_helpdesk"/>
         <field name="act_window_id" ref="crm_case_categ_help_act"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_helpdesk_calendar_view3">
@@ -58,40 +58,40 @@
     <record model="ir.actions.act_window.view" id="action_crm_helpdesk_tree_view2">
         <field name="sequence" eval="3"/>
         <field name="view_mode">form</field>
-        <field name="view_id" ref="crm.crm_case-view"/>
+        <field name="view_id" ref="crm_case_form_view_helpdesk"/>
         <field name="act_window_id" ref="crm_case_categ_help_act"/>
     </record>
     
-<!--    <menuitem parent="menu_help_support_main" id="menu_crm_case_helpdesk_my_act" action="crm_case_categ_help_act" groups="base.group_extended_menu"/>-->
+    <menuitem parent="menu_help_support_main" id="menu_crm_case_helpdesk_my_act" action="crm_case_categ_help_act" groups="base.group_extended_menu"/>
     
     <record model="ir.actions.act_window" id="crm_case_categ_help_new_act">
         <field name="name">New Helpdesk</field>
         <field name="res_model">crm.case</field>
         <field name="view_mode">form,tree</field>
-        <field name="view_id" ref="crm.crm_case-view"/>
+        <field name="view_id" ref="crm_case_form_view_helpdesk"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_help'))+')]'"/>
         <field name="context" eval="{'default_state':'open'}"/>        
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_helpdesk_tree_view1">
         <field name="sequence" eval="2"/>
         <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm.crm_case_tree-view"/>
+        <field name="view_id" ref="crm_case_tree_view_helpdesk"/>
         <field name="act_window_id" ref="crm_case_categ_help_new_act"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_helpdesk_tree_view2">
         <field name="sequence" eval="1"/>
         <field name="view_mode">form</field>
-        <field name="view_id" ref="crm.crm_case-view"/>
+        <field name="view_id" ref="crm_case_form_view_helpdesk"/>
         <field name="act_window_id" ref="crm_case_categ_help_new_act"/>
     </record>
     
-<!--    <menuitem parent="menu_help_support_main" id="menu_crm_case_categ_help_new_act" action="crm_case_categ_help_new_act" sequence="50"/>-->
+    <menuitem parent="menu_help_support_main" id="menu_crm_case_categ_help_new_act" action="crm_case_categ_help_new_act" sequence="50"/>
 
     <record model="ir.actions.act_window" id="crm_case_helpdesk_act_my1">
         <field name="name">My Unclosed Requests</field>
         <field name="res_model">crm.case</field>
         <field name="view_mode">tree,calendar,form</field>
-        <field name="view_id" ref="crm.crm_case_tree-view"/>
+        <field name="view_id" ref="crm_case_tree_view_helpdesk"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_help'))+'),(\'user_id\',\'=\',uid),(\'state\',\'&lt;&gt;\',\'done\')]'"/>
         <field name="context" eval="{'default_state':'open'}"/>
         <field name="filter" eval="True"/>
@@ -101,7 +101,7 @@
     <record model="ir.actions.act_window.view" id="action_crm_helpdesk_tree_view_my1">
         <field name="sequence" eval="1"/>
         <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm.crm_case_tree-view"/>
+        <field name="view_id" ref="crm_case_tree_view_helpdesk"/>
         <field name="act_window_id" ref="crm_case_helpdesk_act_my1"/>
     </record>
     
@@ -115,17 +115,17 @@
     <record model="ir.actions.act_window.view" id="action_crm_helpdesk_form_view_my1">
         <field name="sequence" eval="2"/>
         <field name="view_mode">form</field>
-        <field name="view_id" ref="crm.crm_case-view"/>
+        <field name="view_id" ref="crm_case_form_view_helpdesk"/>
         <field name="act_window_id" ref="crm_case_helpdesk_act_my1"/>
     </record>
     
-<!--    <menuitem parent="menu_crm_case_helpdesk_my_act" id="menu_crm_case_helpdesk_act_my_helpdesk" action="crm_case_helpdesk_act_my1" groups="base.group_extended_menu"/>        -->
+    <menuitem parent="menu_crm_case_helpdesk_my_act" id="menu_crm_case_helpdesk_act_my_helpdesk" action="crm_case_helpdesk_act_my1" groups="base.group_extended_menu"/>        
 
     <record model="ir.actions.act_window" id="crm_case_helpdesk_act_my2">
         <field name="name">My helpdesk Propositions to Review</field>
         <field name="res_model">crm.case</field>
         <field name="view_mode">tree,calendar,form</field>
-        <field name="view_id" ref="crm.crm_case_tree-view"/>
+        <field name="view_id" ref="crm_case_tree_view_helpdesk"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_help'))+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'draft\')]'"/>
         <field name="context" eval="{'default_state':'open'}"/>
         <field name="filter" eval="True"/>
@@ -134,7 +134,7 @@
     <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_my2">
         <field name="sequence" eval="1"/>
         <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm.crm_case_tree-view"/>
+        <field name="view_id" ref="crm_case_tree_view_helpdesk"/>
         <field name="act_window_id" ref="crm_case_helpdesk_act_my2"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_my2">
@@ -146,16 +146,16 @@
     <record model="ir.actions.act_window.view" id="action_crm_sec_form_view_my2">
         <field name="sequence" eval="3"/>
         <field name="view_mode">form</field>
-        <field name="view_id" ref="crm.crm_case-view"/>
+        <field name="view_id" ref="crm_case_form_view_helpdesk"/>
         <field name="act_window_id" ref="crm_case_helpdesk_act_my2"/>
     </record>
-<!--    <menuitem parent="menu_crm_case_helpdesk_my_act" id="menu_crm_case_helpdesk_act_myhelpdesk2" action="crm_case_helpdesk_act_my2" groups="base.group_extended_menu"/>        -->
+    <menuitem parent="menu_crm_case_helpdesk_my_act" id="menu_crm_case_helpdesk_act_myhelpdesk2" action="crm_case_helpdesk_act_my2" groups="base.group_extended_menu"/>        
 
     <record model="ir.actions.act_window" id="crm_case_helpdesk_act_my1">
         <field name="name">My Pending helpdesk Requests</field>
         <field name="res_model">crm.case</field>
         <field name="view_mode">tree,calendar,form</field>
-        <field name="view_id" ref="crm.crm_case_tree-view"/>
+        <field name="view_id" ref="crm_case_tree_view_helpdesk"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_help'))+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'pending\')]'"/>
         <field name="context" eval="{'default_state':'open'}"/>
         <field name="filter" eval="True"/>
@@ -164,7 +164,7 @@
     <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_my1">
         <field name="sequence" eval="1"/>
         <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm.crm_case_tree-view"/>
+        <field name="view_id" ref="crm_case_tree_view_helpdesk"/>
         <field name="act_window_id" ref="crm_case_helpdesk_act_my1"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_my1">
@@ -176,16 +176,16 @@
     <record model="ir.actions.act_window.view" id="action_crm_sec_form_view_my1">
         <field name="sequence" eval="3"/>
         <field name="view_mode">form</field>
-        <field name="view_id" ref="crm.crm_case-view"/>
+        <field name="view_id" ref="crm_case_form_view_helpdesk"/>
         <field name="act_window_id" ref="crm_case_helpdesk_act_my1"/>
     </record>
-<!--    <menuitem parent="menu_crm_case_helpdesk_my_act" id="menu_crm_case_helpdesk_act_myhelpdesk1" action="crm_case_helpdesk_act_my1" groups="base.group_extended_menu"/>                -->
+    <menuitem parent="menu_crm_case_helpdesk_my_act" id="menu_crm_case_helpdesk_act_myhelpdesk1" action="crm_case_helpdesk_act_my1" groups="base.group_extended_menu"/>                
 
     <record model="ir.actions.act_window" id="crm_case_helpdesk_act_my0">
         <field name="name">My Open Helpdesk Requests</field>
         <field name="res_model">crm.case</field>
         <field name="view_mode">tree,calendar,form</field>
-        <field name="view_id" ref="crm.crm_case_tree-view"/>
+        <field name="view_id" ref="crm_case_tree_view_helpdesk"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_help'))+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'open\')]'"/>
         <field name="context" eval="{'default_state':'open'}"/>
         <field name="filter" eval="True"/>
@@ -194,7 +194,7 @@
     <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_my0">
         <field name="sequence" eval="1"/>
         <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm.crm_case_tree-view"/>
+        <field name="view_id" ref="crm_case_tree_view_helpdesk"/>
         <field name="act_window_id" ref="crm_case_helpdesk_act_my0"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_my0">
@@ -206,10 +206,10 @@
     <record model="ir.actions.act_window.view" id="action_crm_sec_form_view_my0">
         <field name="sequence" eval="3"/>
         <field name="view_mode">form</field>
-        <field name="view_id" ref="crm.crm_case-view"/>
+        <field name="view_id" ref="crm_case_form_view_helpdesk"/>
         <field name="act_window_id" ref="crm_case_helpdesk_act_my0"/>
     </record>
-<!--    <menuitem parent="menu_crm_case_helpdesk_my_act" id="menu_crm_case_helpdesk_act_myhelpdesk0" action="crm_case_helpdesk_act_my0" groups="base.group_extended_menu"/>    -->
+    <menuitem parent="menu_crm_case_helpdesk_my_act" id="menu_crm_case_helpdesk_act_myhelpdesk0" action="crm_case_helpdesk_act_my0" groups="base.group_extended_menu"/>    
         
     
     <record model="ir.actions.act_window" id="crm_case_helpdesk_act_myhelpdesk">
@@ -229,29 +229,29 @@
     <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_myhelpdesk">
         <field name="sequence" eval="2"/>
         <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm.crm_case_tree-view"/>
+        <field name="view_id" ref="crm_case_tree_view_helpdesk"/>
         <field name="act_window_id" ref="crm_case_helpdesk_act_myhelpdesk"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_sec_form_view_myhelpdesk">
         <field name="sequence" eval="3"/>
         <field name="view_mode">form</field>
-        <field name="view_id" ref="crm.crm_case-view"/>
+        <field name="view_id" ref="crm_case_form_view_helpdesk"/>
         <field name="act_window_id" ref="crm_case_helpdesk_act_myhelpdesk"/>
     </record>    
-<!--    <menuitem parent="menu_crm_case_helpdesk_my_act" id="menu_crm_case_helpdesk_act_myhelpdesk" action="crm_case_helpdesk_act_myhelpdesk" groups="base.group_extended_menu"/>-->
+    <menuitem parent="menu_crm_case_helpdesk_my_act" id="menu_crm_case_helpdesk_act_myhelpdesk" action="crm_case_helpdesk_act_myhelpdesk" groups="base.group_extended_menu"/>
     
     <!-- 
         ALL Helpdesk REQUESTS 
     -->
 
-<!--    <menuitem parent="menu_help_support_main" id="menu_crm_case_helpdesk_act_all" action="crm_case_helpdesk_act111" groups="base.group_extended_menu"/>        -->
+    <menuitem parent="menu_help_support_main" id="menu_crm_case_helpdesk_act_all" action="crm_case_helpdesk_act111" groups="base.group_extended_menu"/>        
     
 
     <record model="ir.actions.act_window" id="crm_case_helpdesk_act_all3">
         <field name="name">All Unclosed Requests</field>
         <field name="res_model">crm.case</field>
         <field name="view_mode">tree,calendar,form</field>
-        <field name="view_id" ref="crm.crm_case_tree-view"/>
+        <field name="view_id" ref="crm_case_tree_view_helpdesk"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_help'))+'),(\'state\',\'&lt;&gt;\',\'done\')]'"/>
         <field name="context" eval="{'default_state':'open'}"/>
         <field name="filter" eval="True"/>
@@ -260,7 +260,7 @@
     <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_all3">
         <field name="sequence" eval="1"/>
         <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm.crm_case_tree-view"/>
+        <field name="view_id" ref="crm_case_tree_view_helpdesk"/>
         <field name="act_window_id" ref="crm_case_helpdesk_act_all3"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_all3">
@@ -272,16 +272,16 @@
     <record model="ir.actions.act_window.view" id="action_crm_sec_form_view_all3">
         <field name="sequence" eval="3"/>
         <field name="view_mode">form</field>
-        <field name="view_id" ref="crm.crm_case-view"/>
+        <field name="view_id" ref="crm_case_form_view_helpdesk"/>
         <field name="act_window_id" ref="crm_case_helpdesk_act_all3"/>
     </record>
-<!--    <menuitem parent="menu_crm_case_helpdesk_act_all" id="menu_crm_case_helpdesk_act_myhelpdesk_all3" action="crm_case_helpdesk_act_all3" groups="base.group_extended_menu"/>-->
+    <menuitem parent="menu_crm_case_helpdesk_act_all" id="menu_crm_case_helpdesk_act_myhelpdesk_all3" action="crm_case_helpdesk_act_all3" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_helpdesk_act_all2">
         <field name="name">All Helpdesk Propositions</field>
         <field name="res_model">crm.case</field>
         <field name="view_mode">tree,calendar,form</field>
-        <field name="view_id" ref="crm.crm_case_tree-view"/>
+        <field name="view_id" ref="crm_case_tree_view_helpdesk"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_help'))+'),(\'state\',\'=\',\'draft\')]'"/>
         <field name="context" eval="{'default_state':'open'}"/>
         <field name="filter" eval="True"/>
@@ -290,7 +290,7 @@
     <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_all2">
         <field name="sequence" eval="1"/>
         <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm.crm_case_tree-view"/>
+        <field name="view_id" ref="crm_case_tree_view_helpdesk"/>
         <field name="act_window_id" ref="crm_case_helpdesk_act_all2"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_all2">
@@ -302,16 +302,16 @@
     <record model="ir.actions.act_window.view" id="action_crm_sec_form_view_all2">
         <field name="sequence" eval="3"/>
         <field name="view_mode">form</field>
-        <field name="view_id" ref="crm.crm_case-view"/>
+        <field name="view_id" ref="crm_case_form_view_helpdesk"/>
         <field name="act_window_id" ref="crm_case_helpdesk_act_all2"/>
     </record>
-<!--    <menuitem parent="menu_crm_case_helpdesk_act_all" id="menu_crm_case_helpdesk_act_myhelpdesk_all2" action="crm_case_helpdesk_act_all2" groups="base.group_extended_menu"/>        -->
+    <menuitem parent="menu_crm_case_helpdesk_act_all" id="menu_crm_case_helpdesk_act_myhelpdesk_all2" action="crm_case_helpdesk_act_all2" groups="base.group_extended_menu"/>        
 
     <record model="ir.actions.act_window" id="crm_case_helpdesk_act_all1">
         <field name="name">All Pending Helpdesk Requests</field>
         <field name="res_model">crm.case</field>
         <field name="view_mode">tree,calendar,form</field>
-        <field name="view_id" ref="crm.crm_case_tree-view"/>
+        <field name="view_id" ref="crm_case_tree_view_helpdesk"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_help'))+'),(\'state\',\'=\',\'pending\')]'"/>
         <field name="context" eval="{'default_state':'open'}"/>
         <field name="filter" eval="True"/>
@@ -320,7 +320,7 @@
     <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_all1">
         <field name="sequence" eval="1"/>
         <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm.crm_case_tree-view"/>
+        <field name="view_id" ref="crm_case_tree_view_helpdesk"/>
         <field name="act_window_id" ref="crm_case_helpdesk_act_all1"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_all1">
@@ -332,17 +332,17 @@
     <record model="ir.actions.act_window.view" id="action_crm_sec_form_view_all1">
         <field name="sequence" eval="3"/>
         <field name="view_mode">form</field>
-        <field name="view_id" ref="crm.crm_case-view"/>
+        <field name="view_id" ref="crm_case_form_view_helpdesk"/>
         <field name="act_window_id" ref="crm_case_helpdesk_act_all1"/>
     </record>
-<!--    <menuitem  parent="menu_crm_case_helpdesk_act_all" id="menu_crm_case_helpdesk_act_myhelpdesk_all1" action="crm_case_helpdesk_act_all1" groups="base.group_extended_menu"/>        -->
+    <menuitem  parent="menu_crm_case_helpdesk_act_all" id="menu_crm_case_helpdesk_act_myhelpdesk_all1" action="crm_case_helpdesk_act_all1" groups="base.group_extended_menu"/>        
 
 
     <record model="ir.actions.act_window" id="crm_case_helpdesk_act_all0">
         <field name="name">All Open Helpdesk Requests</field>
         <field name="res_model">crm.case</field>
         <field name="view_mode">tree,calendar,form</field>
-        <field name="view_id" ref="crm.crm_case_tree-view"/>
+        <field name="view_id" ref="crm_case_tree_view_helpdesk"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_help'))+'),(\'state\',\'=\',\'open\')]'"/>
         <field name="context" eval="{'default_state':'open'}"/>
         <field name="filter" eval="True"/>
@@ -351,7 +351,7 @@
     <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_all0">
         <field name="sequence" eval="1"/>
         <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm.crm_case_tree-view"/>
+        <field name="view_id" ref="crm_case_tree_view_helpdesk"/>
         <field name="act_window_id" ref="crm_case_helpdesk_act_all0"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_all0">
@@ -363,10 +363,10 @@
     <record model="ir.actions.act_window.view" id="action_crm_sec_form_view_all0">
         <field name="sequence" eval="3"/>
         <field name="view_mode">form</field>
-        <field name="view_id" ref="crm.crm_case-view"/>
+        <field name="view_id" ref="crm_case_form_view_helpdesk"/>
         <field name="act_window_id" ref="crm_case_helpdesk_act_all0"/>
     </record>
-<!--    <menuitem  parent="menu_crm_case_helpdesk_act_all" id="menu_crm_case_helpdesk_act_myhelpdesk_all0" action="crm_case_helpdesk_act_all0" groups="base.group_extended_menu"/>        -->
+    <menuitem  parent="menu_crm_case_helpdesk_act_all" id="menu_crm_case_helpdesk_act_myhelpdesk_all0" action="crm_case_helpdesk_act_all0" groups="base.group_extended_menu"/>        
 
     <record model="ir.actions.act_window" id="crm_case_helpdesk_act_allhelpdesk">
         <field name="name">Calendar of Helpdesk</field>
@@ -385,16 +385,16 @@
     <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_allhelpdesk">
         <field name="sequence" eval="2"/>
         <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm.crm_case_tree-view"/>
+        <field name="view_id" ref="crm_case_tree_view_helpdesk"/>
         <field name="act_window_id" ref="crm_case_helpdesk_act_allhelpdesk"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_sec_form_view_allhelpdesk">
         <field name="sequence" eval="3"/>
         <field name="view_mode">form</field>
-        <field name="view_id" ref="crm.crm_case-view"/>
+        <field name="view_id" ref="crm_case_form_view_helpdesk"/>
         <field name="act_window_id" ref="crm_case_helpdesk_act_allhelpdesk"/>
     </record>
-<!--    <menuitem parent="menu_crm_case_helpdesk_act_all" id="menu_crm_case_helpdesk_act_myhelpdesk_allhelpdesk" action="crm_case_helpdesk_act_allhelpdesk" groups="base.group_extended_menu"/>-->
+    <menuitem parent="menu_crm_case_helpdesk_act_all" id="menu_crm_case_helpdesk_act_myhelpdesk_allhelpdesk" action="crm_case_helpdesk_act_allhelpdesk" groups="base.group_extended_menu"/>
     
     
 </data>
diff --git a/addons/crm_configuration/crm_helpdesk_view.xml b/addons/crm_configuration/crm_helpdesk_view.xml
new file mode 100644
index 00000000000..1a5a71981c1
--- /dev/null
+++ b/addons/crm_configuration/crm_helpdesk_view.xml
@@ -0,0 +1,143 @@
+<?xml version="1.0"?>
+<openerp>
+<data>
+
+    # ------------------------------------------------------ 
+    # Opportunities
+    # ------------------------------------------------------ 
+
+    <record model="ir.ui.view" id="crm_case_form_view_helpdesk">
+        <field name="name">CRM - Helpdisk Support Form</field>
+        <field name="model">crm.case</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Helpdisk Support">
+                <group colspan="4" col="7">
+                    <field colspan="2" name="name" select="1"/>
+                    <field colspan="1" name="section_id" widget="selection"/>
+                    <field name="date" select="1"/>
+                    <field name="date_deadline" select="2"/>
+                    <field name="priority"/>
+                    <group colspan="2">
+                        <field name="case_id" select="1"/>
+                        <button string="Assign" name="%(crm_generic_wizard_act)d"  type="action" />
+                    </group>                    
+                </group>
+                <notebook colspan="4">
+                    <page string="General">
+                        <group col="8" colspan="4">
+                            <field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id, email_from)" select="1"/>
+                            <field colspan="3" name="partner_address_id" on_change="onchange_partner_address_id(partner_address_id, email_from)" select="2"/>
+                            <newline/>
+                            <field colspan="3" name="email_from" select="2"/>
+                            <button name="remind_partner" states="open,pending" string="Send Reminder" type="object" icon="gtk-go-forward"/>
+                            <field name="user_id" select="1"/>
+                            <button name="remind_user" states="open,pending" string="Send Reminder" type="object" icon="gtk-go-forward"/>
+                        </group>
+
+                        <separator colspan="4" string="Description"/>
+                        <field name="description" colspan="4" nolabel="1"/>
+                        <separator colspan="4"/>
+                        <group col="8" colspan="4">
+                            <field name="state" select="1"/>
+                            <button name="case_close" states="open,draft,pending" string="Close" type="object" icon="gtk-close"/>
+                            <button name="case_open" states="draft,pending" string="Open" type="object" icon="gtk-go-forward"/>
+                            <button name="case_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
+                            <button name="case_pending" states="draft,open" string="Pending" type="object" icon="gtk-media-pause"/>
+                            <button name="case_escalate" states="open,draft,pending" string="Escalate" type="object" icon="gtk-go-up"/>
+                            <button name="case_reset" states="done,cancel" string="Reset to Draft" type="object" icon="gtk-convert"/>
+                        </group>
+                    </page>
+                    <page string="History">
+                        <field name="id" select="1"/>
+                        <field name="active" select="2"/>
+                        <field name="categ_id" on_change="onchange_categ_id(categ_id)" select="2"/>
+                        <field name="som" select="2"/>
+                        <separator colspan="4" string="Dates"/>
+                        <field name="create_date"/>
+                        <field name="date_closed"/>
+                        <field name="date_action_last"/>
+                        <field name="date_action_next"/>
+                        <separator colspan="4" string="Estimates"/>
+                        <field name="planned_revenue"/>
+                        <field name="planned_cost"/>
+                        <field name="probability"/>
+                        <separator colspan="4" string="References"/>
+                        <field colspan="4" name="ref"/>
+                        <field colspan="4" name="ref2"/>
+                        <field colspan="4" name="log_ids" nolabel="1">
+                            <form string="Actions">
+                                <separator colspan="4" string="Action Information"/>
+                                <field colspan="4" name="name"/>
+                                <field name="date" select="2"/>
+                                <field name="user_id" select="2"/>
+                                <field name="som" select="2"/>
+                                <field name="canal_id"/>
+                            </form>
+                        </field>
+                    </page>
+                    <page string="Events">
+                       <field name="child_ids" colspan="4" nolabel="1">
+                           <tree string="Related Cases">
+                               <field name="id"/>
+                               <field name="date"/>
+                               <field name="name"/>
+                               <field name="partner_id"/>
+                               <field name="user_id"/>
+                               <field name="section_id" widget="selection"/>
+                               <field name="state"/>
+                           </tree>
+                        </field>
+                    </page>
+                    <page string="Emails">
+                       <group colspan="4">
+                           <field colspan="4" name="email_cc" string="CC"/>
+                       </group>
+                       <field name="history_line" colspan="4" nolabel="1" mode="form,tree">
+                           <form string="Communication history">
+                               <group col="6" colspan="4">
+                                   <field name="date"/>
+                                   <field name="email"/>
+                                   <field name="canal_id"/>
+                               </group>
+                               <newline/>
+                               <field name="description" colspan="4" nolabel="1"/>
+                               <button colspan="4" string="Reply to Last Email" name="%(crm.wizard_crm_send_mail)d" context="{'mail':'reply'}" icon="gtk-undo" type="action"/>
+                           </form>
+                           <tree string="Communication history">
+                               <field name="description"/>
+                               <field name="email"/>
+                               <field name="date"/>
+                           </tree>
+                       </field>
+                       <button colspan="4" string="Send New Email" name="%(crm.wizard_crm_new_send_mail)d" context="{'mail':'new'}" icon="gtk-go-forward" type="action"/>
+                    </page>                        
+                </notebook>
+            </form>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="crm_case_tree_view_helpdesk">
+        <field name="name">CRM - Helpdisk Support Tree</field>
+        <field name="model">crm.case</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Helpdisk Support Tree"  colors="red:state=='open'">
+                <field name="id"/>
+                <field name="name" string="Support Query"/>                
+                <field name="partner_id" string="Partner"/>
+                <field name="planned_revenue"/>
+                <field name="probability"/>
+                <field name="date" string="Deadline"/>
+                <field name="user_id"/>
+                <field name="state"/>
+                <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-close"/>
+                <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
+                <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object"  icon="gtk-cancel"/>
+                <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
+                <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" icon="gtk-go-up"/>
+                <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>                
+            </tree>
+        </field>
+    </record>    
+</data>
+</openerp>
diff --git a/addons/crm_configuration/crm_jobs_menu.xml b/addons/crm_configuration/crm_jobs_menu.xml
index d2b7a3b755b..06762cae4a9 100644
--- a/addons/crm_configuration/crm_jobs_menu.xml
+++ b/addons/crm_configuration/crm_jobs_menu.xml
@@ -79,7 +79,7 @@
         <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
         <field name="act_window_id" ref="crm_case_categ0_act11"/>
     </record>
-<!--    <menuitem parent="menu_crm_case_job_req_main" id="menu_crm_case_categ0_act11" action="crm_case_categ0_act11" groups="base.group_extended_menu"/>-->
+    <menuitem parent="menu_crm_case_job_req_main" id="menu_crm_case_categ0_act11" action="crm_case_categ0_act11" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_categ0_act_my_new3">
         <field name="name">New Job Request</field>
@@ -101,11 +101,11 @@
         <field name="view_id" ref="crm_case_form_view11"/>
         <field name="act_window_id" ref="crm_case_categ0_act_my_new3"/>
     </record>
-<!--    <menuitem-->
-<!--        parent="menu_crm_case_job_req_main"-->
-<!--        id="menu_crm_case_categ0_act_my_new3"-->
-<!--        action="crm_case_categ0_act_my_new3"-->
-<!--        sequence="50"/>-->
+    <menuitem
+        parent="menu_crm_case_job_req_main"
+        id="menu_crm_case_categ0_act_my_new3"
+        action="crm_case_categ0_act_my_new3"
+        sequence="50"/>
 
     <record model="ir.actions.act_window" id="crm_case_categ0_act_my3">
         <field name="name">My Current Jobs Requests</field>
@@ -141,7 +141,7 @@
         <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
         <field name="act_window_id" ref="crm_case_categ0_act_my3"/>
     </record>
-<!--    <menuitem parent="menu_crm_case_categ0_act11" id="menu_crm_case_categ0_act_myjobs3" action="crm_case_categ0_act_my3" groups="base.group_extended_menu"/>-->
+    <menuitem parent="menu_crm_case_categ0_act11" id="menu_crm_case_categ0_act_myjobs3" action="crm_case_categ0_act_my3" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_categ0_act_my2">
         <field name="name">My Jobs Propositions to Review</field>
@@ -177,11 +177,11 @@
         <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
         <field name="act_window_id" ref="crm_case_categ0_act_my2"/>
     </record>
-<!--    <menuitem-->
-<!--        parent="menu_crm_case_categ0_act_myjobs3"-->
-<!--        id="menu_crm_case_categ0_act_myjobs2"-->
-<!--        action="crm_case_categ0_act_my2"-->
-<!--        groups="base.group_extended_menu"/>-->
+    <menuitem
+        parent="menu_crm_case_categ0_act_myjobs3"
+        id="menu_crm_case_categ0_act_myjobs2"
+        action="crm_case_categ0_act_my2"
+        groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_categ0_act_my1">
         <field name="name">My Pending Jobs Requests</field>
@@ -217,9 +217,9 @@
         <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
         <field name="act_window_id" ref="crm_case_categ0_act_my1"/>
     </record>
-<!--    <menuitem parent="menu_crm_case_categ0_act_myjobs3"-->
-<!--        id="menu_crm_case_categ0_act_myjobs1" action="crm_case_categ0_act_my1"-->
-<!--        groups="base.group_extended_menu"/>-->
+    <menuitem parent="menu_crm_case_categ0_act_myjobs3"
+        id="menu_crm_case_categ0_act_myjobs1" action="crm_case_categ0_act_my1"
+        groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_categ0_act_my0">
         <field name="name">My Open Jobs Requests</field>
@@ -255,9 +255,9 @@
         <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
         <field name="act_window_id" ref="crm_case_categ0_act_my0"/>
     </record>
-<!--    <menuitem parent="menu_crm_case_categ0_act_myjobs3" id="menu_crm_case_categ0_act_myjobs0"-->
-<!--        action="crm_case_categ0_act_my0"-->
-<!--        groups="base.group_extended_menu"/>-->
+    <menuitem parent="menu_crm_case_categ0_act_myjobs3" id="menu_crm_case_categ0_act_myjobs0"
+        action="crm_case_categ0_act_my0"
+        groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_categ0_act_myjobs">
         <field name="name">Calendar Of My Interviews</field>
@@ -291,7 +291,7 @@
         <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
         <field name="act_window_id" ref="crm_case_categ0_act_myjobs"/>
     </record>
-<!--    <menuitem parent="menu_crm_case_categ0_act11" id="menu_crm_case_categ0_act_myjobs_myjobs" action="crm_case_categ0_act_myjobs" groups="base.group_extended_menu"/>-->
+    <menuitem parent="menu_crm_case_categ0_act11" id="menu_crm_case_categ0_act_myjobs_myjobs" action="crm_case_categ0_act_myjobs" groups="base.group_extended_menu"/>
     
     <!-- 
         ALL JOBS REQUESTS 
@@ -333,7 +333,7 @@
         <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
         <field name="act_window_id" ref="crm_case_categ0_act_all3"/>
     </record>
-<!--    <menuitem parent="menu_crm_case_categ0_act111" id="menu_crm_case_categ0_act_myjobs_all3" action="crm_case_categ0_act_all3" groups="base.group_extended_menu"/>-->
+    <menuitem parent="menu_crm_case_categ0_act111" id="menu_crm_case_categ0_act_myjobs_all3" action="crm_case_categ0_act_all3" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_categ0_act_all2">
         <field name="name">All Jobs Propositions to Review</field>
@@ -369,7 +369,7 @@
         <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
         <field name="act_window_id" ref="crm_case_categ0_act_all2"/>
     </record>
-<!--    <menuitem parent="menu_crm_case_categ0_act_myjobs_all3" id="menu_crm_case_categ0_act_myjobs_all2" action="crm_case_categ0_act_all2" groups="base.group_extended_menu"/>        -->
+    <menuitem parent="menu_crm_case_categ0_act_myjobs_all3" id="menu_crm_case_categ0_act_myjobs_all2" action="crm_case_categ0_act_all2" groups="base.group_extended_menu"/>        
 
     <record model="ir.actions.act_window" id="crm_case_categ0_act_all1">
         <field name="name">All Pending Jobs Requests</field>
@@ -405,7 +405,7 @@
         <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
         <field name="act_window_id" ref="crm_case_categ0_act_all1"/>
     </record>
-<!--    <menuitem parent="menu_crm_case_categ0_act_myjobs_all3" id="menu_crm_case_categ0_act_myjobs_all1" action="crm_case_categ0_act_all1" groups="base.group_extended_menu"/>        -->
+    <menuitem parent="menu_crm_case_categ0_act_myjobs_all3" id="menu_crm_case_categ0_act_myjobs_all1" action="crm_case_categ0_act_all1" groups="base.group_extended_menu"/>        
 
     <record model="ir.actions.act_window" id="crm_case_categ0_act_all0">
         <field name="name">All Open Jobs Requests</field>
@@ -441,7 +441,7 @@
         <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
         <field name="act_window_id" ref="crm_case_categ0_act_all0"/>
     </record>
-<!--    <menuitem  parent="menu_crm_case_categ0_act_myjobs_all3" id="menu_crm_case_categ0_act_myjobs_all0" action="crm_case_categ0_act_all0" groups="base.group_extended_menu"/>        -->
+    <menuitem  parent="menu_crm_case_categ0_act_myjobs_all3" id="menu_crm_case_categ0_act_myjobs_all0" action="crm_case_categ0_act_all0" groups="base.group_extended_menu"/>        
 
     <record model="ir.actions.act_window" id="crm_case_categ0_act_alljobs">
         <field name="name">Calendar Of Interviews</field>
@@ -475,7 +475,7 @@
         <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
         <field name="act_window_id" ref="crm_case_categ0_act_alljobs"/>
     </record>
-<!--    <menuitem parent="menu_crm_case_categ0_act111" id="menu_crm_case_categ0_act_myjobs_alljobs" action="crm_case_categ0_act_alljobs" groups="base.group_extended_menu"/>-->
+    <menuitem parent="menu_crm_case_categ0_act111" id="menu_crm_case_categ0_act_myjobs_alljobs" action="crm_case_categ0_act_alljobs" groups="base.group_extended_menu"/>
     
 </data>
 </openerp>
diff --git a/addons/crm_configuration/crm_lead_menu.xml b/addons/crm_configuration/crm_lead_menu.xml
index 13aa1b0818e..6127d36b35a 100644
--- a/addons/crm_configuration/crm_lead_menu.xml
+++ b/addons/crm_configuration/crm_lead_menu.xml
@@ -27,7 +27,7 @@
         <field name="act_window_id" ref="crm_case_category_act_leads_all"/>
     </record>
     <menuitem parent="menu_presale" name="Prospects" id="menu_crm_case_categ0_act_leads" action="crm_case_category_act_leads_all"/>
-<!--    <menuitem parent="menu_crm_case_categ0_act_leads" id="menu_crm_case_categ0_act_leads_all" action="crm_case_category_act_leads_all" groups="base.group_extended_menu"/>-->
+    <menuitem parent="menu_crm_case_categ0_act_leads" id="menu_crm_case_categ0_act_leads_all" action="crm_case_category_act_leads_all" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_leads_all1">
         <field name="name">Current Prospects</field>
@@ -51,7 +51,7 @@
         <field name="view_id" ref="crm_case_form_view_leads"/>
         <field name="act_window_id" ref="crm_case_category_act_leads_all1"/>
     </record>
-<!--    <menuitem parent="menu_crm_case_categ0_act_leads_all" id="menu_crm_case_categ0_act_leads_all1" action="crm_case_category_act_leads_all1" groups="base.group_extended_menu"/>-->
+    <menuitem parent="menu_crm_case_categ0_act_leads_all" id="menu_crm_case_categ0_act_leads_all1" action="crm_case_category_act_leads_all1" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_leads_unassigned">
         <field name="name">Unassigned Prospects</field>
@@ -75,11 +75,11 @@
         <field name="view_id" ref="crm_case_form_view_leads"/>
         <field name="act_window_id" ref="crm_case_category_act_leads_unassigned"/>
     </record>
-<!--    <menuitem-->
-<!--        parent="menu_crm_case_categ0_act_leads_all"-->
-<!--        id="menu_crm_case_categ0_act_leads_unassigned"-->
-<!--        action="crm_case_category_act_leads_unassigned"-->
-<!--        groups="base.group_extended_menu"/>-->
+    <menuitem
+        parent="menu_crm_case_categ0_act_leads_all"
+        id="menu_crm_case_categ0_act_leads_unassigned"
+        action="crm_case_category_act_leads_unassigned"
+        groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_leads_all2">
         <field name="name">All Draft Prospects</field>
@@ -103,7 +103,7 @@
         <field name="view_id" ref="crm_case_form_view_leads"/>
         <field name="act_window_id" ref="crm_case_category_act_leads_all2"/>
     </record>
-<!--    <menuitem parent="menu_crm_case_categ0_act_leads_all1" id="menu_crm_case_categ0_act_leads_all2" action="crm_case_category_act_leads_all2" groups="base.group_extended_menu"/>-->
+    <menuitem parent="menu_crm_case_categ0_act_leads_all1" id="menu_crm_case_categ0_act_leads_all2" action="crm_case_category_act_leads_all2" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_leads_all3">
         <field name="name">All Prospects to Qualify</field>
@@ -127,7 +127,7 @@
         <field name="view_id" ref="crm_case_form_view_leads"/>
         <field name="act_window_id" ref="crm_case_category_act_leads_all3"/>
     </record>
-<!--    <menuitem parent="menu_crm_case_categ0_act_leads_all1" id="menu_crm_case_categ0_act_leads_all3" action="crm_case_category_act_leads_all3" groups="base.group_extended_menu"/>-->
+    <menuitem parent="menu_crm_case_categ0_act_leads_all1" id="menu_crm_case_categ0_act_leads_all3" action="crm_case_category_act_leads_all3" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_leads_all4">
         <field name="name">All Pending Prospects</field>
@@ -151,7 +151,7 @@
         <field name="view_id" ref="crm_case_form_view_leads"/>
         <field name="act_window_id" ref="crm_case_category_act_leads_all4"/>
     </record>
-<!--    <menuitem parent="menu_crm_case_categ0_act_leads_all1" id="menu_crm_case_categ0_act_leads_all4" action="crm_case_category_act_leads_all4" groups="base.group_extended_menu"/>-->
+    <menuitem parent="menu_crm_case_categ0_act_leads_all1" id="menu_crm_case_categ0_act_leads_all4" action="crm_case_category_act_leads_all4" groups="base.group_extended_menu"/>
 
 <!-- =================================================================== -->
     <record model="ir.actions.act_window" id="crm_case_category_act_leads_my">
@@ -176,7 +176,7 @@
         <field name="view_id" ref="crm_case_form_view_leads"/>
         <field name="act_window_id" ref="crm_case_category_act_leads_my"/>
     </record>
-<!--    <menuitem parent="menu_crm_case_categ0_act_leads" id="menu_crm_case_categ0_act_leads_my" action="crm_case_category_act_leads_my" groups="base.group_extended_menu"/>-->
+    <menuitem parent="menu_crm_case_categ0_act_leads" id="menu_crm_case_categ0_act_leads_my" action="crm_case_category_act_leads_my" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_leads_my_new">
         <field name="name">New Prospect</field>
@@ -199,7 +199,7 @@
         <field name="view_id" ref="crm_case_form_view_leads"/>
         <field name="act_window_id" ref="crm_case_category_act_leads_my_new"/>
     </record>
-<!--    <menuitem parent="menu_crm_case_categ0_act_leads" id="menu_crm_case_category_act_leads_my_new" action="crm_case_category_act_leads_my_new" sequence="50"/>-->
+    <menuitem parent="menu_crm_case_categ0_act_leads" id="menu_crm_case_category_act_leads_my_new" action="crm_case_category_act_leads_my_new" sequence="50"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_leads_my1">
         <field name="name">My Current Prospects</field>
@@ -223,7 +223,7 @@
         <field name="view_id" ref="crm_case_form_view_leads"/>
         <field name="act_window_id" ref="crm_case_category_act_leads_my1"/>
     </record>
-<!--    <menuitem parent="menu_crm_case_categ0_act_leads_my" id="menu_crm_case_categ0_act_leads_my1" action="crm_case_category_act_leads_my1" groups="base.group_extended_menu"/>-->
+    <menuitem parent="menu_crm_case_categ0_act_leads_my" id="menu_crm_case_categ0_act_leads_my1" action="crm_case_category_act_leads_my1" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_leads_my3">
         <field name="name">My Prospects to Qualify</field>
@@ -247,7 +247,7 @@
         <field name="view_id" ref="crm_case_form_view_leads"/>
         <field name="act_window_id" ref="crm_case_category_act_leads_my3"/>
     </record>
-<!--    <menuitem parent="menu_crm_case_categ0_act_leads_my1" id="menu_crm_case_categ0_act_leads_my3" action="crm_case_category_act_leads_my3" groups="base.group_extended_menu"/>-->
+    <menuitem parent="menu_crm_case_categ0_act_leads_my1" id="menu_crm_case_categ0_act_leads_my3" action="crm_case_category_act_leads_my3" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_leads_my4">
         <field name="name">My Pending Prospects</field>
@@ -271,7 +271,7 @@
         <field name="view_id" ref="crm_case_form_view_leads"/>
         <field name="act_window_id" ref="crm_case_category_act_leads_my4"/>
     </record>
-<!--    <menuitem parent="menu_crm_case_categ0_act_leads_my1" id="menu_crm_case_categ0_act_leads_my4" action="crm_case_category_act_leads_my4" groups="base.group_extended_menu"/>-->
+    <menuitem parent="menu_crm_case_categ0_act_leads_my1" id="menu_crm_case_categ0_act_leads_my4" action="crm_case_category_act_leads_my4" groups="base.group_extended_menu"/>
 
 <!--        REPORTS        -->
     <menuitem name="Prospects"  id="menu_action_report_crm_case_lead" parent="report_crm.next_id_64"/>    
diff --git a/addons/crm_configuration/crm_lead_view.xml b/addons/crm_configuration/crm_lead_view.xml
index 0a54307d065..5a98e4121dd 100644
--- a/addons/crm_configuration/crm_lead_view.xml
+++ b/addons/crm_configuration/crm_lead_view.xml
@@ -188,20 +188,5 @@
         </field>
     </record>
 
-		<!--  PARTNER VIEW -->
-		<record id="view_partner_property_form" model="ir.ui.view">
-			<field name="name">res.partner.crm.form.inherit</field>
-			<field name="model">res.partner</field>
-			<field name="type">form</field>
-			<field name="inherit_id" ref="base.view_partner_form" />
-			<field name="arch" type="xml">
-				<field name="parent_id" position="after">
-					<button string="Create Opportunity"
-						name="%(crm_configuration.wizard_partner_create_opportunity)d" icon="gtk-index"
-						type="action"
-					/>
-				</field>
-			</field>
-		</record>
 </data>
 </openerp>
diff --git a/addons/crm_configuration/crm_meeting_menu.xml b/addons/crm_configuration/crm_meeting_menu.xml
index d6a06c7971e..96c43b0c203 100644
--- a/addons/crm_configuration/crm_meeting_menu.xml
+++ b/addons/crm_configuration/crm_meeting_menu.xml
@@ -110,32 +110,9 @@
         <field name="view_id" ref="crm_case_gantt_view_meet"/>
         <field name="act_window_id" ref="crm_case_categ_meetmy"/>
     </record>
-<!--    <menuitem name="My Meetings" id="menu_crm_case_categ_meet_my" action="crm_case_categ_meetmy" parent="menu_crm_case_category_act_meetings"/>-->
+    <menuitem name="My Meetings" id="menu_crm_case_categ_meet_my" action="crm_case_categ_meetmy" parent="menu_crm_case_category_act_meetings"/>
 
-    <record model="ir.actions.act_window" id="crm_case_category_act_meetings">
-        <field name="name">New Meeting</field>
-        <field name="res_model">crm.case</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">form,tree</field>
-        <field name="context" eval="{'default_state':'open','default_section_id':ref('section_support1')}"/>
-        <field name="view_id" ref="crm_case_form_view_meet"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_meetings">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">form</field>
-        <field name="view_id" ref="crm_case_form_view_meet"/>
-        <field name="act_window_id" ref="crm_case_category_act_meetings"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_meetings">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_tree_view_meet"/>
-        <field name="act_window_id" ref="crm_case_category_act_meetings"/>
-    </record>
-<!--    <menuitem-->
-<!--        parent="menu_crm_case_category_act_meetings"-->
-<!--        id="menu_crm_case_category_act_meetings_new"-->
-<!--        action="crm_case_category_act_meetings" sequence="50"/>-->
+    
 
 
     <!-- 
diff --git a/addons/crm_configuration/crm_meeting_view.xml b/addons/crm_configuration/crm_meeting_view.xml
index 5e14263b590..e4633f4305b 100644
--- a/addons/crm_configuration/crm_meeting_view.xml
+++ b/addons/crm_configuration/crm_meeting_view.xml
@@ -18,7 +18,11 @@
                     <newline/>
                     <field name="date" string="Meeting Date" required="1"/>
                     <field name="duration" colspan="1" widget="float_time" required="1"/>
-                    <field name="case_id" on_change="onchange_case_id(case_id, name, partner_id)"/>
+                    <group colspan="2">
+                        <field name="case_id" on_change="onchange_case_id(case_id, name, partner_id)"/>
+                        <button string="Assign" name="%(crm_generic_wizard_act)d"  type="action" />
+                    </group>
+                    
                 </group>
                 <notebook colspan="4">
 	                <page string="Meeting">
@@ -37,66 +41,7 @@
 	                        <button name="case_cancel" string="Cancel Meeting" states="draft,open,pending" type="object" icon="gtk-cancel"/>
 	                        <button name="case_reset" string="Reset to Unconfirmed" states="done,open,cancel" type="object" icon="gtk-convert"/>
 	                    </group>
-	                </page>
-	                <page string="History">
-	                    <group colspan="4">
-	                        <field name="id" select="1"/>
-	                        <field name="active" select="2"/>
-	                        <newline/>
-	                        <field name="date_deadline" select="2" string="Deadlines"/>
-	                        <field name="priority" select="2"/>
-	                        <newline/>
-	
-	                        <field name="planned_revenue"/>
-	                        <field name="planned_cost"/>
-	                        <field name="probability"/>
-	                        <newline/>                        
-	                        <field name="canal_id"/>
-	                        <field name="som"/>                        
-	                        <separator colspan="4" string="Dates"/>
-	                        <field name="create_date"/>
-	                        <field name="date_closed"/>
-	                        <field name="date_action_last"/>
-	                        <field name="date_action_next"/>
-	                        <separator colspan="4" string="References"/>
-	                        <field name="ref" colspan="4"/>
-	                        <field name="ref2" colspan="4"/>
-	                    </group>                
-	
-	                    <field name="log_ids" nolabel="1" colspan="4">
-	                        <form string="Actions">
-	                            <separator string="Action Information" colspan="4"/>
-	                            <field name="name" colspan="4"/>
-	                            <field name="date"/>
-	                            <field name="user_id"/>
-	                            <field name="som"/>
-	                            <field name="canal_id"/>
-	                        </form>
-	                    </field>
-	                </page>
-	                <page string="Emails" groups="base.group_extended">
-	                    <group colspan="4">
-	                        <field colspan="4" name="email_cc" string="CC"/>
-	                    </group>
-	                    <field name="history_line" colspan="4" nolabel="1" mode="form,tree">
-	                       <form string="Communication history">
-	                           <group col="6" colspan="4">
-	                               <field name="date"/>
-	                               <field name="email"/>
-	                               <field name="canal_id"/>
-	                           </group>
-	                           <newline/>
-	                           <field name="description" colspan="4" nolabel="1"/>
-	                           <button colspan="4" string="Reply to Last Email" name="%(crm.wizard_crm_send_mail)d" context="{'mail':'reply'}" icon="gtk-undo" type="action"/>
-	                        </form>
-	                        <tree string="Communication history">
-	                            <field name="description"/>
-	                            <field name="email"/>
-	                            <field name="date"/>
-	                        </tree>
-	                    </field>
-	                    <button colspan="4" string="Send New Email" name="%(crm.wizard_crm_new_send_mail)d" context="{'mail':'new'}" icon="gtk-go-forward" type="action"/>
-	                </page>                
+	                </page>	               	                             
                 </notebook>
             </form>
         </field>
diff --git a/addons/crm_configuration/crm_opportunity_menu.xml b/addons/crm_configuration/crm_opportunity_menu.xml
index 9f9c22926ee..120ed288f92 100644
--- a/addons/crm_configuration/crm_opportunity_menu.xml
+++ b/addons/crm_configuration/crm_opportunity_menu.xml
@@ -34,7 +34,7 @@
 
 
 <!--          MENU          -->
-<!--     <menuitem parent="menu_crm_case_opp" id="menu_crm_case_categ0_act_oppor11" action="crm_case_category_act_oppor11" groups="base.group_extended_menu"/>-->
+     <menuitem parent="menu_crm_case_opp" id="menu_crm_case_categ0_act_oppor11" action="crm_case_category_act_oppor11" groups="base.group_extended_menu"/>
 
      <record model="ir.actions.act_window" id="crm_case_category_act_oppor1">
           <field name="name">All Open Opportunities</field>
@@ -64,7 +64,7 @@
           <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
           <field name="act_window_id" ref="crm_case_category_act_oppor1"/>
      </record>
-<!--     <menuitem parent="menu_crm_case_categ0_act_oppor11" id="menu_crm_case_categ0_act_oppor1" action="crm_case_category_act_oppor1" groups="base.group_extended_menu"/>-->
+     <menuitem parent="menu_crm_case_categ0_act_oppor11" id="menu_crm_case_categ0_act_oppor1" action="crm_case_category_act_oppor1" groups="base.group_extended_menu"/>
 
 
      <record model="ir.actions.act_window" id="crm_case_category_act_oppor_all2">
@@ -95,7 +95,7 @@
           <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
           <field name="act_window_id" ref="crm_case_category_act_oppor_all2"/>
      </record>
-<!--     <menuitem parent="menu_crm_case_categ0_act_oppor11" id="menu_crm_case_categ0_act_oppor_all2" action="crm_case_category_act_oppor_all2" groups="base.group_extended_menu"/>-->
+     <menuitem parent="menu_crm_case_categ0_act_oppor11" id="menu_crm_case_categ0_act_oppor_all2" action="crm_case_category_act_oppor_all2" groups="base.group_extended_menu"/>
 
 
 <!-- ======================================================== -->
@@ -126,7 +126,7 @@
           <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
           <field name="act_window_id" ref="crm_case_category_act_oppor22"/>
      </record>
-<!--     <menuitem parent="menu_crm_case_opp" id="menu_crm_case_categ0_act_oppor22" action="crm_case_category_act_oppor22" groups="base.group_extended_menu"/>-->
+     <menuitem parent="menu_crm_case_opp" id="menu_crm_case_categ0_act_oppor22" action="crm_case_category_act_oppor22" groups="base.group_extended_menu"/>
 
      <record model="ir.actions.act_window" id="crm_case_category_act_oppor">
           <field name="name">Opportunity</field>
@@ -149,11 +149,11 @@
           <field name="view_id" ref="crm_case_tree_view_oppor"/>
           <field name="act_window_id" ref="crm_case_category_act_oppor"/>
      </record>
-<!--     <menuitem name="New Opportunity"-->
-<!--        parent="menu_crm_case_opp"-->
-<!--        id="menu_crm_case_categ0_act_oppor"-->
-<!--        action="crm_case_category_act_oppor"-->
-<!--        sequence="50"/>-->
+     <menuitem name="New Opportunity"
+        parent="menu_crm_case_opp"
+        id="menu_crm_case_categ0_act_oppor"
+        action="crm_case_category_act_oppor"
+        sequence="50"/>
 
      <record model="ir.actions.act_window" id="crm_case_category_act_oppor2">
           <field name="name">My Open Opportunities</field>
@@ -183,7 +183,7 @@
           <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
           <field name="act_window_id" ref="crm_case_category_act_oppor2"/>
      </record>
-<!--     <menuitem parent="menu_crm_case_categ0_act_oppor22" id="menu_crm_case_categ0_act_oppor2" action="crm_case_category_act_oppor2" groups="base.group_extended_menu"/>-->
+     <menuitem parent="menu_crm_case_categ0_act_oppor22" id="menu_crm_case_categ0_act_oppor2" action="crm_case_category_act_oppor2" groups="base.group_extended_menu"/>
 
      <record model="ir.actions.act_window" id="crm_case_category_act_oppor_my2">
           <field name="name">My Pending Opportunities</field>
@@ -213,7 +213,7 @@
           <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
           <field name="act_window_id" ref="crm_case_category_act_oppor_my2"/>
      </record>
-<!--     <menuitem parent="menu_crm_case_categ0_act_oppor22" id="menu_crm_case_categ0_act_oppor_my2" action="crm_case_category_act_oppor_my2" groups="base.group_extended_menu"/>-->
+     <menuitem parent="menu_crm_case_categ0_act_oppor22" id="menu_crm_case_categ0_act_oppor_my2" action="crm_case_category_act_oppor_my2" groups="base.group_extended_menu"/>
 
 <!--          REPORTS               -->
      <record model="ir.actions.act_window" id="action_report_crm_case_oppor_user">
diff --git a/addons/crm_configuration/crm_opportunity_view.xml b/addons/crm_configuration/crm_opportunity_view.xml
index 0e30b8cd733..519dc49dc5a 100644
--- a/addons/crm_configuration/crm_opportunity_view.xml
+++ b/addons/crm_configuration/crm_opportunity_view.xml
@@ -25,7 +25,10 @@
                         <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
                         </group>
                     <field name="date" string="Deadline"/>
-                    <field name="id" select="1"/>
+                    <group colspan="2">
+                        <field name="case_id" select="1"/>
+                        <button string="Assign" name="%(crm_generic_wizard_act)d"  type="action" />
+                    </group>
                     <button string="Schedule Meeting" icon="terp-crm" name="%(wizard_crm_meeting)d" type="action"/>
                 </group>
                 <notebook colspan="4">
diff --git a/addons/crm_configuration/crm_phonecall_menu.xml b/addons/crm_configuration/crm_phonecall_menu.xml
index ec3a289c8df..16e9f552e52 100644
--- a/addons/crm_configuration/crm_phonecall_menu.xml
+++ b/addons/crm_configuration/crm_phonecall_menu.xml
@@ -72,7 +72,7 @@
         <field name="view_id" ref="crm_case_phone_form_view"/>
         <field name="act_window_id" ref="crm_case_categ_phone_incoming0"/>
     </record>
-<!--    <menuitem name="Inbound" id="menu_crm_case_categ_phone_incoming0"  parent="menu_crm_case_phone" action="crm_case_categ_phone_incoming0"/>-->
+    <menuitem name="Inbound" id="menu_crm_case_categ_phone_incoming0"  parent="menu_crm_case_phone" action="crm_case_categ_phone_incoming0"/>
 
     <record model="ir.actions.act_window" id="crm_case_categ_phone_incoming1">
         <field name="name">New Incoming Call</field>
@@ -95,7 +95,7 @@
         <field name="view_id" ref="crm_case_phone_form_view"/>
         <field name="act_window_id" ref="crm_case_categ_phone_incoming1"/>
     </record>
-<!--    <menuitem name="New Incoming Call" id="menu_crm_case_categ_phone_incoming1"  parent="menu_crm_case_categ_phone_incoming0" action="crm_case_categ_phone_incoming1" sequence="50"/>-->
+    <menuitem name="New Incoming Call" id="menu_crm_case_categ_phone_incoming1"  parent="menu_crm_case_categ_phone_incoming0" action="crm_case_categ_phone_incoming1" sequence="50"/>
 
     <record model="ir.actions.act_window" id="crm_case_categ_phone_incoming2">
         <field name="name">Planned Calls</field>
@@ -126,7 +126,7 @@
         <field name="view_id" ref="crm_case_phone_form_view"/>
         <field name="act_window_id" ref="crm_case_categ_phone_incoming2"/>
     </record>
-<!--    <menuitem name="Planned Calls" id="menu_crm_case_categ_phone_incoming2"  parent="menu_crm_case_categ_phone_incoming0" action="crm_case_categ_phone_incoming2" groups="base.group_extended_menu"/>-->
+    <menuitem name="Planned Calls" id="menu_crm_case_categ_phone_incoming2"  parent="menu_crm_case_categ_phone_incoming0" action="crm_case_categ_phone_incoming2" groups="base.group_extended_menu"/>
 
 ################################################################
     <record model="ir.actions.act_window" id="crm_case_categ_phone_outgoing0">
@@ -156,7 +156,7 @@
         <field name="view_id" ref="crm_case_phone_form_view"/>
         <field name="act_window_id" ref="crm_case_categ_phone_outgoing0"/>
     </record>
-<!--    <menuitem name="Outbound" id="menu_crm_case_categ_phone_outgoing0"  parent="menu_crm_case_phone" action="crm_case_categ_phone_outgoing0"/>-->
+    <menuitem name="Outbound" id="menu_crm_case_categ_phone_outgoing0"  parent="menu_crm_case_phone" action="crm_case_categ_phone_outgoing0"/>
 
     <record model="ir.actions.act_window" id="crm_case_categ_phone_outgoing1">
         <field name="name">New Outgoing Call</field>
@@ -178,7 +178,7 @@
         <field name="view_id" ref="crm_case_phone_form_view"/>
         <field name="act_window_id" ref="crm_case_categ_phone_outgoing1"/>
     </record>
-<!--    <menuitem name="New Outgoing Call" id="menu_crm_case_categ_phone_outgoing1"  parent="menu_crm_case_categ_phone_outgoing0" action="crm_case_categ_phone_outgoing1" sequence="50"/>-->
+    <menuitem name="New Outgoing Call" id="menu_crm_case_categ_phone_outgoing1"  parent="menu_crm_case_categ_phone_outgoing0" action="crm_case_categ_phone_outgoing1" sequence="50"/>
 
     <record model="ir.actions.act_window" id="crm_case_categ_phone_outgoing2">
         <field name="name">Planned Calls</field>
@@ -208,7 +208,7 @@
         <field name="view_id" ref="crm_case_phone_form_view"/>
         <field name="act_window_id" ref="crm_case_categ_phone_outgoing2"/>
     </record>
-<!--    <menuitem name="Planned Calls" id="menu_crm_case_categ_phone_outgoing2"  parent="menu_crm_case_categ_phone_outgoing0" action="crm_case_categ_phone_outgoing2" groups="base.group_extended_menu"/>-->
+    <menuitem name="Planned Calls" id="menu_crm_case_categ_phone_outgoing2"  parent="menu_crm_case_categ_phone_outgoing0" action="crm_case_categ_phone_outgoing2" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_categ_phone_outgoing4">
         <field name="name">Calls Not Held</field>
@@ -238,7 +238,7 @@
         <field name="view_id" ref="crm_case_phone_form_view"/>
         <field name="act_window_id" ref="crm_case_categ_phone_outgoing4"/>
     </record>
-<!--    <menuitem name="Calls Not Held" id="menu_crm_case_categ_phone_outgoing4"  parent="menu_crm_case_categ_phone_outgoing0" action="crm_case_categ_phone_outgoing4" groups="base.group_extended_menu"/>-->
+    <menuitem name="Calls Not Held" id="menu_crm_case_categ_phone_outgoing4"  parent="menu_crm_case_categ_phone_outgoing0" action="crm_case_categ_phone_outgoing4" groups="base.group_extended_menu"/>
 
 </data>
 </openerp>
diff --git a/addons/crm_configuration/crm_phonecall_view.xml b/addons/crm_configuration/crm_phonecall_view.xml
index 74b4f91de37..57c55f5f6cb 100644
--- a/addons/crm_configuration/crm_phonecall_view.xml
+++ b/addons/crm_configuration/crm_phonecall_view.xml
@@ -10,20 +10,17 @@
         <field name="model">crm.case</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Phone Calls"  colors="red:state=='open'">
-                <field name="id"/>
-                <field name="name" string="Subject"/>
-                <field name="categ_id" string="Direction" select="1"/>
+            <tree string="Phone Calls"  editable="bottom" colors="red:state=='open'">
+                <field name="date" string="Date"/>
+                <field name="name" string="Call Summary"/>                
                 <field name="partner_id" string="Partner"/>
                 <field name="partner_address_id" string="Contact"/>
-                <field name="date" string="Date"/>
-                <field name="user_id" string="Assigned to"/>
-                <field name="state"/>
-                <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
-                <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
-                <button name="case_pending" string="Not Held" states="open" type="object" icon="gtk-undo"/>
-                <button name="case_close" string="Held" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
-                <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>                
+                <field name="case_id"/>                
+                <button string="Opportunity" name="%(wizard_crm_opportunity_set)d"  type="action"/>
+                <button string="Meeting"
+                        name="%(wizard_crm_reschedule_phone_call)d"  type="action" />
+                <button string="Assign" name="%(crm_generic_wizard_act)d"  type="action" />
+                
             </tree>
         </field>
     </record>
@@ -42,10 +39,13 @@
                     <newline/>
                     <field name="date" string="Planned Date"/>
                     <field name="duration"/>
-                    <field name="case_id" on_change="onchange_case_id(case_id, name, partner_id)" 
-                    context="{'default_name':name,'default_section_id':section_id,'default_user_id':user_id,'default_duration':duration,
-                           'default_partner_id':partner_id,'default_partner_address_id':partner_address_id,'default_partner_phone':partner_phone,
-                           'default_partner_mobile':partner_mobile,'default_categ_id':categ_id}"/>
+                    <group colspan="2">
+                        <field name="case_id" on_change="onchange_case_id(case_id, name, partner_id)" 
+                        context="{'default_name':name,'default_section_id':section_id,'default_user_id':user_id,'default_duration':duration,
+                               'default_partner_id':partner_id,'default_partner_address_id':partner_address_id,'default_partner_phone':partner_phone,
+                               'default_partner_mobile':partner_mobile,'default_categ_id':categ_id}"/>
+                       <button string="Assign" name="%(crm_generic_wizard_act)d"  type="action" />
+                    </group>
                     <button string="Convert to Opportunity" name="%(wizard_crm_opportunity_set)d" icon="gtk-index" type="action"/>
                     <label string='' colspan='6' />
                     <button string="Schedule a Phone Call"
@@ -74,55 +74,7 @@
                         <button name="case_close" string="Held" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
                         <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
                     </group>
-                </page>
-                <page string="History">
-                    <field name="id" select="1"/>
-                    <field name="canal_id"/>
-                    <separator colspan="4" string="Dates"/>
-                    <field name="create_date"/>
-                    <field name="date_closed"/>
-                    <field name="date_action_last"/>
-                    <field name="date_action_next"/>
-                    <field name="planned_cost"/>
-                    <field name="planned_revenue"/>
-                    <field name="probability"/>
-                    <separator colspan="4" string="References"/>
-                    <field name="ref" colspan="4"/>
-                    <field name="ref2" colspan="4"/>
-                    <field name="log_ids" nolabel="1" colspan="4">
-                        <form string="Actions">
-                            <separator string="Action Information" colspan="4"/>
-                            <field name="name" colspan="4"/>
-                            <field name="date"/>
-                            <field name="user_id"/>
-                            <field name="som"/>
-                            <field name="canal_id"/>
-                        </form>
-                    </field>
-                </page>
-                <page string="Emails" groups="base.group_extended">
-                    <group colspan="4">
-                        <field colspan="4" name="email_cc" string="CC"/>
-                    </group>
-                    <field name="history_line" colspan="4" nolabel="1" mode="form,tree">
-                       <form string="Communication history">
-                           <group col="6" colspan="4">
-                               <field name="date"/>
-                               <field name="email"/>
-                               <field name="canal_id"/>
-                           </group>
-                           <newline/>
-                           <field name="description" colspan="4" nolabel="1"/>
-                           <button colspan="4" string="Reply to Last Email" name="%(crm.wizard_crm_send_mail)d" context="{'mail':'reply'}" icon="gtk-undo" type="action"/>
-                        </form>
-                        <tree string="Communication history">
-                            <field name="description"/>
-                            <field name="email"/>
-                            <field name="date"/>
-                        </tree>
-                    </field>
-                    <button colspan="4" string="Send New Email" name="%(crm.wizard_crm_new_send_mail)d" context="{'mail':'new'}" icon="gtk-go-forward" type="action"/>
-                </page>                                    
+                </page>                            
                </notebook>
            </form>
         </field>