diff --git a/addons/crm/__terp__.py b/addons/crm/__terp__.py
index 0e3fef9603a..ef080317f53 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_view.xml',
-        'crm_report.xml',
         'crm_wizard.xml',
+        'crm_view.xml',
+        'crm_report.xml',        
         'security/crm_security.xml',
         'security/ir.model.access.csv'
     ],
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
old mode 100644
new mode 100755
index b0f85a9e52a..673b14fe65d
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -42,8 +42,8 @@ MAX_LEVEL = 15
 AVAILABLE_STATES = [
     ('draft','Draft'),
     ('open','Open'),
-    ('cancel', 'Cancel'),
-    ('done', 'Close'),
+    ('cancel', 'Cancelled'),
+    ('done', 'Closed'),
     ('pending','Pending')
 ]
 
@@ -74,7 +74,9 @@ class crm_case_section(osv.osv):
         'reply_to': fields.char('Reply-To', size=64, help="The email address put in the 'Reply-To' of all emails sent by Open ERP about cases in this section"),
         'parent_id': fields.many2one('crm.case.section', 'Parent Section'),
         'child_ids': fields.one2many('crm.case.section', 'parent_id', 'Child Sections'),
-        "gateway_ids" : fields.one2many("crm.email.gateway",'section_id',"Email Gateway")        
+        "gateway_ids" : fields.one2many("crm.email.gateway",'section_id',"Email Gateway"),
+        'calendar' : fields.boolean('Calendar', help='Allow to show calendar'),   
+             
     }
     _defaults = {
         'active': lambda *a: 1,
@@ -1037,5 +1039,43 @@ class crm_email_history(osv.osv):
     _order = 'id desc'
 crm_email_history()
 
+
+class crm_email_add_cc_wizard(osv.osv_memory):
+    _name = "crm.email.add.cc"
+    _description = "Email Add CC"
+    _columns = {
+        'name': fields.selection([('user','User'),('partner','Partner'),('email','Email Address')], 'Send to', required=True),
+        'user_id': fields.many2one('res.users',"User"),
+        'partner_id': fields.many2one('res.partner',"Partner"),
+        'email': fields.char('Email', size=32),
+    }
+    
+    def change_email(self, cr, uid, ids, user, partner):
+        if (not partner and not user):
+            return {'value':{'email': False}}
+        email = False
+        if partner:
+            addr = self.pool.get('res.partner').address_get(cr, uid, [partner], ['contact'])
+            if addr:
+                email = self.pool.get('res.partner.address').read(cr, uid,addr['contact'] , ['email'])['email']
+        elif user:
+            addr = self.pool.get('res.users').read(cr, uid, user, ['address_id'])['address_id']
+            if addr:
+                email = self.pool.get('res.partner.address').read(cr, uid,addr[0] , ['email'])['email']
+        return {'value':{'email': email}}
+    
+    
+    def add_cc(self, cr, uid, ids, context={}):
+        email = self.read(cr, uid, ids[0])['email']
+        if not context:
+            return {}
+        history_line = self.pool.get('crm.case.history').browse(cr, uid, context['active_id'])
+        crm_case = self.pool.get('crm.case')
+        case_id = history_line.log_id.case_id.id
+        crm_case.write(cr, uid, case_id, {'email_cc' : email})
+        return {}
+    
+crm_email_add_cc_wizard()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
old mode 100644
new mode 100755
index e9b23b8b50d..156ac40aa3a
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -3,6 +3,7 @@
     <data>
         <menuitem icon="terp-crm" id="menu_crm" name="CRM &amp; SRM"/>
         <menuitem id="menu_crm_configuration" name="Configuration" parent="crm.menu_crm" sequence="0"/>
+        <menuitem action="wizard_case_section_menu" id="menu_wizard_case_section_menu" parent="crm.menu_crm_configuration" type="wizard"/>
         <wizard id="wizard_crm_send_mail" model="crm.case.history" name="crm.send.mail" string="Send Mail" menu="False"/>
         <wizard id="wizard_crm_new_send_mail" model="crm.case" name="crm.new.send.mail" string="Send New Mail" menu="False"/>        
 
@@ -37,8 +38,11 @@
                             <field name="active" select="2"/>
                             <field name="user_id" select="2"/>
                             <field name="parent_id" select="2" widget="selection"/>
-                            <field name="allow_unlink" select="2"/>
-                            <field name="reply_to" select="2"/>
+                            <group colspan="2" >
+	                            <field name="allow_unlink" select="2"/>
+	                            <field name="calendar" select="2"/>
+	                        </group>
+	                            <field name="reply_to" select="2"/>
                             <field name="gateway_ids" widget="one2many_list" nolabel="1" colspan="4">
                                 <tree string="Email Gateway" editable="bottom">                                   
                                    <field name="name" />                                                                    
@@ -234,7 +238,39 @@
             <field name="view_id" ref="crm_case_rule_tree-view"/>
         </record>
         <menuitem action="crm_case_rule-act" id="menu_crm_case_rule-act" parent="crm.next_id_51"/>
+		
+       <record id="view_crm_email_add_cc_wizard" model="ir.ui.view">
+            <field name="name">Add CC</field>
+            <field name="model">crm.email.add.cc</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Add CC">
+                    <field name="name"/>
+                    <separator string="Test" colspan="4"/>
+                    <newline/>
+                    <field name="user_id"
+                    	attrs="{ 'required' : [('name','=','user')]}"
+                    	on_change="change_email(user_id, partner_id)"
+                    />
+                    <field name="partner_id"
+                    	attrs="{'required' : [('name','=','partner')]}"
+                    	on_change="change_email(user_id, partner_id)"
+                    />
+                    <field name="email"/>
+                    <button name="add_cc" string="Ok" type="object" icon="gtk-go-forward"/>
+                </form>
+            </field>
+        </record>
 
+        <record id="action_view_crm_email_add_cc_wizard" model="ir.actions.act_window">
+            <field name="name">Add CC</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">crm.email.add.cc</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+        
         <!-- Cases -->
         <record id="crm_case_log_tree-view" model="ir.ui.view">
             <field name="name">crm.case.log.tree</field>
@@ -380,10 +416,14 @@
                            </group>
                            <field name="history_line" colspan="4" nolabel="1" mode="form,tree">
                                <form string="Communication history">
-                                   <group col="6" colspan="4">
+                                   <group col="7" colspan="4">
                                        <field name="date"/>
                                        <field name="email"/>
                                        <field name="canal_id"/>
+                                       <button
+                                     string="Add a CC"
+		                                   	name="%(action_view_crm_email_add_cc_wizard)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 9e96530a782..1227f273fd3 100644
--- a/addons/crm/crm_wizard.xml
+++ b/addons/crm/crm_wizard.xml
@@ -6,9 +6,8 @@
         <wizard string="Fetch mail"
            model="crm.case.section"
            name="crm.case.section.fetchmail"
-           id="wizard_crm_case_section_fetchmail"/>        
-
-        <menuitem action="wizard_case_section_menu" id="menu_wizard_case_section_menu" parent="crm.menu_crm_configuration" type="wizard"/>
+           id="wizard_crm_case_section_fetchmail"/> 
+        
         
     </data>
 </openerp>
diff --git a/addons/crm/wizard/wizard_crm_new_send_email.py b/addons/crm/wizard/wizard_crm_new_send_email.py
index b905d31aa8e..330096c8373 100644
--- a/addons/crm/wizard/wizard_crm_new_send_email.py
+++ b/addons/crm/wizard/wizard_crm_new_send_email.py
@@ -27,6 +27,7 @@ import netsvc
 import ir
 import pooler
 import tools
+import base64
 from tools.translate import _
 
 
@@ -39,17 +40,35 @@ 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" />
+    <separator colspan="4" string="State of Case"/>
+    <newline/>
+    <field name="state" />
 </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}
+    'text': {'string':'Message', 'type':'text_tag', 'required':True},
+    'state':{'string':'State', 'type':'selection', 'selection':[('done','Done'),('pending','Pending'),('unchanged','Unchanged')]},
+    'doc1' :  {'string':"Attachment1", 'type':'binary'},
+    'doc2' :  {'string':"Attachment2", 'type':'binary'},
+    'doc3' :  {'string':"Attachment3", 'type':'binary'},
+    'state' :  {'string':"Set State to", 'type':'selection', 'required' : True, 'default' :'done',\
+                    'selection': [('unchanged','Unchanged'),('done','Done'),('pending','Pending')]},
 }
 
 # 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')
 
@@ -62,16 +81,32 @@ def _mass_mail_send(self, cr, uid, data, context):
     emails = [data['form']['to']] + (data['form']['cc'] or '').split(',')
     emails = filter(None, emails)
     body = data['form']['text']
+    if not case.user_id.address_id.email:
+        raise wizard.except_wizard(_('Warning!'),("Please specify user's email address"))
     if case.user_id.signature:
         body += '\n\n%s' % (case.user_id.signature)
-    tools.email_send(
+    flag = tools.email_send(
         case.user_id.address_id.email,
         emails,
         data['form']['subject'],
+        body,
         case_pool.format_body(body),
+        attach=attach,
         reply_to=case.section_id.reply_to,
         tinycrm=str(case.id)
     )
+    if flag:
+        if data['form']['state'] == 'unchanged':
+            pass
+        elif data['form']['state'] == 'done':
+            case_pool.case_close(cr, uid, data['ids'])
+        elif data['form']['state'] == 'pending':
+            case_pool.case_pending(cr, uid, data['ids'])
+        cr.commit()
+        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 218acd0e420..ff61776e21d 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">All Bugs</field>
+        <field name="name">Bugs</field>
         <field name="res_model">crm.case</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,calendar</field>
@@ -62,644 +62,6 @@
         <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"/>
 
-    <record model="ir.actions.act_window" id="crm_case_category_act_all1">
-        <field name="name">Bugs Waiting Approval</field>
-        <field name="res_model">crm.case</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,calendar</field>
-        <field name="view_id" ref="crm_case_tree_view"/>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'&lt;&gt;\','+str(categ3)+'),(\'state\',\'=\',\'draft\')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>
-        <field name="filter" eval="True"/>
-        <field name="search_view_id" ref="crm_configuration.view_crm_case_bugs_filter"/>        
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_all1">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_tree_view"/>
-        <field name="act_window_id" ref="crm_case_category_act_all1"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_all1">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_calendar_view"/>
-        <field name="act_window_id" ref="crm_case_category_act_all1"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_all1">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">form</field>
-        <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"/>
-
-    <record model="ir.actions.act_window" id="crm_case_category_act_all2">
-        <field name="name">Open Bugs</field>
-        <field name="res_model">crm.case</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,calendar</field>
-        <field name="view_id" ref="crm_case_tree_view"/>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'&lt;&gt;\','+str(categ3)+'),(\'stage_id\',\'&lt;&gt;\','+str(stage7)+'),(\'state\',\'=\',\'open\')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>
-        <field name="filter" eval="True"/>
-        <field name="search_view_id" ref="crm_configuration.view_crm_case_bugs_filter"/>        
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_all2">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_tree_view"/>
-        <field name="act_window_id" ref="crm_case_category_act_all2"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_all2">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_calendar_view"/>
-        <field name="act_window_id" ref="crm_case_category_act_all2"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_all2">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">form</field>
-        <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"/>
-
-    <record model="ir.actions.act_window" id="crm_case_category_act_all3">
-        <field name="name">Bugs With Patches Waiting Approval</field>
-        <field name="res_model">crm.case</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,calendar</field>
-        <field name="view_id" ref="crm_case_tree_view"/>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'&lt;&gt;\','+str(categ3)+'),(\'categ_id\',\'=\','+str(categ2)+'), (\'stage_id\',\'=\','+str(stage5)+'),(\'state\',\'=\',\'open\')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>
-        <field name="filter" eval="True"/>
-        <field name="search_view_id" ref="crm_configuration.view_crm_case_bugs_filter"/>        
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_all3">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_tree_view"/>
-        <field name="act_window_id" ref="crm_case_category_act_all3"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_all3">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_calendar_view"/>
-        <field name="act_window_id" ref="crm_case_category_act_all3"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_all3">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">form</field>
-        <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"/>
-
-    <record model="ir.actions.act_window" id="crm_case_category_act_all4">
-        <field name="name">Bugs Not Fixed</field>
-        <field name="res_model">crm.case</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,calendar</field>
-        <field name="view_id" ref="crm_case_tree_view"/>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'), (\'categ_id\',\'&lt;&gt;\','+str(categ3)+'),(\'categ_id\',\'=\','+str(categ1)+'), (\'stage_id\',\'&lt;&gt;\','+str(stage2)+'),(\'state\',\'=\',\'open\')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>
-        <field name="filter" eval="True"/>
-        <field name="search_view_id" ref="crm_configuration.view_crm_case_bugs_filter"/>        
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_all4">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_tree_view"/>
-        <field name="act_window_id" ref="crm_case_category_act_all4"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_all4">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_calendar_view"/>
-        <field name="act_window_id" ref="crm_case_category_act_all4"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_all4">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">form</field>
-        <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"/>
-
-    <record model="ir.actions.act_window" id="crm_case_category_act_all5">
-        <field name="name">Pending Bugs</field>
-        <field name="res_model">crm.case</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,calendar</field>
-        <field name="view_id" ref="crm_case_tree_view"/>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'&lt;&gt;\','+str(categ3)+'),(\'state\',\'=\',\'pending\')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>
-        <field name="filter" eval="True"/>
-        <field name="search_view_id" ref="crm_configuration.view_crm_case_bugs_filter"/>        
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_all5">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_tree_view"/>
-        <field name="act_window_id" ref="crm_case_category_act_all5"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_all5">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_calendar_view"/>
-        <field name="act_window_id" ref="crm_case_category_act_all5"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_all5">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">form</field>
-        <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"/>
-
-    <record model="ir.actions.act_window" id="crm_case_category_act_all6">
-        <field name="name">Planned For Future Release</field>
-        <field name="res_model">crm.case</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,calendar</field>
-        <field name="view_id" ref="crm_case_tree_view"/>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'&lt;&gt;\','+str(categ3)+'),(\'stage_id\',\'=\','+str(stage7)+'),(\'state\',\'=\',\'pending\')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>
-        <field name="filter" eval="True"/>
-        <field name="search_view_id" ref="crm_configuration.view_crm_case_bugs_filter"/>        
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_all6">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_tree_view"/>
-        <field name="act_window_id" ref="crm_case_category_act_all6"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_all6">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_calendar_view"/>
-        <field name="act_window_id" ref="crm_case_category_act_all6"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_all6">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">form</field>
-        <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"/>
-
-    <record model="ir.actions.act_window" id="crm_case_category_act_all7">
-        <field name="name">Waiting For Reporter Response</field>
-        <field name="res_model">crm.case</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,calendar</field>
-        <field name="view_id" ref="crm_case_tree_view"/>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'&lt;&gt;\','+str(categ3)+'),(\'stage_id\',\'=\','+str(stage5)+'),(\'state\',\'=\',\'pending\')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>
-        <field name="filter" eval="True"/>
-        <field name="search_view_id" ref="crm_configuration.view_crm_case_bugs_filter"/>        
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_all7">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_tree_view"/>
-        <field name="act_window_id" ref="crm_case_category_act_all7"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_all7">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_calendar_view"/>
-        <field name="act_window_id" ref="crm_case_category_act_all7"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_all7">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">form</field>
-        <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"/>
-
-    <record model="ir.actions.act_window" id="crm_case_category_act_all8">
-        <field name="name">Old Bugs</field>
-        <field name="res_model">crm.case</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,calendar</field>
-        <field name="view_id" ref="crm_case_tree_view"/>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'&lt;&gt;\','+str(categ3)+'),(\'state\',\'&lt;&gt;\',\'draft\'),(\'state\',\'&lt;&gt;\',\'open\'),(\'state\',\'&lt;&gt;\',\'pending\')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>
-        <field name="filter" eval="True"/>
-        <field name="search_view_id" ref="crm_configuration.view_crm_case_bugs_filter"/>        
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_all8">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_tree_view"/>
-        <field name="act_window_id" ref="crm_case_category_act_all8"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_all8">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_calendar_view"/>
-        <field name="act_window_id" ref="crm_case_category_act_all8"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_all8">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">form</field>
-        <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
-    -->
-    <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>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,calendar</field>
-        <field name="view_id" ref="crm_case_tree_view"/>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'user_id\',\'=\',uid)]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>
-        <field name="filter" eval="True"/>
-        <field name="search_view_id" ref="crm_configuration.view_crm_case_bugs_filter"/>        
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_my0">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_tree_view"/>
-        <field name="act_window_id" ref="crm_case_category_act_my0"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_my0">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_calendar_view"/>
-        <field name="act_window_id" ref="crm_case_category_act_my0"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_my0">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">form</field>
-        <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"/>
-    
-    <record model="ir.actions.act_window" id="crm_case_categ_act_new">
-        <field name="name">New Bug</field>
-        <field name="res_model">crm.case</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">form,tree</field>
-        <field name="view_id" ref="crm_case_form_view"/>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>        
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_form_view1_new">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">form</field>
-        <field name="view_id" ref="crm_case_form_view"/>
-        <field name="act_window_id" ref="crm_case_categ_act_new"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view1_new">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">tree</field>
-        <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"/>
-    
-    <record model="ir.actions.act_window" id="crm_case_category_act_my1">
-        <field name="name">My Open Bugs</field>
-        <field name="res_model">crm.case</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,calendar</field>
-        <field name="view_id" ref="crm_case_tree_view"/>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'open\')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>
-        <field name="filter" eval="True"/>
-        <field name="search_view_id" ref="crm_configuration.view_crm_case_bugs_filter"/>        
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_my1">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_tree_view"/>
-        <field name="act_window_id" ref="crm_case_category_act_my1"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_my1">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_calendar_view"/>
-        <field name="act_window_id" ref="crm_case_category_act_my1"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_my1">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">form</field>
-        <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"/>
-
-    <record model="ir.actions.act_window" id="crm_case_category_act_my2">
-        <field name="name">My Bugs With Patches</field>
-        <field name="res_model">crm.case</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,calendar</field>
-        <field name="view_id" ref="crm_case_tree_view"/>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'user_id\',\'=\',uid),(\'categ_id\',\'=\','+str(categ2)+'), (\'stage_id\',\'=\','+str(stage5)+'),(\'state\',\'=\',\'open\')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>
-        <field name="filter" eval="True"/>
-        <field name="search_view_id" ref="crm_configuration.view_crm_case_bugs_filter"/>        
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_my2">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_tree_view"/>
-        <field name="act_window_id" ref="crm_case_category_act_my2"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_my2">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_calendar_view"/>
-        <field name="act_window_id" ref="crm_case_category_act_my2"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_my2">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">form</field>
-        <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"/>
-
-    <record model="ir.actions.act_window" id="crm_case_category_act_my3">
-        <field name="name">My Bugs Not Fixed</field>
-        <field name="res_model">crm.case</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,calendar</field>
-        <field name="view_id" ref="crm_case_tree_view"/>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'user_id\',\'=\',uid),(\'categ_id\',\'=\','+str(categ1)+'), (\'stage_id\',\'&lt;&gt;\','+str(stage2)+'),(\'state\',\'=\',\'open\')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>
-        <field name="filter" eval="True"/>
-        <field name="search_view_id" ref="crm_configuration.view_crm_case_bugs_filter"/>        
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_my3">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_tree_view"/>
-        <field name="act_window_id" ref="crm_case_category_act_my3"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_my3">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_calendar_view"/>
-        <field name="act_window_id" ref="crm_case_category_act_my3"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_my3">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">form</field>
-        <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"/>
-
-    <!-- 
-        ALL FEATURE REQUESTS 
-    -->
-    <record model="ir.actions.act_window" id="crm_case_category_act_f0">
-        <field name="name">All Feature Requests</field>
-        <field name="res_model">crm.case</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,calendar</field>
-        <field name="view_id" ref="crm_case_tree_view"/>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'=\','+str(categ3)+')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>
-        <field name="search_view_id" ref="crm_configuration.view_crm_case_feature_request_filter"/>        
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_f0">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_tree_view"/>
-        <field name="act_window_id" ref="crm_case_category_act_f0"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_f0">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_calendar_view"/>
-        <field name="act_window_id" ref="crm_case_category_act_f0"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_f0">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">form</field>
-        <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"/>
-    
-    <record model="ir.actions.act_window" id="crm_case_category_act_f1">
-        <field name="name">New Feature Request</field>
-        <field name="res_model">crm.case</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">form,tree</field>
-        <field name="view_id" ref="crm_case_form_view"/>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'=\','+str(categ3)+')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>        
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_f1">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">form</field>
-        <field name="view_id" ref="crm_case_form_view"/>
-        <field name="act_window_id" ref="crm_case_category_act_f1"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_f1">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">tree</field>
-        <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"/>
-
-    <record model="ir.actions.act_window" id="crm_case_category_act_f2">
-        <field name="name">Feature Requests Waiting Approval</field>
-        <field name="res_model">crm.case</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,calendar</field>
-        <field name="view_id" ref="crm_case_tree_view"/>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'), (\'categ_id\',\'=\','+str(categ3)+'), (\'state\',\'=\',\'draft\')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>
-        <field name="filter" eval="True"/>
-        <field name="search_view_id" ref="crm_configuration.view_crm_case_feature_request_filter"/>        
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_f2">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_tree_view"/>
-        <field name="act_window_id" ref="crm_case_category_act_f2"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_f2">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_calendar_view"/>
-        <field name="act_window_id" ref="crm_case_category_act_f2"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_f2">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">form</field>
-        <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"/>
-    <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>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,calendar</field>
-        <field name="view_id" ref="crm_case_tree_view"/>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'=\','+str(categ3)+'),(\'stage_id\',\'&lt;&gt;\','+str(stage7)+'),(\'state\',\'=\',\'open\')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>
-        <field name="filter" eval="True"/>
-        <field name="search_view_id" ref="crm_configuration.view_crm_case_feature_request_filter"/>        
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_f3">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_tree_view"/>
-        <field name="act_window_id" ref="crm_case_category_act_f3"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_f3">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_calendar_view"/>
-        <field name="act_window_id" ref="crm_case_category_act_f3"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_f3">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">form</field>
-        <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"/>
-
-    <record model="ir.actions.act_window" id="crm_case_category_act_f4">
-        <field name="name">Pending Feature Requests</field>
-        <field name="res_model">crm.case</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,calendar</field>
-        <field name="view_id" ref="crm_case_tree_view"/>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'=\','+str(categ3)+'),(\'state\',\'=\',\'pending\')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>
-        <field name="filter" eval="True"/>
-        <field name="search_view_id" ref="crm_configuration.view_crm_case_feature_request_filter"/>        
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_f4">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_tree_view"/>
-        <field name="act_window_id" ref="crm_case_category_act_f4"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_f4">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_calendar_view"/>
-        <field name="act_window_id" ref="crm_case_category_act_f4"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_f4">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">form</field>
-        <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"/>
-
-    <record model="ir.actions.act_window" id="crm_case_category_act_f5">
-        <field name="name">Planned For Future Release</field>
-        <field name="res_model">crm.case</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,calendar</field>
-        <field name="view_id" ref="crm_case_tree_view"/>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'=\','+str(categ3)+'),(\'state\',\'=\',\'pending\'),(\'stage_id\',\'=\','+str(stage7)+')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>
-        <field name="filter" eval="True"/>
-        <field name="search_view_id" ref="crm_configuration.view_crm_case_feature_request_filter"/>        
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_f5">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_tree_view"/>
-        <field name="act_window_id" ref="crm_case_category_act_f5"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_f5">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_calendar_view"/>
-        <field name="act_window_id" ref="crm_case_category_act_f5"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_f5">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">form</field>
-        <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"/>
-
-    <record model="ir.actions.act_window" id="crm_case_category_act_f6">
-        <field name="name">Waiting For Reporter Response</field>
-        <field name="res_model">crm.case</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,calendar</field>
-        <field name="view_id" ref="crm_case_tree_view"/>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'=\','+str(categ3)+'),(\'state\',\'=\',\'pending\'),(\'stage_id\',\'=\','+str(stage5)+')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>
-        <field name="filter" eval="True"/>
-        <field name="search_view_id" ref="crm_configuration.view_crm_case_feature_request_filter"/>        
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_f6">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_tree_view"/>
-        <field name="act_window_id" ref="crm_case_category_act_f6"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_f6">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_calendar_view"/>
-        <field name="act_window_id" ref="crm_case_category_act_f6"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_f6">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">form</field>
-        <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"/>
-
-    <record model="ir.actions.act_window" id="crm_case_category_act_f7">
-        <field name="name">Old Feature Requests</field>
-        <field name="res_model">crm.case</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,calendar</field>
-        <field name="view_id" ref="crm_case_tree_view"/>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'=\','+str(categ3)+'),(\'state\',\'&lt;&gt;\',\'draft\'),(\'state\',\'&lt;&gt;\',\'open\'),(\'state\',\'&lt;&gt;\',\'pending\')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>
-        <field name="filter" eval="True"/>
-        <field name="search_view_id" ref="crm_configuration.view_crm_case_feature_request_filter"/>        
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_f7">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_tree_view"/>
-        <field name="act_window_id" ref="crm_case_category_act_f7"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_f7">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_calendar_view"/>
-        <field name="act_window_id" ref="crm_case_category_act_f7"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_f7">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">form</field>
-        <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"/>
-    
 </data>
 </openerp>
diff --git a/addons/crm_configuration/crm_bugs_view.xml b/addons/crm_configuration/crm_bugs_view.xml
old mode 100644
new mode 100755
index a48c54de94c..612037d1c20
--- a/addons/crm_configuration/crm_bugs_view.xml
+++ b/addons/crm_configuration/crm_bugs_view.xml
@@ -23,19 +23,21 @@
                             <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
                         </group>
                     <field name="date"/>
-                    <field name="email_from" colspan="2"/>
                     <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)"/>
                     <field name="priority" string="Severity"/>
-
+                    <group colspan="2">
+                        <field name="case_id" select="1"/>
+                        <button string="Assign" name="%(crm_generic_wizard_act)d"  type="action" />
+                    </group>    
                     <newline/>
                     <separator string= "Description" colspan="4"/>
                     <field name="description" nolabel="1" colspan="4"/>
@@ -76,6 +78,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"/>
@@ -134,20 +149,42 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Bugs">
-               <group col="5" colspan="1">
-                   <filter icon="gtk-execute" string="My Bugs" domain="[('user_id','=',uid)]" separator="1" help="Bugs Related to Current User"/>
-                   <filter icon="gtk-execute" string="Fixed Bugs" domain="[('section_id.name','=','Bug Tracking'),('stage_id.name','=','Fixed')]" separator="1" help="All Fixed Bugs"/>
-                   <filter icon="gtk-execute" string="Waiting Bugs" domain="[('section_id.name','=','Bug Tracking'),('stage_id.name','=','Awaiting Response')]" separator="1" help="All Waiting Bugs"/>
-                   <filter icon="gtk-execute" string="Future Bugs" domain="[('section_id.name','=','Bug Tracking'),('stage_id.name','=','Future')]" separator="1" help="All Future Bugs"/>
+               <group col="7" colspan="1">
+                   <filter icon="gtk-apply" string="Fixed Bugs"
+                   	domain="[('section_id.name','=','Bug Tracking'),('stage_id.name','=','Fixed')]"
+                   	separator="1" help="All Fixed Bugs"
+                   />
+                   <filter icon="gtk-media-pause" string="Waiting Bugs"
+                   	domain="[('section_id.name','=','Bug Tracking'),('stage_id.name','=','Awaiting Response')]"
+                   	separator="1" help="All Waiting Bugs"
+                   />
+                   <filter icon="gtk-media-forward" string="Future Bugs"
+                   	domain="[('section_id.name','=','Bug Tracking'),('stage_id.name','=','Future')]"
+                   	separator="1" help="All Future Bugs"
+                   />
+                   <separator orientation="vertical"/>
+                   <filter icon="gtk-home" string="   Today   "
+                   	separator="1"
+                   	domain="[('create_date::date','=',time.strftime('%%Y-%%m-%%d'))]"
+                   	help="Todays's bugs"
+                   />
+                   <filter icon="gtk-media-rewind" string="    7 Days    "
+                   	separator="1" domain="[]"
+                   	help="Bugs during last 7 days"
+                   />
                </group>
-               <group col="4" colspan="4">
-                   <field name="state" select="1">
-                       <filter icon="terp-crm" domain="[('state','=','draft')]" help="Draft Bugs"/>
-                       <filter icon="terp-crm" domain="[('state','=','open')]" help="Open Bugs"/>
-                       <filter icon="terp-crm" domain="[('state','=','pending')]" help="Pending Bugs"/>
+               <separator orientation="vertical"/>
+               <group col="4" colspan="2">
+               		<field name="name" select='1' string="Subject"/>
+                   <field name="user_id" select="1" widget="selection">
+                   	<filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Bugs" default="1"/>
+                   	<filter icon="terp-crm" domain="[('user_id','child_of',[uid])]" help="My department's Bugs"/>
+                   </field>
+                   <field name="state" select="1">
+                       <filter icon="gtk-new" domain="[('state','=','draft')]" help="Draft Bugs"/>
+                       <filter icon="gtk-yes" domain="[('state','=','open')]" help="Open Bugs"/>
+                       <filter icon="gtk-media-pause" domain="[('state','=','pending')]" help="Pending Bugs"/>
                    </field>
-                   <field name="name" select='1'/>
-                   <field name="user_id" select="1" widget="selection"/>
                </group>
             </search>
          </field>
diff --git a/addons/crm_configuration/crm_claims_menu.xml b/addons/crm_configuration/crm_claims_menu.xml
index 9f98aaeffcd..ba825bfef1e 100644
--- a/addons/crm_configuration/crm_claims_menu.xml
+++ b/addons/crm_configuration/crm_claims_menu.xml
@@ -34,143 +34,5 @@
     </record>
     <menuitem name="Claims" id="menu_crm_case_claims"  parent="menu_aftersale" action="crm_case_categ_claim0"/>
     
-    <!-- My Claims -->
-    <record model="ir.actions.act_window" id="crm_case_category_act_claim_my1">
-        <field name="name">My Claims</field>
-        <field name="res_model">crm.case</field>
-        <field name="view_mode">tree,form,calendar</field>
-        <field name="view_id" ref="crm_case_claims_tree_view"/>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_claims'))+'),(\'user_id\',\'=\',uid)]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>
-        <field name="filter" eval="True"/>
-        <field name="search_view_id" ref="crm_configuration.view_crm_case_claims_filter"/>        
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_claim_my1">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_claims_tree_view"/>
-        <field name="act_window_id" ref="crm_case_category_act_claim_my1"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_graph_view_claim_my1">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_claims_calendar_view"/>
-        <field name="act_window_id" ref="crm_case_category_act_claim_my1"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_claim_my1">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">form</field>
-        <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"/>
-
-    <record model="ir.actions.act_window" id="crm_case_category_act_claim1">
-        <field name="name">Claims</field>
-        <field name="res_model">crm.case</field>
-        <field name="view_mode">form</field>
-        <field name="view_id" ref="crm_case_claims_form_view"/>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_claims'))+')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>        
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_claim1">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">form</field>
-        <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"/>
-
-    <record model="ir.actions.act_window" id="crm_case_category_act_claim_my2">
-        <field name="name">My Unclosed Claims</field>
-        <field name="res_model">crm.case</field>
-        <field name="view_mode">tree,calendar,form</field>
-        <field name="view_id" ref="crm_case_claims_tree_view"/>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_claims'))+'),(\'user_id\',\'=\',uid),(\'state\',\'&lt;&gt;\',\'done\'),(\'state\',\'&lt;&gt;\',\'cancel\')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>
-        <field name="filter" eval="True"/>
-        <field name="search_view_id" ref="crm_configuration.view_crm_case_claims_filter"/>        
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_claim_my2">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_claims_tree_view"/>
-        <field name="act_window_id" ref="crm_case_category_act_claim_my2"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_claim_my2">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_claims_calendar_view"/>
-        <field name="act_window_id" ref="crm_case_category_act_claim_my2"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_claim_my2">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">form</field>
-        <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"/>
-
-    <record model="ir.actions.act_window" id="crm_case_category_act_claim_my2_open">
-        <field name="name">My Open Claims</field>
-        <field name="res_model">crm.case</field>
-        <field name="view_mode">tree,calendar,form</field>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_claims'))+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'open\')]'"/>
-        <field name="filter" eval="True"/>
-        <field name="search_view_id" ref="crm_configuration.view_crm_case_claims_filter"/>        
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_claim_my2_open">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_claims_tree_view"/>
-        <field name="act_window_id" ref="crm_case_category_act_claim_my2_open"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_claim_my2_open">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_claims_calendar_view"/>
-        <field name="act_window_id" ref="crm_case_category_act_claim_my2_open"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_claim_my2_open">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">form</field>
-        <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"/>
-
-    <!-- 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"/>
-
-    <record model="ir.actions.act_window" id="crm_case_category_act_claim_all2">
-        <field name="name">All Unclosed Claims</field>
-        <field name="res_model">crm.case</field>
-        <field name="view_mode">tree,calendar,form</field>
-        <field name="view_id" ref="crm_case_claims_tree_view"/>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_claims'))+'),(\'state\',\'&lt;&gt;\',\'done\'),(\'state\',\'&lt;&gt;\',\'cancel\')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>
-        <field name="filter" eval="True"/>
-        <field name="search_view_id" ref="crm_configuration.view_crm_case_claims_filter"/>        
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_claim_all2">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_claims_tree_view"/>
-        <field name="act_window_id" ref="crm_case_category_act_claim_all2"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_claim_all2">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_claims_calendar_view"/>
-        <field name="act_window_id" ref="crm_case_category_act_claim_all2"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_claim_all2">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">form</field>
-        <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"/>
-
-</data>
+    </data>
 </openerp>
diff --git a/addons/crm_configuration/crm_claims_view.xml b/addons/crm_configuration/crm_claims_view.xml
old mode 100644
new mode 100755
index 730072228fa..706e38602de
--- a/addons/crm_configuration/crm_claims_view.xml
+++ b/addons/crm_configuration/crm_claims_view.xml
@@ -12,17 +12,12 @@
         <field name="arch" type="xml">
             <tree string="Claims"  colors="red:state=='open'">
                 <field name="id"/>
+                <field name="name"/>
                 <field name="partner_id"/>
-                <field name="date" string="Date of Claim"/>
-                <field name="categ_id" string="Type of claim" select="1"/>
-                <field name="date_closed"/>
-                <field name="planned_cost" string="Claim Cost"/>
+                <field name="date" string="Date"/>
+                <field name="categ_id" string="Type" select="1"/>
+                <field name="user_id" string="Responsible" select="2"/>
                 <field name="state"/>
-                <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
-                <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_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>                
             </tree>
         </field>
     </record>
@@ -41,12 +36,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">
@@ -155,19 +153,26 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Claims">
-                   <group col="5" colspan="1">
-                       <filter icon="gtk-execute" string="My Claims" domain="[('user_id','=',uid)]" separator="1" help="Claims Related to Current User"/>
-                       <filter icon="gtk-execute" string="Fixed Claims" domain="[('section_id.name','=','Claims'),('stage_id.name','=','Fixed')]" separator="1" help="All Fixed Claims"/>
-                       <filter icon="gtk-execute" string="Waiting Claims" domain="[('section_id.name','=','Claims'),('stage_id.name','=','Awaiting Response')]" separator="1" help="All Waiting Claims"/>
-                       <filter icon="gtk-execute" string="Accepted Claims" domain="[('section_id.name','=','Claims'),('stage_id.name','=','Accepted as Claim')]" separator="1" help="All Accepted Claims"/>
+                   <group col="4" colspan="1">
+                       <filter icon="gtk-new" string="New Claims"
+                       	domain="[('section_id.name','=','Claims'),('state','=','draft')]"
+                       	separator="1" help="New Claims"
+                       />
+                       <filter icon="gtk-execute"
+                       	string="In Progress Claims"
+                       	domain="[('section_id.name','=','Claims'),('state','=','open')]"
+                       	separator="1" help="In Progress Claims"
+                       />
+                       <filter icon="gtk-media-pause"
+                       	string="Pending Claims"
+                       	domain="[('section_id.name','=','Claims'),('state','=','pending')]"
+                       	separator="1" help="All pending Claims"
+                       />
                    </group>
-                   <group col="4" colspan="4">
-                       <field name="state" select="1">
-                           <filter icon="terp-crm" domain="[('state','=','draft')]" help="Draft Claims"/>
-                           <filter icon="terp-crm" domain="[('state','=','open')]" help="Open Claims"/>
-                           <filter icon="terp-crm" domain="[('state','=','pending')]" help="Pending Claims"/>
-                       </field>
+                   <separator orientation="vertical"/>
+                   <group col="4" colspan="2">
                        <field name="name" select='1'/>
+                       <field name="partner_id" select="1"/>
                        <field name="user_id" select="1" widget="selection"/>
                    </group>
                </search>
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 8bacfa6b68d..dfd1397902e 100644
--- a/addons/crm_configuration/crm_configuration_wizard.xml
+++ b/addons/crm_configuration/crm_configuration_wizard.xml
@@ -3,7 +3,7 @@
     <data>
 
        <wizard 
-           string="History of Events" 
+         string="History of Events"
            name="crm.case.history.events" 
            model="crm.case" 
            id="wizard_case_history_event" />
@@ -31,6 +31,14 @@
             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"
@@ -39,6 +47,15 @@
             name="crm.case.reschedule_phone_call"
             multi="True"
             string="Schedule Phone Call" />
+            
+	   <wizard
+          id="wizard_partner_create_opportunity"
+            keyword="client_action_multi"
+            model="res.partner"
+            name="crm.case.partner.opportunity_create"
+            menu="False"
+            string="Create Opportunity"/>
+            
 
     </data>
 </openerp>
diff --git a/addons/crm_configuration/crm_fund_menu.xml b/addons/crm_configuration/crm_fund_menu.xml
index 44df34c9f06..652a176091b 100644
--- a/addons/crm_configuration/crm_fund_menu.xml
+++ b/addons/crm_configuration/crm_fund_menu.xml
@@ -31,182 +31,6 @@
     </record>
 
     <menuitem name="Fund Raising" id="menu_crm_case_fund_raise" parent="crm.menu_crm" action="crm_case_category_act_fund_all1"/>
-    
-    <!-- My Funds -->
-    <record model="ir.actions.act_window" id="crm_case_category_act_fund_my1">
-        <field name="name">My Funds</field>
-        <field name="res_model">crm.case</field>
-        <field name="view_mode">tree,form</field>
-        <field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support4)+'),(\'user_id\',\'=\',uid)]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>
-        <field name="filter" eval="True"/>
-        <field name="search_view_id" ref="crm_configuration.view_crm_case_fund_filter"/>        
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_fund_my1">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
-        <field name="act_window_id" ref="crm_case_category_act_fund_my1"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_graph_view_fund_my1">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">graph</field>
-        <field name="view_id" ref="crm_configuration.crm_case_graph_view_fund"/>
-        <field name="act_window_id" ref="crm_case_category_act_fund_my1"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_fund_my1">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">form</field>
-        <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"/>
-
-    <record model="ir.actions.act_window" id="crm_case_category_act_fund1">
-        <field name="name">Funds</field>
-        <field name="res_model">crm.case</field>
-        <field name="view_mode">form,graph</field>
-        <field name="view_id" ref="crm_configuration.crm_case_form_view_fund"/>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support4)+')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>        
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_fund1">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">graph</field>
-        <field name="view_id" ref="crm_configuration.crm_case_graph_view_fund"/>
-        <field name="act_window_id" ref="crm_case_category_act_fund1"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_fund1">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">form</field>
-        <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"/>
-
-    <record model="ir.actions.act_window" id="crm_case_category_act_fund_my2">
-        <field name="name">My Funds Waiting Validation</field>
-        <field name="res_model">crm.case</field>
-        <field name="view_mode">tree,form,graph</field>
-        <field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support4)+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'draft\')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>
-        <field name="filter" eval="True"/>
-        <field name="search_view_id" ref="crm_configuration.view_crm_case_fund_filter"/>        
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_fund_my2">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
-        <field name="act_window_id" ref="crm_case_category_act_fund_my2"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_fund_my2">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">form</field>
-        <field name="view_id" ref="crm_configuration.crm_case_form_view_fund"/>
-        <field name="act_window_id" ref="crm_case_category_act_fund_my2"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_graph_view_fund_my2">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">graph</field>
-        <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"/>
-
-    <record model="ir.actions.act_window" id="crm_case_category_act_fund_my3">
-        <field name="name">My Funds To Be Processed</field>
-        <field name="res_model">crm.case</field>
-        <field name="view_mode">tree,form,graph</field>
-        <field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support4)+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'open\')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>
-        <field name="filter" eval="True"/>
-        <field name="search_view_id" ref="crm_configuration.view_crm_case_fund_filter"/>        
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_fund_my3">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
-        <field name="act_window_id" ref="crm_case_category_act_fund_my3"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_fund_my3">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">form</field>
-        <field name="view_id" ref="crm_configuration.crm_case_form_view_fund"/>
-        <field name="act_window_id" ref="crm_case_category_act_fund_my3"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_graph_view_fund_my3">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">graph</field>
-        <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"/>
-
-    <!-- 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"/>
-
-    <record model="ir.actions.act_window" id="crm_case_category_act_fund_all2">
-        <field name="name">All Funds Waiting Validation</field>
-        <field name="res_model">crm.case</field>
-        <field name="view_mode">tree,form,graph</field>
-        <field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support4)+'),(\'state\',\'=\',\'draft\')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>
-        <field name="filter" eval="True"/>
-        <field name="search_view_id" ref="crm_configuration.view_crm_case_fund_filter"/>        
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_fund_all2">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
-        <field name="act_window_id" ref="crm_case_category_act_fund_all2"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_fund_all2">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">form</field>
-        <field name="view_id" ref="crm_configuration.crm_case_form_view_fund"/>
-        <field name="act_window_id" ref="crm_case_category_act_fund_all2"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_graph_view_fund_all2">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">graph</field>
-        <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"/>
-
-    <record model="ir.actions.act_window" id="crm_case_category_act_fund_all3">
-        <field name="name">All Funds To Be Processed</field>
-        <field name="res_model">crm.case</field>
-        <field name="view_mode">tree,form,graph</field>
-        <field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support4)+'),(\'state\',\'=\',\'open\')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>
-        <field name="filter" eval="True"/>
-        <field name="search_view_id" ref="crm_configuration.view_crm_case_fund_filter"/>        
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_fund_all3">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
-        <field name="act_window_id" ref="crm_case_category_act_fund_all3"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_fund_all3">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">form</field>
-        <field name="view_id" ref="crm_configuration.crm_case_form_view_fund"/>
-        <field name="act_window_id" ref="crm_case_category_act_fund_all3"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_graph_view_fund_all3">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">graph</field>
-        <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"/>
 
 </data>
 </openerp>
diff --git a/addons/crm_configuration/crm_fund_view.xml b/addons/crm_configuration/crm_fund_view.xml
index 9398786ec25..1e96637eee9 100644
--- a/addons/crm_configuration/crm_fund_view.xml
+++ b/addons/crm_configuration/crm_fund_view.xml
@@ -153,11 +153,15 @@
             <field name="arch" type="xml">
                 <search string="Search Funds">
                    <group col='6' colspan='4'>
-                       <filter icon="gtk-execute" string="My Funds" domain="[('user_id','=',uid)]" separator="1" help="Funds Related to Current User"/>
+                       <filter icon="terp-partner" string="My Funds"
+                       	default="1" domain="[('user_id','=',uid)]"
+                       	separator="1"
+                       	help="Funds Related to Current User"
+                       />
                        <field name="state" select="1">
-                           <filter icon="terp-crm" domain="[('state','=','draft')]" help="Draft Funds"/>
-                           <filter icon="terp-crm" domain="[('state','=','open')]" help="Open Funds"/>
-                           <filter icon="terp-crm" domain="[('state','=','pending')]" help="Pending Funds"/>
+                           <filter icon="gtk-new" domain="[('state','=','draft')]" help="Draft Funds"/>
+                           <filter icon="gtk-yes" domain="[('state','=','open')]" help="Open Funds"/>
+                           <filter icon="gtk-media-pause" domain="[('state','=','pending')]" help="Pending Funds"/>
                        </field>
                        <field name="name" select='1'/>
                        <field name="user_id" select="1" widget="selection"/>
diff --git a/addons/crm_configuration/crm_helpdesk_menu.xml b/addons/crm_configuration/crm_helpdesk_menu.xml
index 7989897f927..1a0885440c5 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,356 +46,22 @@
     <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">
         <field name="sequence" eval="2"/>
         <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_calendar_view11"/>
+        <field name="view_id" ref="crm_case_helpdesk_calendar_view"/>
         <field name="act_window_id" ref="crm_case_categ_help_act"/>
     </record>
     <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"/>
-    
-    <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="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="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="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"/>
-
-    <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="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"/>
-        <field name="search_view_id" ref="crm.view_crm_case_filter"/>        
-    </record>
-    
-    <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="act_window_id" ref="crm_case_helpdesk_act_my1"/>
-    </record>
-    
-    <record model="ir.actions.act_window.view" id="action_crm_helpdesk_calendar_view_my1">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm.crm_case_calendar-view"/>
-        <field name="act_window_id" ref="crm_case_helpdesk_act_my1"/>
-    </record>
-    
-    <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="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"/>        
-
-    <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="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"/>
-        <field name="search_view_id" ref="crm.view_crm_case_filter"/>        
-    </record>
-    <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="act_window_id" ref="crm_case_helpdesk_act_my2"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_my2">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm.crm_case_calendar-view"/>
-        <field name="act_window_id" ref="crm_case_helpdesk_act_my2"/>
-    </record>
-    <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="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"/>        
-
-    <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="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"/>
-        <field name="search_view_id" ref="crm.view_crm_case_filter"/>        
-    </record>
-    <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="act_window_id" ref="crm_case_helpdesk_act_my1"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_my1">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm.crm_case_calendar-view"/>
-        <field name="act_window_id" ref="crm_case_helpdesk_act_my1"/>
-    </record>
-    <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="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"/>                
-
-    <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="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"/>
-        <field name="search_view_id" ref="crm.view_crm_case_filter"/>        
-    </record>
-    <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="act_window_id" ref="crm_case_helpdesk_act_my0"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_my0">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm.crm_case_calendar-view"/>
-        <field name="act_window_id" ref="crm_case_helpdesk_act_my0"/>
-    </record>
-    <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="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"/>    
-        
-    
-    <record model="ir.actions.act_window" id="crm_case_helpdesk_act_myhelpdesk">
-        <field name="name">Calendar of Helpdesk</field>
-        <field name="res_model">crm.case</field>
-        <field name="view_mode">calendar,tree,form</field>
-        <field name="view_id" ref="crm.crm_case_calendar-view"/>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_help'))+'),(\'state\',\'=\',\'done\'),(\'user_id\',\'=\',uid)]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>        
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_myhelpdesk">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm.crm_case_calendar-view"/>
-        <field name="act_window_id" ref="crm_case_helpdesk_act_myhelpdesk"/>
-    </record>
-    <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="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="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"/>
-    
-    <!-- 
-        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"/>        
-    
-
-    <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="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"/>
-        <field name="search_view_id" ref="crm.view_crm_case_filter"/>        
-    </record>
-    <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="act_window_id" ref="crm_case_helpdesk_act_all3"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_all3">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm.crm_case_calendar-view"/>
-        <field name="act_window_id" ref="crm_case_helpdesk_act_all3"/>
-    </record>
-    <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="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"/>
-
-    <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="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_help'))+'),(\'state\',\'=\',\'draft\')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>
-        <field name="filter" eval="True"/>
-        <field name="search_view_id" ref="crm.view_crm_case_filter"/>        
-    </record>
-    <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="act_window_id" ref="crm_case_helpdesk_act_all2"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_all2">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm.crm_case_calendar-view"/>
-        <field name="act_window_id" ref="crm_case_helpdesk_act_all2"/>
-    </record>
-    <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="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"/>        
-
-    <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="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_help'))+'),(\'state\',\'=\',\'pending\')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>
-        <field name="filter" eval="True"/>
-        <field name="search_view_id" ref="crm.view_crm_case_filter"/>        
-    </record>
-    <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="act_window_id" ref="crm_case_helpdesk_act_all1"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_all1">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm.crm_case_calendar-view"/>
-        <field name="act_window_id" ref="crm_case_helpdesk_act_all1"/>
-    </record>
-    <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="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"/>        
-
-
-    <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="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_help'))+'),(\'state\',\'=\',\'open\')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>
-        <field name="filter" eval="True"/>
-        <field name="search_view_id" ref="crm.view_crm_case_filter"/>        
-    </record>
-    <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="act_window_id" ref="crm_case_helpdesk_act_all0"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_all0">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm.crm_case_calendar-view"/>
-        <field name="act_window_id" ref="crm_case_helpdesk_act_all0"/>
-    </record>
-    <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="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"/>        
-
-    <record model="ir.actions.act_window" id="crm_case_helpdesk_act_allhelpdesk">
-        <field name="name">Calendar of Helpdesk</field>
-        <field name="res_model">crm.case</field>
-        <field name="view_mode">calendar,tree,form</field>
-        <field name="view_id" ref="crm.crm_case_calendar-view"/>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_help'))+'),(\'state\',\'=\',\'done\')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>        
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_allhelpdesk">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm.crm_case_calendar-view"/>
-        <field name="act_window_id" ref="crm_case_helpdesk_act_allhelpdesk"/>
-    </record>
-    <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="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="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"/>
-    
     
 </data>
 </openerp>
diff --git a/addons/crm_configuration/crm_helpdesk_view.xml b/addons/crm_configuration/crm_helpdesk_view.xml
new file mode 100644
index 00000000000..63b7141eebe
--- /dev/null
+++ b/addons/crm_configuration/crm_helpdesk_view.xml
@@ -0,0 +1,158 @@
+<?xml version="1.0"?>
+<openerp>
+<data>
+
+    # ------------------------------------------------------ 
+    # Helpdisk Support
+    # ------------------------------------------------------ 
+
+    <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_helpdesk_calendar_view">
+        <field name="name">CRM - Helpdisk Support Calendar</field>
+        <field name="model">crm.case</field>
+        <field name="type">calendar</field>
+        <field name="priority" eval="2"/>
+        <field name="arch" type="xml">
+            <calendar string="Helpdisk Supports" date_start="date" color="user_id" date_delay="duration">
+                <field name="name"/>
+                <field name="partner_id"/>
+                <field name="categ_id"/>
+            </calendar>
+        </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 06762cae4a9..507f97ea237 100644
--- a/addons/crm_configuration/crm_jobs_menu.xml
+++ b/addons/crm_configuration/crm_jobs_menu.xml
@@ -4,478 +4,48 @@
     <menuitem icon="terp-hr" id="menu_hr" name="Human Resources"/>
 
     ######################## JOB OPPORTUNITIES (menu) ###########################
-     <record model="ir.actions.act_window" id="crm_case_categ0_act111">
+     <record model="ir.actions.act_window" id="crm_case_categ0_act_job">
         <field name="name">All Jobs Requests</field>
         <field name="res_model">crm.case</field>
         <field name="view_mode">tree,calendar,form,graph</field>
-        <field name="view_id" ref="crm_case_tree_view11"/>
+        <field name="view_id" ref="crm_case_tree_view_job"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support0)+')]'"/>
         <field name="context" eval="{'default_state':'open'}"/>
         <field name="search_view_id" ref="crm_configuration.view_crm_case_jobs_filter"/>        
     </record>
-    <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_act111">
+    <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_act_job">
         <field name="sequence" eval="1"/>
         <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_tree_view11"/>
-        <field name="act_window_id" ref="crm_case_categ0_act111"/>
+        <field name="view_id" ref="crm_case_tree_view_job"/>
+        <field name="act_window_id" ref="crm_case_categ0_act_job"/>
     </record>
-    <record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_act111">
+    <record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_act_job">
         <field name="sequence" eval="2"/>
         <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_calendar_view11"/>
-        <field name="act_window_id" ref="crm_case_categ0_act111"/>
+        <field name="view_id" ref="crm_case_calendar_view_job"/>
+        <field name="act_window_id" ref="crm_case_categ0_act_job"/>
     </record>
-    <record model="ir.actions.act_window.view" id="action_crm_sec_form_view_act111">
+    <record model="ir.actions.act_window.view" id="action_crm_sec_form_view_act_job">
         <field name="sequence" eval="3"/>
         <field name="view_mode">form</field>
-        <field name="view_id" ref="crm_case_form_view11"/>
-        <field name="act_window_id" ref="crm_case_categ0_act111"/>
+        <field name="view_id" ref="crm_case_form_view_job"/>
+        <field name="act_window_id" ref="crm_case_categ0_act_job"/>
     </record>
-    <record model="ir.actions.act_window.view" id="action_crm_sec_graph_view_act111">
+    <record model="ir.actions.act_window.view" id="action_crm_sec_graph_view_act_job">
         <field name="sequence" eval="4"/>
         <field name="view_mode">graph</field>
         <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
-        <field name="act_window_id" ref="crm_case_categ0_act111"/>
+        <field name="act_window_id" ref="crm_case_categ0_act_job"/>
     </record>
     <menuitem
         name="Jobs - Hiring Process" 
         id="menu_crm_case_job_req_main" 
         parent="menu_hr"/>
 
-    <!-- 
-        MY JOBS REQUESTS 
-    -->
-    <record model="ir.actions.act_window" id="crm_case_categ0_act11">
-        <field name="name">My Jobs Requests</field>
-        <field name="res_model">crm.case</field>
-        <field name="view_mode">tree,calendar,form,graph</field>
-        <field name="view_id" ref="crm_case_tree_view11"/>
-        <field name="domain" eval="'[(\'user_id\',\'=\',uid),(\'section_id\',\'=\','+str(section_support0)+')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>
-        <field name="filter" eval="True"/>
-        <field name="search_view_id" ref="crm_configuration.view_crm_case_jobs_filter"/>        
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view1">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_tree_view11"/>
-        <field name="act_window_id" ref="crm_case_categ0_act11"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view3">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_calendar_view11"/>
-        <field name="act_window_id" ref="crm_case_categ0_act11"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view2">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">form</field>
-        <field name="view_id" ref="crm_case_form_view11"/>
-        <field name="act_window_id" ref="crm_case_categ0_act11"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_sec_graph_view2">
-        <field name="sequence" eval="4"/>
-        <field name="view_mode">graph</field>
-        <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"/>
-
-    <record model="ir.actions.act_window" id="crm_case_categ0_act_my_new3">
-        <field name="name">New Job Request</field>
-        <field name="res_model">crm.case</field>
-        <field name="view_mode">form,tree</field>
-        <field name="view_id" ref="crm_case_form_view11"/>
-        <field name="domain" eval="'[(\'user_id\',\'=\',uid),(\'section_id\',\'=\','+str(section_support0)+')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>        
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_my3">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_tree_view11"/>
-        <field name="act_window_id" ref="crm_case_categ0_act_my_new3"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_sec_form_view_my3">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">form</field>
-        <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"/>
-
-    <record model="ir.actions.act_window" id="crm_case_categ0_act_my3">
-        <field name="name">My Current Jobs Requests</field>
-        <field name="res_model">crm.case</field>
-        <field name="view_mode">tree,calendar,form,graph</field>
-        <field name="view_id" ref="crm_case_tree_view11"/>
-        <field name="domain" eval="'[(\'user_id\',\'=\',uid),(\'state\',\'in\',(\'pending\',\'open\',\'draft\')),(\'section_id\',\'=\','+str(section_support0)+')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>
-        <field name="filter" eval="True"/>
-        <field name="search_view_id" ref="crm_configuration.view_crm_case_jobs_filter"/>        
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_my3">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_tree_view11"/>
-        <field name="act_window_id" ref="crm_case_categ0_act_my3"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_my3">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_calendar_view11"/>
-        <field name="act_window_id" ref="crm_case_categ0_act_my3"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_sec_form_view_my3">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">form</field>
-        <field name="view_id" ref="crm_case_form_view11"/>
-        <field name="act_window_id" ref="crm_case_categ0_act_my3"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_sec_graph_view_my3">
-        <field name="sequence" eval="4"/>
-        <field name="view_mode">graph</field>
-        <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"/>
-
-    <record model="ir.actions.act_window" id="crm_case_categ0_act_my2">
-        <field name="name">My Jobs Propositions to Review</field>
-        <field name="res_model">crm.case</field>
-        <field name="view_mode">tree,calendar,form,graph</field>
-        <field name="view_id" ref="crm_case_tree_view11"/>
-        <field name="domain" eval="'[(\'user_id\',\'=\',uid),(\'state\',\'=\',\'draft\'),(\'section_id\',\'=\','+str(section_support0)+')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>
-        <field name="filter" eval="True"/>
-        <field name="search_view_id" ref="crm_configuration.view_crm_case_jobs_filter"/>        
-    </record>
-    <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_case_tree_view11"/>
-        <field name="act_window_id" ref="crm_case_categ0_act_my2"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_my2">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_calendar_view11"/>
-        <field name="act_window_id" ref="crm_case_categ0_act_my2"/>
-    </record>
-    <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_case_form_view11"/>
-        <field name="act_window_id" ref="crm_case_categ0_act_my2"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_sec_graph_view_my2">
-        <field name="sequence" eval="4"/>
-        <field name="view_mode">graph</field>
-        <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"/>
-
-    <record model="ir.actions.act_window" id="crm_case_categ0_act_my1">
-        <field name="name">My Pending Jobs Requests</field>
-        <field name="res_model">crm.case</field>
-        <field name="view_mode">tree,calendar,form,graph</field>
-        <field name="view_id" ref="crm_case_tree_view11"/>
-        <field name="domain" eval="'[(\'user_id\',\'=\',uid),(\'state\',\'=\',\'pending\'),(\'section_id\',\'=\','+str(section_support0)+')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>
-        <field name="filter" eval="True"/>
-        <field name="search_view_id" ref="crm_configuration.view_crm_case_jobs_filter"/>        
-    </record>
-    <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_case_tree_view11"/>
-        <field name="act_window_id" ref="crm_case_categ0_act_my1"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_my1">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_calendar_view11"/>
-        <field name="act_window_id" ref="crm_case_categ0_act_my1"/>
-    </record>
-    <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_case_form_view11"/>
-        <field name="act_window_id" ref="crm_case_categ0_act_my1"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_sec_graph_view_my1">
-        <field name="sequence" eval="4"/>
-        <field name="view_mode">graph</field>
-        <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"/>
-
-    <record model="ir.actions.act_window" id="crm_case_categ0_act_my0">
-        <field name="name">My Open Jobs Requests</field>
-        <field name="res_model">crm.case</field>
-        <field name="view_mode">tree,calendar,form,graph</field>
-        <field name="view_id" ref="crm_case_tree_view11"/>
-        <field name="domain" eval="'[(\'user_id\',\'=\',uid),(\'state\',\'=\',\'open\'),(\'section_id\',\'=\','+str(section_support0)+')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>
-        <field name="filter" eval="True"/>
-        <field name="search_view_id" ref="crm_configuration.view_crm_case_jobs_filter"/>        
-    </record>
-    <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_case_tree_view11"/>
-        <field name="act_window_id" ref="crm_case_categ0_act_my0"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_my0">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_calendar_view11"/>
-        <field name="act_window_id" ref="crm_case_categ0_act_my0"/>
-    </record>
-    <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_case_form_view11"/>
-        <field name="act_window_id" ref="crm_case_categ0_act_my0"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_sec_graph_view_my0">
-        <field name="sequence" eval="4"/>
-        <field name="view_mode">graph</field>
-        <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"/>
-
-    <record model="ir.actions.act_window" id="crm_case_categ0_act_myjobs">
-        <field name="name">Calendar Of My Interviews</field>
-        <field name="res_model">crm.case</field>
-        <field name="view_mode">calendar,tree,form,graph</field>
-        <field name="view_id" ref="crm_case_calendar_view11"/>
-        <field name="domain" eval="'[(\'state\',\'=\',\'done\'),(\'user_id\',\'=\',uid),(\'section_id\',\'=\','+str(section_support0)+')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>        
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_myjobs">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_calendar_view11"/>
-        <field name="act_window_id" ref="crm_case_categ0_act_myjobs"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_myjobs">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_tree_view11"/>
-        <field name="act_window_id" ref="crm_case_categ0_act_myjobs"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_sec_form_view_myjobs">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">form</field>
-        <field name="view_id" ref="crm_case_form_view11"/>
-        <field name="act_window_id" ref="crm_case_categ0_act_myjobs"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_sec_graph_view_myjobs">
-        <field name="sequence" eval="4"/>
-        <field name="view_mode">graph</field>
-        <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"/>
-    
-    <!-- 
+ <!-- 
         ALL JOBS REQUESTS 
     -->
-    <menuitem parent="menu_crm_case_job_req_main" id="menu_crm_case_categ0_act111" action="crm_case_categ0_act111"/>    
-    
-
-    <record model="ir.actions.act_window" id="crm_case_categ0_act_all3">
-        <field name="name">Current Requests</field>
-        <field name="res_model">crm.case</field>
-        <field name="view_mode">tree,calendar,form,graph</field>
-        <field name="view_id" ref="crm_case_tree_view11"/>
-        <field name="domain" eval="'[(\'state\',\'&lt;&gt;\',\'done\'),(\'section_id\',\'=\','+str(section_support0)+')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>
-        <field name="filter" eval="True"/>
-        <field name="search_view_id" ref="crm_configuration.view_crm_case_jobs_filter"/>        
-    </record>
-    <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_case_tree_view11"/>
-        <field name="act_window_id" ref="crm_case_categ0_act_all3"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_all3">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_calendar_view11"/>
-        <field name="act_window_id" ref="crm_case_categ0_act_all3"/>
-    </record>
-    <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_case_form_view11"/>
-        <field name="act_window_id" ref="crm_case_categ0_act_all3"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_sec_graph_view_all3">
-        <field name="sequence" eval="4"/>
-        <field name="view_mode">graph</field>
-        <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"/>
-
-    <record model="ir.actions.act_window" id="crm_case_categ0_act_all2">
-        <field name="name">All Jobs Propositions to Review</field>
-        <field name="res_model">crm.case</field>
-        <field name="view_mode">tree,calendar,form,graph</field>
-        <field name="view_id" ref="crm_case_tree_view11"/>
-        <field name="domain" eval="'[(\'state\',\'=\',\'draft\'),(\'section_id\',\'=\','+str(section_support0)+')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>
-        <field name="filter" eval="True"/>
-        <field name="search_view_id" ref="crm_configuration.view_crm_case_jobs_filter"/>        
-    </record>
-    <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_case_tree_view11"/>
-        <field name="act_window_id" ref="crm_case_categ0_act_all2"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_all2">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_calendar_view11"/>
-        <field name="act_window_id" ref="crm_case_categ0_act_all2"/>
-    </record>
-    <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_case_form_view11"/>
-        <field name="act_window_id" ref="crm_case_categ0_act_all2"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_sec_graph_view_all2">
-        <field name="sequence" eval="4"/>
-        <field name="view_mode">graph</field>
-        <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"/>        
-
-    <record model="ir.actions.act_window" id="crm_case_categ0_act_all1">
-        <field name="name">All Pending Jobs Requests</field>
-        <field name="res_model">crm.case</field>
-        <field name="view_mode">tree,calendar,form,graph</field>
-        <field name="view_id" ref="crm_case_tree_view11"/>
-        <field name="domain" eval="'[(\'state\',\'=\',\'pending\'),(\'section_id\',\'=\','+str(section_support0)+')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>
-        <field name="filter" eval="True"/>
-        <field name="search_view_id" ref="crm_configuration.view_crm_case_jobs_filter"/>        
-    </record>
-    <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_case_tree_view11"/>
-        <field name="act_window_id" ref="crm_case_categ0_act_all1"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_all1">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_calendar_view11"/>
-        <field name="act_window_id" ref="crm_case_categ0_act_all1"/>
-    </record>
-    <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_case_form_view11"/>
-        <field name="act_window_id" ref="crm_case_categ0_act_all1"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_sec_graph_view_all1">
-        <field name="sequence" eval="4"/>
-        <field name="view_mode">graph</field>
-        <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"/>        
-
-    <record model="ir.actions.act_window" id="crm_case_categ0_act_all0">
-        <field name="name">All Open Jobs Requests</field>
-        <field name="res_model">crm.case</field>
-        <field name="view_mode">tree,calendar,form,graph</field>
-        <field name="view_id" ref="crm_case_tree_view11"/>
-        <field name="domain" eval="'[(\'state\',\'=\',\'open\'),(\'section_id\',\'=\','+str(section_support0)+')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>
-        <field name="filter" eval="True"/>
-        <field name="search_view_id" ref="crm_configuration.view_crm_case_jobs_filter"/>        
-    </record>
-    <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_case_tree_view11"/>
-        <field name="act_window_id" ref="crm_case_categ0_act_all0"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_all0">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_calendar_view11"/>
-        <field name="act_window_id" ref="crm_case_categ0_act_all0"/>
-    </record>
-    <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_case_form_view11"/>
-        <field name="act_window_id" ref="crm_case_categ0_act_all0"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_sec_graph_view_all0">
-        <field name="sequence" eval="4"/>
-        <field name="view_mode">graph</field>
-        <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"/>        
-
-    <record model="ir.actions.act_window" id="crm_case_categ0_act_alljobs">
-        <field name="name">Calendar Of Interviews</field>
-        <field name="res_model">crm.case</field>
-        <field name="view_mode">calendar,tree,form,graph</field>
-        <field name="view_id" ref="crm_case_calendar_view11"/>
-        <field name="domain" eval="'[(\'state\',\'=\',\'done\'),(\'section_id\',\'=\','+str(section_support0)+')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>        
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_alljobs">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_calendar_view11"/>
-        <field name="act_window_id" ref="crm_case_categ0_act_alljobs"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_alljobs">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_tree_view11"/>
-        <field name="act_window_id" ref="crm_case_categ0_act_alljobs"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_sec_form_view_alljobs">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">form</field>
-        <field name="view_id" ref="crm_case_form_view11"/>
-        <field name="act_window_id" ref="crm_case_categ0_act_alljobs"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_sec_graph_view_alljobs">
-        <field name="sequence" eval="4"/>
-        <field name="view_mode">graph</field>
-        <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_job_req_main" id="menu_crm_case_categ0_act_job" action="crm_case_categ0_act_job"/>    
     
 </data>
 </openerp>
diff --git a/addons/crm_configuration/crm_jobs_view.xml b/addons/crm_configuration/crm_jobs_view.xml
old mode 100644
new mode 100755
index bb109a3c488..c7a2f08c72a
--- a/addons/crm_configuration/crm_jobs_view.xml
+++ b/addons/crm_configuration/crm_jobs_view.xml
@@ -5,7 +5,7 @@
     # Jobs
     # ------------------------------------------------------ 
 
-    <record model="ir.ui.view" id="crm_case_tree_view11">
+    <record model="ir.ui.view" id="crm_case_tree_view_job">
         <field name="name">CRM - Jobs Requests Tree</field>
         <field name="model">crm.case</field>
         <field name="type">tree</field>
@@ -13,10 +13,10 @@
             <tree string="Jobs - Recruitment Tree"  colors="red:state=='open'">
                 <field name="id"/>
                 <field name="name" string="Description"/>
-                <field name="partner_name" string="Candidate Name"/>
-                <field name="partner_phone"/>
+                <field name="partner_name" string="Name"/>
+                <field name="email_from" string="Candidate Email"/>
+                <field name="partner_phone" string="Candidate Phone"/>
                 <field name="categ_id" string="Applied Job" select="1"/>
-                <field name="category2_id" string="Degree" select="1"/>
                 <field name="stage_id"/>
                 <field name="priority" string="Appreciation"/>
                 <field name="user_id"/>
@@ -30,7 +30,7 @@
         </field>
     </record>
 
-    <record model="ir.ui.view" id="crm_case_form_view11">
+    <record model="ir.ui.view" id="crm_case_form_view_job">
         <field name="name">CRM - Jobs Requests Form</field>
         <field name="model">crm.case</field>
         <field name="type">form</field>
@@ -40,7 +40,8 @@
                     <field name="name" string="Description" colspan="2"/>
                     <field name="section_id" colspan="1" widget="selection"/>
                     <field name="user_id" string="Responsible" select="2"/>
-                    <button name="set_partner" string="Convert to Partner" icon="terp-partner"/>
+                	<button string="Schedule a Phone Call"
+                        name="%(wizard_crm_reschedule_phone_call)d" icon="gtk-redo" type="action" />
                     <newline/>
                         <label string="Stage: " align="1.0"/>
                         <group colspan="1" col="2">
@@ -60,8 +61,11 @@
                         <field name="partner_mobile"/>
                         <field name="email_from" string="Candidate Email"/>
                         <newline/>
-                        <field name="partner_id" on_change="onchange_partner_id(partner_id, email_from)" colspan="2"/>
+                        <group col="6" colspan="4">
+                        <field  name="partner_id" on_change="onchange_partner_id(partner_id, email_from)" colspan="2"/>
+                        <button name="set_partner" string="Convert to Partner" icon="terp-partner"/>
                         <field name="partner_address_id" string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="1"/>
+                        </group>
                         <separator colspan="4" string="Contract Data"/>
                         <field name="probability" string="Availability (weeks)"/>
                         <newline/>
@@ -137,7 +141,7 @@
         </field>
     </record>
 
-    <record model="ir.ui.view" id="crm_case_calendar_view11">
+    <record model="ir.ui.view" id="crm_case_calendar_view_job">
         <field name="name">CRM - Jobs Requests Calendar</field>
         <field name="model">crm.case</field>
         <field name="type">calendar</field>
@@ -157,19 +161,34 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Jobs">
-                   <group col="5" colspan="1">
-                       <filter icon="gtk-execute" string="My Jobs" domain="[('user_id','=',uid)]" separator="1" help="Jobs Related to Current User"/>
-                       <filter icon="gtk-execute" string="Initial Jobs" domain="[('section_id.name','=','Jobs'),('stage_id.name','=','Initial Jobs Demand')]" separator="1" help="All Initial Jobs"/>
-                       <filter icon="gtk-execute" string="First Interview" domain="[('section_id.name','=','Jobs'),('stage_id.name','=','First Interview')]" separator="1" help="First Interview"/>
-                       <filter icon="gtk-execute" string="Second Interview" domain="[('section_id.name','=','Jobs'),('stage_id.name','=','Second Interview')]" separator="1" help="Second Interview"/>
+                   <group col="7" colspan="1">
+	                   <filter icon="gtk-home" string="   Today   "
+	                   	separator="1"
+	                   	domain="[('create_date::date','=',time.strftime('%%Y-%%m-%%d'))]"
+	                   	help="Todays's Jobs Requests"
+	                   />
+	                   <filter icon="gtk-media-rewind"
+	                   	string="    7 Days    " separator="1" domain="[]"
+	                   	help="Jobs Requests during last 7 days"
+	                   />
+	                   <separator orientation="vertical"/>
+	                   <filter icon="gtk-new" string="New Jobs"
+	                   	domain="[('section_id.name','=','Jobs'),('stage_id.name','=','Initial Jobs Demand')]"
+	                   	separator="1" help="All Initial Jobs"
+	                   />
+	                   <filter icon="gtk-yes" string="Open Jobs"
+	                   	domain="[('section_id.name','=','Jobs'),('state','=','open')]"
+	                   	separator="1" help="Open Jobs"
+	                   />
+	                   <filter icon="gtk-media-pause" string="Pending Jobs"
+	                   	domain="[('section_id.name','=','Jobs'),('state','=','pending')]"
+	                   	separator="1" help="Pending Jobs"
+	                   />
                    </group>
-                   <group col="4" colspan="4">
-                       <field name="state" select="1">
-                           <filter icon="terp-crm" domain="[('state','=','draft')]" help="Draft Jobs"/>
-                           <filter icon="terp-crm" domain="[('state','=','open')]" help="Open Jobs"/>
-                           <filter icon="terp-crm" domain="[('state','=','pending')]" help="Pending Jobs"/>
-                       </field>
-                       <field name="name" select='1'/>
+                   <separator orientation="vertical"/>
+                   <group col="4" colspan="2">
+                   		<field name="name" select='1' string="Name"/>
+                   		<field name="email_from" select='1' string="Email"/>
                        <field name="user_id" select="1" widget="selection"/>
                    </group>
                </search>
diff --git a/addons/crm_configuration/crm_lead_menu.xml b/addons/crm_configuration/crm_lead_menu.xml
index 6127d36b35a..204bd7b9238 100644
--- a/addons/crm_configuration/crm_lead_menu.xml
+++ b/addons/crm_configuration/crm_lead_menu.xml
@@ -27,251 +27,6 @@
         <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"/>
-
-    <record model="ir.actions.act_window" id="crm_case_category_act_leads_all1">
-        <field name="name">Current Prospects</field>
-        <field name="res_model">crm.case</field>
-        <field name="view_mode">tree,form</field>
-        <field name="view_id" ref="crm_case_tree_view_leads"/>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'state\',\'&lt;&gt;\',\'done\'),(\'state\',\'&lt;&gt;\',\'cancel\')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>
-        <field name="filter" eval="True"/>
-        <field name="search_view_id" ref="crm_configuration.view_crm_case_leads_filter"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_all1">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_tree_view_leads"/>
-        <field name="act_window_id" ref="crm_case_category_act_leads_all1"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_all1">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">form</field>
-        <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"/>
-
-    <record model="ir.actions.act_window" id="crm_case_category_act_leads_unassigned">
-        <field name="name">Unassigned Prospects</field>
-        <field name="res_model">crm.case</field>
-        <field name="view_mode">tree,form</field>
-        <field name="view_id" ref="crm_case_tree_view_leads"/>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'state\',\'&lt;&gt;\',\'done\'),(\'state\',\'&lt;&gt;\',\'cancel\'),(\'user_id\',\'=\',False)]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>
-        <field name="filter" eval="True"/>
-        <field name="search_view_id" ref="crm_configuration.view_crm_case_leads_filter"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_unassigned">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_tree_view_leads"/>
-        <field name="act_window_id" ref="crm_case_category_act_leads_unassigned"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_unassigned">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">form</field>
-        <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"/>
-
-    <record model="ir.actions.act_window" id="crm_case_category_act_leads_all2">
-        <field name="name">All Draft Prospects</field>
-        <field name="res_model">crm.case</field>
-        <field name="view_mode">tree,form</field>
-        <field name="view_id" ref="crm_case_tree_view_leads"/>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'state\',\'=\',\'draft\')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>
-        <field name="filter" eval="True"/>
-        <field name="search_view_id" ref="crm_configuration.view_crm_case_leads_filter"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_all2">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_tree_view_leads"/>
-        <field name="act_window_id" ref="crm_case_category_act_leads_all2"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_all2">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">form</field>
-        <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"/>
-
-    <record model="ir.actions.act_window" id="crm_case_category_act_leads_all3">
-        <field name="name">All Prospects to Qualify</field>
-        <field name="res_model">crm.case</field>
-        <field name="view_mode">tree,form</field>
-        <field name="view_id" ref="crm_case_tree_view_leads"/>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'state\',\'=\',\'open\')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>
-        <field name="filter" eval="True"/>
-        <field name="search_view_id" ref="crm_configuration.view_crm_case_leads_filter"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_all3">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_tree_view_leads"/>
-        <field name="act_window_id" ref="crm_case_category_act_leads_all3"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_all3">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">form</field>
-        <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"/>
-
-    <record model="ir.actions.act_window" id="crm_case_category_act_leads_all4">
-        <field name="name">All Pending Prospects</field>
-        <field name="res_model">crm.case</field>
-        <field name="view_mode">tree,form</field>
-        <field name="view_id" ref="crm_case_tree_view_leads"/>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'state\',\'=\',\'pending\')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>
-        <field name="filter" eval="True"/>
-        <field name="search_view_id" ref="crm_configuration.view_crm_case_leads_filter"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_all4">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_tree_view_leads"/>
-        <field name="act_window_id" ref="crm_case_category_act_leads_all4"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_all4">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">form</field>
-        <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"/>
-
-<!-- =================================================================== -->
-    <record model="ir.actions.act_window" id="crm_case_category_act_leads_my">
-        <field name="name">My Prospects</field>
-        <field name="res_model">crm.case</field>
-        <field name="view_mode">tree,form</field>
-        <field name="view_id" ref="crm_case_tree_view_leads"/>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'user_id\',\'=\',uid)]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>
-        <field name="filter" eval="True"/>
-        <field name="search_view_id" ref="crm_configuration.view_crm_case_leads_filter"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_my">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_tree_view_leads"/>
-        <field name="act_window_id" ref="crm_case_category_act_leads_my"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_my">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">form</field>
-        <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"/>
-
-    <record model="ir.actions.act_window" id="crm_case_category_act_leads_my_new">
-        <field name="name">New Prospect</field>
-        <field name="res_model">crm.case</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">form,tree</field>
-        <field name="view_id" ref="crm_case_form_view_leads"/>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_new">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_tree_view_leads"/>
-        <field name="act_window_id" ref="crm_case_category_act_leads_my_new"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_new">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">form</field>
-        <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"/>
-
-    <record model="ir.actions.act_window" id="crm_case_category_act_leads_my1">
-        <field name="name">My Current Prospects</field>
-        <field name="res_model">crm.case</field>
-        <field name="view_mode">tree,form</field>
-        <field name="view_id" ref="crm_case_tree_view_leads"/>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'user_id\',\'=\',uid),(\'state\',\'&lt;&gt;\',\'done\'),(\'state\',\'&lt;&gt;\',\'cancel\')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>
-        <field name="filter" eval="True"/>
-        <field name="search_view_id" ref="crm_configuration.view_crm_case_leads_filter"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_my1">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_tree_view_leads"/>
-        <field name="act_window_id" ref="crm_case_category_act_leads_my1"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_my1">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">form</field>
-        <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"/>
-
-    <record model="ir.actions.act_window" id="crm_case_category_act_leads_my3">
-        <field name="name">My Prospects to Qualify</field>
-        <field name="res_model">crm.case</field>
-        <field name="view_mode">tree,form</field>
-        <field name="view_id" ref="crm_case_tree_view_leads"/>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'open\')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>
-        <field name="filter" eval="True"/>
-        <field name="search_view_id" ref="crm_configuration.view_crm_case_leads_filter"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_my3">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_tree_view_leads"/>
-        <field name="act_window_id" ref="crm_case_category_act_leads_my3"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_my3">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">form</field>
-        <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"/>
-
-    <record model="ir.actions.act_window" id="crm_case_category_act_leads_my4">
-        <field name="name">My Pending Prospects</field>
-        <field name="res_model">crm.case</field>
-        <field name="view_mode">tree,form</field>
-        <field name="view_id" ref="crm_case_tree_view_leads"/>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'pending\')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>
-        <field name="filter" eval="True"/>
-        <field name="search_view_id" ref="crm_configuration.view_crm_case_leads_filter"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_my4">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_tree_view_leads"/>
-        <field name="act_window_id" ref="crm_case_category_act_leads_my4"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_my4">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">form</field>
-        <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"/>
 
 <!--        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 5a98e4121dd..5efe38fa177 100644
--- a/addons/crm_configuration/crm_lead_view.xml
+++ b/addons/crm_configuration/crm_lead_view.xml
@@ -15,13 +15,13 @@
                 <group colspan="4" col="7">
                     <field name="name" select="1" string="Prospect Subject"/>
                     <field name="section_id" colspan="1" widget="selection"/>
+                    <field name="user_id" select="2"/>
+                    <newline/>
                     <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>
-                    <button string="Convert to Partner" icon="terp-partner" name="%(wizard_crm_partner_create)d" type="action" attrs="{'invisible':[('partner_id','!=',False)]}"/>
-                    <field name="user_id" select="2"/>
                     <field name="categ_id" select="1" on_change="onchange_categ_id(categ_id)" string="Prospect Source"/>
                     <field name="category2_id" string="Campaign Type" select="1"/>
                     <button string="Convert to Opportunity" name="%(wizard_crm_opportunity_set)d" icon="gtk-index" type="action"/>
@@ -35,7 +35,14 @@
                     <field name="partner_mobile"/>
                     <field name="email_from" string="Prospect Email"/>
                     <newline/>
-                    <field name="partner_id" select="1" on_change="onchange_partner_id(partner_id, email_from)"/>
+					 <group colspan="2" col="4">
+						 <label string="Partner:"  colspan="1" align="1.0"/>
+						 <field name="partner_id" nolabel="1"  colspan="2"/>
+						  <button string="Convert to Partner"
+						  	icon="terp-partner" name="%(wizard_crm_partner_create)d"
+						  	type="action" attrs="{'invisible':[('partner_id','!=',False)]}"
+						  />
+					 </group>
                     <field name="partner_address_id" string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)"/>
 
                     <field name="priority" string="Priority"/>
@@ -85,7 +92,7 @@
                         </form>
                     </field>
                  </page>
-                 <page string="Events">
+                 <page string="Events" groups="base.group_extended">
                    <field name="child_ids" colspan="4" nolabel="1">
                        <tree string="Related Cases">
                            <field name="id"/>
@@ -98,7 +105,7 @@
                        </tree>
                     </field>
                  </page>
-                 <page string="Emails">
+                 <page string="Emails" groups="base.group_extended">
                    <group colspan="4">
                        <field colspan="4" name="email_cc" string="CC"/>
                    </group>
@@ -140,12 +147,10 @@
                 <field name="category2_id" string="Campaign Type"/>
                 <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_close" string="Done" states="open,draft,pending" type="object"  icon="gtk-close"/>
                 <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"/>                
+                <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object"  icon="gtk-cancel"/>
             </tree>
         </field>
     </record>
@@ -163,30 +168,61 @@
         </field>
     </record>
 
-    <record id="view_crm_case_leads_filter" model="ir.ui.view">
+
+	<record id="view_crm_case_leads_filter" model="ir.ui.view">
         <field name="name">crm.case.leads.select</field>
         <field name="model">crm.case</field>
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Prospects">
-               <group col="5" colspan="1">
-                   <filter icon="gtk-execute" string="My Prospects" domain="[('user_id','=',uid)]" separator="1" help="Prospects Related to Current User"/>
-                   <filter icon="gtk-execute" string="Assigned Prospects" domain="[('section_id.name','=','Prospects'),('stage_id.name','=','Assigned')]" separator="1" help="All Assigned Prospects"/>
-                   <filter icon="gtk-execute" string="In Process Prospects" domain="[('section_id.name','=','Prospects'),('stage_id.name','=','In Process')]" separator="1" help="In Process Prospects"/>
-                   <filter icon="gtk-execute" string="Converted Prospects" domain="[('section_id.name','=','Prospects'),('stage_id.name','=','Converted')]" separator="1" help="Converted Prospects"/>
+               <group col="3" colspan="1">
+                <filter icon="gtk-home" string="   Today   "
+                	separator="1"
+                	domain="[('create_date::date','=',time.strftime('%%Y-%%m-%%d'))]"
+                	help="Todays's Prospects"
+                />
+                <filter icon="gtk-media-rewind" string="    7 Days    "
+                	separator="1" domain="[]"
+                	help="Prospects during last 7 days"
+                />
                </group>
-               <group col="4" colspan="4">
-                   <field name="state" select="1">
-                       <filter icon="terp-crm" domain="[('state','=','draft')]" help="Draft Prospects"/>
-                       <filter icon="terp-crm" domain="[('state','=','open')]" help="Open Prospects"/>
-                       <filter icon="terp-crm" domain="[('state','=','pending')]" help="Pending Prospects"/>
+               <separator orientation="vertical"/>
+               <group col="4" colspan="2">
+                   <field name="name" select="1"/>
+                   <field name="user_id" select="1" widget="selection">
+	                   	<filter icon="terp-partner"
+	                   		domain="[('user_id','=',uid)]" help="My Prospects"
+	                   		default="1"
+	                   	/>
+	                   	<filter icon="terp-crm"
+	                   		domain="[('user_id','child_of',[uid])]"
+	                   		help="My department's Prospects"
+	                   	/>
+                   </field>
+                   <field name="state" select="1">
+                       <filter icon="gtk-new" domain="[('state','=','draft')]" help="Draft Prospects"/>
+                       <filter icon="gtk-yes" domain="[('state','=','open')]" help="Open Prospects"/>
                    </field>
-                   <field name="name" select='1'/>
-                   <field name="user_id" select="1" widget="selection"/>
                </group>
            </search>
         </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="supplier" position="after">
+					<button string="Create Opportunity"
+						name="%(crm_configuration.wizard_partner_create_opportunity)d" icon="gtk-index"
+						type="action" colspan="2"
+					/>
+				</field>
+			</field>
+		</record>
 </data>
 </openerp>
diff --git a/addons/crm_configuration/crm_meeting_data.xml b/addons/crm_configuration/crm_meeting_data.xml
index 441cb45a0fc..086222c9f25 100644
--- a/addons/crm_configuration/crm_meeting_data.xml
+++ b/addons/crm_configuration/crm_meeting_data.xml
@@ -5,6 +5,7 @@
     <record model="crm.case.section" id="section_support1">
         <field name="name">Meetings</field>
         <field name="code">Mtngs</field>
+        <field name="calendar">True</field>
     </record>
         <!--    CASE CATEGORY(categ_id)        -->
 
diff --git a/addons/crm_configuration/crm_meeting_menu.xml b/addons/crm_configuration/crm_meeting_menu.xml
old mode 100644
new mode 100755
index 0f519b55a04..c5d8f30a911
--- a/addons/crm_configuration/crm_meeting_menu.xml
+++ b/addons/crm_configuration/crm_meeting_menu.xml
@@ -47,6 +47,7 @@
         <field name="view_id" ref="crm_case_calendar_view"/>
         <field name="context" eval="{'default_state':'open'}"/>
         <field name="search_view_id" ref="view_crm_case_meetings_filter"/>
+        <field name="domain" eval="[('section_id.calendar','=',1)]"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_meet">
         <field name="sequence" eval="1"/>
@@ -81,7 +82,7 @@
         <field name="res_model">crm.case</field>
         <field name="view_mode">calendar,tree,form,graph,gantt</field>
         <field name="view_id" ref="crm_case_calendar_view_meet"/>
-        <field name="domain" eval="'[(\'user_id\',\'=\',uid)]'"/>
+        <field name="domain" eval="'[(\'user_id\',\'=\',uid),(\'section_id.calendar\',\'=\',1)]'"/>
         <field name="context" eval="{'default_state':'open'}"/>
         <field name="filter" eval="True"/>
         <field name="search_view_id" ref="view_crm_case_meetings_filter"/>
@@ -112,33 +113,6 @@
     </record>
     <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"/>
-        <field name="search_view_id" ref="view_crm_case_meetings_filter"/>
-    </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"/>
-
-
     <!-- 
         ALL MEETINGS 
     -->
diff --git a/addons/crm_configuration/crm_meeting_view.xml b/addons/crm_configuration/crm_meeting_view.xml
old mode 100644
new mode 100755
index 1febc90046a..67ed305e864
--- 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 120ed288f92..e14614531c6 100644
--- a/addons/crm_configuration/crm_opportunity_menu.xml
+++ b/addons/crm_configuration/crm_opportunity_menu.xml
@@ -34,186 +34,6 @@
 
 
 <!--          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>
-          <field name="res_model">crm.case</field>
-          <field name="view_mode">tree,form,graph</field>
-          <field name="view_id" ref="crm_case_tree_view_oppor"/>
-          <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+'),(\'state\',\'=\',\'open\')]'"/>
-          <field name="context" eval="{'default_state':'open'}"/>
-          <field name="filter" eval="True"/>
-          <field name="search_view_id" ref="crm_configuration.view_crm_case_opportunities_filter"/>
-     </record>
-     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_oppor1">
-          <field name="sequence" eval="1"/>
-          <field name="view_mode">tree</field>
-          <field name="view_id" ref="crm_case_tree_view_oppor"/>
-          <field name="act_window_id" ref="crm_case_category_act_oppor1"/>
-     </record>
-     <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_oppor1">
-          <field name="sequence" eval="3"/>
-          <field name="view_mode">form</field>
-          <field name="view_id" ref="crm_case_form_view_oppor"/>
-          <field name="act_window_id" ref="crm_case_category_act_oppor1"/>
-     </record>
-     <record model="ir.actions.act_window.view" id="action_crm_tag_graph_view_oppor1">
-          <field name="sequence" eval="4"/>
-          <field name="view_mode">graph</field>
-          <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"/>
-
-
-     <record model="ir.actions.act_window" id="crm_case_category_act_oppor_all2">
-          <field name="name">All Unassigned Opportunities</field>
-          <field name="res_model">crm.case</field>
-          <field name="view_mode">tree,form,graph</field>
-          <field name="view_id" ref="crm_case_tree_view_oppor"/>
-          <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+'),(\'state\',\'=\',\'pending\'),(\'user_id\',\'=\',False)]'"/>
-          <field name="context" eval="{'default_state':'open'}"/>
-          <field name="filter" eval="True"/>
-          <field name="search_view_id" ref="crm_configuration.view_crm_case_opportunities_filter"/>
-     </record>
-     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_oppor_all2">
-          <field name="sequence" eval="1"/>
-          <field name="view_mode">tree</field>
-          <field name="view_id" ref="crm_case_tree_view_oppor"/>
-          <field name="act_window_id" ref="crm_case_category_act_oppor_all2"/>
-     </record>
-     <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_oppor_all2">
-          <field name="sequence" eval="3"/>
-          <field name="view_mode">form</field>
-          <field name="view_id" ref="crm_case_form_view_oppor"/>
-          <field name="act_window_id" ref="crm_case_category_act_oppor_all2"/>
-     </record>
-     <record model="ir.actions.act_window.view" id="action_crm_tag_graph_view_oppor_all2">
-          <field name="sequence" eval="4"/>
-          <field name="view_mode">graph</field>
-          <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"/>
-
-
-<!-- ======================================================== -->
-     <record model="ir.actions.act_window" id="crm_case_category_act_oppor22">
-          <field name="name">My Opportunities</field>
-          <field name="res_model">crm.case</field>
-          <field name="view_mode">tree,form,graph</field>
-          <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+'),(\'user_id\',\'=\',uid)]'"/>
-          <field name="context" eval="{'default_state':'open'}"/>
-          <field name="filter" eval="True"/>
-          <field name="search_view_id" ref="crm_configuration.view_crm_case_opportunities_filter"/>
-     </record>
-     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_oppor22">
-          <field name="sequence" eval="1"/>
-          <field name="view_mode">tree</field>
-          <field name="view_id" ref="crm_case_tree_view_oppor"/>
-          <field name="act_window_id" ref="crm_case_category_act_oppor22"/>
-     </record>
-     <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_oppor22">
-          <field name="sequence" eval="3"/>
-          <field name="view_mode">form</field>
-          <field name="view_id" ref="crm_case_form_view_oppor"/>
-          <field name="act_window_id" ref="crm_case_category_act_oppor22"/>
-     </record>
-     <record model="ir.actions.act_window.view" id="action_crm_tag_graph_view_oppor22">
-          <field name="sequence" eval="4"/>
-          <field name="view_mode">graph</field>
-          <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"/>
-
-     <record model="ir.actions.act_window" id="crm_case_category_act_oppor">
-          <field name="name">Opportunity</field>
-          <field name="res_model">crm.case</field>
-          <field name="view_type">form</field>
-          <field name="view_mode">form,tree</field>
-          <field name="view_id" ref="crm_case_form_view_oppor"/>
-          <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+')]'"/>
-          <field name="context" eval="{'default_state':'open'}"/>
-     </record>
-     <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_oppor">
-          <field name="sequence" eval="1"/>
-          <field name="view_mode">form</field>
-          <field name="view_id" ref="crm_case_form_view_oppor"/>
-          <field name="act_window_id" ref="crm_case_category_act_oppor"/>
-     </record>
-     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_oppor">
-          <field name="sequence" eval="2"/>
-          <field name="view_mode">tree</field>
-          <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"/>
-
-     <record model="ir.actions.act_window" id="crm_case_category_act_oppor2">
-          <field name="name">My Open Opportunities</field>
-          <field name="res_model">crm.case</field>
-          <field name="view_mode">tree,form,graph</field>
-          <field name="view_id" ref="crm_case_tree_view_oppor"/>
-          <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+'),(\'state\',\'=\',\'open\'),(\'user_id\',\'=\',uid)]'"/>
-          <field name="context" eval="{'default_state':'open'}"/>
-          <field name="filter" eval="True"/>
-          <field name="search_view_id" ref="crm_configuration.view_crm_case_opportunities_filter"/>
-     </record>
-     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_oppor2">
-          <field name="sequence" eval="1"/>
-          <field name="view_mode">tree</field>
-          <field name="view_id" ref="crm_case_tree_view_oppor"/>
-          <field name="act_window_id" ref="crm_case_category_act_oppor2"/>
-     </record>
-     <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_oppor2">
-          <field name="sequence" eval="3"/>
-          <field name="view_mode">form</field>
-          <field name="view_id" ref="crm_case_form_view_oppor"/>
-          <field name="act_window_id" ref="crm_case_category_act_oppor2"/>
-     </record>
-     <record model="ir.actions.act_window.view" id="action_crm_tag_graph_view_oppor2">
-          <field name="sequence" eval="4"/>
-          <field name="view_mode">graph</field>
-          <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"/>
-
-     <record model="ir.actions.act_window" id="crm_case_category_act_oppor_my2">
-          <field name="name">My Pending Opportunities</field>
-          <field name="res_model">crm.case</field>
-          <field name="view_mode">tree,form,graph</field>
-          <field name="view_id" ref="crm_case_tree_view_oppor"/>
-          <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+'),(\'state\',\'=\',\'pending\'),(\'user_id\',\'=\',uid)]'"/>
-          <field name="context" eval="{'default_state':'open'}"/>
-          <field name="filter" eval="True"/>
-          <field name="search_view_id" ref="crm_configuration.view_crm_case_opportunities_filter"/>
-     </record>
-     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_oppor_my2">
-          <field name="sequence" eval="1"/>
-          <field name="view_mode">tree</field>
-          <field name="view_id" ref="crm_case_tree_view_oppor"/>
-          <field name="act_window_id" ref="crm_case_category_act_oppor_my2"/>
-     </record>
-     <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_oppor_my2">
-          <field name="sequence" eval="3"/>
-          <field name="view_mode">form</field>
-          <field name="view_id" ref="crm_case_form_view_oppor"/>
-          <field name="act_window_id" ref="crm_case_category_act_oppor_my2"/>
-     </record>
-     <record model="ir.actions.act_window.view" id="action_crm_tag_graph_view_oppor_my2">
-          <field name="sequence" eval="4"/>
-          <field name="view_mode">graph</field>
-          <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"/>
 
 <!--          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..22fe5552413 100644
--- a/addons/crm_configuration/crm_opportunity_view.xml
+++ b/addons/crm_configuration/crm_opportunity_view.xml
@@ -6,6 +6,15 @@
     # Opportunities
     # ------------------------------------------------------ 
 
+	<act_window
+        id="crm_case_categ_meet_opportunity"
+        name="Schedule a Meeting"
+        res_model="crm.case"
+        src_model="crm.case"
+        view_mode="calendar,tree,form,gantt"
+        context="{'default_case_id': active_id, 'default_duration': 4.0}"
+        domain="[('section_id','=','Meetings')]"/>
+
     <record model="ir.ui.view" id="crm_case_form_view_oppor">
         <field name="name">CRM - Opportunities Form</field>
         <field name="model">crm.case</field>
@@ -25,8 +34,11 @@
                         <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
                         </group>
                     <field name="date" string="Deadline"/>
-                    <field name="id" select="1"/>
-                    <button string="Schedule Meeting" icon="terp-crm" name="%(wizard_crm_meeting)d" type="action"/>
+                    <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="%(crm_case_categ_meet_opportunity)d" type="action"/>
                 </group>
                 <notebook colspan="4">
                 <page string="Description">
@@ -135,36 +147,49 @@
                 <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_close" string="Done" states="open,draft,pending" type="object" icon="gtk-close"/>
                 <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"/>                
+                <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object"  icon="gtk-cancel"/>
             </tree>
         </field>
     </record>
+    
     <record id="view_crm_case_opportunities_filter" model="ir.ui.view">
         <field name="name">crm.case.opportunities.select</field>
         <field name="model">crm.case</field>
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Opportunities">
-               <group col="5" colspan="1">
-                   <filter icon="gtk-execute" string="My Opportunities" domain="[('user_id','=',uid)]" separator="1" help="Opportunities Related to Current User"/>
-                   <filter icon="gtk-execute" string="Prospecting" domain="[('section_id.name','=','Opportunities'),('stage_id.name','=','Prospecting')]" separator="1" help="All Prospecting Prospects"/>
-                   <filter icon="gtk-execute" string="Proposition" domain="[('section_id.name','=','Opportunities'),('stage_id.name','=','Value Proposition')]" separator="1" help="Value Proposition Prospects"/>
-                   <filter icon="gtk-execute" string="Analysis" domain="[('section_id.name','=','Opportunities'),('stage_id.name','=','Needs Analysis')]" separator="1" help="Needs Analysis Prospects"/>
-                   </group>
-               <group col="4" colspan="4">
-                   <field name="state" select="1">
-                       <filter icon="terp-crm" domain="[('state','=','draft')]" help="Draft Opportunities"/>
-                       <filter icon="terp-crm" domain="[('state','=','open')]" help="Open Opportunities"/>
-                       <filter icon="terp-crm" domain="[('state','=','pending')]" help="Pending Opportunities"/>
+           		<group col="3" colspan="1">
+                <filter icon="gtk-home" string="   Today   "
+                	separator="1"
+                	domain="[('create_date::date','=',time.strftime('%%Y-%%m-%%d'))]"
+                	help="Todays's Opportunities"
+                />
+                <filter icon="gtk-media-rewind" string="    7 Days    "
+                	separator="1" domain="[]"
+                	help="Opportunities during last 7 days"
+                />
+           		</group>
+               <separator orientation="vertical"/>
+               <group col="5" colspan="2">
+                   <field name="name" select="1" string="Opportunity"/>
+                   <field name="user_id" select="1" widget="selection">
+                   	<filter icon="terp-partner"
+                   		domain="[('user_id','=',uid)]"
+                   		help="My Opportunities" default="1"
+                   	/>
+                   	<filter icon="terp-crm"
+                   		domain="[('user_id','child_of',[uid])]"
+                   		help="My department's Opportunities"
+                   	/>
                    </field>
-                   <field name="name" select='1'/>
-                   <field name="user_id" select="1" widget="selection"/>
-                   </group>
+                   <field name="partner_id" select="1"/>
+                   <field name="state" select="1">
+                       <filter icon="gtk-index" domain="[('state','in',('open','draft' ))]" help="Current "/>
+                   </field>
+               </group>
            </search>
         </field>
     </record>
diff --git a/addons/crm_configuration/crm_phonecall_menu.xml b/addons/crm_configuration/crm_phonecall_menu.xml
index 16e9f552e52..1897c3c24ac 100644
--- a/addons/crm_configuration/crm_phonecall_menu.xml
+++ b/addons/crm_configuration/crm_phonecall_menu.xml
@@ -52,7 +52,7 @@
         <field name="view_id" ref="crm_case_phone_tree_view"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_phone'))+'), (\'categ_id\',\'=\','+str(ref('categ_phone1'))+')]'"/>
         <field name="context" eval="{'default_state':'open'}"/>
-        <field name="search_view_id" ref="crm_configuration.view_crm_case_inbound_phonecalls_filter"/>
+        <field name="search_view_id" ref="crm_configuration.view_crm_case_phonecalls_filter"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_phone_incoming0">
         <field name="sequence" eval="1"/>
@@ -72,173 +72,6 @@
         <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"/>
-
-    <record model="ir.actions.act_window" id="crm_case_categ_phone_incoming1">
-        <field name="name">New Incoming Call</field>
-        <field name="res_model">crm.case</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_phone_form_view"/>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_phone'))+'), (\'categ_id\',\'=\','+str(ref('categ_phone1'))+')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_phone_incoming1">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_phone_tree_view"/>
-        <field name="act_window_id" ref="crm_case_categ_phone_incoming1"/>
-    </record>    
-    <record model="ir.actions.act_window.view" id="action_crm_tag_form_phone_incoming1">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">form</field>
-        <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"/>
-
-    <record model="ir.actions.act_window" id="crm_case_categ_phone_incoming2">
-        <field name="name">Planned Calls</field>
-        <field name="res_model">crm.case</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,calendar</field>
-        <field name="view_id" ref="crm_case_phone_tree_view"/>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_phone'))+'), (\'categ_id\',\'=\','+str(ref('categ_phone1'))+'), (\'state\',\'=\',\'open\')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>
-        <field name="filter" eval="True"/>
-        <field name="search_view_id" ref="crm_configuration.view_crm_case_inbound_phonecalls_filter"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_phone_incoming2">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_phone_tree_view"/>
-        <field name="act_window_id" ref="crm_case_categ_phone_incoming2"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_phone_incoming2">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_phone_calendar_view"/>
-        <field name="act_window_id" ref="crm_case_categ_phone_incoming2"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_form_phone_incoming2">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">form</field>
-        <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"/>
-
-################################################################
-    <record model="ir.actions.act_window" id="crm_case_categ_phone_outgoing0">
-        <field name="name">Outbound</field>
-        <field name="res_model">crm.case</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,calendar</field>
-        <field name="view_id" ref="crm_case_phone_tree_view"/>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_phone'))+'), (\'categ_id\',\'=\','+str(ref('categ_phone2'))+')]'"/>
-        <field name="search_view_id" ref="crm_configuration.view_crm_case_outbound_phonecalls_filter"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_phone_outgoing0">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_phone_tree_view"/>
-        <field name="act_window_id" ref="crm_case_categ_phone_outgoing0"/>
-    </record>    
-    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_phone_outgoing0">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_phone_calendar_view"/>
-        <field name="act_window_id" ref="crm_case_categ_phone_outgoing0"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_form_phone_outgoing0">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">form</field>
-        <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"/>
-
-    <record model="ir.actions.act_window" id="crm_case_categ_phone_outgoing1">
-        <field name="name">New Outgoing Call</field>
-        <field name="res_model">crm.case</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_phone_form_view"/>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_phone'))+'), (\'categ_id\',\'=\','+str(ref('categ_phone2'))+')]'"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_phone_outgoing1">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_phone_tree_view"/>
-        <field name="act_window_id" ref="crm_case_categ_phone_outgoing1"/>
-    </record>    
-    <record model="ir.actions.act_window.view" id="action_crm_tag_form_phone_outgoing1">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">form</field>
-        <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"/>
-
-    <record model="ir.actions.act_window" id="crm_case_categ_phone_outgoing2">
-        <field name="name">Planned Calls</field>
-        <field name="res_model">crm.case</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,calendar</field>
-        <field name="view_id" ref="crm_case_phone_tree_view"/>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_phone'))+'), (\'categ_id\',\'=\','+str(ref('categ_phone2'))+'), (\'state\',\'=\',\'draft\')]'"/>
-        <field name="filter" eval="True"/>
-        <field name="search_view_id" ref="crm_configuration.view_crm_case_outbound_phonecalls_filter"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_phone_outgoing2">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_phone_tree_view"/>
-        <field name="act_window_id" ref="crm_case_categ_phone_outgoing2"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_phone_outgoing2">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_phone_calendar_view"/>
-        <field name="act_window_id" ref="crm_case_categ_phone_outgoing2"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_form_phone_outgoing2">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">form</field>
-        <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"/>
-
-    <record model="ir.actions.act_window" id="crm_case_categ_phone_outgoing4">
-        <field name="name">Calls Not Held</field>
-        <field name="res_model">crm.case</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,calendar</field>
-        <field name="view_id" ref="crm_case_phone_tree_view"/>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_phone'))+'), (\'categ_id\',\'=\','+str(ref('categ_phone2'))+'), (\'state\',\'=\',\'pending\')]'"/>
-        <field name="filter" eval="True"/>
-        <field name="search_view_id" ref="crm_configuration.view_crm_case_outbound_phonecalls_filter"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_phone_outgoing4">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_phone_tree_view"/>
-        <field name="act_window_id" ref="crm_case_categ_phone_outgoing4"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_phone_outgoing4">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_phone_calendar_view"/>
-        <field name="act_window_id" ref="crm_case_categ_phone_outgoing4"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_form_phone_outgoing4">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">form</field>
-        <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"/>
 
 </data>
 </openerp>
diff --git a/addons/crm_configuration/crm_phonecall_view.xml b/addons/crm_configuration/crm_phonecall_view.xml
index 74b4f91de37..1a70b69ccf7 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>
@@ -37,17 +34,18 @@
                 <group colspan="4" col="7">
                     <field name="name" string="Subject"/>
                     <field name="section_id" colspan="1" widget="selection"/>
-                    <field name="user_id" string="Assigned to" select="2"/>
-                    <button string="Convert to Partner" icon="terp-crm" name="%(wizard_crm_partner_create)d" type="action" attrs="{'invisible':[('partner_id','!=',False)]}"/>                    
+                    <field name="user_id" string="Assigned to" select="2"/> 
+                    <button string="Convert to Opportunity" name="%(wizard_crm_opportunity_set)d" icon="gtk-index" type="action"/>                   
                     <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}"/>
-                    <button string="Convert to Opportunity" name="%(wizard_crm_opportunity_set)d" icon="gtk-index" type="action"/>
-                    <label string='' colspan='6' />
+                    <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="Schedule a Phone Call"
                         name="%(wizard_crm_reschedule_phone_call)d" icon="gtk-redo" type="action" />
                 </group>
@@ -55,11 +53,14 @@
                 <page string="General">
                     <field name="categ_id" string="Direction" select="1" on_change="onchange_categ_id(categ_id)" required="1"/>
                     <field name="active" string="Reminder"/>
-                    <field name="partner_id" string="Partner"/>
-                    <field name="partner_address_id" string="Contact"/>
-                    <newline/>
+                    <label string="Partner:" align="1.0"/>
+                    <group colspan="1">
+                        <field name="partner_id" string="Partner" nolabel="1"/>
+                        <button string="Convert to Partner" icon="terp-crm" name="%(wizard_crm_partner_create)d" type="action" attrs="{'invisible':[('partner_id','!=',False)]}"/>                        
+                    </group>                        
+                    <field name="partner_address_id" string="Contact"/>                                     
                     <field name="partner_phone"/>
-                    <field name="partner_mobile"/>
+                    <field name="partner_mobile"/>                    
                     <newline/>
                     <field name="som"/>
                     <field name="priority" string="Relevant"/>
@@ -74,55 +75,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>
@@ -148,71 +101,43 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Phonecalls">
-               <group col="4" colspan="1">
-                   <filter icon="gtk-execute" string="My Phonecalls" domain="[('user_id','=',uid)]" separator="1" help="Phonecalls Related to Current User"/>
-                   <filter icon="gtk-execute" string="Inbound Phonecalls" domain="[('section_id.name','=','Phone Calls'),('categ_id.name','=','Inbound')]" separator="1" help="All Inbound Phonecalls"/>
-                   <filter icon="gtk-execute" string="Outbound Phonecalls" domain="[('section_id.name','=','Phone Calls'),('categ_id.name','=','Outbound')]" separator="1" help="All Outbound Phonecalls"/>
-                   </group>
-               <group col="4" colspan="4">
-                   <field name="state" select="1">
-                       <filter icon="terp-crm" domain="[('state','=','draft')]" help="Draft Phonecalls"/>
-                       <filter icon="terp-crm" domain="[('state','=','open')]" help="Open Phonecalls"/>
-                       <filter icon="terp-crm" domain="[('state','=','pending')]" help="Pending Phonecalls"/>
+               <group col="6" colspan="1">
+                   <filter icon="gtk-jump-to"
+                   	string="Inbound"
+                   	domain="[('section_id.name','=','Phone Calls'),('categ_id.name','=','Inbound')]"
+                   	separator="1" help="All Inbound Phonecalls"
+                   />
+                   <filter icon="gtk-redo"
+                   	string="Outbound"
+                   	domain="[('section_id.name','=','Phone Calls'),('categ_id.name','=','Outbound')]"
+                   	separator="1" help="All Outbound Phonecalls"
+                   />
+                   <separator orientation="vertical"/>
+                   <filter icon="gtk-home" string="   Today   "
+                   	separator="1"
+                   	domain="[('create_date::date','=',time.strftime('%%Y-%%m-%%d'))]"
+                   	help="Todays's Phonecalls"
+                   />
+                   <filter icon="gtk-media-rewind" string="    7 Days    "
+                   	separator="1" domain="[]"
+                   	help="Phonecalls during last 7 days"
+                   />
+               </group>
+               <separator orientation="vertical"/>
+               <group col="4" colspan="2">
+             		<field name="name" select='1' string="Subject"/>
+               		<field name="user_id" select="1" widget="selection">
+	                   	<filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Phonecalls" default="1"/>
+	                   	<filter icon="terp-crm" domain="[('user_id','child_of',[uid])]" help="My department's Phonecalls"/>
+                   </field>
+                   <field name="state" select="1">
+                       <filter icon="gtk-index" domain="[('state','in',('open','draft' ))]" help="Current "/>
                    </field>
-                   <field name="name" select='1'/>
-                   <field name="user_id" select="1" widget="selection"/>
                    </group>
            </search>
         </field>
     </record>
     
-    <record id="view_crm_case_inbound_phonecalls_filter" model="ir.ui.view">
-        <field name="name">crm.case.inbound.phonecalls.select</field>
-        <field name="model">crm.case</field>
-        <field name="type">search</field>
-        <field name="arch" type="xml">
-            <search string="Search Inbound Phonecalls">
-               <group col="4" colspan="1">
-                   <filter icon="gtk-execute" string="My Inbound Phonecalls" domain="[('user_id','=',uid),('categ_id.name','=','Inbound')]" separator="1" help="Inbound Phonecalls Related to Current User"/>
-                   <filter icon="gtk-execute" string="Planned" domain="[('section_id.name','=','Phone Calls'),('stage_id.name','=','Planned')]" separator="1" help="All Planned Inbound Phonecalls"/>
-                   <filter icon="gtk-execute" string="Not Held" domain="[('section_id.name','=','Phone Calls'),('stage_id.name','=','Not Held')]" separator="1" help="All Not Held Inbound Phonecalls"/>
-                   </group>
-               <group col="4" colspan="4">
-                   <field name="state" select="1">
-                       <filter icon="terp-crm" domain="[('state','=','draft')]" help="Draft Inbound Phonecalls"/>
-                       <filter icon="terp-crm" domain="[('state','=','open')]" help="Open Inbound Phonecalls"/>
-                       <filter icon="terp-crm" domain="[('state','=','pending')]" help="Pending Inbound Phonecalls"/>
-                   </field>
-                   <field name="name" select='1'/>
-                   <field name="user_id" select="1" widget="selection"/>
-                   </group>
-           </search>
-        </field>
-    </record>
-    
-    <record id="view_crm_case_outbound_phonecalls_filter" model="ir.ui.view">
-        <field name="name">crm.case.outbound.phonecalls.select</field>
-        <field name="model">crm.case</field>
-        <field name="type">search</field>
-        <field name="arch" type="xml">
-            <search string="Search Outbound Phonecalls">
-               <group col="4" colspan="1">
-                   <filter icon="gtk-execute" string="My Outbound Phonecalls" domain="[('user_id','=',uid),('categ_id.name','=','Outbound')]" separator="1" help="Outbound Phonecalls Related to Current User"/>
-                   <filter icon="gtk-execute" string="Planned" domain="[('section_id.name','=','Phone Calls'),('stage_id.name','=','Planned')]" separator="1" help="All Planned Outbound Phonecalls"/>
-                   <filter icon="gtk-execute" string="Not Held" domain="[('section_id.name','=','Phone Calls'),('stage_id.name','=','Not Held')]" separator="1" help="All Not Held Outbound Phonecalls"/>
-                   </group>
-               <group col="4" colspan="4">
-                   <field name="state" select="1">
-                       <filter icon="terp-crm" domain="[('state','=','draft')]" help="Draft Outbound Phonecalls"/>
-                       <filter icon="terp-crm" domain="[('state','=','open')]" help="Open Outbound Phonecalls"/>
-                       <filter icon="terp-crm" domain="[('state','=','pending')]" help="Pending Outbound Phonecalls"/>
-                   </field>
-                   <field name="name" select='1'/>
-                   <field name="user_id" select="1" widget="selection"/>
-                   </group>
-           </search>
-        </field>
-    </record>
         
     </data>
 </openerp>
diff --git a/addons/crm_configuration/wizard/__init__.py b/addons/crm_configuration/wizard/__init__.py
index 7469c2ac483..d8995686cf8 100644
--- a/addons/crm_configuration/wizard/__init__.py
+++ b/addons/crm_configuration/wizard/__init__.py
@@ -24,4 +24,6 @@ import wizard_partner_create
 import wizard_opportunity_set
 import schedule_phone_call
 import wizard_history_event
+import wizard_partner_opportunity
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_configuration/wizard/schedule_phone_call.py b/addons/crm_configuration/wizard/schedule_phone_call.py
index ca65352efd8..4d17a36455f 100644
--- a/addons/crm_configuration/wizard/schedule_phone_call.py
+++ b/addons/crm_configuration/wizard/schedule_phone_call.py
@@ -32,7 +32,7 @@ from tools.translate import _
 
 case_form = """<?xml version="1.0"?>
 <form string="Schedule Phone Call">
-    <separator string="Phone Call Description" colspan="2" />
+    <separator string="Phone Call Description" colspan="4" />
     <newline />
     <field name='user_id' />
     <field name='deadline' />
@@ -45,7 +45,7 @@ case_form = """<?xml version="1.0"?>
 
 case_fields = {
     'user_id' : {'string' : 'Assign To', 'type' : 'many2one', 'relation' : 'res.users'},
-    'deadline' : {'string' : 'Planned Date', 'type' : 'datetime', 'required' : True},
+    'deadline' : {'string' : 'Planned Date', 'type' : 'datetime'},
     'note' : {'string' : 'Goals', 'type' : 'text'},
     'category_id' : {'string' : 'Category', 'type' : 'many2one', 'relation' : 'crm.case.categ', 'required' : True},
     'section_id' : {'string' : 'Section', 'type' : 'many2one', 'relation' : 'crm.case.section', 'required' : True},
@@ -68,7 +68,6 @@ class reschedule_phone_call(wizard.interface):
         return {
                 'user_id' : case.user_id and case.user_id.id,
                 'category_id' : categ_id and categ_id[0] or case.categ_id and case.categ_id.id,
-                'deadline' : time.strftime('%Y-%m-%d %H:%M:%S'),
                 'section_id' : sec_id and sec_id[0],
                 'note' : case.description
                }
@@ -104,8 +103,8 @@ class reschedule_phone_call(wizard.interface):
             'view_type': 'form',
             'view_mode': 'tree,form',
             'res_model': 'crm.case',
-#            'view_id': id2,
-            'views': [(id2,'tree'),(id3,'form'),(False,'calendar'),(False,'graph')],
+            'res_id' : new_case,
+            'views': [(id3,'form'),(id2,'tree'),(False,'calendar'),(False,'graph')],
             'type': 'ir.actions.act_window',
             'search_view_id': res['res_id']
         }
diff --git a/addons/crm_configuration/wizard/wizard_opportunity_set.py b/addons/crm_configuration/wizard/wizard_opportunity_set.py
index b4e3ea5dd96..e148f53c1cb 100644
--- a/addons/crm_configuration/wizard/wizard_opportunity_set.py
+++ b/addons/crm_configuration/wizard/wizard_opportunity_set.py
@@ -114,10 +114,15 @@ class make_opportunity(wizard.interface):
             'case_id':data['id'],
             'state':'open',
         })
-        case_obj.write(cr, uid, [data['id']], {
+        
+        vals = {
             'partner_id': data['form']['partner_id'],
             'state':'done',
-        })
+            }
+        case_id = case_obj.read(cr, uid, data['id'], ['case_id'])['case_id']
+        if not case_id:
+            vals.update({'case_id' : new_pros})
+        case_obj.write(cr, uid, [data['id']], vals)
         value = {
             'domain': "[('section_id','=',%d)]"%(id),
             'name': _('Opportunity'),
diff --git a/addons/crm_configuration/wizard/wizard_partner_opportunity.py b/addons/crm_configuration/wizard/wizard_partner_opportunity.py
new file mode 100644
index 00000000000..487035ea3d2
--- /dev/null
+++ b/addons/crm_configuration/wizard/wizard_partner_opportunity.py
@@ -0,0 +1,124 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+from mx.DateTime import now
+
+import wizard
+import netsvc
+import ir
+import pooler
+from tools.translate import _
+
+
+case_form = """<?xml version="1.0"?>
+<form string="Create Opportunity">
+    <field name="name"/>
+    <field name="partner_id" readonly="1"/>
+    <newline/>
+    <field name="planned_revenue"/>
+    <field name="probability"/>
+</form>"""
+
+case_fields = {
+    'name' : {'type' :'char', 'size' :64, 'string' :'Opportunity Name', 'required' :True}, 
+    'planned_revenue' : {'type' :'float', 'digits' :(16, 2), 'string' : 'Expected Revenue'}, 
+    'probability' : {'type' :'float', 'digits' :(16, 2), 'string' : 'Success Probability'}, 
+    'partner_id' : {'type' :'many2one', 'relation' :'res.partner', 'string' :'Partner'}, 
+}
+
+
+class create_opportunity(wizard.interface):
+
+    def _select_data(self, cr, uid, data, context):
+        pool = pooler.get_pool(cr.dbname)
+        part_obj = pool.get('res.partner')
+        part = part_obj.read(cr, uid, data['id' ], ['name'])
+        return {'partner_id' : data['id'], 'name' : part['name'] }
+
+    def _make_opportunity(self, cr, uid, data, context):
+        pool = pooler.get_pool(cr.dbname)
+        data_obj = pool.get('ir.model.data')
+        result = data_obj._get_id(cr, uid, 'crm_configuration', 'view_crm_case_opportunities_filter')
+        res = data_obj.read(cr, uid, result, ['res_id'])
+        section_obj = pool.get('crm.case.section')
+        id = section_obj.search(cr, uid, [('code', '=', 'oppor')], context=context)
+        if not id:
+            raise wizard.except_wizard(_('Error !'), 
+                _('You did not installed the opportunities tracking when you configured the crm_configuration module.' \
+                  '\nYou can not convert the prospect to an opportunity, you must create a section with the code \'oppor\'.'
+                  ))
+        id = id[0]
+
+        id2 = data_obj._get_id(cr, uid, 'crm_configuration', 'crm_case_form_view_oppor')
+        id3 = data_obj._get_id(cr, uid, 'crm_configuration', 'crm_case_tree_view_oppor')
+        if id2:
+            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+        if id3:
+            id3 = data_obj.browse(cr, uid, id3, context=context).res_id
+        
+        part_obj = pool.get('res.partner')
+        address = part_obj.address_get(cr, uid, data['ids' ])
+        
+        
+        categ_obj = pool.get('crm.case.categ')
+        categ_ids = categ_obj.search(cr, uid, [('section_id','=',id), ('name','ilike','Part%')])
+
+        case_obj = pool.get('crm.case')
+        opp_id = case_obj.create(cr, uid, {
+            'section_id' : id, 
+            'name' : data['form']['name'], 
+            'planned_revenue' : data['form']['planned_revenue'], 
+            'probability' : data['form']['probability'], 
+            'partner_id' : data['form']['partner_id'], 
+            'partner_address_id' : address['default'],
+            'categ_id' : categ_ids[0],
+            'case_id' :data['id'], 
+            'state' :'draft', 
+        })
+        value = {
+            'domain' : "[('section_id','=',%d)]"%(id), 
+            'name' : _('Opportunity'), 
+            'view_type' : 'form', 
+            'view_mode' : 'form,tree', 
+            'res_model' : 'crm.case', 
+            'res_id' : opp_id, 
+            'view_id' : False, 
+            'views' : [(id2, 'form'), (id3, 'tree'), (False, 'calendar'), (False, 'graph')], 
+            'type' : 'ir.actions.act_window', 
+            'search_view_id' : res['res_id'] 
+        }
+        return value
+
+    states = {
+        'init' : {
+            'actions' : [_select_data], 
+            'result' : {'type' : 'form', 'arch' : case_form, 'fields' : case_fields, 
+                'state' : [('end', 'Cancel', 'gtk-cancel'), ('confirm', 'Create Opportunity', 'gtk-go-forward')]}
+        }, 
+        'confirm' : {
+            'actions' : [], 
+            'result' : {'type' : 'action', 'action' : _make_opportunity, 'state' : 'end'}
+        }
+    }
+
+create_opportunity('crm.case.partner.opportunity_create')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/report_analytic_planning/report_analytic_planning_view.xml b/addons/report_analytic_planning/report_analytic_planning_view.xml
index 80f2c8e49c3..b8fd81d2091 100644
--- a/addons/report_analytic_planning/report_analytic_planning_view.xml
+++ b/addons/report_analytic_planning/report_analytic_planning_view.xml
@@ -389,7 +389,7 @@
             <field name="inherit_id" ref="project.view_task_form2"/>
             <field name="arch" type="xml">
                 <field name="priority" position="before">
-                	<field name="planning_line_id" select="2" domain="[('user_id', '=', user_id)]" />
+                	<field name="planning_line_id" select="2" domain="['|', ('user_id','=',user_id), ('user_id','=', False)]"/>
                 </field>
             </field>
         </record>