From 9236113bf5752f72918590b81c424fab54846d4c Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 23 Oct 2009 18:51:17 +0530
Subject: [PATCH 01/30] [IMP]: Planning: Changes in domain value of project
 task for planning line

bzr revid: rpa@tinyerp.com-20091023132117-jx8lsmm7ccot8gha
---
 addons/report_analytic_planning/report_analytic_planning.py    | 3 ++-
 .../report_analytic_planning/report_analytic_planning_view.xml | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/report_analytic_planning/report_analytic_planning.py b/addons/report_analytic_planning/report_analytic_planning.py
index cf15bde3456..d4b80a003a6 100644
--- a/addons/report_analytic_planning/report_analytic_planning.py
+++ b/addons/report_analytic_planning/report_analytic_planning.py
@@ -141,7 +141,8 @@ class report_account_analytic_planning_line(osv.osv):
         reads = self.read(cr, uid, ids, ['user_id','planning_id','note'], context)
         res = []
         for record in reads:
-            name = '['+record['planning_id'][1] + " - " +record['user_id'][1]+'] '
+            name = '['+record['planning_id'][1] + \
+                    " - " + ((record['user_id'] and record['user_id'][1]) or 'Unassigned' ) +  ']'
             if record['note']:
                 name += record['note']
             res.append((record['id'], name))
diff --git a/addons/report_analytic_planning/report_analytic_planning_view.xml b/addons/report_analytic_planning/report_analytic_planning_view.xml
index 78fb258c093..3e0595e07c0 100644
--- a/addons/report_analytic_planning/report_analytic_planning_view.xml
+++ b/addons/report_analytic_planning/report_analytic_planning_view.xml
@@ -388,7 +388,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>

From 16bdfd6d1df6b15a117c8b5d721916e173fc46eb Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 27 Oct 2009 19:19:48 +0530
Subject: [PATCH 02/30] [IMP]: Changed state name in crm from cancel >
 cancelled

bzr revid: rpa@tinyerp.com-20091027134948-x2i70k118m8a5ynj
---
 addons/crm/crm.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 4b6b831935d..71a6a243fd5 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -37,8 +37,8 @@ MAX_LEVEL = 15
 AVAILABLE_STATES = [
     ('draft','Draft'),
     ('open','Open'),
-    ('cancel', 'Cancel'),
-    ('done', 'Close'),
+    ('cancel', 'Cancelled'),
+    ('done', 'Closed'),
     ('pending','Pending')
 ]
 

From 2af791c69555633c3a60dc2d4af069c6365f6c08 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 27 Oct 2009 19:21:56 +0530
Subject: [PATCH 03/30] [IMP]: Crm improvement blueprint: , keep only one menu
 "CRM > Sales > Leads" and remove all the others "My Leads, My Pending Leads,
 ..."

bzr revid: rpa@tinyerp.com-20091027135156-jiyz94stla8a32jq
---
 addons/crm_configuration/crm_bugs_menu.xml    | 49 +++++++++----------
 addons/crm_configuration/crm_claims_menu.xml  | 12 ++---
 .../crm_configuration_wizard.xml              |  8 +++
 addons/crm_configuration/crm_fund_menu.xml    | 14 +++---
 .../crm_configuration/crm_helpdesk_menu.xml   | 26 +++++-----
 addons/crm_configuration/crm_jobs_menu.xml    | 48 +++++++++---------
 addons/crm_configuration/crm_lead_menu.xml    | 30 ++++++------
 addons/crm_configuration/crm_lead_view.xml    | 15 ++++++
 addons/crm_configuration/crm_meeting_menu.xml | 10 ++--
 .../crm_opportunity_menu.xml                  | 22 ++++-----
 .../crm_configuration/crm_phonecall_menu.xml  | 14 +++---
 11 files changed, 135 insertions(+), 113 deletions(-)

diff --git a/addons/crm_configuration/crm_bugs_menu.xml b/addons/crm_configuration/crm_bugs_menu.xml
index 218acd0e420..0b5922e1407 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,7 +62,7 @@
         <field name="act_window_id" ref="crm_case_categ_act0"/>
     </record>
     <menuitem name="Bug Tracking" id="menu_crm_case_bug_track"  parent="menu_aftersale" action="crm_case_categ_act0"/>
-    <menuitem  id="menu_crm_case_categ_act0" action="crm_case_categ_act0" parent="menu_crm_case_bug_track"/>
+<!--    <menuitem  id="menu_crm_case_categ_act0" action="crm_case_categ_act0" parent="menu_crm_case_bug_track"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_all1">
         <field name="name">Bugs Waiting Approval</field>
@@ -93,7 +93,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_all1"/>
     </record>
-    <menuitem  id="menu_crm_case_categ0_act_all1" action="crm_case_category_act_all1" parent="menu_crm_case_categ_act0" groups="base.group_extended_menu"/>
+<!--    <menuitem  id="menu_crm_case_categ0_act_all1" action="crm_case_category_act_all1" parent="menu_crm_case_categ_act0" groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_all2">
         <field name="name">Open Bugs</field>
@@ -124,7 +124,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_all2"/>
     </record>
-    <menuitem  id="menu_crm_case_categ0_act_all2" action="crm_case_category_act_all2" parent="menu_crm_case_categ_act0" groups="base.group_extended_menu"/>
+<!--    <menuitem  id="menu_crm_case_categ0_act_all2" action="crm_case_category_act_all2" parent="menu_crm_case_categ_act0" groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_all3">
         <field name="name">Bugs With Patches Waiting Approval</field>
@@ -155,7 +155,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_all3"/>
     </record>
-    <menuitem  id="menu_crm_case_categ0_act_all3" action="crm_case_category_act_all3" parent="menu_crm_case_categ0_act_all2" groups="base.group_extended_menu"/>
+<!--    <menuitem  id="menu_crm_case_categ0_act_all3" action="crm_case_category_act_all3" parent="menu_crm_case_categ0_act_all2" groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_all4">
         <field name="name">Bugs Not Fixed</field>
@@ -186,7 +186,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_all4"/>
     </record>
-    <menuitem  id="menu_crm_case_categ0_act_all4" action="crm_case_category_act_all4" parent="menu_crm_case_categ0_act_all2" groups="base.group_extended_menu"/>
+<!--    <menuitem  id="menu_crm_case_categ0_act_all4" action="crm_case_category_act_all4" parent="menu_crm_case_categ0_act_all2" groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_all5">
         <field name="name">Pending Bugs</field>
@@ -217,7 +217,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_all5"/>
     </record>
-    <menuitem  id="menu_crm_case_categ0_act_all5" action="crm_case_category_act_all5" parent="menu_crm_case_categ_act0" groups="base.group_extended_menu"/>
+<!--    <menuitem  id="menu_crm_case_categ0_act_all5" action="crm_case_category_act_all5" parent="menu_crm_case_categ_act0" groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_all6">
         <field name="name">Planned For Future Release</field>
@@ -248,7 +248,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_all6"/>
     </record>
-    <menuitem  id="menu_crm_case_categ0_act_all6" action="crm_case_category_act_all6" parent="menu_crm_case_categ0_act_all5" groups="base.group_extended_menu"/>
+<!--    <menuitem  id="menu_crm_case_categ0_act_all6" action="crm_case_category_act_all6" parent="menu_crm_case_categ0_act_all5" groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_all7">
         <field name="name">Waiting For Reporter Response</field>
@@ -279,7 +279,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_all7"/>
     </record>
-    <menuitem  id="menu_crm_case_categ0_act_all7" action="crm_case_category_act_all7" parent="menu_crm_case_categ0_act_all5" groups="base.group_extended_menu"/>
+<!--    <menuitem  id="menu_crm_case_categ0_act_all7" action="crm_case_category_act_all7" parent="menu_crm_case_categ0_act_all5" groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_all8">
         <field name="name">Old Bugs</field>
@@ -310,9 +310,8 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_all8"/>
     </record>
-    <menuitem  id="menu_crm_case_categ0_act_all8" action="crm_case_category_act_all8" parent="menu_crm_case_categ_act0" groups="base.group_extended_menu"/>    <!-- 
-        MY BUGS
-    -->
+<!--    <menuitem  id="menu_crm_case_categ0_act_all8" action="crm_case_category_act_all8" parent="menu_crm_case_categ_act0" groups="base.group_extended_menu"/>     -->
+<!--        MY BUGS-->
     <record model="ir.actions.act_window" id="crm_case_category_act_my0">
         <field name="name">My Bugs</field>
         <field name="res_model">crm.case</field>
@@ -342,7 +341,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_my0"/>
     </record>
-    <menuitem parent="menu_crm_case_bug_track" id="menu_crm_case_categ0_act_my0" action="crm_case_category_act_my0" groups="base.group_extended_menu"/>
+<!--    <menuitem parent="menu_crm_case_bug_track" id="menu_crm_case_categ0_act_my0" action="crm_case_category_act_my0" groups="base.group_extended_menu"/>-->
     
     <record model="ir.actions.act_window" id="crm_case_categ_act_new">
         <field name="name">New Bug</field>
@@ -365,7 +364,7 @@
         <field name="view_id" ref="crm_case_tree_view"/>
         <field name="act_window_id" ref="crm_case_categ_act_new"/>
     </record>    
-    <menuitem  id="menu_crm_case_categ_act_new" action="crm_case_categ_act_new" parent="menu_crm_case_bug_track" sequence="50"/>
+<!--    <menuitem  id="menu_crm_case_categ_act_new" action="crm_case_categ_act_new" parent="menu_crm_case_bug_track" sequence="50"/>-->
     
     <record model="ir.actions.act_window" id="crm_case_category_act_my1">
         <field name="name">My Open Bugs</field>
@@ -396,7 +395,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_my1"/>
     </record>
-    <menuitem parent="menu_crm_case_categ0_act_my0" id="menu_crm_case_categ0_act_my1" action="crm_case_category_act_my1" groups="base.group_extended_menu"/>
+<!--    <menuitem parent="menu_crm_case_categ0_act_my0" id="menu_crm_case_categ0_act_my1" action="crm_case_category_act_my1" groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_my2">
         <field name="name">My Bugs With Patches</field>
@@ -427,7 +426,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_my2"/>
     </record>
-    <menuitem parent="menu_crm_case_categ0_act_my1" id="menu_crm_case_categ0_act_my2" action="crm_case_category_act_my2" groups="base.group_extended_menu"/>
+<!--    <menuitem parent="menu_crm_case_categ0_act_my1" id="menu_crm_case_categ0_act_my2" action="crm_case_category_act_my2" groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_my3">
         <field name="name">My Bugs Not Fixed</field>
@@ -458,7 +457,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_my3"/>
     </record>
-    <menuitem parent="menu_crm_case_categ0_act_my1" id="menu_crm_case_categ0_act_my3" action="crm_case_category_act_my3" groups="base.group_extended_menu"/>
+<!--    <menuitem parent="menu_crm_case_categ0_act_my1" id="menu_crm_case_categ0_act_my3" action="crm_case_category_act_my3" groups="base.group_extended_menu"/>-->
 
     <!-- 
         ALL FEATURE REQUESTS 
@@ -491,7 +490,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_f0"/>
     </record>
-    <menuitem parent="menu_crm_case_bug_track" id="menu_crm_case_category_act_f0" action="crm_case_category_act_f0"/>
+<!--    <menuitem parent="menu_crm_case_bug_track" id="menu_crm_case_category_act_f0" action="crm_case_category_act_f0"/>-->
     
     <record model="ir.actions.act_window" id="crm_case_category_act_f1">
         <field name="name">New Feature Request</field>
@@ -514,7 +513,7 @@
         <field name="view_id" ref="crm_case_tree_view"/>
         <field name="act_window_id" ref="crm_case_category_act_f1"/>
     </record>
-    <menuitem parent="menu_crm_case_category_act_f0" id="menu_crm_case_category_act_f1" action="crm_case_category_act_f1" sequence="50"/>
+<!--    <menuitem parent="menu_crm_case_category_act_f0" id="menu_crm_case_category_act_f1" action="crm_case_category_act_f1" sequence="50"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_f2">
         <field name="name">Feature Requests Waiting Approval</field>
@@ -545,7 +544,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_f2"/>
     </record>
-    <menuitem parent="menu_crm_case_category_act_f0" id="menu_crm_case_categ0_act_f2" action="crm_case_category_act_f2" groups="base.group_extended_menu"/>
+<!--    <menuitem parent="menu_crm_case_category_act_f0" id="menu_crm_case_categ0_act_f2" action="crm_case_category_act_f2" groups="base.group_extended_menu"/>-->
     <record model="ir.actions.act_window" id="crm_case_category_act_f3">
         <field name="name">Open Feature Requests</field>
         <field name="res_model">crm.case</field>
@@ -575,7 +574,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_f3"/>
     </record>
-    <menuitem parent="menu_crm_case_category_act_f0" id="menu_crm_case_categ0_act_f3" action="crm_case_category_act_f3" groups="base.group_extended_menu"/>
+<!--    <menuitem parent="menu_crm_case_category_act_f0" id="menu_crm_case_categ0_act_f3" action="crm_case_category_act_f3" groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_f4">
         <field name="name">Pending Feature Requests</field>
@@ -606,7 +605,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_f4"/>
     </record>
-    <menuitem parent="menu_crm_case_category_act_f0" id="menu_crm_case_categ0_act_f4" action="crm_case_category_act_f4" groups="base.group_extended_menu"/>
+<!--    <menuitem parent="menu_crm_case_category_act_f0" id="menu_crm_case_categ0_act_f4" action="crm_case_category_act_f4" groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_f5">
         <field name="name">Planned For Future Release</field>
@@ -637,7 +636,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_f5"/>
     </record>
-    <menuitem parent="menu_crm_case_categ0_act_f4" id="menu_crm_case_categ0_act_f5" action="crm_case_category_act_f5" groups="base.group_extended_menu"/>
+<!--    <menuitem parent="menu_crm_case_categ0_act_f4" id="menu_crm_case_categ0_act_f5" action="crm_case_category_act_f5" groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_f6">
         <field name="name">Waiting For Reporter Response</field>
@@ -668,7 +667,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_f6"/>
     </record>
-    <menuitem parent="menu_crm_case_categ0_act_f4" id="menu_crm_case_categ0_act_f6" action="crm_case_category_act_f6" groups="base.group_extended_menu"/>
+<!--    <menuitem parent="menu_crm_case_categ0_act_f4" id="menu_crm_case_categ0_act_f6" action="crm_case_category_act_f6" groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_f7">
         <field name="name">Old Feature Requests</field>
@@ -699,7 +698,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_f7"/>
     </record>
-    <menuitem parent="menu_crm_case_category_act_f0" id="menu_crm_case_categ0_act_f7" action="crm_case_category_act_f7" groups="base.group_extended_menu"/>
+<!--    <menuitem parent="menu_crm_case_category_act_f0" id="menu_crm_case_categ0_act_f7" action="crm_case_category_act_f7" groups="base.group_extended_menu"/>-->
     
 </data>
 </openerp>
diff --git a/addons/crm_configuration/crm_claims_menu.xml b/addons/crm_configuration/crm_claims_menu.xml
index 9f98aaeffcd..3f3d8c32592 100644
--- a/addons/crm_configuration/crm_claims_menu.xml
+++ b/addons/crm_configuration/crm_claims_menu.xml
@@ -63,7 +63,7 @@
         <field name="view_id" ref="crm_case_claims_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_claim_my1"/>
     </record>
-    <menuitem name="My Claims" id="menu_crm_case_category_act_claim_my1" action="crm_case_category_act_claim_my1"  parent="menu_crm_case_claims" groups="base.group_extended_menu"/>
+<!--    <menuitem name="My Claims" id="menu_crm_case_category_act_claim_my1" action="crm_case_category_act_claim_my1"  parent="menu_crm_case_claims" groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_claim1">
         <field name="name">Claims</field>
@@ -79,7 +79,7 @@
         <field name="view_id" ref="crm_case_claims_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_claim1"/>
     </record>
-    <menuitem name="New Claim" id="menu_crm_case_categ0_act_claim" action="crm_case_category_act_claim1" parent="menu_crm_case_claims" sequence="50"/>
+<!--    <menuitem name="New Claim" id="menu_crm_case_categ0_act_claim" action="crm_case_category_act_claim1" parent="menu_crm_case_claims" sequence="50"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_claim_my2">
         <field name="name">My Unclosed Claims</field>
@@ -109,7 +109,7 @@
         <field name="view_id" ref="crm_case_claims_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_claim_my2"/>
     </record>
-    <menuitem name="My Unclosed Claims" id="menu_crm_case_categ0_act_claim_my2" action="crm_case_category_act_claim_my2" parent="menu_crm_case_category_act_claim_my1" groups="base.group_extended_menu"/>
+<!--    <menuitem name="My Unclosed Claims" id="menu_crm_case_categ0_act_claim_my2" action="crm_case_category_act_claim_my2" parent="menu_crm_case_category_act_claim_my1" groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_claim_my2_open">
         <field name="name">My Open Claims</field>
@@ -137,10 +137,10 @@
         <field name="view_id" ref="crm_case_claims_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_claim_my2_open"/>
     </record>
-    <menuitem name="My Open Claims" id="menu_crm_case_categ0_act_claim_my2_open" action="crm_case_category_act_claim_my2_open" parent="menu_crm_case_categ0_act_claim_my2" groups="base.group_extended_menu"/>
+<!--    <menuitem name="My Open Claims" id="menu_crm_case_categ0_act_claim_my2_open" action="crm_case_category_act_claim_my2_open" parent="menu_crm_case_categ0_act_claim_my2" groups="base.group_extended_menu"/>-->
 
     <!-- All Claims -->
-    <menuitem  name="All Claims" id="menu_crm_case_categ_claim0" action="crm_case_categ_claim0" parent="menu_crm_case_claims" groups="base.group_extended_menu"/>
+<!--    <menuitem  name="All Claims" id="menu_crm_case_categ_claim0" action="crm_case_categ_claim0" parent="menu_crm_case_claims" groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_claim_all2">
         <field name="name">All Unclosed Claims</field>
@@ -170,7 +170,7 @@
         <field name="view_id" ref="crm_case_claims_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_claim_all2"/>
     </record>
-    <menuitem name="All Unclosed Claims" id="menu_crm_case_categ0_act_claim_all2" action="crm_case_category_act_claim_all2" parent="menu_crm_case_categ_claim0" groups="base.group_extended_menu"/>
+<!--    <menuitem name="All Unclosed Claims" id="menu_crm_case_categ0_act_claim_all2" action="crm_case_category_act_claim_all2" parent="menu_crm_case_categ_claim0" groups="base.group_extended_menu"/>-->
 
 </data>
 </openerp>
diff --git a/addons/crm_configuration/crm_configuration_wizard.xml b/addons/crm_configuration/crm_configuration_wizard.xml
index 8bacfa6b68d..3c52bfec7e2 100644
--- a/addons/crm_configuration/crm_configuration_wizard.xml
+++ b/addons/crm_configuration/crm_configuration_wizard.xml
@@ -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"
diff --git a/addons/crm_configuration/crm_fund_menu.xml b/addons/crm_configuration/crm_fund_menu.xml
index 44df34c9f06..15c56b24d69 100644
--- a/addons/crm_configuration/crm_fund_menu.xml
+++ b/addons/crm_configuration/crm_fund_menu.xml
@@ -61,7 +61,7 @@
         <field name="view_id" ref="crm_configuration.crm_case_form_view_fund"/>
         <field name="act_window_id" ref="crm_case_category_act_fund_my1"/>
     </record>
-    <menuitem name="My Funds" id="menu_crm_case_category_act_fund_my1" action="crm_case_category_act_fund_my1"  parent="menu_crm_case_fund_raise" groups="base.group_extended_menu"/>
+<!--    <menuitem name="My Funds" id="menu_crm_case_category_act_fund_my1" action="crm_case_category_act_fund_my1"  parent="menu_crm_case_fund_raise" groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_fund1">
         <field name="name">Funds</field>
@@ -83,7 +83,7 @@
         <field name="view_id" ref="crm_configuration.crm_case_form_view_fund"/>
         <field name="act_window_id" ref="crm_case_category_act_fund1"/>
     </record>
-    <menuitem name="New Fund Opportunity" id="menu_crm_case_categ0_act_fund" action="crm_case_category_act_fund1" parent="menu_crm_case_fund_raise" sequence="50"/>
+<!--    <menuitem name="New Fund Opportunity" id="menu_crm_case_categ0_act_fund" action="crm_case_category_act_fund1" parent="menu_crm_case_fund_raise" sequence="50"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_fund_my2">
         <field name="name">My Funds Waiting Validation</field>
@@ -113,7 +113,7 @@
         <field name="view_id" ref="crm_configuration.crm_case_graph_view_fund"/>
         <field name="act_window_id" ref="crm_case_category_act_fund_my2"/>
     </record>
-    <menuitem name="My Funds Waiting Validation" id="menu_crm_case_categ0_act_fund_my2" action="crm_case_category_act_fund_my2" parent="menu_crm_case_category_act_fund_my1" groups="base.group_extended_menu"/>
+<!--    <menuitem name="My Funds Waiting Validation" id="menu_crm_case_categ0_act_fund_my2" action="crm_case_category_act_fund_my2" parent="menu_crm_case_category_act_fund_my1" groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_fund_my3">
         <field name="name">My Funds To Be Processed</field>
@@ -143,10 +143,10 @@
         <field name="view_id" ref="crm_configuration.crm_case_graph_view_fund"/>
         <field name="act_window_id" ref="crm_case_category_act_fund_my3"/>
     </record>
-    <menuitem name="My Funds To Be Processed" id="menu_crm_case_categ0_act_fund_my3" action="crm_case_category_act_fund_my3" parent="menu_crm_case_category_act_fund_my1" groups="base.group_extended_menu"/>
+<!--    <menuitem name="My Funds To Be Processed" id="menu_crm_case_categ0_act_fund_my3" action="crm_case_category_act_fund_my3" parent="menu_crm_case_category_act_fund_my1" groups="base.group_extended_menu"/>-->
 
     <!-- All Funds -->
-    <menuitem name="All Funds" id="menu_crm_case_categ0_act_fund_all1" action="crm_case_category_act_fund_all1" parent="menu_crm_case_fund_raise" groups="base.group_extended_menu"/>
+<!--    <menuitem name="All Funds" id="menu_crm_case_categ0_act_fund_all1" action="crm_case_category_act_fund_all1" parent="menu_crm_case_fund_raise" groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_fund_all2">
         <field name="name">All Funds Waiting Validation</field>
@@ -176,7 +176,7 @@
         <field name="view_id" ref="crm_configuration.crm_case_graph_view_fund"/>
         <field name="act_window_id" ref="crm_case_category_act_fund_all2"/>
     </record>
-    <menuitem name="All Funds Waiting Validation" id="menu_crm_case_categ0_act_fund_all2" action="crm_case_category_act_fund_all2" parent="menu_crm_case_categ0_act_fund_all1" groups="base.group_extended_menu"/>
+<!--    <menuitem name="All Funds Waiting Validation" id="menu_crm_case_categ0_act_fund_all2" action="crm_case_category_act_fund_all2" parent="menu_crm_case_categ0_act_fund_all1" groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_fund_all3">
         <field name="name">All Funds To Be Processed</field>
@@ -206,7 +206,7 @@
         <field name="view_id" ref="crm_configuration.crm_case_graph_view_fund"/>
         <field name="act_window_id" ref="crm_case_category_act_fund_all3"/>
     </record>
-    <menuitem name="All Funds To Be Processed" id="menu_crm_case_categ0_act_fund_all3" action="crm_case_category_act_fund_all3" parent="menu_crm_case_categ0_act_fund_all1" groups="base.group_extended_menu"/>
+<!--    <menuitem name="All Funds To Be Processed" id="menu_crm_case_categ0_act_fund_all3" action="crm_case_category_act_fund_all3" parent="menu_crm_case_categ0_act_fund_all1" groups="base.group_extended_menu"/>-->
 
 </data>
 </openerp>
diff --git a/addons/crm_configuration/crm_helpdesk_menu.xml b/addons/crm_configuration/crm_helpdesk_menu.xml
index 7989897f927..05ad8197280 100644
--- a/addons/crm_configuration/crm_helpdesk_menu.xml
+++ b/addons/crm_configuration/crm_helpdesk_menu.xml
@@ -62,7 +62,7 @@
         <field name="act_window_id" ref="crm_case_categ_help_act"/>
     </record>
     
-    <menuitem parent="menu_help_support_main" id="menu_crm_case_helpdesk_my_act" action="crm_case_categ_help_act" groups="base.group_extended_menu"/>
+<!--    <menuitem parent="menu_help_support_main" id="menu_crm_case_helpdesk_my_act" action="crm_case_categ_help_act" groups="base.group_extended_menu"/>-->
     
     <record model="ir.actions.act_window" id="crm_case_categ_help_new_act">
         <field name="name">New Helpdesk</field>
@@ -85,7 +85,7 @@
         <field name="act_window_id" ref="crm_case_categ_help_new_act"/>
     </record>
     
-    <menuitem parent="menu_help_support_main" id="menu_crm_case_categ_help_new_act" action="crm_case_categ_help_new_act" sequence="50"/>
+<!--    <menuitem parent="menu_help_support_main" id="menu_crm_case_categ_help_new_act" action="crm_case_categ_help_new_act" sequence="50"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_helpdesk_act_my1">
         <field name="name">My Unclosed Requests</field>
@@ -119,7 +119,7 @@
         <field name="act_window_id" ref="crm_case_helpdesk_act_my1"/>
     </record>
     
-    <menuitem parent="menu_crm_case_helpdesk_my_act" id="menu_crm_case_helpdesk_act_my_helpdesk" action="crm_case_helpdesk_act_my1" groups="base.group_extended_menu"/>        
+<!--    <menuitem parent="menu_crm_case_helpdesk_my_act" id="menu_crm_case_helpdesk_act_my_helpdesk" action="crm_case_helpdesk_act_my1" groups="base.group_extended_menu"/>        -->
 
     <record model="ir.actions.act_window" id="crm_case_helpdesk_act_my2">
         <field name="name">My helpdesk Propositions to Review</field>
@@ -149,7 +149,7 @@
         <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"/>        
+<!--    <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>
@@ -179,7 +179,7 @@
         <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"/>                
+<!--    <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>
@@ -209,7 +209,7 @@
         <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"/>    
+<!--    <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">
@@ -238,13 +238,13 @@
         <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"/>
+<!--    <menuitem parent="menu_crm_case_helpdesk_my_act" id="menu_crm_case_helpdesk_act_myhelpdesk" action="crm_case_helpdesk_act_myhelpdesk" groups="base.group_extended_menu"/>-->
     
     <!-- 
         ALL Helpdesk REQUESTS 
     -->
 
-    <menuitem parent="menu_help_support_main" id="menu_crm_case_helpdesk_act_all" action="crm_case_helpdesk_act111" groups="base.group_extended_menu"/>        
+<!--    <menuitem parent="menu_help_support_main" id="menu_crm_case_helpdesk_act_all" action="crm_case_helpdesk_act111" groups="base.group_extended_menu"/>        -->
     
 
     <record model="ir.actions.act_window" id="crm_case_helpdesk_act_all3">
@@ -275,7 +275,7 @@
         <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"/>
+<!--    <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>
@@ -305,7 +305,7 @@
         <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"/>        
+<!--    <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>
@@ -335,7 +335,7 @@
         <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"/>        
+<!--    <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">
@@ -366,7 +366,7 @@
         <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"/>        
+<!--    <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>
@@ -394,7 +394,7 @@
         <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"/>
+<!--    <menuitem parent="menu_crm_case_helpdesk_act_all" id="menu_crm_case_helpdesk_act_myhelpdesk_allhelpdesk" action="crm_case_helpdesk_act_allhelpdesk" groups="base.group_extended_menu"/>-->
     
     
 </data>
diff --git a/addons/crm_configuration/crm_jobs_menu.xml b/addons/crm_configuration/crm_jobs_menu.xml
index 06762cae4a9..d2b7a3b755b 100644
--- a/addons/crm_configuration/crm_jobs_menu.xml
+++ b/addons/crm_configuration/crm_jobs_menu.xml
@@ -79,7 +79,7 @@
         <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
         <field name="act_window_id" ref="crm_case_categ0_act11"/>
     </record>
-    <menuitem parent="menu_crm_case_job_req_main" id="menu_crm_case_categ0_act11" action="crm_case_categ0_act11" groups="base.group_extended_menu"/>
+<!--    <menuitem parent="menu_crm_case_job_req_main" id="menu_crm_case_categ0_act11" action="crm_case_categ0_act11" groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_categ0_act_my_new3">
         <field name="name">New Job Request</field>
@@ -101,11 +101,11 @@
         <field name="view_id" ref="crm_case_form_view11"/>
         <field name="act_window_id" ref="crm_case_categ0_act_my_new3"/>
     </record>
-    <menuitem
-        parent="menu_crm_case_job_req_main"
-        id="menu_crm_case_categ0_act_my_new3"
-        action="crm_case_categ0_act_my_new3"
-        sequence="50"/>
+<!--    <menuitem-->
+<!--        parent="menu_crm_case_job_req_main"-->
+<!--        id="menu_crm_case_categ0_act_my_new3"-->
+<!--        action="crm_case_categ0_act_my_new3"-->
+<!--        sequence="50"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_categ0_act_my3">
         <field name="name">My Current Jobs Requests</field>
@@ -141,7 +141,7 @@
         <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
         <field name="act_window_id" ref="crm_case_categ0_act_my3"/>
     </record>
-    <menuitem parent="menu_crm_case_categ0_act11" id="menu_crm_case_categ0_act_myjobs3" action="crm_case_categ0_act_my3" groups="base.group_extended_menu"/>
+<!--    <menuitem parent="menu_crm_case_categ0_act11" id="menu_crm_case_categ0_act_myjobs3" action="crm_case_categ0_act_my3" groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_categ0_act_my2">
         <field name="name">My Jobs Propositions to Review</field>
@@ -177,11 +177,11 @@
         <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
         <field name="act_window_id" ref="crm_case_categ0_act_my2"/>
     </record>
-    <menuitem
-        parent="menu_crm_case_categ0_act_myjobs3"
-        id="menu_crm_case_categ0_act_myjobs2"
-        action="crm_case_categ0_act_my2"
-        groups="base.group_extended_menu"/>
+<!--    <menuitem-->
+<!--        parent="menu_crm_case_categ0_act_myjobs3"-->
+<!--        id="menu_crm_case_categ0_act_myjobs2"-->
+<!--        action="crm_case_categ0_act_my2"-->
+<!--        groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_categ0_act_my1">
         <field name="name">My Pending Jobs Requests</field>
@@ -217,9 +217,9 @@
         <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
         <field name="act_window_id" ref="crm_case_categ0_act_my1"/>
     </record>
-    <menuitem parent="menu_crm_case_categ0_act_myjobs3"
-        id="menu_crm_case_categ0_act_myjobs1" action="crm_case_categ0_act_my1"
-        groups="base.group_extended_menu"/>
+<!--    <menuitem parent="menu_crm_case_categ0_act_myjobs3"-->
+<!--        id="menu_crm_case_categ0_act_myjobs1" action="crm_case_categ0_act_my1"-->
+<!--        groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_categ0_act_my0">
         <field name="name">My Open Jobs Requests</field>
@@ -255,9 +255,9 @@
         <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
         <field name="act_window_id" ref="crm_case_categ0_act_my0"/>
     </record>
-    <menuitem parent="menu_crm_case_categ0_act_myjobs3" id="menu_crm_case_categ0_act_myjobs0"
-        action="crm_case_categ0_act_my0"
-        groups="base.group_extended_menu"/>
+<!--    <menuitem parent="menu_crm_case_categ0_act_myjobs3" id="menu_crm_case_categ0_act_myjobs0"-->
+<!--        action="crm_case_categ0_act_my0"-->
+<!--        groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_categ0_act_myjobs">
         <field name="name">Calendar Of My Interviews</field>
@@ -291,7 +291,7 @@
         <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
         <field name="act_window_id" ref="crm_case_categ0_act_myjobs"/>
     </record>
-    <menuitem parent="menu_crm_case_categ0_act11" id="menu_crm_case_categ0_act_myjobs_myjobs" action="crm_case_categ0_act_myjobs" groups="base.group_extended_menu"/>
+<!--    <menuitem parent="menu_crm_case_categ0_act11" id="menu_crm_case_categ0_act_myjobs_myjobs" action="crm_case_categ0_act_myjobs" groups="base.group_extended_menu"/>-->
     
     <!-- 
         ALL JOBS REQUESTS 
@@ -333,7 +333,7 @@
         <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
         <field name="act_window_id" ref="crm_case_categ0_act_all3"/>
     </record>
-    <menuitem parent="menu_crm_case_categ0_act111" id="menu_crm_case_categ0_act_myjobs_all3" action="crm_case_categ0_act_all3" groups="base.group_extended_menu"/>
+<!--    <menuitem parent="menu_crm_case_categ0_act111" id="menu_crm_case_categ0_act_myjobs_all3" action="crm_case_categ0_act_all3" groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_categ0_act_all2">
         <field name="name">All Jobs Propositions to Review</field>
@@ -369,7 +369,7 @@
         <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
         <field name="act_window_id" ref="crm_case_categ0_act_all2"/>
     </record>
-    <menuitem parent="menu_crm_case_categ0_act_myjobs_all3" id="menu_crm_case_categ0_act_myjobs_all2" action="crm_case_categ0_act_all2" groups="base.group_extended_menu"/>        
+<!--    <menuitem parent="menu_crm_case_categ0_act_myjobs_all3" id="menu_crm_case_categ0_act_myjobs_all2" action="crm_case_categ0_act_all2" groups="base.group_extended_menu"/>        -->
 
     <record model="ir.actions.act_window" id="crm_case_categ0_act_all1">
         <field name="name">All Pending Jobs Requests</field>
@@ -405,7 +405,7 @@
         <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
         <field name="act_window_id" ref="crm_case_categ0_act_all1"/>
     </record>
-    <menuitem parent="menu_crm_case_categ0_act_myjobs_all3" id="menu_crm_case_categ0_act_myjobs_all1" action="crm_case_categ0_act_all1" groups="base.group_extended_menu"/>        
+<!--    <menuitem parent="menu_crm_case_categ0_act_myjobs_all3" id="menu_crm_case_categ0_act_myjobs_all1" action="crm_case_categ0_act_all1" groups="base.group_extended_menu"/>        -->
 
     <record model="ir.actions.act_window" id="crm_case_categ0_act_all0">
         <field name="name">All Open Jobs Requests</field>
@@ -441,7 +441,7 @@
         <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
         <field name="act_window_id" ref="crm_case_categ0_act_all0"/>
     </record>
-    <menuitem  parent="menu_crm_case_categ0_act_myjobs_all3" id="menu_crm_case_categ0_act_myjobs_all0" action="crm_case_categ0_act_all0" groups="base.group_extended_menu"/>        
+<!--    <menuitem  parent="menu_crm_case_categ0_act_myjobs_all3" id="menu_crm_case_categ0_act_myjobs_all0" action="crm_case_categ0_act_all0" groups="base.group_extended_menu"/>        -->
 
     <record model="ir.actions.act_window" id="crm_case_categ0_act_alljobs">
         <field name="name">Calendar Of Interviews</field>
@@ -475,7 +475,7 @@
         <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
         <field name="act_window_id" ref="crm_case_categ0_act_alljobs"/>
     </record>
-    <menuitem parent="menu_crm_case_categ0_act111" id="menu_crm_case_categ0_act_myjobs_alljobs" action="crm_case_categ0_act_alljobs" groups="base.group_extended_menu"/>
+<!--    <menuitem parent="menu_crm_case_categ0_act111" id="menu_crm_case_categ0_act_myjobs_alljobs" action="crm_case_categ0_act_alljobs" groups="base.group_extended_menu"/>-->
     
 </data>
 </openerp>
diff --git a/addons/crm_configuration/crm_lead_menu.xml b/addons/crm_configuration/crm_lead_menu.xml
index 6127d36b35a..13aa1b0818e 100644
--- a/addons/crm_configuration/crm_lead_menu.xml
+++ b/addons/crm_configuration/crm_lead_menu.xml
@@ -27,7 +27,7 @@
         <field name="act_window_id" ref="crm_case_category_act_leads_all"/>
     </record>
     <menuitem parent="menu_presale" name="Prospects" id="menu_crm_case_categ0_act_leads" action="crm_case_category_act_leads_all"/>
-    <menuitem parent="menu_crm_case_categ0_act_leads" id="menu_crm_case_categ0_act_leads_all" action="crm_case_category_act_leads_all" groups="base.group_extended_menu"/>
+<!--    <menuitem parent="menu_crm_case_categ0_act_leads" id="menu_crm_case_categ0_act_leads_all" action="crm_case_category_act_leads_all" groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_leads_all1">
         <field name="name">Current Prospects</field>
@@ -51,7 +51,7 @@
         <field name="view_id" ref="crm_case_form_view_leads"/>
         <field name="act_window_id" ref="crm_case_category_act_leads_all1"/>
     </record>
-    <menuitem parent="menu_crm_case_categ0_act_leads_all" id="menu_crm_case_categ0_act_leads_all1" action="crm_case_category_act_leads_all1" groups="base.group_extended_menu"/>
+<!--    <menuitem parent="menu_crm_case_categ0_act_leads_all" id="menu_crm_case_categ0_act_leads_all1" action="crm_case_category_act_leads_all1" groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_leads_unassigned">
         <field name="name">Unassigned Prospects</field>
@@ -75,11 +75,11 @@
         <field name="view_id" ref="crm_case_form_view_leads"/>
         <field name="act_window_id" ref="crm_case_category_act_leads_unassigned"/>
     </record>
-    <menuitem
-        parent="menu_crm_case_categ0_act_leads_all"
-        id="menu_crm_case_categ0_act_leads_unassigned"
-        action="crm_case_category_act_leads_unassigned"
-        groups="base.group_extended_menu"/>
+<!--    <menuitem-->
+<!--        parent="menu_crm_case_categ0_act_leads_all"-->
+<!--        id="menu_crm_case_categ0_act_leads_unassigned"-->
+<!--        action="crm_case_category_act_leads_unassigned"-->
+<!--        groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_leads_all2">
         <field name="name">All Draft Prospects</field>
@@ -103,7 +103,7 @@
         <field name="view_id" ref="crm_case_form_view_leads"/>
         <field name="act_window_id" ref="crm_case_category_act_leads_all2"/>
     </record>
-    <menuitem parent="menu_crm_case_categ0_act_leads_all1" id="menu_crm_case_categ0_act_leads_all2" action="crm_case_category_act_leads_all2" groups="base.group_extended_menu"/>
+<!--    <menuitem parent="menu_crm_case_categ0_act_leads_all1" id="menu_crm_case_categ0_act_leads_all2" action="crm_case_category_act_leads_all2" groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_leads_all3">
         <field name="name">All Prospects to Qualify</field>
@@ -127,7 +127,7 @@
         <field name="view_id" ref="crm_case_form_view_leads"/>
         <field name="act_window_id" ref="crm_case_category_act_leads_all3"/>
     </record>
-    <menuitem parent="menu_crm_case_categ0_act_leads_all1" id="menu_crm_case_categ0_act_leads_all3" action="crm_case_category_act_leads_all3" groups="base.group_extended_menu"/>
+<!--    <menuitem parent="menu_crm_case_categ0_act_leads_all1" id="menu_crm_case_categ0_act_leads_all3" action="crm_case_category_act_leads_all3" groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_leads_all4">
         <field name="name">All Pending Prospects</field>
@@ -151,7 +151,7 @@
         <field name="view_id" ref="crm_case_form_view_leads"/>
         <field name="act_window_id" ref="crm_case_category_act_leads_all4"/>
     </record>
-    <menuitem parent="menu_crm_case_categ0_act_leads_all1" id="menu_crm_case_categ0_act_leads_all4" action="crm_case_category_act_leads_all4" groups="base.group_extended_menu"/>
+<!--    <menuitem parent="menu_crm_case_categ0_act_leads_all1" id="menu_crm_case_categ0_act_leads_all4" action="crm_case_category_act_leads_all4" groups="base.group_extended_menu"/>-->
 
 <!-- =================================================================== -->
     <record model="ir.actions.act_window" id="crm_case_category_act_leads_my">
@@ -176,7 +176,7 @@
         <field name="view_id" ref="crm_case_form_view_leads"/>
         <field name="act_window_id" ref="crm_case_category_act_leads_my"/>
     </record>
-    <menuitem parent="menu_crm_case_categ0_act_leads" id="menu_crm_case_categ0_act_leads_my" action="crm_case_category_act_leads_my" groups="base.group_extended_menu"/>
+<!--    <menuitem parent="menu_crm_case_categ0_act_leads" id="menu_crm_case_categ0_act_leads_my" action="crm_case_category_act_leads_my" groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_leads_my_new">
         <field name="name">New Prospect</field>
@@ -199,7 +199,7 @@
         <field name="view_id" ref="crm_case_form_view_leads"/>
         <field name="act_window_id" ref="crm_case_category_act_leads_my_new"/>
     </record>
-    <menuitem parent="menu_crm_case_categ0_act_leads" id="menu_crm_case_category_act_leads_my_new" action="crm_case_category_act_leads_my_new" sequence="50"/>
+<!--    <menuitem parent="menu_crm_case_categ0_act_leads" id="menu_crm_case_category_act_leads_my_new" action="crm_case_category_act_leads_my_new" sequence="50"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_leads_my1">
         <field name="name">My Current Prospects</field>
@@ -223,7 +223,7 @@
         <field name="view_id" ref="crm_case_form_view_leads"/>
         <field name="act_window_id" ref="crm_case_category_act_leads_my1"/>
     </record>
-    <menuitem parent="menu_crm_case_categ0_act_leads_my" id="menu_crm_case_categ0_act_leads_my1" action="crm_case_category_act_leads_my1" groups="base.group_extended_menu"/>
+<!--    <menuitem parent="menu_crm_case_categ0_act_leads_my" id="menu_crm_case_categ0_act_leads_my1" action="crm_case_category_act_leads_my1" groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_leads_my3">
         <field name="name">My Prospects to Qualify</field>
@@ -247,7 +247,7 @@
         <field name="view_id" ref="crm_case_form_view_leads"/>
         <field name="act_window_id" ref="crm_case_category_act_leads_my3"/>
     </record>
-    <menuitem parent="menu_crm_case_categ0_act_leads_my1" id="menu_crm_case_categ0_act_leads_my3" action="crm_case_category_act_leads_my3" groups="base.group_extended_menu"/>
+<!--    <menuitem parent="menu_crm_case_categ0_act_leads_my1" id="menu_crm_case_categ0_act_leads_my3" action="crm_case_category_act_leads_my3" groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_leads_my4">
         <field name="name">My Pending Prospects</field>
@@ -271,7 +271,7 @@
         <field name="view_id" ref="crm_case_form_view_leads"/>
         <field name="act_window_id" ref="crm_case_category_act_leads_my4"/>
     </record>
-    <menuitem parent="menu_crm_case_categ0_act_leads_my1" id="menu_crm_case_categ0_act_leads_my4" action="crm_case_category_act_leads_my4" groups="base.group_extended_menu"/>
+<!--    <menuitem parent="menu_crm_case_categ0_act_leads_my1" id="menu_crm_case_categ0_act_leads_my4" action="crm_case_category_act_leads_my4" groups="base.group_extended_menu"/>-->
 
 <!--        REPORTS        -->
     <menuitem name="Prospects"  id="menu_action_report_crm_case_lead" parent="report_crm.next_id_64"/>    
diff --git a/addons/crm_configuration/crm_lead_view.xml b/addons/crm_configuration/crm_lead_view.xml
index 5a98e4121dd..0a54307d065 100644
--- a/addons/crm_configuration/crm_lead_view.xml
+++ b/addons/crm_configuration/crm_lead_view.xml
@@ -188,5 +188,20 @@
         </field>
     </record>
 
+		<!--  PARTNER VIEW -->
+		<record id="view_partner_property_form" model="ir.ui.view">
+			<field name="name">res.partner.crm.form.inherit</field>
+			<field name="model">res.partner</field>
+			<field name="type">form</field>
+			<field name="inherit_id" ref="base.view_partner_form" />
+			<field name="arch" type="xml">
+				<field name="parent_id" position="after">
+					<button string="Create Opportunity"
+						name="%(crm_configuration.wizard_partner_create_opportunity)d" icon="gtk-index"
+						type="action"
+					/>
+				</field>
+			</field>
+		</record>
 </data>
 </openerp>
diff --git a/addons/crm_configuration/crm_meeting_menu.xml b/addons/crm_configuration/crm_meeting_menu.xml
index c918efacf76..d6a06c7971e 100644
--- a/addons/crm_configuration/crm_meeting_menu.xml
+++ b/addons/crm_configuration/crm_meeting_menu.xml
@@ -110,7 +110,7 @@
         <field name="view_id" ref="crm_case_gantt_view_meet"/>
         <field name="act_window_id" ref="crm_case_categ_meetmy"/>
     </record>
-    <menuitem name="My Meetings" id="menu_crm_case_categ_meet_my" action="crm_case_categ_meetmy" parent="menu_crm_case_category_act_meetings"/>
+<!--    <menuitem name="My Meetings" id="menu_crm_case_categ_meet_my" action="crm_case_categ_meetmy" parent="menu_crm_case_category_act_meetings"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_meetings">
         <field name="name">New Meeting</field>
@@ -132,10 +132,10 @@
         <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"/>
+<!--    <menuitem-->
+<!--        parent="menu_crm_case_category_act_meetings"-->
+<!--        id="menu_crm_case_category_act_meetings_new"-->
+<!--        action="crm_case_category_act_meetings" sequence="50"/>-->
 
 
     <!-- 
diff --git a/addons/crm_configuration/crm_opportunity_menu.xml b/addons/crm_configuration/crm_opportunity_menu.xml
index 120ed288f92..9f9c22926ee 100644
--- a/addons/crm_configuration/crm_opportunity_menu.xml
+++ b/addons/crm_configuration/crm_opportunity_menu.xml
@@ -34,7 +34,7 @@
 
 
 <!--          MENU          -->
-     <menuitem parent="menu_crm_case_opp" id="menu_crm_case_categ0_act_oppor11" action="crm_case_category_act_oppor11" groups="base.group_extended_menu"/>
+<!--     <menuitem parent="menu_crm_case_opp" id="menu_crm_case_categ0_act_oppor11" action="crm_case_category_act_oppor11" groups="base.group_extended_menu"/>-->
 
      <record model="ir.actions.act_window" id="crm_case_category_act_oppor1">
           <field name="name">All Open Opportunities</field>
@@ -64,7 +64,7 @@
           <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
           <field name="act_window_id" ref="crm_case_category_act_oppor1"/>
      </record>
-     <menuitem parent="menu_crm_case_categ0_act_oppor11" id="menu_crm_case_categ0_act_oppor1" action="crm_case_category_act_oppor1" groups="base.group_extended_menu"/>
+<!--     <menuitem parent="menu_crm_case_categ0_act_oppor11" id="menu_crm_case_categ0_act_oppor1" action="crm_case_category_act_oppor1" groups="base.group_extended_menu"/>-->
 
 
      <record model="ir.actions.act_window" id="crm_case_category_act_oppor_all2">
@@ -95,7 +95,7 @@
           <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
           <field name="act_window_id" ref="crm_case_category_act_oppor_all2"/>
      </record>
-     <menuitem parent="menu_crm_case_categ0_act_oppor11" id="menu_crm_case_categ0_act_oppor_all2" action="crm_case_category_act_oppor_all2" groups="base.group_extended_menu"/>
+<!--     <menuitem parent="menu_crm_case_categ0_act_oppor11" id="menu_crm_case_categ0_act_oppor_all2" action="crm_case_category_act_oppor_all2" groups="base.group_extended_menu"/>-->
 
 
 <!-- ======================================================== -->
@@ -126,7 +126,7 @@
           <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
           <field name="act_window_id" ref="crm_case_category_act_oppor22"/>
      </record>
-     <menuitem parent="menu_crm_case_opp" id="menu_crm_case_categ0_act_oppor22" action="crm_case_category_act_oppor22" groups="base.group_extended_menu"/>
+<!--     <menuitem parent="menu_crm_case_opp" id="menu_crm_case_categ0_act_oppor22" action="crm_case_category_act_oppor22" groups="base.group_extended_menu"/>-->
 
      <record model="ir.actions.act_window" id="crm_case_category_act_oppor">
           <field name="name">Opportunity</field>
@@ -149,11 +149,11 @@
           <field name="view_id" ref="crm_case_tree_view_oppor"/>
           <field name="act_window_id" ref="crm_case_category_act_oppor"/>
      </record>
-     <menuitem name="New Opportunity"
-        parent="menu_crm_case_opp"
-        id="menu_crm_case_categ0_act_oppor"
-        action="crm_case_category_act_oppor"
-        sequence="50"/>
+<!--     <menuitem name="New Opportunity"-->
+<!--        parent="menu_crm_case_opp"-->
+<!--        id="menu_crm_case_categ0_act_oppor"-->
+<!--        action="crm_case_category_act_oppor"-->
+<!--        sequence="50"/>-->
 
      <record model="ir.actions.act_window" id="crm_case_category_act_oppor2">
           <field name="name">My Open Opportunities</field>
@@ -183,7 +183,7 @@
           <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
           <field name="act_window_id" ref="crm_case_category_act_oppor2"/>
      </record>
-     <menuitem parent="menu_crm_case_categ0_act_oppor22" id="menu_crm_case_categ0_act_oppor2" action="crm_case_category_act_oppor2" groups="base.group_extended_menu"/>
+<!--     <menuitem parent="menu_crm_case_categ0_act_oppor22" id="menu_crm_case_categ0_act_oppor2" action="crm_case_category_act_oppor2" groups="base.group_extended_menu"/>-->
 
      <record model="ir.actions.act_window" id="crm_case_category_act_oppor_my2">
           <field name="name">My Pending Opportunities</field>
@@ -213,7 +213,7 @@
           <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
           <field name="act_window_id" ref="crm_case_category_act_oppor_my2"/>
      </record>
-     <menuitem parent="menu_crm_case_categ0_act_oppor22" id="menu_crm_case_categ0_act_oppor_my2" action="crm_case_category_act_oppor_my2" groups="base.group_extended_menu"/>
+<!--     <menuitem parent="menu_crm_case_categ0_act_oppor22" id="menu_crm_case_categ0_act_oppor_my2" action="crm_case_category_act_oppor_my2" groups="base.group_extended_menu"/>-->
 
 <!--          REPORTS               -->
      <record model="ir.actions.act_window" id="action_report_crm_case_oppor_user">
diff --git a/addons/crm_configuration/crm_phonecall_menu.xml b/addons/crm_configuration/crm_phonecall_menu.xml
index 16e9f552e52..ec3a289c8df 100644
--- a/addons/crm_configuration/crm_phonecall_menu.xml
+++ b/addons/crm_configuration/crm_phonecall_menu.xml
@@ -72,7 +72,7 @@
         <field name="view_id" ref="crm_case_phone_form_view"/>
         <field name="act_window_id" ref="crm_case_categ_phone_incoming0"/>
     </record>
-    <menuitem name="Inbound" id="menu_crm_case_categ_phone_incoming0"  parent="menu_crm_case_phone" action="crm_case_categ_phone_incoming0"/>
+<!--    <menuitem name="Inbound" id="menu_crm_case_categ_phone_incoming0"  parent="menu_crm_case_phone" action="crm_case_categ_phone_incoming0"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_categ_phone_incoming1">
         <field name="name">New Incoming Call</field>
@@ -95,7 +95,7 @@
         <field name="view_id" ref="crm_case_phone_form_view"/>
         <field name="act_window_id" ref="crm_case_categ_phone_incoming1"/>
     </record>
-    <menuitem name="New Incoming Call" id="menu_crm_case_categ_phone_incoming1"  parent="menu_crm_case_categ_phone_incoming0" action="crm_case_categ_phone_incoming1" sequence="50"/>
+<!--    <menuitem name="New Incoming Call" id="menu_crm_case_categ_phone_incoming1"  parent="menu_crm_case_categ_phone_incoming0" action="crm_case_categ_phone_incoming1" sequence="50"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_categ_phone_incoming2">
         <field name="name">Planned Calls</field>
@@ -126,7 +126,7 @@
         <field name="view_id" ref="crm_case_phone_form_view"/>
         <field name="act_window_id" ref="crm_case_categ_phone_incoming2"/>
     </record>
-    <menuitem name="Planned Calls" id="menu_crm_case_categ_phone_incoming2"  parent="menu_crm_case_categ_phone_incoming0" action="crm_case_categ_phone_incoming2" groups="base.group_extended_menu"/>
+<!--    <menuitem name="Planned Calls" id="menu_crm_case_categ_phone_incoming2"  parent="menu_crm_case_categ_phone_incoming0" action="crm_case_categ_phone_incoming2" groups="base.group_extended_menu"/>-->
 
 ################################################################
     <record model="ir.actions.act_window" id="crm_case_categ_phone_outgoing0">
@@ -156,7 +156,7 @@
         <field name="view_id" ref="crm_case_phone_form_view"/>
         <field name="act_window_id" ref="crm_case_categ_phone_outgoing0"/>
     </record>
-    <menuitem name="Outbound" id="menu_crm_case_categ_phone_outgoing0"  parent="menu_crm_case_phone" action="crm_case_categ_phone_outgoing0"/>
+<!--    <menuitem name="Outbound" id="menu_crm_case_categ_phone_outgoing0"  parent="menu_crm_case_phone" action="crm_case_categ_phone_outgoing0"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_categ_phone_outgoing1">
         <field name="name">New Outgoing Call</field>
@@ -178,7 +178,7 @@
         <field name="view_id" ref="crm_case_phone_form_view"/>
         <field name="act_window_id" ref="crm_case_categ_phone_outgoing1"/>
     </record>
-    <menuitem name="New Outgoing Call" id="menu_crm_case_categ_phone_outgoing1"  parent="menu_crm_case_categ_phone_outgoing0" action="crm_case_categ_phone_outgoing1" sequence="50"/>
+<!--    <menuitem name="New Outgoing Call" id="menu_crm_case_categ_phone_outgoing1"  parent="menu_crm_case_categ_phone_outgoing0" action="crm_case_categ_phone_outgoing1" sequence="50"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_categ_phone_outgoing2">
         <field name="name">Planned Calls</field>
@@ -208,7 +208,7 @@
         <field name="view_id" ref="crm_case_phone_form_view"/>
         <field name="act_window_id" ref="crm_case_categ_phone_outgoing2"/>
     </record>
-    <menuitem name="Planned Calls" id="menu_crm_case_categ_phone_outgoing2"  parent="menu_crm_case_categ_phone_outgoing0" action="crm_case_categ_phone_outgoing2" groups="base.group_extended_menu"/>
+<!--    <menuitem name="Planned Calls" id="menu_crm_case_categ_phone_outgoing2"  parent="menu_crm_case_categ_phone_outgoing0" action="crm_case_categ_phone_outgoing2" groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_categ_phone_outgoing4">
         <field name="name">Calls Not Held</field>
@@ -238,7 +238,7 @@
         <field name="view_id" ref="crm_case_phone_form_view"/>
         <field name="act_window_id" ref="crm_case_categ_phone_outgoing4"/>
     </record>
-    <menuitem name="Calls Not Held" id="menu_crm_case_categ_phone_outgoing4"  parent="menu_crm_case_categ_phone_outgoing0" action="crm_case_categ_phone_outgoing4" groups="base.group_extended_menu"/>
+<!--    <menuitem name="Calls Not Held" id="menu_crm_case_categ_phone_outgoing4"  parent="menu_crm_case_categ_phone_outgoing0" action="crm_case_categ_phone_outgoing4" groups="base.group_extended_menu"/>-->
 
 </data>
 </openerp>

From 487d6e924e4f8c6f89343bf98a3f8ff4ce1c4ee4 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 28 Oct 2009 11:55:21 +0530
Subject: [PATCH 04/30] [IMP]: CRM Ergonomy Improvement blueprint: Added
 fields.binary in send mail wizard of crm to put attachements to emails.

bzr revid: rpa@tinyerp.com-20091028062521-3wqo97t8olfdgn48
---
 .../crm/wizard/wizard_crm_new_send_email.py   | 26 ++++++++++++++++---
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/addons/crm/wizard/wizard_crm_new_send_email.py b/addons/crm/wizard/wizard_crm_new_send_email.py
index b905d31aa8e..9cb3d87466c 100644
--- a/addons/crm/wizard/wizard_crm_new_send_email.py
+++ b/addons/crm/wizard/wizard_crm_new_send_email.py
@@ -28,7 +28,7 @@ import ir
 import pooler
 import tools
 from tools.translate import _
-
+import base64
 
 email_send_form = '''<?xml version="1.0"?>
 <form string="Mass Mailing">
@@ -39,17 +39,30 @@ email_send_form = '''<?xml version="1.0"?>
     <field name="subject"/>
     <newline/>
     <field name="text" />
+    <newline/>
+    <field name="doc1" />
+    <newline/>
+    <field name="doc2" />
+    <newline/>
+    <field name="doc3" />
 </form>'''
 
 email_send_fields = {
     'to': {'string':"To", 'type':'char', 'size':64, 'required':True},
     'cc': {'string':"CC", 'type':'char', 'size':128,},
     'subject': {'string':'Subject', 'type':'char', 'size':128, 'required':True},
-    'text': {'string':'Message', 'type':'text_tag', 'required':True}
+    'text': {'string':'Message', 'type':'text_tag', 'required':True},
+    'doc1' :  {'string':"Attachment1", 'type':'binary'},
+    'doc2' :  {'string':"Attachment2", 'type':'binary'},
+    'doc3' :  {'string':"Attachment3", 'type':'binary'},
 }
 
 # 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')
 
@@ -64,14 +77,19 @@ def _mass_mail_send(self, cr, uid, data, context):
     body = data['form']['text']
     if case.user_id.signature:
         body += '\n\n%s' % (case.user_id.signature)
-    tools.email_send(
+    flag = tools.email_send(
         case.user_id.address_id.email,
         emails,
         data['form']['subject'],
-        case_pool.format_body(body),
+        body,
+        attach=attach,
         reply_to=case.section_id.reply_to,
         tinycrm=str(case.id)
     )
+    if flag:
+        raise wizard.except_wizard(_('Message!'),("Email Successfully Sent..!!"))   
+    else:
+        raise wizard.except_wizard(_('Warning!'),("Email is not sent Successfully"))   
     return {}
 
 def _get_info(self, cr, uid, data, context):

From 6951e39fd22535fecb62e11af62c7f95efe8c780 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 28 Oct 2009 14:20:32 +0530
Subject: [PATCH 05/30] [ADD]: CRM Ergonomy Improvement blueprint: Added wizard
 on case history to send last mail

bzr revid: rpa@tinyerp.com-20091028085032-r41p2o4cw5lzvkqb
---
 addons/crm/__terp__.py             |  2 +-
 addons/crm/crm_view.xml            |  6 ++-
 addons/crm/crm_wizard.xml          |  6 +++
 addons/crm/wizard/__init__.py      |  1 +
 addons/crm/wizard/wizard_add_cc.py | 77 ++++++++++++++++++++++++++++++
 5 files changed, 90 insertions(+), 2 deletions(-)
 create mode 100644 addons/crm/wizard/wizard_add_cc.py

diff --git a/addons/crm/__terp__.py b/addons/crm/__terp__.py
index 0e3fef9603a..8b317e532f9 100644
--- a/addons/crm/__terp__.py
+++ b/addons/crm/__terp__.py
@@ -47,9 +47,9 @@ between mails and Open ERP.""",
     'depends': ['base'],
     'init_xml': ['crm_data.xml'],
     'update_xml': [
+       'crm_wizard.xml',
         'crm_view.xml',
         'crm_report.xml',
-        'crm_wizard.xml',
         'security/crm_security.xml',
         'security/ir.model.access.csv'
     ],
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 260afc42d6f..06798626476 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -380,10 +380,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="%(wizard_crm_case_email_add_cc)d"
+		                                   	icon="gtk-add" type="action"/>
                                    </group>
                                    <newline/>
                                    <field name="description" colspan="4" nolabel="1"/>
diff --git a/addons/crm/crm_wizard.xml b/addons/crm/crm_wizard.xml
index 9e96530a782..f4873431789 100644
--- a/addons/crm/crm_wizard.xml
+++ b/addons/crm/crm_wizard.xml
@@ -10,5 +10,11 @@
 
         <menuitem action="wizard_case_section_menu" id="menu_wizard_case_section_menu" parent="crm.menu_crm_configuration" type="wizard"/>
         
+        <wizard string="Add a CC"
+           model="crm.case"
+           menu = "False"
+           name="crm.case.email.add_cc"
+           id="wizard_crm_case_email_add_cc"/> 
+
     </data>
 </openerp>
diff --git a/addons/crm/wizard/__init__.py b/addons/crm/wizard/__init__.py
index b29cbe06375..55f1d9a3a7c 100644
--- a/addons/crm/wizard/__init__.py
+++ b/addons/crm/wizard/__init__.py
@@ -23,6 +23,7 @@ import crm_wizard
 import wizard_crm_send_email
 import wizard_crm_new_send_email
 import wizard_fetch_mail
+import wizard_add_cc
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/crm/wizard/wizard_add_cc.py b/addons/crm/wizard/wizard_add_cc.py
new file mode 100644
index 00000000000..2848126f9c2
--- /dev/null
+++ b/addons/crm/wizard/wizard_add_cc.py
@@ -0,0 +1,77 @@
+# -*- 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/>.     
+#
+##############################################################################
+
+
+import time
+import wizard
+import osv
+import pooler
+
+cc_form = '''<?xml version="1.0"?>
+<form string="Add a CC">
+    <field name="send_to"/>
+    <newline/>
+    <field name="user_id" attrs="{'readonly' : [('send_to','!=','user')], 'required' : [('send_to','=','user')]}"/>
+    <field name="partner_id" attrs="{'readonly' : [('send_to','!=','partner')], 'required' : [('send_to','=','partner')]}"/>/>
+    <field name="email"/>
+</form>'''
+
+#on_change="change_email(user_id, partner_id)" 
+
+cc_fields = {
+    'send_to' : {'string' : 'Send to', 'type' : 'selection', 'required' :True, \
+                      'selection' :[('user','User'),('partner','Partner'),('email','Email Address')], \
+                      'default' : 'email'},
+    'user_id' : {'string' : 'User', 'type' : 'many2one', 'relation' : 'res.users'},
+    'partner_id' : {'string' : 'Partner', 'type' : 'many2one', 'relation' : 'res.partner'},
+    'email' : {'string' : 'Email', 'type' : 'char', 'size' : 24},
+}
+
+#def change_email(self, cr, uid, data, context):
+#    return {}
+
+def email_cc_add(self, cr, uid, data, context):
+    pool = pooler.get_pool(cr.dbname)
+    history_line = pool.get('crm.case.history').browse(cr, uid, data['id'])
+    crm_case = pool.get('crm.case')
+    case_id = history_line.log_id.case_id.id
+    crm_case.write(cr, uid, case_id, {'email_cc' : data['form']['email']})
+    #TODO: send the latest email to the email adderss
+    return {}
+
+
+class wizard_add_cc(wizard.interface):
+    states = {
+        'init' : {
+            'actions' : [], 
+            'result' : {'type' : 'form', 'arch' : cc_form, 'fields' :cc_fields,\
+                         'state' :[('end','Cancel', 'gtk-cancel'),('add','Ok', 'gtk-go-forward' )]}
+        },
+        'add' : {
+            'actions' : [email_cc_add],
+            'result' : {'type' : 'state', 'state' : 'end'}
+        }
+    }
+wizard_add_cc('crm.case.email.add_cc')
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+

From 2cc3cf9630bccd4550e9258819d82267ae88a2d6 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Wed, 28 Oct 2009 17:27:55 +0530
Subject: [PATCH 06/30] [IMP]crm, crm_configuration : functional improvement

bzr revid: hmo@tinyerp.com-20091028115755-e91jgphry3abviu2
---
 addons/crm/__terp__.py                        |   2 +-
 addons/crm/crm.py                             |   4 +-
 addons/crm/crm_view.xml                       |   6 +-
 addons/crm/crm_wizard.xml                     |   6 -
 addons/crm/wizard/__init__.py                 |   1 -
 .../crm/wizard/wizard_crm_new_send_email.py   |  26 +---
 addons/crm_configuration/__terp__.py          |   3 +-
 addons/crm_configuration/crm_bugs_menu.xml    |  49 +++---
 addons/crm_configuration/crm_bugs_view.xml    |  20 ++-
 addons/crm_configuration/crm_claims_menu.xml  |  12 +-
 addons/crm_configuration/crm_claims_view.xml  |  15 +-
 addons/crm_configuration/crm_config.py        |  43 ++++++
 addons/crm_configuration/crm_config_view.xml  |  30 ++++
 .../crm_configuration_wizard.xml              |   8 -
 addons/crm_configuration/crm_fund_menu.xml    |  14 +-
 .../crm_configuration/crm_helpdesk_menu.xml   | 100 ++++++------
 .../crm_configuration/crm_helpdesk_view.xml   | 143 ++++++++++++++++++
 addons/crm_configuration/crm_jobs_menu.xml    |  48 +++---
 addons/crm_configuration/crm_lead_menu.xml    |  30 ++--
 addons/crm_configuration/crm_lead_view.xml    |  15 --
 addons/crm_configuration/crm_meeting_menu.xml |  27 +---
 addons/crm_configuration/crm_meeting_view.xml |  67 +-------
 .../crm_opportunity_menu.xml                  |  22 +--
 .../crm_opportunity_view.xml                  |   5 +-
 .../crm_configuration/crm_phonecall_menu.xml  |  14 +-
 .../crm_configuration/crm_phonecall_view.xml  |  82 +++-------
 26 files changed, 427 insertions(+), 365 deletions(-)
 create mode 100644 addons/crm_configuration/crm_helpdesk_view.xml

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

From 596c51a427bf1b971e9c2a1a5ec66c22f76dd961 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 28 Oct 2009 17:48:58 +0530
Subject: [PATCH 07/30] [IMP]: Added  wizard of crm_configuration that was
 removed in last commit

bzr revid: rpa@tinyerp.com-20091028121858-3r6f2xzj73vwwlyj
---
 addons/crm_configuration/crm_configuration_wizard.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/addons/crm_configuration/crm_configuration_wizard.xml b/addons/crm_configuration/crm_configuration_wizard.xml
index 8bacfa6b68d..f5a853abfd1 100644
--- a/addons/crm_configuration/crm_configuration_wizard.xml
+++ b/addons/crm_configuration/crm_configuration_wizard.xml
@@ -39,6 +39,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>

From 1400068ae4fc80a946df70de9225b05edf73158f Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 28 Oct 2009 18:06:38 +0530
Subject: [PATCH 08/30] [IMP]: CRM Ergonomy Improvement blueprint:  General
 Improvements, Leads - Search View,Leads - Form View improvement

bzr revid: rpa@tinyerp.com-20091028123638-wfc8gom4ymj173yb
---
 addons/crm_configuration/crm_bugs_view.xml    |   3 +-
 addons/crm_configuration/crm_claims_view.xml  |   2 +-
 addons/crm_configuration/crm_fund_view.xml    |   2 +-
 addons/crm_configuration/crm_lead_view.xml    |  56 +++++---
 addons/crm_configuration/crm_meeting_view.xml |   2 +-
 .../crm_opportunity_view.xml                  |   2 +-
 .../crm_configuration/crm_phonecall_view.xml  |   2 +-
 addons/crm_configuration/wizard/__init__.py   |   2 +
 .../wizard/wizard_opportunity_set.py          |   9 +-
 .../wizard/wizard_partner_opportunity.py      | 124 ++++++++++++++++++
 10 files changed, 179 insertions(+), 25 deletions(-)
 create mode 100644 addons/crm_configuration/wizard/wizard_partner_opportunity.py

diff --git a/addons/crm_configuration/crm_bugs_view.xml b/addons/crm_configuration/crm_bugs_view.xml
index 212503482ab..fb3455d2928 100644
--- a/addons/crm_configuration/crm_bugs_view.xml
+++ b/addons/crm_configuration/crm_bugs_view.xml
@@ -150,8 +150,7 @@
         <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"/>
+               <group col="4" colspan="1">
                    <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"/>
diff --git a/addons/crm_configuration/crm_claims_view.xml b/addons/crm_configuration/crm_claims_view.xml
index 1f09f71967a..4f9a73da22f 100644
--- a/addons/crm_configuration/crm_claims_view.xml
+++ b/addons/crm_configuration/crm_claims_view.xml
@@ -159,7 +159,7 @@
             <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="My Claims" domain="[('user_id','=',uid)]" separator="1" default="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"/>
diff --git a/addons/crm_configuration/crm_fund_view.xml b/addons/crm_configuration/crm_fund_view.xml
index 9398786ec25..5a71a550d15 100644
--- a/addons/crm_configuration/crm_fund_view.xml
+++ b/addons/crm_configuration/crm_fund_view.xml
@@ -153,7 +153,7 @@
             <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="gtk-execute" 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"/>
diff --git a/addons/crm_configuration/crm_lead_view.xml b/addons/crm_configuration/crm_lead_view.xml
index 5a98e4121dd..6ee12aeb4d9 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)"/>
+                     <label string="Partner:" align="1.0"/>
+					 <group colspan="1" col="2">
+						 <field name="partner_id" nolabel="1"/>
+						  <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>
@@ -163,30 +170,47 @@
         </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-execute" string="   Today   " separator="1" domain="[('create_date::date','=',time.strftime('%%Y-%%m-%%d'))]" help="Todays's Prospects"/>
+<!--                <filter icon="gtk-execute" string="    7 Days    " separator="1" domain="[('create_date::date','&lt;',time.strftime('%%Y-%%m-%%d'))]" help="Prospects during last 7 days"/> -->
                </group>
                <group col="4" colspan="4">
+                   <field name="name" select="1"/>
                    <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"/>
+                       <filter icon="gtk-new" domain="[('state','=','draft')]" help="Draft Prospects"/>
+                       <filter icon="gtk-yes" domain="[('state','=','open')]" help="Open Prospects"/>
+                   </field>
+                   <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="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="parent_id" position="after">
+					<button string="Create Opportunity"
+						name="%(crm_configuration.wizard_partner_create_opportunity)d" icon="gtk-index"
+						type="action"
+					/>
+				</field>
+			</field>
+		</record>
 </data>
 </openerp>
diff --git a/addons/crm_configuration/crm_meeting_view.xml b/addons/crm_configuration/crm_meeting_view.xml
index e4633f4305b..e74c01d3cb3 100644
--- a/addons/crm_configuration/crm_meeting_view.xml
+++ b/addons/crm_configuration/crm_meeting_view.xml
@@ -101,7 +101,7 @@
         <field name="arch" type="xml">
             <search string="Search Meetings">
                <group col="5" colspan="1">
-                   <filter icon="gtk-execute" string="My Meetings" domain="[('user_id','=',uid)]" help="Meetings Related to Current User"/>
+                   <filter icon="gtk-execute" string="My Meetings" default="1" domain="[('user_id','=',uid)]" help="Meetings Related to Current User"/>
                </group>
                <group col="4" colspan="4">
                    <field name="state" select="1">
diff --git a/addons/crm_configuration/crm_opportunity_view.xml b/addons/crm_configuration/crm_opportunity_view.xml
index 519dc49dc5a..bc75830d7ba 100644
--- a/addons/crm_configuration/crm_opportunity_view.xml
+++ b/addons/crm_configuration/crm_opportunity_view.xml
@@ -154,7 +154,7 @@
         <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="My Opportunities" default="1" 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"/>
diff --git a/addons/crm_configuration/crm_phonecall_view.xml b/addons/crm_configuration/crm_phonecall_view.xml
index 57c55f5f6cb..fbf5a8bded9 100644
--- a/addons/crm_configuration/crm_phonecall_view.xml
+++ b/addons/crm_configuration/crm_phonecall_view.xml
@@ -101,7 +101,7 @@
         <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="My Phonecalls" default="1" 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>
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/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:

From fe7773ea988d9e6adcc619a41520ff17ee9f235e Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 28 Oct 2009 19:25:44 +0530
Subject: [PATCH 09/30] [IMP]: CRM Ergonomy Improvement blueprint:  Improvement
 in search views for leads, opportunities, phonecalls, bugs, jobs , claims

bzr revid: rpa@tinyerp.com-20091028135544-4xgt7v00243w0bi7
---
 addons/crm_configuration/crm_bugs_view.xml    | 14 ++++++---
 addons/crm_configuration/crm_claims_view.xml  | 14 ++++-----
 addons/crm_configuration/crm_jobs_view.xml    | 24 +++++++--------
 addons/crm_configuration/crm_lead_view.xml    |  5 ++--
 .../crm_opportunity_view.xml                  | 30 ++++++++++---------
 .../crm_configuration/crm_phonecall_view.xml  | 22 ++++++++------
 6 files changed, 59 insertions(+), 50 deletions(-)

diff --git a/addons/crm_configuration/crm_bugs_view.xml b/addons/crm_configuration/crm_bugs_view.xml
index fb3455d2928..112decd8491 100644
--- a/addons/crm_configuration/crm_bugs_view.xml
+++ b/addons/crm_configuration/crm_bugs_view.xml
@@ -150,19 +150,25 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Bugs">
-               <group col="4" colspan="1">
+               <group col="7" colspan="1">
                    <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"/>
+                   <separator orientation="vertical"/>
+                   <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">
+               <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="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"/>
                    </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_view.xml b/addons/crm_configuration/crm_claims_view.xml
index 4f9a73da22f..81b2153e2b8 100644
--- a/addons/crm_configuration/crm_claims_view.xml
+++ b/addons/crm_configuration/crm_claims_view.xml
@@ -159,18 +159,14 @@
             <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" default="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"/>
+<!--                       <filter icon="gtk-execute" string="My Claims" domain="[('user_id','=',uid)]" separator="1" default="1" help="Claims Related to Current User"/>-->
+                       <filter icon="gtk-execute" 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-execute" 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>
                        <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_jobs_view.xml b/addons/crm_configuration/crm_jobs_view.xml
index bb109a3c488..d4c1739f28c 100644
--- a/addons/crm_configuration/crm_jobs_view.xml
+++ b/addons/crm_configuration/crm_jobs_view.xml
@@ -157,19 +157,19 @@
             <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-execute" string="   Today   " separator="1" domain="[('create_date::date','=',time.strftime('%%Y-%%m-%%d'))]" help="Todays's Opportunities"/>
+	                	<filter icon="gtk-execute" string="    7 Days    " separator="1" domain="[]" help="Opportunities during last 7 days"/>
+<!--                       <filter icon="gtk-execute" string="My Jobs" domain="[('user_id','=',uid)]" separator="1" help="Jobs Related to Current User"/>-->
+						<separator orientation="vertical"/>
+                       <filter icon="gtk-execute" string="New Jobs" domain="[('section_id.name','=','Jobs'),('stage_id.name','=','Initial Jobs Demand')]" separator="1" help="All Initial Jobs"/>
+                       <filter icon="gtk-execute" string="Open Jobs" domain="[('section_id.name','=','Jobs'),('state','=','open')]" separator="1" help="Open Jobs"/>
+                       <filter icon="gtk-execute" 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'/>
+                   		<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_view.xml b/addons/crm_configuration/crm_lead_view.xml
index 6ee12aeb4d9..0cfcbe0334e 100644
--- a/addons/crm_configuration/crm_lead_view.xml
+++ b/addons/crm_configuration/crm_lead_view.xml
@@ -179,9 +179,10 @@
             <search string="Search Prospects">
                <group col="3" colspan="1">
                 <filter icon="gtk-execute" string="   Today   " separator="1" domain="[('create_date::date','=',time.strftime('%%Y-%%m-%%d'))]" help="Todays's Prospects"/>
-<!--                <filter icon="gtk-execute" string="    7 Days    " separator="1" domain="[('create_date::date','&lt;',time.strftime('%%Y-%%m-%%d'))]" help="Prospects during last 7 days"/> -->
+                <filter icon="gtk-execute" string="    7 Days    " separator="1" domain="[]" help="Prospects during last 7 days"/> 
                </group>
-               <group col="4" colspan="4">
+               <separator orientation="vertical"/>
+               <group col="4" colspan="2">
                    <field name="name" select="1"/>
                    <field name="state" select="1">
                        <filter icon="gtk-new" domain="[('state','=','draft')]" help="Draft Prospects"/>
diff --git a/addons/crm_configuration/crm_opportunity_view.xml b/addons/crm_configuration/crm_opportunity_view.xml
index bc75830d7ba..d08062b8ae6 100644
--- a/addons/crm_configuration/crm_opportunity_view.xml
+++ b/addons/crm_configuration/crm_opportunity_view.xml
@@ -147,27 +147,29 @@
             </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" default="1" 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-execute" string="   Today   " separator="1" domain="[('create_date::date','=',time.strftime('%%Y-%%m-%%d'))]" help="Todays's Opportunities"/>
+                <filter icon="gtk-execute" 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"/>
+                   <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="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_view.xml b/addons/crm_configuration/crm_phonecall_view.xml
index fbf5a8bded9..9e064fd74c1 100644
--- a/addons/crm_configuration/crm_phonecall_view.xml
+++ b/addons/crm_configuration/crm_phonecall_view.xml
@@ -100,19 +100,23 @@
         <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" default="1" domain="[('user_id','=',uid)]" separator="1" help="Phonecalls Related to Current User"/>
+               <group col="6" colspan="1">
+					<filter icon="gtk-execute" string="   Today   " separator="1" domain="[('create_date::date','=',time.strftime('%%Y-%%m-%%d'))]" help="Todays's Opportunities"/>
+					<filter icon="gtk-execute" string="    7 Days    " separator="1" domain="[]" help="Opportunities during last 7 days"/>
+                   <separator orientation="vertical"/>
                    <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"/>
+                 <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-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>

From 7b5fb564c6d1d949dd9731d8990058e677dbf876 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 28 Oct 2009 19:29:36 +0530
Subject: [PATCH 10/30] [IMP]: Applied changes for hiding too much menu items
 that were reverted in merge

bzr revid: rpa@tinyerp.com-20091028135936-u2b3t1dyd04gm1jm
---
 addons/crm_configuration/crm_bugs_menu.xml    | 49 +++++++++----------
 addons/crm_configuration/crm_claims_menu.xml  | 12 ++---
 .../crm_configuration_wizard.xml              |  8 +++
 addons/crm_configuration/crm_fund_menu.xml    | 14 +++---
 .../crm_configuration/crm_helpdesk_menu.xml   |  6 +--
 addons/crm_configuration/crm_jobs_menu.xml    | 48 +++++++++---------
 addons/crm_configuration/crm_lead_menu.xml    | 30 ++++++------
 .../crm_opportunity_menu.xml                  | 22 ++++-----
 .../crm_configuration/crm_phonecall_menu.xml  | 14 +++---
 9 files changed, 105 insertions(+), 98 deletions(-)

diff --git a/addons/crm_configuration/crm_bugs_menu.xml b/addons/crm_configuration/crm_bugs_menu.xml
index 218acd0e420..0b5922e1407 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,7 +62,7 @@
         <field name="act_window_id" ref="crm_case_categ_act0"/>
     </record>
     <menuitem name="Bug Tracking" id="menu_crm_case_bug_track"  parent="menu_aftersale" action="crm_case_categ_act0"/>
-    <menuitem  id="menu_crm_case_categ_act0" action="crm_case_categ_act0" parent="menu_crm_case_bug_track"/>
+<!--    <menuitem  id="menu_crm_case_categ_act0" action="crm_case_categ_act0" parent="menu_crm_case_bug_track"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_all1">
         <field name="name">Bugs Waiting Approval</field>
@@ -93,7 +93,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_all1"/>
     </record>
-    <menuitem  id="menu_crm_case_categ0_act_all1" action="crm_case_category_act_all1" parent="menu_crm_case_categ_act0" groups="base.group_extended_menu"/>
+<!--    <menuitem  id="menu_crm_case_categ0_act_all1" action="crm_case_category_act_all1" parent="menu_crm_case_categ_act0" groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_all2">
         <field name="name">Open Bugs</field>
@@ -124,7 +124,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_all2"/>
     </record>
-    <menuitem  id="menu_crm_case_categ0_act_all2" action="crm_case_category_act_all2" parent="menu_crm_case_categ_act0" groups="base.group_extended_menu"/>
+<!--    <menuitem  id="menu_crm_case_categ0_act_all2" action="crm_case_category_act_all2" parent="menu_crm_case_categ_act0" groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_all3">
         <field name="name">Bugs With Patches Waiting Approval</field>
@@ -155,7 +155,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_all3"/>
     </record>
-    <menuitem  id="menu_crm_case_categ0_act_all3" action="crm_case_category_act_all3" parent="menu_crm_case_categ0_act_all2" groups="base.group_extended_menu"/>
+<!--    <menuitem  id="menu_crm_case_categ0_act_all3" action="crm_case_category_act_all3" parent="menu_crm_case_categ0_act_all2" groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_all4">
         <field name="name">Bugs Not Fixed</field>
@@ -186,7 +186,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_all4"/>
     </record>
-    <menuitem  id="menu_crm_case_categ0_act_all4" action="crm_case_category_act_all4" parent="menu_crm_case_categ0_act_all2" groups="base.group_extended_menu"/>
+<!--    <menuitem  id="menu_crm_case_categ0_act_all4" action="crm_case_category_act_all4" parent="menu_crm_case_categ0_act_all2" groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_all5">
         <field name="name">Pending Bugs</field>
@@ -217,7 +217,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_all5"/>
     </record>
-    <menuitem  id="menu_crm_case_categ0_act_all5" action="crm_case_category_act_all5" parent="menu_crm_case_categ_act0" groups="base.group_extended_menu"/>
+<!--    <menuitem  id="menu_crm_case_categ0_act_all5" action="crm_case_category_act_all5" parent="menu_crm_case_categ_act0" groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_all6">
         <field name="name">Planned For Future Release</field>
@@ -248,7 +248,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_all6"/>
     </record>
-    <menuitem  id="menu_crm_case_categ0_act_all6" action="crm_case_category_act_all6" parent="menu_crm_case_categ0_act_all5" groups="base.group_extended_menu"/>
+<!--    <menuitem  id="menu_crm_case_categ0_act_all6" action="crm_case_category_act_all6" parent="menu_crm_case_categ0_act_all5" groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_all7">
         <field name="name">Waiting For Reporter Response</field>
@@ -279,7 +279,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_all7"/>
     </record>
-    <menuitem  id="menu_crm_case_categ0_act_all7" action="crm_case_category_act_all7" parent="menu_crm_case_categ0_act_all5" groups="base.group_extended_menu"/>
+<!--    <menuitem  id="menu_crm_case_categ0_act_all7" action="crm_case_category_act_all7" parent="menu_crm_case_categ0_act_all5" groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_all8">
         <field name="name">Old Bugs</field>
@@ -310,9 +310,8 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_all8"/>
     </record>
-    <menuitem  id="menu_crm_case_categ0_act_all8" action="crm_case_category_act_all8" parent="menu_crm_case_categ_act0" groups="base.group_extended_menu"/>    <!-- 
-        MY BUGS
-    -->
+<!--    <menuitem  id="menu_crm_case_categ0_act_all8" action="crm_case_category_act_all8" parent="menu_crm_case_categ_act0" groups="base.group_extended_menu"/>     -->
+<!--        MY BUGS-->
     <record model="ir.actions.act_window" id="crm_case_category_act_my0">
         <field name="name">My Bugs</field>
         <field name="res_model">crm.case</field>
@@ -342,7 +341,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_my0"/>
     </record>
-    <menuitem parent="menu_crm_case_bug_track" id="menu_crm_case_categ0_act_my0" action="crm_case_category_act_my0" groups="base.group_extended_menu"/>
+<!--    <menuitem parent="menu_crm_case_bug_track" id="menu_crm_case_categ0_act_my0" action="crm_case_category_act_my0" groups="base.group_extended_menu"/>-->
     
     <record model="ir.actions.act_window" id="crm_case_categ_act_new">
         <field name="name">New Bug</field>
@@ -365,7 +364,7 @@
         <field name="view_id" ref="crm_case_tree_view"/>
         <field name="act_window_id" ref="crm_case_categ_act_new"/>
     </record>    
-    <menuitem  id="menu_crm_case_categ_act_new" action="crm_case_categ_act_new" parent="menu_crm_case_bug_track" sequence="50"/>
+<!--    <menuitem  id="menu_crm_case_categ_act_new" action="crm_case_categ_act_new" parent="menu_crm_case_bug_track" sequence="50"/>-->
     
     <record model="ir.actions.act_window" id="crm_case_category_act_my1">
         <field name="name">My Open Bugs</field>
@@ -396,7 +395,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_my1"/>
     </record>
-    <menuitem parent="menu_crm_case_categ0_act_my0" id="menu_crm_case_categ0_act_my1" action="crm_case_category_act_my1" groups="base.group_extended_menu"/>
+<!--    <menuitem parent="menu_crm_case_categ0_act_my0" id="menu_crm_case_categ0_act_my1" action="crm_case_category_act_my1" groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_my2">
         <field name="name">My Bugs With Patches</field>
@@ -427,7 +426,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_my2"/>
     </record>
-    <menuitem parent="menu_crm_case_categ0_act_my1" id="menu_crm_case_categ0_act_my2" action="crm_case_category_act_my2" groups="base.group_extended_menu"/>
+<!--    <menuitem parent="menu_crm_case_categ0_act_my1" id="menu_crm_case_categ0_act_my2" action="crm_case_category_act_my2" groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_my3">
         <field name="name">My Bugs Not Fixed</field>
@@ -458,7 +457,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_my3"/>
     </record>
-    <menuitem parent="menu_crm_case_categ0_act_my1" id="menu_crm_case_categ0_act_my3" action="crm_case_category_act_my3" groups="base.group_extended_menu"/>
+<!--    <menuitem parent="menu_crm_case_categ0_act_my1" id="menu_crm_case_categ0_act_my3" action="crm_case_category_act_my3" groups="base.group_extended_menu"/>-->
 
     <!-- 
         ALL FEATURE REQUESTS 
@@ -491,7 +490,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_f0"/>
     </record>
-    <menuitem parent="menu_crm_case_bug_track" id="menu_crm_case_category_act_f0" action="crm_case_category_act_f0"/>
+<!--    <menuitem parent="menu_crm_case_bug_track" id="menu_crm_case_category_act_f0" action="crm_case_category_act_f0"/>-->
     
     <record model="ir.actions.act_window" id="crm_case_category_act_f1">
         <field name="name">New Feature Request</field>
@@ -514,7 +513,7 @@
         <field name="view_id" ref="crm_case_tree_view"/>
         <field name="act_window_id" ref="crm_case_category_act_f1"/>
     </record>
-    <menuitem parent="menu_crm_case_category_act_f0" id="menu_crm_case_category_act_f1" action="crm_case_category_act_f1" sequence="50"/>
+<!--    <menuitem parent="menu_crm_case_category_act_f0" id="menu_crm_case_category_act_f1" action="crm_case_category_act_f1" sequence="50"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_f2">
         <field name="name">Feature Requests Waiting Approval</field>
@@ -545,7 +544,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_f2"/>
     </record>
-    <menuitem parent="menu_crm_case_category_act_f0" id="menu_crm_case_categ0_act_f2" action="crm_case_category_act_f2" groups="base.group_extended_menu"/>
+<!--    <menuitem parent="menu_crm_case_category_act_f0" id="menu_crm_case_categ0_act_f2" action="crm_case_category_act_f2" groups="base.group_extended_menu"/>-->
     <record model="ir.actions.act_window" id="crm_case_category_act_f3">
         <field name="name">Open Feature Requests</field>
         <field name="res_model">crm.case</field>
@@ -575,7 +574,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_f3"/>
     </record>
-    <menuitem parent="menu_crm_case_category_act_f0" id="menu_crm_case_categ0_act_f3" action="crm_case_category_act_f3" groups="base.group_extended_menu"/>
+<!--    <menuitem parent="menu_crm_case_category_act_f0" id="menu_crm_case_categ0_act_f3" action="crm_case_category_act_f3" groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_f4">
         <field name="name">Pending Feature Requests</field>
@@ -606,7 +605,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_f4"/>
     </record>
-    <menuitem parent="menu_crm_case_category_act_f0" id="menu_crm_case_categ0_act_f4" action="crm_case_category_act_f4" groups="base.group_extended_menu"/>
+<!--    <menuitem parent="menu_crm_case_category_act_f0" id="menu_crm_case_categ0_act_f4" action="crm_case_category_act_f4" groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_f5">
         <field name="name">Planned For Future Release</field>
@@ -637,7 +636,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_f5"/>
     </record>
-    <menuitem parent="menu_crm_case_categ0_act_f4" id="menu_crm_case_categ0_act_f5" action="crm_case_category_act_f5" groups="base.group_extended_menu"/>
+<!--    <menuitem parent="menu_crm_case_categ0_act_f4" id="menu_crm_case_categ0_act_f5" action="crm_case_category_act_f5" groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_f6">
         <field name="name">Waiting For Reporter Response</field>
@@ -668,7 +667,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_f6"/>
     </record>
-    <menuitem parent="menu_crm_case_categ0_act_f4" id="menu_crm_case_categ0_act_f6" action="crm_case_category_act_f6" groups="base.group_extended_menu"/>
+<!--    <menuitem parent="menu_crm_case_categ0_act_f4" id="menu_crm_case_categ0_act_f6" action="crm_case_category_act_f6" groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_f7">
         <field name="name">Old Feature Requests</field>
@@ -699,7 +698,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_f7"/>
     </record>
-    <menuitem parent="menu_crm_case_category_act_f0" id="menu_crm_case_categ0_act_f7" action="crm_case_category_act_f7" groups="base.group_extended_menu"/>
+<!--    <menuitem parent="menu_crm_case_category_act_f0" id="menu_crm_case_categ0_act_f7" action="crm_case_category_act_f7" groups="base.group_extended_menu"/>-->
     
 </data>
 </openerp>
diff --git a/addons/crm_configuration/crm_claims_menu.xml b/addons/crm_configuration/crm_claims_menu.xml
index 9f98aaeffcd..3f3d8c32592 100644
--- a/addons/crm_configuration/crm_claims_menu.xml
+++ b/addons/crm_configuration/crm_claims_menu.xml
@@ -63,7 +63,7 @@
         <field name="view_id" ref="crm_case_claims_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_claim_my1"/>
     </record>
-    <menuitem name="My Claims" id="menu_crm_case_category_act_claim_my1" action="crm_case_category_act_claim_my1"  parent="menu_crm_case_claims" groups="base.group_extended_menu"/>
+<!--    <menuitem name="My Claims" id="menu_crm_case_category_act_claim_my1" action="crm_case_category_act_claim_my1"  parent="menu_crm_case_claims" groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_claim1">
         <field name="name">Claims</field>
@@ -79,7 +79,7 @@
         <field name="view_id" ref="crm_case_claims_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_claim1"/>
     </record>
-    <menuitem name="New Claim" id="menu_crm_case_categ0_act_claim" action="crm_case_category_act_claim1" parent="menu_crm_case_claims" sequence="50"/>
+<!--    <menuitem name="New Claim" id="menu_crm_case_categ0_act_claim" action="crm_case_category_act_claim1" parent="menu_crm_case_claims" sequence="50"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_claim_my2">
         <field name="name">My Unclosed Claims</field>
@@ -109,7 +109,7 @@
         <field name="view_id" ref="crm_case_claims_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_claim_my2"/>
     </record>
-    <menuitem name="My Unclosed Claims" id="menu_crm_case_categ0_act_claim_my2" action="crm_case_category_act_claim_my2" parent="menu_crm_case_category_act_claim_my1" groups="base.group_extended_menu"/>
+<!--    <menuitem name="My Unclosed Claims" id="menu_crm_case_categ0_act_claim_my2" action="crm_case_category_act_claim_my2" parent="menu_crm_case_category_act_claim_my1" groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_claim_my2_open">
         <field name="name">My Open Claims</field>
@@ -137,10 +137,10 @@
         <field name="view_id" ref="crm_case_claims_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_claim_my2_open"/>
     </record>
-    <menuitem name="My Open Claims" id="menu_crm_case_categ0_act_claim_my2_open" action="crm_case_category_act_claim_my2_open" parent="menu_crm_case_categ0_act_claim_my2" groups="base.group_extended_menu"/>
+<!--    <menuitem name="My Open Claims" id="menu_crm_case_categ0_act_claim_my2_open" action="crm_case_category_act_claim_my2_open" parent="menu_crm_case_categ0_act_claim_my2" groups="base.group_extended_menu"/>-->
 
     <!-- All Claims -->
-    <menuitem  name="All Claims" id="menu_crm_case_categ_claim0" action="crm_case_categ_claim0" parent="menu_crm_case_claims" groups="base.group_extended_menu"/>
+<!--    <menuitem  name="All Claims" id="menu_crm_case_categ_claim0" action="crm_case_categ_claim0" parent="menu_crm_case_claims" groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_claim_all2">
         <field name="name">All Unclosed Claims</field>
@@ -170,7 +170,7 @@
         <field name="view_id" ref="crm_case_claims_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_claim_all2"/>
     </record>
-    <menuitem name="All Unclosed Claims" id="menu_crm_case_categ0_act_claim_all2" action="crm_case_category_act_claim_all2" parent="menu_crm_case_categ_claim0" groups="base.group_extended_menu"/>
+<!--    <menuitem name="All Unclosed Claims" id="menu_crm_case_categ0_act_claim_all2" action="crm_case_category_act_claim_all2" parent="menu_crm_case_categ_claim0" groups="base.group_extended_menu"/>-->
 
 </data>
 </openerp>
diff --git a/addons/crm_configuration/crm_configuration_wizard.xml b/addons/crm_configuration/crm_configuration_wizard.xml
index f5a853abfd1..146f8f43f11 100644
--- a/addons/crm_configuration/crm_configuration_wizard.xml
+++ b/addons/crm_configuration/crm_configuration_wizard.xml
@@ -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"
diff --git a/addons/crm_configuration/crm_fund_menu.xml b/addons/crm_configuration/crm_fund_menu.xml
index 44df34c9f06..15c56b24d69 100644
--- a/addons/crm_configuration/crm_fund_menu.xml
+++ b/addons/crm_configuration/crm_fund_menu.xml
@@ -61,7 +61,7 @@
         <field name="view_id" ref="crm_configuration.crm_case_form_view_fund"/>
         <field name="act_window_id" ref="crm_case_category_act_fund_my1"/>
     </record>
-    <menuitem name="My Funds" id="menu_crm_case_category_act_fund_my1" action="crm_case_category_act_fund_my1"  parent="menu_crm_case_fund_raise" groups="base.group_extended_menu"/>
+<!--    <menuitem name="My Funds" id="menu_crm_case_category_act_fund_my1" action="crm_case_category_act_fund_my1"  parent="menu_crm_case_fund_raise" groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_fund1">
         <field name="name">Funds</field>
@@ -83,7 +83,7 @@
         <field name="view_id" ref="crm_configuration.crm_case_form_view_fund"/>
         <field name="act_window_id" ref="crm_case_category_act_fund1"/>
     </record>
-    <menuitem name="New Fund Opportunity" id="menu_crm_case_categ0_act_fund" action="crm_case_category_act_fund1" parent="menu_crm_case_fund_raise" sequence="50"/>
+<!--    <menuitem name="New Fund Opportunity" id="menu_crm_case_categ0_act_fund" action="crm_case_category_act_fund1" parent="menu_crm_case_fund_raise" sequence="50"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_fund_my2">
         <field name="name">My Funds Waiting Validation</field>
@@ -113,7 +113,7 @@
         <field name="view_id" ref="crm_configuration.crm_case_graph_view_fund"/>
         <field name="act_window_id" ref="crm_case_category_act_fund_my2"/>
     </record>
-    <menuitem name="My Funds Waiting Validation" id="menu_crm_case_categ0_act_fund_my2" action="crm_case_category_act_fund_my2" parent="menu_crm_case_category_act_fund_my1" groups="base.group_extended_menu"/>
+<!--    <menuitem name="My Funds Waiting Validation" id="menu_crm_case_categ0_act_fund_my2" action="crm_case_category_act_fund_my2" parent="menu_crm_case_category_act_fund_my1" groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_fund_my3">
         <field name="name">My Funds To Be Processed</field>
@@ -143,10 +143,10 @@
         <field name="view_id" ref="crm_configuration.crm_case_graph_view_fund"/>
         <field name="act_window_id" ref="crm_case_category_act_fund_my3"/>
     </record>
-    <menuitem name="My Funds To Be Processed" id="menu_crm_case_categ0_act_fund_my3" action="crm_case_category_act_fund_my3" parent="menu_crm_case_category_act_fund_my1" groups="base.group_extended_menu"/>
+<!--    <menuitem name="My Funds To Be Processed" id="menu_crm_case_categ0_act_fund_my3" action="crm_case_category_act_fund_my3" parent="menu_crm_case_category_act_fund_my1" groups="base.group_extended_menu"/>-->
 
     <!-- All Funds -->
-    <menuitem name="All Funds" id="menu_crm_case_categ0_act_fund_all1" action="crm_case_category_act_fund_all1" parent="menu_crm_case_fund_raise" groups="base.group_extended_menu"/>
+<!--    <menuitem name="All Funds" id="menu_crm_case_categ0_act_fund_all1" action="crm_case_category_act_fund_all1" parent="menu_crm_case_fund_raise" groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_fund_all2">
         <field name="name">All Funds Waiting Validation</field>
@@ -176,7 +176,7 @@
         <field name="view_id" ref="crm_configuration.crm_case_graph_view_fund"/>
         <field name="act_window_id" ref="crm_case_category_act_fund_all2"/>
     </record>
-    <menuitem name="All Funds Waiting Validation" id="menu_crm_case_categ0_act_fund_all2" action="crm_case_category_act_fund_all2" parent="menu_crm_case_categ0_act_fund_all1" groups="base.group_extended_menu"/>
+<!--    <menuitem name="All Funds Waiting Validation" id="menu_crm_case_categ0_act_fund_all2" action="crm_case_category_act_fund_all2" parent="menu_crm_case_categ0_act_fund_all1" groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_fund_all3">
         <field name="name">All Funds To Be Processed</field>
@@ -206,7 +206,7 @@
         <field name="view_id" ref="crm_configuration.crm_case_graph_view_fund"/>
         <field name="act_window_id" ref="crm_case_category_act_fund_all3"/>
     </record>
-    <menuitem name="All Funds To Be Processed" id="menu_crm_case_categ0_act_fund_all3" action="crm_case_category_act_fund_all3" parent="menu_crm_case_categ0_act_fund_all1" groups="base.group_extended_menu"/>
+<!--    <menuitem name="All Funds To Be Processed" id="menu_crm_case_categ0_act_fund_all3" action="crm_case_category_act_fund_all3" parent="menu_crm_case_categ0_act_fund_all1" groups="base.group_extended_menu"/>-->
 
 </data>
 </openerp>
diff --git a/addons/crm_configuration/crm_helpdesk_menu.xml b/addons/crm_configuration/crm_helpdesk_menu.xml
index 683207727b2..b71ef300bcd 100644
--- a/addons/crm_configuration/crm_helpdesk_menu.xml
+++ b/addons/crm_configuration/crm_helpdesk_menu.xml
@@ -62,7 +62,7 @@
         <field name="act_window_id" ref="crm_case_categ_help_act"/>
     </record>
     
-    <menuitem parent="menu_help_support_main" id="menu_crm_case_helpdesk_my_act" action="crm_case_categ_help_act" groups="base.group_extended_menu"/>
+<!--    <menuitem parent="menu_help_support_main" id="menu_crm_case_helpdesk_my_act" action="crm_case_categ_help_act" groups="base.group_extended_menu"/>-->
     
     <record model="ir.actions.act_window" id="crm_case_categ_help_new_act">
         <field name="name">New Helpdesk</field>
@@ -85,7 +85,7 @@
         <field name="act_window_id" ref="crm_case_categ_help_new_act"/>
     </record>
     
-    <menuitem parent="menu_help_support_main" id="menu_crm_case_categ_help_new_act" action="crm_case_categ_help_new_act" sequence="50"/>
+<!--    <menuitem parent="menu_help_support_main" id="menu_crm_case_categ_help_new_act" action="crm_case_categ_help_new_act" sequence="50"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_helpdesk_act_my1">
         <field name="name">My Unclosed Requests</field>
@@ -119,7 +119,7 @@
         <field name="act_window_id" ref="crm_case_helpdesk_act_my1"/>
     </record>
     
-    <menuitem parent="menu_crm_case_helpdesk_my_act" id="menu_crm_case_helpdesk_act_my_helpdesk" action="crm_case_helpdesk_act_my1" groups="base.group_extended_menu"/>        
+<!--    <menuitem parent="menu_crm_case_helpdesk_my_act" id="menu_crm_case_helpdesk_act_my_helpdesk" action="crm_case_helpdesk_act_my1" groups="base.group_extended_menu"/>        -->
 
     <record model="ir.actions.act_window" id="crm_case_helpdesk_act_my2">
         <field name="name">My helpdesk Propositions to Review</field>
diff --git a/addons/crm_configuration/crm_jobs_menu.xml b/addons/crm_configuration/crm_jobs_menu.xml
index 06762cae4a9..d2b7a3b755b 100644
--- a/addons/crm_configuration/crm_jobs_menu.xml
+++ b/addons/crm_configuration/crm_jobs_menu.xml
@@ -79,7 +79,7 @@
         <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
         <field name="act_window_id" ref="crm_case_categ0_act11"/>
     </record>
-    <menuitem parent="menu_crm_case_job_req_main" id="menu_crm_case_categ0_act11" action="crm_case_categ0_act11" groups="base.group_extended_menu"/>
+<!--    <menuitem parent="menu_crm_case_job_req_main" id="menu_crm_case_categ0_act11" action="crm_case_categ0_act11" groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_categ0_act_my_new3">
         <field name="name">New Job Request</field>
@@ -101,11 +101,11 @@
         <field name="view_id" ref="crm_case_form_view11"/>
         <field name="act_window_id" ref="crm_case_categ0_act_my_new3"/>
     </record>
-    <menuitem
-        parent="menu_crm_case_job_req_main"
-        id="menu_crm_case_categ0_act_my_new3"
-        action="crm_case_categ0_act_my_new3"
-        sequence="50"/>
+<!--    <menuitem-->
+<!--        parent="menu_crm_case_job_req_main"-->
+<!--        id="menu_crm_case_categ0_act_my_new3"-->
+<!--        action="crm_case_categ0_act_my_new3"-->
+<!--        sequence="50"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_categ0_act_my3">
         <field name="name">My Current Jobs Requests</field>
@@ -141,7 +141,7 @@
         <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
         <field name="act_window_id" ref="crm_case_categ0_act_my3"/>
     </record>
-    <menuitem parent="menu_crm_case_categ0_act11" id="menu_crm_case_categ0_act_myjobs3" action="crm_case_categ0_act_my3" groups="base.group_extended_menu"/>
+<!--    <menuitem parent="menu_crm_case_categ0_act11" id="menu_crm_case_categ0_act_myjobs3" action="crm_case_categ0_act_my3" groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_categ0_act_my2">
         <field name="name">My Jobs Propositions to Review</field>
@@ -177,11 +177,11 @@
         <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
         <field name="act_window_id" ref="crm_case_categ0_act_my2"/>
     </record>
-    <menuitem
-        parent="menu_crm_case_categ0_act_myjobs3"
-        id="menu_crm_case_categ0_act_myjobs2"
-        action="crm_case_categ0_act_my2"
-        groups="base.group_extended_menu"/>
+<!--    <menuitem-->
+<!--        parent="menu_crm_case_categ0_act_myjobs3"-->
+<!--        id="menu_crm_case_categ0_act_myjobs2"-->
+<!--        action="crm_case_categ0_act_my2"-->
+<!--        groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_categ0_act_my1">
         <field name="name">My Pending Jobs Requests</field>
@@ -217,9 +217,9 @@
         <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
         <field name="act_window_id" ref="crm_case_categ0_act_my1"/>
     </record>
-    <menuitem parent="menu_crm_case_categ0_act_myjobs3"
-        id="menu_crm_case_categ0_act_myjobs1" action="crm_case_categ0_act_my1"
-        groups="base.group_extended_menu"/>
+<!--    <menuitem parent="menu_crm_case_categ0_act_myjobs3"-->
+<!--        id="menu_crm_case_categ0_act_myjobs1" action="crm_case_categ0_act_my1"-->
+<!--        groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_categ0_act_my0">
         <field name="name">My Open Jobs Requests</field>
@@ -255,9 +255,9 @@
         <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
         <field name="act_window_id" ref="crm_case_categ0_act_my0"/>
     </record>
-    <menuitem parent="menu_crm_case_categ0_act_myjobs3" id="menu_crm_case_categ0_act_myjobs0"
-        action="crm_case_categ0_act_my0"
-        groups="base.group_extended_menu"/>
+<!--    <menuitem parent="menu_crm_case_categ0_act_myjobs3" id="menu_crm_case_categ0_act_myjobs0"-->
+<!--        action="crm_case_categ0_act_my0"-->
+<!--        groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_categ0_act_myjobs">
         <field name="name">Calendar Of My Interviews</field>
@@ -291,7 +291,7 @@
         <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
         <field name="act_window_id" ref="crm_case_categ0_act_myjobs"/>
     </record>
-    <menuitem parent="menu_crm_case_categ0_act11" id="menu_crm_case_categ0_act_myjobs_myjobs" action="crm_case_categ0_act_myjobs" groups="base.group_extended_menu"/>
+<!--    <menuitem parent="menu_crm_case_categ0_act11" id="menu_crm_case_categ0_act_myjobs_myjobs" action="crm_case_categ0_act_myjobs" groups="base.group_extended_menu"/>-->
     
     <!-- 
         ALL JOBS REQUESTS 
@@ -333,7 +333,7 @@
         <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
         <field name="act_window_id" ref="crm_case_categ0_act_all3"/>
     </record>
-    <menuitem parent="menu_crm_case_categ0_act111" id="menu_crm_case_categ0_act_myjobs_all3" action="crm_case_categ0_act_all3" groups="base.group_extended_menu"/>
+<!--    <menuitem parent="menu_crm_case_categ0_act111" id="menu_crm_case_categ0_act_myjobs_all3" action="crm_case_categ0_act_all3" groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_categ0_act_all2">
         <field name="name">All Jobs Propositions to Review</field>
@@ -369,7 +369,7 @@
         <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
         <field name="act_window_id" ref="crm_case_categ0_act_all2"/>
     </record>
-    <menuitem parent="menu_crm_case_categ0_act_myjobs_all3" id="menu_crm_case_categ0_act_myjobs_all2" action="crm_case_categ0_act_all2" groups="base.group_extended_menu"/>        
+<!--    <menuitem parent="menu_crm_case_categ0_act_myjobs_all3" id="menu_crm_case_categ0_act_myjobs_all2" action="crm_case_categ0_act_all2" groups="base.group_extended_menu"/>        -->
 
     <record model="ir.actions.act_window" id="crm_case_categ0_act_all1">
         <field name="name">All Pending Jobs Requests</field>
@@ -405,7 +405,7 @@
         <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
         <field name="act_window_id" ref="crm_case_categ0_act_all1"/>
     </record>
-    <menuitem parent="menu_crm_case_categ0_act_myjobs_all3" id="menu_crm_case_categ0_act_myjobs_all1" action="crm_case_categ0_act_all1" groups="base.group_extended_menu"/>        
+<!--    <menuitem parent="menu_crm_case_categ0_act_myjobs_all3" id="menu_crm_case_categ0_act_myjobs_all1" action="crm_case_categ0_act_all1" groups="base.group_extended_menu"/>        -->
 
     <record model="ir.actions.act_window" id="crm_case_categ0_act_all0">
         <field name="name">All Open Jobs Requests</field>
@@ -441,7 +441,7 @@
         <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
         <field name="act_window_id" ref="crm_case_categ0_act_all0"/>
     </record>
-    <menuitem  parent="menu_crm_case_categ0_act_myjobs_all3" id="menu_crm_case_categ0_act_myjobs_all0" action="crm_case_categ0_act_all0" groups="base.group_extended_menu"/>        
+<!--    <menuitem  parent="menu_crm_case_categ0_act_myjobs_all3" id="menu_crm_case_categ0_act_myjobs_all0" action="crm_case_categ0_act_all0" groups="base.group_extended_menu"/>        -->
 
     <record model="ir.actions.act_window" id="crm_case_categ0_act_alljobs">
         <field name="name">Calendar Of Interviews</field>
@@ -475,7 +475,7 @@
         <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
         <field name="act_window_id" ref="crm_case_categ0_act_alljobs"/>
     </record>
-    <menuitem parent="menu_crm_case_categ0_act111" id="menu_crm_case_categ0_act_myjobs_alljobs" action="crm_case_categ0_act_alljobs" groups="base.group_extended_menu"/>
+<!--    <menuitem parent="menu_crm_case_categ0_act111" id="menu_crm_case_categ0_act_myjobs_alljobs" action="crm_case_categ0_act_alljobs" groups="base.group_extended_menu"/>-->
     
 </data>
 </openerp>
diff --git a/addons/crm_configuration/crm_lead_menu.xml b/addons/crm_configuration/crm_lead_menu.xml
index 6127d36b35a..13aa1b0818e 100644
--- a/addons/crm_configuration/crm_lead_menu.xml
+++ b/addons/crm_configuration/crm_lead_menu.xml
@@ -27,7 +27,7 @@
         <field name="act_window_id" ref="crm_case_category_act_leads_all"/>
     </record>
     <menuitem parent="menu_presale" name="Prospects" id="menu_crm_case_categ0_act_leads" action="crm_case_category_act_leads_all"/>
-    <menuitem parent="menu_crm_case_categ0_act_leads" id="menu_crm_case_categ0_act_leads_all" action="crm_case_category_act_leads_all" groups="base.group_extended_menu"/>
+<!--    <menuitem parent="menu_crm_case_categ0_act_leads" id="menu_crm_case_categ0_act_leads_all" action="crm_case_category_act_leads_all" groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_leads_all1">
         <field name="name">Current Prospects</field>
@@ -51,7 +51,7 @@
         <field name="view_id" ref="crm_case_form_view_leads"/>
         <field name="act_window_id" ref="crm_case_category_act_leads_all1"/>
     </record>
-    <menuitem parent="menu_crm_case_categ0_act_leads_all" id="menu_crm_case_categ0_act_leads_all1" action="crm_case_category_act_leads_all1" groups="base.group_extended_menu"/>
+<!--    <menuitem parent="menu_crm_case_categ0_act_leads_all" id="menu_crm_case_categ0_act_leads_all1" action="crm_case_category_act_leads_all1" groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_leads_unassigned">
         <field name="name">Unassigned Prospects</field>
@@ -75,11 +75,11 @@
         <field name="view_id" ref="crm_case_form_view_leads"/>
         <field name="act_window_id" ref="crm_case_category_act_leads_unassigned"/>
     </record>
-    <menuitem
-        parent="menu_crm_case_categ0_act_leads_all"
-        id="menu_crm_case_categ0_act_leads_unassigned"
-        action="crm_case_category_act_leads_unassigned"
-        groups="base.group_extended_menu"/>
+<!--    <menuitem-->
+<!--        parent="menu_crm_case_categ0_act_leads_all"-->
+<!--        id="menu_crm_case_categ0_act_leads_unassigned"-->
+<!--        action="crm_case_category_act_leads_unassigned"-->
+<!--        groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_leads_all2">
         <field name="name">All Draft Prospects</field>
@@ -103,7 +103,7 @@
         <field name="view_id" ref="crm_case_form_view_leads"/>
         <field name="act_window_id" ref="crm_case_category_act_leads_all2"/>
     </record>
-    <menuitem parent="menu_crm_case_categ0_act_leads_all1" id="menu_crm_case_categ0_act_leads_all2" action="crm_case_category_act_leads_all2" groups="base.group_extended_menu"/>
+<!--    <menuitem parent="menu_crm_case_categ0_act_leads_all1" id="menu_crm_case_categ0_act_leads_all2" action="crm_case_category_act_leads_all2" groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_leads_all3">
         <field name="name">All Prospects to Qualify</field>
@@ -127,7 +127,7 @@
         <field name="view_id" ref="crm_case_form_view_leads"/>
         <field name="act_window_id" ref="crm_case_category_act_leads_all3"/>
     </record>
-    <menuitem parent="menu_crm_case_categ0_act_leads_all1" id="menu_crm_case_categ0_act_leads_all3" action="crm_case_category_act_leads_all3" groups="base.group_extended_menu"/>
+<!--    <menuitem parent="menu_crm_case_categ0_act_leads_all1" id="menu_crm_case_categ0_act_leads_all3" action="crm_case_category_act_leads_all3" groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_leads_all4">
         <field name="name">All Pending Prospects</field>
@@ -151,7 +151,7 @@
         <field name="view_id" ref="crm_case_form_view_leads"/>
         <field name="act_window_id" ref="crm_case_category_act_leads_all4"/>
     </record>
-    <menuitem parent="menu_crm_case_categ0_act_leads_all1" id="menu_crm_case_categ0_act_leads_all4" action="crm_case_category_act_leads_all4" groups="base.group_extended_menu"/>
+<!--    <menuitem parent="menu_crm_case_categ0_act_leads_all1" id="menu_crm_case_categ0_act_leads_all4" action="crm_case_category_act_leads_all4" groups="base.group_extended_menu"/>-->
 
 <!-- =================================================================== -->
     <record model="ir.actions.act_window" id="crm_case_category_act_leads_my">
@@ -176,7 +176,7 @@
         <field name="view_id" ref="crm_case_form_view_leads"/>
         <field name="act_window_id" ref="crm_case_category_act_leads_my"/>
     </record>
-    <menuitem parent="menu_crm_case_categ0_act_leads" id="menu_crm_case_categ0_act_leads_my" action="crm_case_category_act_leads_my" groups="base.group_extended_menu"/>
+<!--    <menuitem parent="menu_crm_case_categ0_act_leads" id="menu_crm_case_categ0_act_leads_my" action="crm_case_category_act_leads_my" groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_leads_my_new">
         <field name="name">New Prospect</field>
@@ -199,7 +199,7 @@
         <field name="view_id" ref="crm_case_form_view_leads"/>
         <field name="act_window_id" ref="crm_case_category_act_leads_my_new"/>
     </record>
-    <menuitem parent="menu_crm_case_categ0_act_leads" id="menu_crm_case_category_act_leads_my_new" action="crm_case_category_act_leads_my_new" sequence="50"/>
+<!--    <menuitem parent="menu_crm_case_categ0_act_leads" id="menu_crm_case_category_act_leads_my_new" action="crm_case_category_act_leads_my_new" sequence="50"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_leads_my1">
         <field name="name">My Current Prospects</field>
@@ -223,7 +223,7 @@
         <field name="view_id" ref="crm_case_form_view_leads"/>
         <field name="act_window_id" ref="crm_case_category_act_leads_my1"/>
     </record>
-    <menuitem parent="menu_crm_case_categ0_act_leads_my" id="menu_crm_case_categ0_act_leads_my1" action="crm_case_category_act_leads_my1" groups="base.group_extended_menu"/>
+<!--    <menuitem parent="menu_crm_case_categ0_act_leads_my" id="menu_crm_case_categ0_act_leads_my1" action="crm_case_category_act_leads_my1" groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_leads_my3">
         <field name="name">My Prospects to Qualify</field>
@@ -247,7 +247,7 @@
         <field name="view_id" ref="crm_case_form_view_leads"/>
         <field name="act_window_id" ref="crm_case_category_act_leads_my3"/>
     </record>
-    <menuitem parent="menu_crm_case_categ0_act_leads_my1" id="menu_crm_case_categ0_act_leads_my3" action="crm_case_category_act_leads_my3" groups="base.group_extended_menu"/>
+<!--    <menuitem parent="menu_crm_case_categ0_act_leads_my1" id="menu_crm_case_categ0_act_leads_my3" action="crm_case_category_act_leads_my3" groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_leads_my4">
         <field name="name">My Pending Prospects</field>
@@ -271,7 +271,7 @@
         <field name="view_id" ref="crm_case_form_view_leads"/>
         <field name="act_window_id" ref="crm_case_category_act_leads_my4"/>
     </record>
-    <menuitem parent="menu_crm_case_categ0_act_leads_my1" id="menu_crm_case_categ0_act_leads_my4" action="crm_case_category_act_leads_my4" groups="base.group_extended_menu"/>
+<!--    <menuitem parent="menu_crm_case_categ0_act_leads_my1" id="menu_crm_case_categ0_act_leads_my4" action="crm_case_category_act_leads_my4" groups="base.group_extended_menu"/>-->
 
 <!--        REPORTS        -->
     <menuitem name="Prospects"  id="menu_action_report_crm_case_lead" parent="report_crm.next_id_64"/>    
diff --git a/addons/crm_configuration/crm_opportunity_menu.xml b/addons/crm_configuration/crm_opportunity_menu.xml
index 120ed288f92..9f9c22926ee 100644
--- a/addons/crm_configuration/crm_opportunity_menu.xml
+++ b/addons/crm_configuration/crm_opportunity_menu.xml
@@ -34,7 +34,7 @@
 
 
 <!--          MENU          -->
-     <menuitem parent="menu_crm_case_opp" id="menu_crm_case_categ0_act_oppor11" action="crm_case_category_act_oppor11" groups="base.group_extended_menu"/>
+<!--     <menuitem parent="menu_crm_case_opp" id="menu_crm_case_categ0_act_oppor11" action="crm_case_category_act_oppor11" groups="base.group_extended_menu"/>-->
 
      <record model="ir.actions.act_window" id="crm_case_category_act_oppor1">
           <field name="name">All Open Opportunities</field>
@@ -64,7 +64,7 @@
           <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
           <field name="act_window_id" ref="crm_case_category_act_oppor1"/>
      </record>
-     <menuitem parent="menu_crm_case_categ0_act_oppor11" id="menu_crm_case_categ0_act_oppor1" action="crm_case_category_act_oppor1" groups="base.group_extended_menu"/>
+<!--     <menuitem parent="menu_crm_case_categ0_act_oppor11" id="menu_crm_case_categ0_act_oppor1" action="crm_case_category_act_oppor1" groups="base.group_extended_menu"/>-->
 
 
      <record model="ir.actions.act_window" id="crm_case_category_act_oppor_all2">
@@ -95,7 +95,7 @@
           <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
           <field name="act_window_id" ref="crm_case_category_act_oppor_all2"/>
      </record>
-     <menuitem parent="menu_crm_case_categ0_act_oppor11" id="menu_crm_case_categ0_act_oppor_all2" action="crm_case_category_act_oppor_all2" groups="base.group_extended_menu"/>
+<!--     <menuitem parent="menu_crm_case_categ0_act_oppor11" id="menu_crm_case_categ0_act_oppor_all2" action="crm_case_category_act_oppor_all2" groups="base.group_extended_menu"/>-->
 
 
 <!-- ======================================================== -->
@@ -126,7 +126,7 @@
           <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
           <field name="act_window_id" ref="crm_case_category_act_oppor22"/>
      </record>
-     <menuitem parent="menu_crm_case_opp" id="menu_crm_case_categ0_act_oppor22" action="crm_case_category_act_oppor22" groups="base.group_extended_menu"/>
+<!--     <menuitem parent="menu_crm_case_opp" id="menu_crm_case_categ0_act_oppor22" action="crm_case_category_act_oppor22" groups="base.group_extended_menu"/>-->
 
      <record model="ir.actions.act_window" id="crm_case_category_act_oppor">
           <field name="name">Opportunity</field>
@@ -149,11 +149,11 @@
           <field name="view_id" ref="crm_case_tree_view_oppor"/>
           <field name="act_window_id" ref="crm_case_category_act_oppor"/>
      </record>
-     <menuitem name="New Opportunity"
-        parent="menu_crm_case_opp"
-        id="menu_crm_case_categ0_act_oppor"
-        action="crm_case_category_act_oppor"
-        sequence="50"/>
+<!--     <menuitem name="New Opportunity"-->
+<!--        parent="menu_crm_case_opp"-->
+<!--        id="menu_crm_case_categ0_act_oppor"-->
+<!--        action="crm_case_category_act_oppor"-->
+<!--        sequence="50"/>-->
 
      <record model="ir.actions.act_window" id="crm_case_category_act_oppor2">
           <field name="name">My Open Opportunities</field>
@@ -183,7 +183,7 @@
           <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
           <field name="act_window_id" ref="crm_case_category_act_oppor2"/>
      </record>
-     <menuitem parent="menu_crm_case_categ0_act_oppor22" id="menu_crm_case_categ0_act_oppor2" action="crm_case_category_act_oppor2" groups="base.group_extended_menu"/>
+<!--     <menuitem parent="menu_crm_case_categ0_act_oppor22" id="menu_crm_case_categ0_act_oppor2" action="crm_case_category_act_oppor2" groups="base.group_extended_menu"/>-->
 
      <record model="ir.actions.act_window" id="crm_case_category_act_oppor_my2">
           <field name="name">My Pending Opportunities</field>
@@ -213,7 +213,7 @@
           <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
           <field name="act_window_id" ref="crm_case_category_act_oppor_my2"/>
      </record>
-     <menuitem parent="menu_crm_case_categ0_act_oppor22" id="menu_crm_case_categ0_act_oppor_my2" action="crm_case_category_act_oppor_my2" groups="base.group_extended_menu"/>
+<!--     <menuitem parent="menu_crm_case_categ0_act_oppor22" id="menu_crm_case_categ0_act_oppor_my2" action="crm_case_category_act_oppor_my2" groups="base.group_extended_menu"/>-->
 
 <!--          REPORTS               -->
      <record model="ir.actions.act_window" id="action_report_crm_case_oppor_user">
diff --git a/addons/crm_configuration/crm_phonecall_menu.xml b/addons/crm_configuration/crm_phonecall_menu.xml
index 16e9f552e52..ec3a289c8df 100644
--- a/addons/crm_configuration/crm_phonecall_menu.xml
+++ b/addons/crm_configuration/crm_phonecall_menu.xml
@@ -72,7 +72,7 @@
         <field name="view_id" ref="crm_case_phone_form_view"/>
         <field name="act_window_id" ref="crm_case_categ_phone_incoming0"/>
     </record>
-    <menuitem name="Inbound" id="menu_crm_case_categ_phone_incoming0"  parent="menu_crm_case_phone" action="crm_case_categ_phone_incoming0"/>
+<!--    <menuitem name="Inbound" id="menu_crm_case_categ_phone_incoming0"  parent="menu_crm_case_phone" action="crm_case_categ_phone_incoming0"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_categ_phone_incoming1">
         <field name="name">New Incoming Call</field>
@@ -95,7 +95,7 @@
         <field name="view_id" ref="crm_case_phone_form_view"/>
         <field name="act_window_id" ref="crm_case_categ_phone_incoming1"/>
     </record>
-    <menuitem name="New Incoming Call" id="menu_crm_case_categ_phone_incoming1"  parent="menu_crm_case_categ_phone_incoming0" action="crm_case_categ_phone_incoming1" sequence="50"/>
+<!--    <menuitem name="New Incoming Call" id="menu_crm_case_categ_phone_incoming1"  parent="menu_crm_case_categ_phone_incoming0" action="crm_case_categ_phone_incoming1" sequence="50"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_categ_phone_incoming2">
         <field name="name">Planned Calls</field>
@@ -126,7 +126,7 @@
         <field name="view_id" ref="crm_case_phone_form_view"/>
         <field name="act_window_id" ref="crm_case_categ_phone_incoming2"/>
     </record>
-    <menuitem name="Planned Calls" id="menu_crm_case_categ_phone_incoming2"  parent="menu_crm_case_categ_phone_incoming0" action="crm_case_categ_phone_incoming2" groups="base.group_extended_menu"/>
+<!--    <menuitem name="Planned Calls" id="menu_crm_case_categ_phone_incoming2"  parent="menu_crm_case_categ_phone_incoming0" action="crm_case_categ_phone_incoming2" groups="base.group_extended_menu"/>-->
 
 ################################################################
     <record model="ir.actions.act_window" id="crm_case_categ_phone_outgoing0">
@@ -156,7 +156,7 @@
         <field name="view_id" ref="crm_case_phone_form_view"/>
         <field name="act_window_id" ref="crm_case_categ_phone_outgoing0"/>
     </record>
-    <menuitem name="Outbound" id="menu_crm_case_categ_phone_outgoing0"  parent="menu_crm_case_phone" action="crm_case_categ_phone_outgoing0"/>
+<!--    <menuitem name="Outbound" id="menu_crm_case_categ_phone_outgoing0"  parent="menu_crm_case_phone" action="crm_case_categ_phone_outgoing0"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_categ_phone_outgoing1">
         <field name="name">New Outgoing Call</field>
@@ -178,7 +178,7 @@
         <field name="view_id" ref="crm_case_phone_form_view"/>
         <field name="act_window_id" ref="crm_case_categ_phone_outgoing1"/>
     </record>
-    <menuitem name="New Outgoing Call" id="menu_crm_case_categ_phone_outgoing1"  parent="menu_crm_case_categ_phone_outgoing0" action="crm_case_categ_phone_outgoing1" sequence="50"/>
+<!--    <menuitem name="New Outgoing Call" id="menu_crm_case_categ_phone_outgoing1"  parent="menu_crm_case_categ_phone_outgoing0" action="crm_case_categ_phone_outgoing1" sequence="50"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_categ_phone_outgoing2">
         <field name="name">Planned Calls</field>
@@ -208,7 +208,7 @@
         <field name="view_id" ref="crm_case_phone_form_view"/>
         <field name="act_window_id" ref="crm_case_categ_phone_outgoing2"/>
     </record>
-    <menuitem name="Planned Calls" id="menu_crm_case_categ_phone_outgoing2"  parent="menu_crm_case_categ_phone_outgoing0" action="crm_case_categ_phone_outgoing2" groups="base.group_extended_menu"/>
+<!--    <menuitem name="Planned Calls" id="menu_crm_case_categ_phone_outgoing2"  parent="menu_crm_case_categ_phone_outgoing0" action="crm_case_categ_phone_outgoing2" groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_categ_phone_outgoing4">
         <field name="name">Calls Not Held</field>
@@ -238,7 +238,7 @@
         <field name="view_id" ref="crm_case_phone_form_view"/>
         <field name="act_window_id" ref="crm_case_categ_phone_outgoing4"/>
     </record>
-    <menuitem name="Calls Not Held" id="menu_crm_case_categ_phone_outgoing4"  parent="menu_crm_case_categ_phone_outgoing0" action="crm_case_categ_phone_outgoing4" groups="base.group_extended_menu"/>
+<!--    <menuitem name="Calls Not Held" id="menu_crm_case_categ_phone_outgoing4"  parent="menu_crm_case_categ_phone_outgoing0" action="crm_case_categ_phone_outgoing4" groups="base.group_extended_menu"/>-->
 
 </data>
 </openerp>

From 58904a1fb7859785b549a0e3f247ba37384bc160 Mon Sep 17 00:00:00 2001
From: "ysa (Open ERP)" <ysa@tinyerp.co.in>
Date: Thu, 29 Oct 2009 10:37:01 +0530
Subject: [PATCH 11/30] [IMP] change:- Bugs Form View, Claims Tree View, jobs -
 Form View, Jobs Tree View, Meetings Form View

bzr revid: ysa@tinyerp.co.in-20091029050701-wg9hwrqgjoja20hr
---
 addons/crm/crm.py                             |  4 +++-
 addons/crm/crm_view.xml                       |  7 +++++--
 addons/crm_configuration/crm_bugs_view.xml    |  9 ++++-----
 addons/crm_configuration/crm_claims_view.xml  | 13 ++++---------
 addons/crm_configuration/crm_jobs_view.xml    | 14 +++++++++-----
 addons/crm_configuration/crm_meeting_menu.xml |  3 ++-
 addons/crm_configuration/crm_meeting_view.xml |  0
 7 files changed, 27 insertions(+), 23 deletions(-)
 mode change 100644 => 100755 addons/crm/crm.py
 mode change 100644 => 100755 addons/crm/crm_view.xml
 mode change 100644 => 100755 addons/crm_configuration/crm_bugs_view.xml
 mode change 100644 => 100755 addons/crm_configuration/crm_claims_view.xml
 mode change 100644 => 100755 addons/crm_configuration/crm_jobs_view.xml
 mode change 100644 => 100755 addons/crm_configuration/crm_meeting_menu.xml
 mode change 100644 => 100755 addons/crm_configuration/crm_meeting_view.xml

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
old mode 100644
new mode 100755
index b0f85a9e52a..3c52022b98b
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -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,
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
old mode 100644
new mode 100755
index e9b23b8b50d..66512cbb1a3
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -37,8 +37,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" />                                                                    
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 fb3455d2928..25f473f891e
--- a/addons/crm_configuration/crm_bugs_view.xml
+++ b/addons/crm_configuration/crm_bugs_view.xml
@@ -23,10 +23,6 @@
                             <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
                         </group>
                     <field name="date"/>
-                    <group colspan="2">
-                        <field name="case_id" select="1"/>
-                        <button string="Assign" name="%(crm_generic_wizard_act)d"  type="action" />
-                    </group>    
                     <field name="user_id" />
                 </group>
                 <notebook colspan="4">
@@ -38,7 +34,10 @@
                     <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"/>
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 4f9a73da22f..e8cff913c3b
--- 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>
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..c2b0f1db900
--- a/addons/crm_configuration/crm_jobs_view.xml
+++ b/addons/crm_configuration/crm_jobs_view.xml
@@ -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"/>
@@ -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/>
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 96c43b0c203..6a9bfb93848
--- 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"/>
diff --git a/addons/crm_configuration/crm_meeting_view.xml b/addons/crm_configuration/crm_meeting_view.xml
old mode 100644
new mode 100755

From 6f74f18802675185e96ddd3a368ce461a9615510 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Thu, 29 Oct 2009 11:46:57 +0530
Subject: [PATCH 12/30] reput rpa changes from rev:2423

bzr revid: hmo@tinyerp.com-20091029061657-ov79u9gl28e8t465
---
 addons/crm/crm.py                             |  4 ++--
 addons/crm/crm_view.xml                       |  6 ++++-
 addons/crm/crm_wizard.xml                     |  6 +++++
 addons/crm/wizard/__init__.py                 |  1 +
 .../crm/wizard/wizard_crm_new_send_email.py   | 23 +++++++++++++++++--
 5 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 3c52022b98b..a57ffcd272c 100755
--- 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')
 ]
 
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 66512cbb1a3..2786b069fe9 100755
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -383,10 +383,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="%(wizard_crm_case_email_add_cc)d"
+		                                   	icon="gtk-add" type="action"/>
                                    </group>
                                    <newline/>
                                    <field name="description" colspan="4" nolabel="1"/>
diff --git a/addons/crm/crm_wizard.xml b/addons/crm/crm_wizard.xml
index 9e96530a782..c086172df7f 100644
--- a/addons/crm/crm_wizard.xml
+++ b/addons/crm/crm_wizard.xml
@@ -10,5 +10,11 @@
 
         <menuitem action="wizard_case_section_menu" id="menu_wizard_case_section_menu" parent="crm.menu_crm_configuration" type="wizard"/>
         
+        <wizard string="Add a CC"
+           model="crm.case"
+           menu = "False"
+           name="crm.case.email.add_cc"
+           id="wizard_crm_case_email_add_cc"/> 
+        
     </data>
 </openerp>
diff --git a/addons/crm/wizard/__init__.py b/addons/crm/wizard/__init__.py
index b29cbe06375..55f1d9a3a7c 100644
--- a/addons/crm/wizard/__init__.py
+++ b/addons/crm/wizard/__init__.py
@@ -23,6 +23,7 @@ import crm_wizard
 import wizard_crm_send_email
 import wizard_crm_new_send_email
 import wizard_fetch_mail
+import wizard_add_cc
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/crm/wizard/wizard_crm_new_send_email.py b/addons/crm/wizard/wizard_crm_new_send_email.py
index b905d31aa8e..36191aaae30 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,29 @@ email_send_form = '''<?xml version="1.0"?>
     <field name="subject"/>
     <newline/>
     <field name="text" />
+    <newline/>
+    <field name="doc1" />
+    <newline/>
+    <field name="doc2" />
+    <newline/>
+    <field name="doc3" />
 </form>'''
 
 email_send_fields = {
     'to': {'string':"To", 'type':'char', 'size':64, 'required':True},
     'cc': {'string':"CC", 'type':'char', 'size':128,},
     'subject': {'string':'Subject', 'type':'char', 'size':128, 'required':True},
-    'text': {'string':'Message', 'type':'text_tag', 'required':True}
+    'text': {'string':'Message', 'type':'text_tag', 'required':True},
+    'doc1' :  {'string':"Attachment1", 'type':'binary'},
+    'doc2' :  {'string':"Attachment2", 'type':'binary'},
+    'doc3' :  {'string':"Attachment3", 'type':'binary'},
 }
 
 # 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')
 
@@ -64,14 +77,20 @@ def _mass_mail_send(self, cr, uid, data, context):
     body = data['form']['text']
     if case.user_id.signature:
         body += '\n\n%s' % (case.user_id.signature)
-    tools.email_send(
+    flag = tools.email_send(
         case.user_id.address_id.email,
         emails,
         data['form']['subject'],
+        body,
+        attach=attach
         case_pool.format_body(body),
         reply_to=case.section_id.reply_to,
         tinycrm=str(case.id)
     )
+    if flag:
+        raise wizard.except_wizard(_('Message!'),("Email Successfully Sent..!!"))   
+    else:
+        raise wizard.except_wizard(_('Warning!'),("Email is not sent Successfully"))
     return {}
 
 def _get_info(self, cr, uid, data, context):

From bf165f278d3fdd92c95727fa5def24995735729a Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 29 Oct 2009 11:53:51 +0530
Subject: [PATCH 13/30] [IMP]:CRM:  Resolved conflict in send mail wizard

bzr revid: rpa@tinyerp.com-20091029062351-88ypdag88y3xatse
---
 addons/crm/wizard/wizard_crm_new_send_email.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/crm/wizard/wizard_crm_new_send_email.py b/addons/crm/wizard/wizard_crm_new_send_email.py
index 36191aaae30..78673917d29 100644
--- a/addons/crm/wizard/wizard_crm_new_send_email.py
+++ b/addons/crm/wizard/wizard_crm_new_send_email.py
@@ -53,6 +53,7 @@ email_send_fields = {
     'cc': {'string':"CC", 'type':'char', 'size':128,},
     'subject': {'string':'Subject', 'type':'char', 'size':128, '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'},

From 6cae6533d0a96999809e140307b1a5204b2a10d6 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 29 Oct 2009 11:58:57 +0530
Subject: [PATCH 14/30] [FIX]:CRM: Minor change in send mail wizard

bzr revid: rpa@tinyerp.com-20091029062857-i78zyncqy04rkswp
---
 addons/crm/wizard/wizard_crm_new_send_email.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/crm/wizard/wizard_crm_new_send_email.py b/addons/crm/wizard/wizard_crm_new_send_email.py
index 78673917d29..3b08189d90e 100644
--- a/addons/crm/wizard/wizard_crm_new_send_email.py
+++ b/addons/crm/wizard/wizard_crm_new_send_email.py
@@ -53,7 +53,7 @@ email_send_fields = {
     'cc': {'string':"CC", 'type':'char', 'size':128,},
     'subject': {'string':'Subject', 'type':'char', 'size':128, 'required':True},
     'text': {'string':'Message', 'type':'text_tag', 'required':True},
-    'state':{'string':'State', 'type':'selection', 'selection':[('done','Done'),('pending','Pending'),('unchanged','Unchanged')]}
+    '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'},
@@ -83,8 +83,8 @@ def _mass_mail_send(self, cr, uid, data, context):
         emails,
         data['form']['subject'],
         body,
-        attach=attach
         case_pool.format_body(body),
+        attach=attach,
         reply_to=case.section_id.reply_to,
         tinycrm=str(case.id)
     )

From 038d38353e6add67110a15aee15af68195074d19 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 29 Oct 2009 12:08:25 +0530
Subject: [PATCH 15/30] [IMP]: crm improvement blueprint: Added remaining
 changes in hiding menus in helpdesk & support section

bzr revid: rpa@tinyerp.com-20091029063825-gtq7umi09zyt6umb
---
 .../crm_configuration/crm_helpdesk_menu.xml   | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/addons/crm_configuration/crm_helpdesk_menu.xml b/addons/crm_configuration/crm_helpdesk_menu.xml
index b71ef300bcd..072cda4e180 100644
--- a/addons/crm_configuration/crm_helpdesk_menu.xml
+++ b/addons/crm_configuration/crm_helpdesk_menu.xml
@@ -149,7 +149,7 @@
         <field name="view_id" ref="crm_case_form_view_helpdesk"/>
         <field name="act_window_id" ref="crm_case_helpdesk_act_my2"/>
     </record>
-    <menuitem parent="menu_crm_case_helpdesk_my_act" id="menu_crm_case_helpdesk_act_myhelpdesk2" action="crm_case_helpdesk_act_my2" groups="base.group_extended_menu"/>        
+<!--    <menuitem parent="menu_crm_case_helpdesk_my_act" id="menu_crm_case_helpdesk_act_myhelpdesk2" action="crm_case_helpdesk_act_my2" groups="base.group_extended_menu"/>        -->
 
     <record model="ir.actions.act_window" id="crm_case_helpdesk_act_my1">
         <field name="name">My Pending helpdesk Requests</field>
@@ -179,7 +179,7 @@
         <field name="view_id" ref="crm_case_form_view_helpdesk"/>
         <field name="act_window_id" ref="crm_case_helpdesk_act_my1"/>
     </record>
-    <menuitem parent="menu_crm_case_helpdesk_my_act" id="menu_crm_case_helpdesk_act_myhelpdesk1" action="crm_case_helpdesk_act_my1" groups="base.group_extended_menu"/>                
+<!--    <menuitem parent="menu_crm_case_helpdesk_my_act" id="menu_crm_case_helpdesk_act_myhelpdesk1" action="crm_case_helpdesk_act_my1" groups="base.group_extended_menu"/>                -->
 
     <record model="ir.actions.act_window" id="crm_case_helpdesk_act_my0">
         <field name="name">My Open Helpdesk Requests</field>
@@ -209,7 +209,7 @@
         <field name="view_id" ref="crm_case_form_view_helpdesk"/>
         <field name="act_window_id" ref="crm_case_helpdesk_act_my0"/>
     </record>
-    <menuitem parent="menu_crm_case_helpdesk_my_act" id="menu_crm_case_helpdesk_act_myhelpdesk0" action="crm_case_helpdesk_act_my0" groups="base.group_extended_menu"/>    
+<!--    <menuitem parent="menu_crm_case_helpdesk_my_act" id="menu_crm_case_helpdesk_act_myhelpdesk0" action="crm_case_helpdesk_act_my0" groups="base.group_extended_menu"/>    -->
         
     
     <record model="ir.actions.act_window" id="crm_case_helpdesk_act_myhelpdesk">
@@ -238,13 +238,13 @@
         <field name="view_id" ref="crm_case_form_view_helpdesk"/>
         <field name="act_window_id" ref="crm_case_helpdesk_act_myhelpdesk"/>
     </record>    
-    <menuitem parent="menu_crm_case_helpdesk_my_act" id="menu_crm_case_helpdesk_act_myhelpdesk" action="crm_case_helpdesk_act_myhelpdesk" groups="base.group_extended_menu"/>
+<!--    <menuitem parent="menu_crm_case_helpdesk_my_act" id="menu_crm_case_helpdesk_act_myhelpdesk" action="crm_case_helpdesk_act_myhelpdesk" groups="base.group_extended_menu"/>-->
     
     <!-- 
         ALL Helpdesk REQUESTS 
     -->
 
-    <menuitem parent="menu_help_support_main" id="menu_crm_case_helpdesk_act_all" action="crm_case_helpdesk_act111" groups="base.group_extended_menu"/>        
+<!--    <menuitem parent="menu_help_support_main" id="menu_crm_case_helpdesk_act_all" action="crm_case_helpdesk_act111" groups="base.group_extended_menu"/>        -->
     
 
     <record model="ir.actions.act_window" id="crm_case_helpdesk_act_all3">
@@ -275,7 +275,7 @@
         <field name="view_id" ref="crm_case_form_view_helpdesk"/>
         <field name="act_window_id" ref="crm_case_helpdesk_act_all3"/>
     </record>
-    <menuitem parent="menu_crm_case_helpdesk_act_all" id="menu_crm_case_helpdesk_act_myhelpdesk_all3" action="crm_case_helpdesk_act_all3" groups="base.group_extended_menu"/>
+<!--    <menuitem parent="menu_crm_case_helpdesk_act_all" id="menu_crm_case_helpdesk_act_myhelpdesk_all3" action="crm_case_helpdesk_act_all3" groups="base.group_extended_menu"/>-->
 
     <record model="ir.actions.act_window" id="crm_case_helpdesk_act_all2">
         <field name="name">All Helpdesk Propositions</field>
@@ -305,7 +305,7 @@
         <field name="view_id" ref="crm_case_form_view_helpdesk"/>
         <field name="act_window_id" ref="crm_case_helpdesk_act_all2"/>
     </record>
-    <menuitem parent="menu_crm_case_helpdesk_act_all" id="menu_crm_case_helpdesk_act_myhelpdesk_all2" action="crm_case_helpdesk_act_all2" groups="base.group_extended_menu"/>        
+<!--    <menuitem parent="menu_crm_case_helpdesk_act_all" id="menu_crm_case_helpdesk_act_myhelpdesk_all2" action="crm_case_helpdesk_act_all2" groups="base.group_extended_menu"/>        -->
 
     <record model="ir.actions.act_window" id="crm_case_helpdesk_act_all1">
         <field name="name">All Pending Helpdesk Requests</field>
@@ -335,7 +335,7 @@
         <field name="view_id" ref="crm_case_form_view_helpdesk"/>
         <field name="act_window_id" ref="crm_case_helpdesk_act_all1"/>
     </record>
-    <menuitem  parent="menu_crm_case_helpdesk_act_all" id="menu_crm_case_helpdesk_act_myhelpdesk_all1" action="crm_case_helpdesk_act_all1" groups="base.group_extended_menu"/>        
+<!--    <menuitem  parent="menu_crm_case_helpdesk_act_all" id="menu_crm_case_helpdesk_act_myhelpdesk_all1" action="crm_case_helpdesk_act_all1" groups="base.group_extended_menu"/>        -->
 
 
     <record model="ir.actions.act_window" id="crm_case_helpdesk_act_all0">
@@ -366,7 +366,7 @@
         <field name="view_id" ref="crm_case_form_view_helpdesk"/>
         <field name="act_window_id" ref="crm_case_helpdesk_act_all0"/>
     </record>
-    <menuitem  parent="menu_crm_case_helpdesk_act_all" id="menu_crm_case_helpdesk_act_myhelpdesk_all0" action="crm_case_helpdesk_act_all0" groups="base.group_extended_menu"/>        
+<!--    <menuitem  parent="menu_crm_case_helpdesk_act_all" id="menu_crm_case_helpdesk_act_myhelpdesk_all0" action="crm_case_helpdesk_act_all0" groups="base.group_extended_menu"/>        -->
 
     <record model="ir.actions.act_window" id="crm_case_helpdesk_act_allhelpdesk">
         <field name="name">Calendar of Helpdesk</field>
@@ -394,7 +394,7 @@
         <field name="view_id" ref="crm_case_form_view_helpdesk"/>
         <field name="act_window_id" ref="crm_case_helpdesk_act_allhelpdesk"/>
     </record>
-    <menuitem parent="menu_crm_case_helpdesk_act_all" id="menu_crm_case_helpdesk_act_myhelpdesk_allhelpdesk" action="crm_case_helpdesk_act_allhelpdesk" groups="base.group_extended_menu"/>
+<!--    <menuitem parent="menu_crm_case_helpdesk_act_all" id="menu_crm_case_helpdesk_act_myhelpdesk_allhelpdesk" action="crm_case_helpdesk_act_allhelpdesk" groups="base.group_extended_menu"/>-->
     
     
 </data>

From 8ee0c40be8a5fbf787175158440d24d44c5696f4 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 29 Oct 2009 12:29:11 +0530
Subject: [PATCH 16/30] [IMP]:CRM: Improvement in mail send wizard for user
 email address

bzr revid: rpa@tinyerp.com-20091029065911-jxxa7fl5ybz13mbt
---
 addons/crm/wizard/wizard_crm_new_send_email.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/crm/wizard/wizard_crm_new_send_email.py b/addons/crm/wizard/wizard_crm_new_send_email.py
index 3b08189d90e..f83296690aa 100644
--- a/addons/crm/wizard/wizard_crm_new_send_email.py
+++ b/addons/crm/wizard/wizard_crm_new_send_email.py
@@ -76,6 +76,8 @@ 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)
     flag = tools.email_send(

From 584b8700d0290d6f46438290940842aac977e10f Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 29 Oct 2009 14:40:59 +0530
Subject: [PATCH 17/30] [IMP]: CRM Ergonomy Improvement blueprint:  Improvement
 in search views and form views,  Changes done by uco for Opportunity form
 view + modifications

bzr revid: rpa@tinyerp.com-20091029091059-1e2lp7k0q1i4pu16
---
 addons/crm/crm_view.xml                       |  8 +-
 addons/crm/crm_wizard.xml                     |  6 --
 addons/crm_configuration/crm_bugs_view.xml    | 11 +--
 addons/crm_configuration/crm_claims_view.xml  |  6 +-
 .../crm_configuration_wizard.xml              |  2 +-
 addons/crm_configuration/crm_lead_view.xml    | 18 ++---
 .../crm_opportunity_view.xml                  | 17 ++++-
 .../crm_configuration/crm_phonecall_view.xml  | 74 ++++++-------------
 .../wizard/schedule_phone_call.py             |  9 +--
 9 files changed, 64 insertions(+), 87 deletions(-)

diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 2786b069fe9..ce06acd373a 100755
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -237,7 +237,13 @@
             <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"/>
-
+		
+       <wizard string="Add a CC"
+           model="crm.case"
+           menu = "False"
+           name="crm.case.email.add_cc"
+           id="wizard_crm_case_email_add_cc"/> 
+        
         <!-- Cases -->
         <record id="crm_case_log_tree-view" model="ir.ui.view">
             <field name="name">crm.case.log.tree</field>
diff --git a/addons/crm/crm_wizard.xml b/addons/crm/crm_wizard.xml
index c086172df7f..9e96530a782 100644
--- a/addons/crm/crm_wizard.xml
+++ b/addons/crm/crm_wizard.xml
@@ -10,11 +10,5 @@
 
         <menuitem action="wizard_case_section_menu" id="menu_wizard_case_section_menu" parent="crm.menu_crm_configuration" type="wizard"/>
         
-        <wizard string="Add a CC"
-           model="crm.case"
-           menu = "False"
-           name="crm.case.email.add_cc"
-           id="wizard_crm_case_email_add_cc"/> 
-        
     </data>
 </openerp>
diff --git a/addons/crm_configuration/crm_bugs_view.xml b/addons/crm_configuration/crm_bugs_view.xml
index 992e29c3ed0..bbbcab5633b 100755
--- a/addons/crm_configuration/crm_bugs_view.xml
+++ b/addons/crm_configuration/crm_bugs_view.xml
@@ -154,14 +154,15 @@
                    <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"/>
                    <separator orientation="vertical"/>
-                   <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"/>
+                   <filter icon="gtk-execute" string="   Today   " separator="1" domain="[('create_date::date','=',time.strftime('%%Y-%%m-%%d'))]" help="Todays's bugs"/>
+               	    <filter icon="gtk-execute" string="    7 Days    " separator="1" domain="[]" help="Bugs during last 7 days"/>
                </group>
+               <separator orientation="vertical"/>
                <group col="4" colspan="2">
-               		<field name="name" select='1'/>
+               		<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 Prospects" default="1"/>
-                   	<filter icon="terp-crm" domain="[('user_id','child_of',[uid])]" help="My department's Prospects"/>
+                   	<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="terp-crm" domain="[('state','=','draft')]" help="Draft Bugs"/>
diff --git a/addons/crm_configuration/crm_claims_view.xml b/addons/crm_configuration/crm_claims_view.xml
index 6e29ba34cfe..f293f8d8b05 100755
--- a/addons/crm_configuration/crm_claims_view.xml
+++ b/addons/crm_configuration/crm_claims_view.xml
@@ -153,13 +153,13 @@
             <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" default="1" help="Claims Related to Current User"/>-->
+                   <group col="4" colspan="1">
                        <filter icon="gtk-execute" 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-execute" string="Pending Claims" domain="[('section_id.name','=','Claims'),('state','=','pending')]" separator="1" help="All pending Claims"/>
                    </group>
-                   <group col="4" colspan="4">
+                   <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"/>
diff --git a/addons/crm_configuration/crm_configuration_wizard.xml b/addons/crm_configuration/crm_configuration_wizard.xml
index 146f8f43f11..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" />
diff --git a/addons/crm_configuration/crm_lead_view.xml b/addons/crm_configuration/crm_lead_view.xml
index 0cfcbe0334e..1a5d83aa55f 100644
--- a/addons/crm_configuration/crm_lead_view.xml
+++ b/addons/crm_configuration/crm_lead_view.xml
@@ -35,9 +35,9 @@
                     <field name="partner_mobile"/>
                     <field name="email_from" string="Prospect Email"/>
                     <newline/>
-                     <label string="Partner:" align="1.0"/>
-					 <group colspan="1" col="2">
-						 <field name="partner_id" nolabel="1"/>
+					 <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)]}"
@@ -184,14 +184,14 @@
                <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="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>
                </group>
            </search>
         </field>
@@ -205,10 +205,10 @@
 			<field name="type">form</field>
 			<field name="inherit_id" ref="base.view_partner_form" />
 			<field name="arch" type="xml">
-				<field name="parent_id" position="after">
+				<field name="supplier" position="after">
 					<button string="Create Opportunity"
 						name="%(crm_configuration.wizard_partner_create_opportunity)d" icon="gtk-index"
-						type="action"
+						type="action" colspan="2"
 					/>
 				</field>
 			</field>
diff --git a/addons/crm_configuration/crm_opportunity_view.xml b/addons/crm_configuration/crm_opportunity_view.xml
index d08062b8ae6..787a4d2cc3b 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>
@@ -29,7 +38,7 @@
                         <field name="case_id" select="1"/>
                         <button string="Assign" name="%(crm_generic_wizard_act)d"  type="action" />
                     </group>
-                    <button string="Schedule Meeting" icon="terp-crm" name="%(wizard_crm_meeting)d" type="action"/>
+                    <button string="Schedule Meeting" icon="terp-crm" name="%(crm_case_categ_meet_opportunity)d" type="action"/>
                 </group>
                 <notebook colspan="4">
                 <page string="Description">
@@ -160,10 +169,10 @@
                </group>
                <separator orientation="vertical"/>
                <group col="5" colspan="2">
-                   <field name="name" select="1"/>
+                   <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 Prospects" default="1"/>
-                   	<filter icon="terp-crm" domain="[('user_id','child_of',[uid])]" help="My department's Prospects"/>
+                   	<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="partner_id" select="1"/>
                    <field name="state" select="1">
diff --git a/addons/crm_configuration/crm_phonecall_view.xml b/addons/crm_configuration/crm_phonecall_view.xml
index 9e064fd74c1..4397166a841 100644
--- a/addons/crm_configuration/crm_phonecall_view.xml
+++ b/addons/crm_configuration/crm_phonecall_view.xml
@@ -101,13 +101,28 @@
         <field name="arch" type="xml">
             <search string="Search Phonecalls">
                <group col="6" colspan="1">
-					<filter icon="gtk-execute" string="   Today   " separator="1" domain="[('create_date::date','=',time.strftime('%%Y-%%m-%%d'))]" help="Todays's Opportunities"/>
-					<filter icon="gtk-execute" string="    7 Days    " separator="1" domain="[]" help="Opportunities during last 7 days"/>
+                   <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"
+                   />
                    <separator orientation="vertical"/>
-                   <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>
-                 <separator orientation="vertical"/>
+                   <filter icon="gtk-execute" string="   Today   "
+                   	separator="1"
+                   	domain="[('create_date::date','=',time.strftime('%%Y-%%m-%%d'))]"
+                   	help="Todays's Phonecalls"
+                   />
+                   <filter icon="gtk-execute" 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'/>
                		<field name="user_id" select="1" widget="selection">
@@ -122,53 +137,6 @@
         </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/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']
         }

From 7e988c0c7b095cb2b6e6598fa955313fe5cd1e61 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 29 Oct 2009 15:10:15 +0530
Subject: [PATCH 18/30] [IMP]: CRM Ergonomy Improvement blueprint:  Improvement
 in search views : Added proper buttons in search views

bzr revid: rpa@tinyerp.com-20091029094015-l6obtv101qg3wqa4
---
 addons/crm_configuration/crm_bugs_view.xml    | 32 ++++++++++++++-----
 addons/crm_configuration/crm_claims_view.xml  | 17 ++++++++--
 addons/crm_configuration/crm_fund_view.xml    | 12 ++++---
 addons/crm_configuration/crm_jobs_view.xml    | 29 +++++++++++++----
 addons/crm_configuration/crm_lead_view.xml    | 21 +++++++++---
 addons/crm_configuration/crm_meeting_view.xml |  8 ++---
 .../crm_opportunity_view.xml                  | 23 ++++++++++---
 .../crm_configuration/crm_phonecall_view.xml  |  8 ++---
 8 files changed, 111 insertions(+), 39 deletions(-)

diff --git a/addons/crm_configuration/crm_bugs_view.xml b/addons/crm_configuration/crm_bugs_view.xml
index bbbcab5633b..612037d1c20 100755
--- a/addons/crm_configuration/crm_bugs_view.xml
+++ b/addons/crm_configuration/crm_bugs_view.xml
@@ -150,12 +150,28 @@
         <field name="arch" type="xml">
             <search string="Search Bugs">
                <group col="7" colspan="1">
-                   <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"/>
+                   <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-execute" string="   Today   " separator="1" domain="[('create_date::date','=',time.strftime('%%Y-%%m-%%d'))]" help="Todays's bugs"/>
-               	    <filter icon="gtk-execute" string="    7 Days    " separator="1" domain="[]" help="Bugs during last 7 days"/>
+                   <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>
                <separator orientation="vertical"/>
                <group col="4" colspan="2">
@@ -165,9 +181,9 @@
                    	<filter icon="terp-crm" domain="[('user_id','child_of',[uid])]" help="My department's Bugs"/>
                    </field>
                    <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"/>
+                       <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>
                </group>
             </search>
diff --git a/addons/crm_configuration/crm_claims_view.xml b/addons/crm_configuration/crm_claims_view.xml
index f293f8d8b05..706e38602de 100755
--- a/addons/crm_configuration/crm_claims_view.xml
+++ b/addons/crm_configuration/crm_claims_view.xml
@@ -154,9 +154,20 @@
             <field name="arch" type="xml">
                 <search string="Search Claims">
                    <group col="4" colspan="1">
-                       <filter icon="gtk-execute" 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-execute" string="Pending Claims" domain="[('section_id.name','=','Claims'),('state','=','pending')]" separator="1" help="All pending Claims"/>
+                       <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>
                    <separator orientation="vertical"/>
                    <group col="4" colspan="2">
diff --git a/addons/crm_configuration/crm_fund_view.xml b/addons/crm_configuration/crm_fund_view.xml
index 5a71a550d15..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" default="1" 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_jobs_view.xml b/addons/crm_configuration/crm_jobs_view.xml
index 09a9874e340..d8608c87437 100755
--- a/addons/crm_configuration/crm_jobs_view.xml
+++ b/addons/crm_configuration/crm_jobs_view.xml
@@ -162,13 +162,28 @@
             <field name="arch" type="xml">
                 <search string="Search Jobs">
                    <group col="7" colspan="1">
-	                   <filter icon="gtk-execute" string="   Today   " separator="1" domain="[('create_date::date','=',time.strftime('%%Y-%%m-%%d'))]" help="Todays's Opportunities"/>
-	                	<filter icon="gtk-execute" string="    7 Days    " separator="1" domain="[]" help="Opportunities during last 7 days"/>
-<!--                       <filter icon="gtk-execute" string="My Jobs" domain="[('user_id','=',uid)]" separator="1" help="Jobs Related to Current User"/>-->
-						<separator orientation="vertical"/>
-                       <filter icon="gtk-execute" string="New Jobs" domain="[('section_id.name','=','Jobs'),('stage_id.name','=','Initial Jobs Demand')]" separator="1" help="All Initial Jobs"/>
-                       <filter icon="gtk-execute" string="Open Jobs" domain="[('section_id.name','=','Jobs'),('state','=','open')]" separator="1" help="Open Jobs"/>
-                       <filter icon="gtk-execute" string="Pending Jobs" domain="[('section_id.name','=','Jobs'),('state','=','pending')]" separator="1" help="Pending Jobs"/>
+	                   <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"
+	                   />
+	                   <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>
                    <separator orientation="vertical"/>
                    <group col="4" colspan="2">
diff --git a/addons/crm_configuration/crm_lead_view.xml b/addons/crm_configuration/crm_lead_view.xml
index 1a5d83aa55f..22055aac619 100644
--- a/addons/crm_configuration/crm_lead_view.xml
+++ b/addons/crm_configuration/crm_lead_view.xml
@@ -178,15 +178,28 @@
         <field name="arch" type="xml">
             <search string="Search Prospects">
                <group col="3" colspan="1">
-                <filter icon="gtk-execute" string="   Today   " separator="1" domain="[('create_date::date','=',time.strftime('%%Y-%%m-%%d'))]" help="Todays's Prospects"/>
-                <filter icon="gtk-execute" string="    7 Days    " separator="1" domain="[]" help="Prospects during last 7 days"/> 
+                <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>
                <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"/>
+	                   	<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"/>
diff --git a/addons/crm_configuration/crm_meeting_view.xml b/addons/crm_configuration/crm_meeting_view.xml
index e74c01d3cb3..f3795aacdaa 100755
--- a/addons/crm_configuration/crm_meeting_view.xml
+++ b/addons/crm_configuration/crm_meeting_view.xml
@@ -101,13 +101,13 @@
         <field name="arch" type="xml">
             <search string="Search Meetings">
                <group col="5" colspan="1">
-                   <filter icon="gtk-execute" string="My Meetings" default="1" domain="[('user_id','=',uid)]" help="Meetings Related to Current User"/>
+                   <filter icon="terp-partner" string="My Meetings" default="1" domain="[('user_id','=',uid)]" help="Meetings Related to Current User"/>
                </group>
                <group col="4" colspan="4">
                    <field name="state" select="1">
-                       <filter icon="terp-crm" domain="[('state','=','draft')]" help="Draft Meetings"/>
-                       <filter icon="terp-crm" domain="[('state','=','open')]" help="Open Meetings"/>
-                       <filter icon="terp-crm" domain="[('state','=','pending')]" help="Pending Meetings"/>
+                       <filter icon="gtk-new" domain="[('state','=','draft')]" help="Draft Meetings"/>
+                       <filter icon="gtk-yes" domain="[('state','=','open')]" help="Open Meetings"/>
+                       <filter icon="gtk-media-pause" domain="[('state','=','pending')]" help="Pending Meetings"/>
                    </field>
                    <field name="name" select='1'/>
                    <field name="user_id" select="1" widget="selection"/>
diff --git a/addons/crm_configuration/crm_opportunity_view.xml b/addons/crm_configuration/crm_opportunity_view.xml
index 787a4d2cc3b..8faf2a47ff2 100644
--- a/addons/crm_configuration/crm_opportunity_view.xml
+++ b/addons/crm_configuration/crm_opportunity_view.xml
@@ -164,15 +164,28 @@
         <field name="arch" type="xml">
             <search string="Search Opportunities">
            		<group col="3" colspan="1">
-                <filter icon="gtk-execute" string="   Today   " separator="1" domain="[('create_date::date','=',time.strftime('%%Y-%%m-%%d'))]" help="Todays's Opportunities"/>
-                <filter icon="gtk-execute" string="    7 Days    " separator="1" domain="[]" help="Opportunities during last 7 days"/> 
-               </group>
+                <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"/>
+                   	<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="partner_id" select="1"/>
                    <field name="state" select="1">
diff --git a/addons/crm_configuration/crm_phonecall_view.xml b/addons/crm_configuration/crm_phonecall_view.xml
index 4397166a841..1086a9e4ec4 100644
--- a/addons/crm_configuration/crm_phonecall_view.xml
+++ b/addons/crm_configuration/crm_phonecall_view.xml
@@ -101,23 +101,23 @@
         <field name="arch" type="xml">
             <search string="Search Phonecalls">
                <group col="6" colspan="1">
-                   <filter icon="gtk-execute"
+                   <filter icon="gtk-jump-to"
                    	string="Inbound Phonecalls"
                    	domain="[('section_id.name','=','Phone Calls'),('categ_id.name','=','Inbound')]"
                    	separator="1" help="All Inbound Phonecalls"
                    />
-                   <filter icon="gtk-execute"
+                   <filter icon="gtk-redo"
                    	string="Outbound Phonecalls"
                    	domain="[('section_id.name','=','Phone Calls'),('categ_id.name','=','Outbound')]"
                    	separator="1" help="All Outbound Phonecalls"
                    />
                    <separator orientation="vertical"/>
-                   <filter icon="gtk-execute" string="   Today   "
+                   <filter icon="gtk-home" string="   Today   "
                    	separator="1"
                    	domain="[('create_date::date','=',time.strftime('%%Y-%%m-%%d'))]"
                    	help="Todays's Phonecalls"
                    />
-                   <filter icon="gtk-execute" string="    7 Days    "
+                   <filter icon="gtk-media-rewind" string="    7 Days    "
                    	separator="1" domain="[]"
                    	help="Phonecalls during last 7 days"
                    />

From 0f270d383a48f380f78777e69a59a4f8a52ebaa8 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 29 Oct 2009 15:19:54 +0530
Subject: [PATCH 19/30] [IMP]: CRM Ergonomy Improvement blueprint:  Improvement
 in phonecall search view

bzr revid: rpa@tinyerp.com-20091029094954-ectn40l7ad9uldxr
---
 addons/crm_configuration/crm_phonecall_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/crm_configuration/crm_phonecall_view.xml b/addons/crm_configuration/crm_phonecall_view.xml
index 1086a9e4ec4..2e45b0e8cee 100644
--- a/addons/crm_configuration/crm_phonecall_view.xml
+++ b/addons/crm_configuration/crm_phonecall_view.xml
@@ -102,12 +102,12 @@
             <search string="Search Phonecalls">
                <group col="6" colspan="1">
                    <filter icon="gtk-jump-to"
-                   	string="Inbound Phonecalls"
+                   	string="Inbound"
                    	domain="[('section_id.name','=','Phone Calls'),('categ_id.name','=','Inbound')]"
                    	separator="1" help="All Inbound Phonecalls"
                    />
                    <filter icon="gtk-redo"
-                   	string="Outbound Phonecalls"
+                   	string="Outbound"
                    	domain="[('section_id.name','=','Phone Calls'),('categ_id.name','=','Outbound')]"
                    	separator="1" help="All Outbound Phonecalls"
                    />
@@ -124,7 +124,7 @@
                </group>
                <separator orientation="vertical"/>
                <group col="4" colspan="2">
-             		<field name="name" select='1'/>
+             		<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 Prospects" default="1"/>
 	                   	<filter icon="terp-crm" domain="[('user_id','child_of',[uid])]" help="My department's Prospects"/>

From 6cb73acd40eb6528b3c25945a46d3506f692c9e1 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Thu, 29 Oct 2009 15:36:39 +0530
Subject: [PATCH 20/30] [FIX]crm : crash on installing module

bzr revid: hmo@tinyerp.com-20091029100639-2pw56f38znqekpq9
---
 addons/crm/__terp__.py    | 4 ++--
 addons/crm/crm_view.xml   | 1 +
 addons/crm/crm_wizard.xml | 5 ++---
 3 files changed, 5 insertions(+), 5 deletions(-)

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_view.xml b/addons/crm/crm_view.xml
index ce06acd373a..fdb79ed5d73 100755
--- 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"/>        
 
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>

From 337c086db0d5f6d87e6f9c7ab262d34800630e92 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 29 Oct 2009 15:52:17 +0530
Subject: [PATCH 21/30] [IMP]: CRM Ergonomy Improvement blueprint:  In Send New
 Emai  Added a selection field to set state of case accordingly

bzr revid: rpa@tinyerp.com-20091029102217-c3obo1ru5tpoeawc
---
 addons/crm/wizard/wizard_crm_new_send_email.py | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/addons/crm/wizard/wizard_crm_new_send_email.py b/addons/crm/wizard/wizard_crm_new_send_email.py
index f83296690aa..330096c8373 100644
--- a/addons/crm/wizard/wizard_crm_new_send_email.py
+++ b/addons/crm/wizard/wizard_crm_new_send_email.py
@@ -46,6 +46,9 @@ email_send_form = '''<?xml version="1.0"?>
     <field name="doc2" />
     <newline/>
     <field name="doc3" />
+    <separator colspan="4" string="State of Case"/>
+    <newline/>
+    <field name="state" />
 </form>'''
 
 email_send_fields = {
@@ -57,6 +60,8 @@ email_send_fields = {
     '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.
@@ -91,7 +96,15 @@ def _mass_mail_send(self, cr, uid, data, context):
         tinycrm=str(case.id)
     )
     if flag:
-        raise wizard.except_wizard(_('Message!'),("Email Successfully Sent..!!"))   
+        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 {}

From c4919b57df8710a77a1e968081fa0e6789ce6f0d Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 29 Oct 2009 16:57:13 +0530
Subject: [PATCH 22/30] [IMP]: CRM Ergonomy Improvement blueprint: 
 Modifications for removing simple wizard and put osv_memory wizard instead of
 it ,for onchange issue in CRM

bzr revid: rpa@tinyerp.com-20091029112713-p7ozeg2ni2x92xbj
---
 addons/crm/crm.py                  | 38 +++++++++++++++
 addons/crm/crm_view.xml            | 40 +++++++++++++---
 addons/crm/wizard/__init__.py      |  1 -
 addons/crm/wizard/wizard_add_cc.py | 77 ------------------------------
 4 files changed, 71 insertions(+), 85 deletions(-)
 delete mode 100644 addons/crm/wizard/wizard_add_cc.py

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index a57ffcd272c..673b14fe65d 100755
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -1039,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
index fdb79ed5d73..156ac40aa3a 100755
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -239,11 +239,37 @@
         </record>
         <menuitem action="crm_case_rule-act" id="menu_crm_case_rule-act" parent="crm.next_id_51"/>
 		
-       <wizard string="Add a CC"
-           model="crm.case"
-           menu = "False"
-           name="crm.case.email.add_cc"
-           id="wizard_crm_case_email_add_cc"/> 
+       <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">
@@ -395,8 +421,8 @@
                                        <field name="email"/>
                                        <field name="canal_id"/>
                                        <button
-                                           	string="Add a CC"
-		                                   	name="%(wizard_crm_case_email_add_cc)d"
+                                     string="Add a CC"
+		                                   	name="%(action_view_crm_email_add_cc_wizard)d"
 		                                   	icon="gtk-add" type="action"/>
                                    </group>
                                    <newline/>
diff --git a/addons/crm/wizard/__init__.py b/addons/crm/wizard/__init__.py
index 55f1d9a3a7c..b29cbe06375 100644
--- a/addons/crm/wizard/__init__.py
+++ b/addons/crm/wizard/__init__.py
@@ -23,7 +23,6 @@ import crm_wizard
 import wizard_crm_send_email
 import wizard_crm_new_send_email
 import wizard_fetch_mail
-import wizard_add_cc
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/crm/wizard/wizard_add_cc.py b/addons/crm/wizard/wizard_add_cc.py
deleted file mode 100644
index 2848126f9c2..00000000000
--- a/addons/crm/wizard/wizard_add_cc.py
+++ /dev/null
@@ -1,77 +0,0 @@
-# -*- 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/>.     
-#
-##############################################################################
-
-
-import time
-import wizard
-import osv
-import pooler
-
-cc_form = '''<?xml version="1.0"?>
-<form string="Add a CC">
-    <field name="send_to"/>
-    <newline/>
-    <field name="user_id" attrs="{'readonly' : [('send_to','!=','user')], 'required' : [('send_to','=','user')]}"/>
-    <field name="partner_id" attrs="{'readonly' : [('send_to','!=','partner')], 'required' : [('send_to','=','partner')]}"/>/>
-    <field name="email"/>
-</form>'''
-
-#on_change="change_email(user_id, partner_id)" 
-
-cc_fields = {
-    'send_to' : {'string' : 'Send to', 'type' : 'selection', 'required' :True, \
-                      'selection' :[('user','User'),('partner','Partner'),('email','Email Address')], \
-                      'default' : 'email'},
-    'user_id' : {'string' : 'User', 'type' : 'many2one', 'relation' : 'res.users'},
-    'partner_id' : {'string' : 'Partner', 'type' : 'many2one', 'relation' : 'res.partner'},
-    'email' : {'string' : 'Email', 'type' : 'char', 'size' : 24},
-}
-
-#def change_email(self, cr, uid, data, context):
-#    return {}
-
-def email_cc_add(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    history_line = pool.get('crm.case.history').browse(cr, uid, data['id'])
-    crm_case = pool.get('crm.case')
-    case_id = history_line.log_id.case_id.id
-    crm_case.write(cr, uid, case_id, {'email_cc' : data['form']['email']})
-    #TODO: send the latest email to the email adderss
-    return {}
-
-
-class wizard_add_cc(wizard.interface):
-    states = {
-        'init' : {
-            'actions' : [], 
-            'result' : {'type' : 'form', 'arch' : cc_form, 'fields' :cc_fields,\
-                         'state' :[('end','Cancel', 'gtk-cancel'),('add','Ok', 'gtk-go-forward' )]}
-        },
-        'add' : {
-            'actions' : [email_cc_add],
-            'result' : {'type' : 'state', 'state' : 'end'}
-        }
-    }
-wizard_add_cc('crm.case.email.add_cc')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

From bfa22f3150e7ed82d6433b69b570ee1aa4511d97 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 29 Oct 2009 17:29:35 +0530
Subject: [PATCH 23/30] [IMP] : CRM Improvement : Removed unused filters in all
 sections

bzr revid: rpa@tinyerp.com-20091029115935-lgxz6dpiogs8y5dx
---
 addons/crm_configuration/crm_bugs_menu.xml    | 637 ------------------
 addons/crm_configuration/crm_claims_menu.xml  | 140 +---
 addons/crm_configuration/crm_fund_menu.xml    | 176 -----
 .../crm_configuration/crm_helpdesk_menu.xml   | 334 ---------
 addons/crm_configuration/crm_jobs_menu.xml    | 435 ------------
 addons/crm_configuration/crm_lead_menu.xml    | 245 -------
 .../crm_opportunity_menu.xml                  | 180 -----
 .../crm_configuration/crm_phonecall_menu.xml  | 169 +----
 8 files changed, 2 insertions(+), 2314 deletions(-)

diff --git a/addons/crm_configuration/crm_bugs_menu.xml b/addons/crm_configuration/crm_bugs_menu.xml
index 0b5922e1407..ff61776e21d 100644
--- a/addons/crm_configuration/crm_bugs_menu.xml
+++ b/addons/crm_configuration/crm_bugs_menu.xml
@@ -62,643 +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_claims_menu.xml b/addons/crm_configuration/crm_claims_menu.xml
index 3f3d8c32592..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_fund_menu.xml b/addons/crm_configuration/crm_fund_menu.xml
index 15c56b24d69..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_helpdesk_menu.xml b/addons/crm_configuration/crm_helpdesk_menu.xml
index 072cda4e180..764a694539f 100644
--- a/addons/crm_configuration/crm_helpdesk_menu.xml
+++ b/addons/crm_configuration/crm_helpdesk_menu.xml
@@ -62,340 +62,6 @@
         <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_case_form_view_helpdesk"/>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_help'))+')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>        
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_helpdesk_tree_view1">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_tree_view_helpdesk"/>
-        <field name="act_window_id" ref="crm_case_categ_help_new_act"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_helpdesk_tree_view2">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">form</field>
-        <field name="view_id" ref="crm_case_form_view_helpdesk"/>
-        <field name="act_window_id" ref="crm_case_categ_help_new_act"/>
-    </record>
-    
-<!--    <menuitem parent="menu_help_support_main" id="menu_crm_case_categ_help_new_act" action="crm_case_categ_help_new_act" sequence="50"/>-->
-
-    <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_case_tree_view_helpdesk"/>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_help'))+'),(\'user_id\',\'=\',uid),(\'state\',\'&lt;&gt;\',\'done\')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>
-        <field name="filter" eval="True"/>
-        <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_case_tree_view_helpdesk"/>
-        <field name="act_window_id" ref="crm_case_helpdesk_act_my1"/>
-    </record>
-    
-    <record model="ir.actions.act_window.view" id="action_crm_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_case_form_view_helpdesk"/>
-        <field name="act_window_id" ref="crm_case_helpdesk_act_my1"/>
-    </record>
-    
-<!--    <menuitem parent="menu_crm_case_helpdesk_my_act" id="menu_crm_case_helpdesk_act_my_helpdesk" action="crm_case_helpdesk_act_my1" groups="base.group_extended_menu"/>        -->
-
-    <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_case_tree_view_helpdesk"/>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_help'))+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'draft\')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>
-        <field name="filter" eval="True"/>
-        <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_case_tree_view_helpdesk"/>
-        <field name="act_window_id" ref="crm_case_helpdesk_act_my2"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_my2">
-        <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_case_form_view_helpdesk"/>
-        <field name="act_window_id" ref="crm_case_helpdesk_act_my2"/>
-    </record>
-<!--    <menuitem parent="menu_crm_case_helpdesk_my_act" id="menu_crm_case_helpdesk_act_myhelpdesk2" action="crm_case_helpdesk_act_my2" groups="base.group_extended_menu"/>        -->
-
-    <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_case_tree_view_helpdesk"/>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_help'))+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'pending\')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>
-        <field name="filter" eval="True"/>
-        <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_case_tree_view_helpdesk"/>
-        <field name="act_window_id" ref="crm_case_helpdesk_act_my1"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_my1">
-        <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_case_form_view_helpdesk"/>
-        <field name="act_window_id" ref="crm_case_helpdesk_act_my1"/>
-    </record>
-<!--    <menuitem parent="menu_crm_case_helpdesk_my_act" id="menu_crm_case_helpdesk_act_myhelpdesk1" action="crm_case_helpdesk_act_my1" groups="base.group_extended_menu"/>                -->
-
-    <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_case_tree_view_helpdesk"/>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_help'))+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'open\')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>
-        <field name="filter" eval="True"/>
-        <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_case_tree_view_helpdesk"/>
-        <field name="act_window_id" ref="crm_case_helpdesk_act_my0"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_my0">
-        <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_case_form_view_helpdesk"/>
-        <field name="act_window_id" ref="crm_case_helpdesk_act_my0"/>
-    </record>
-<!--    <menuitem parent="menu_crm_case_helpdesk_my_act" id="menu_crm_case_helpdesk_act_myhelpdesk0" action="crm_case_helpdesk_act_my0" groups="base.group_extended_menu"/>    -->
-        
-    
-    <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_case_tree_view_helpdesk"/>
-        <field name="act_window_id" ref="crm_case_helpdesk_act_myhelpdesk"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_sec_form_view_myhelpdesk">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">form</field>
-        <field name="view_id" ref="crm_case_form_view_helpdesk"/>
-        <field name="act_window_id" ref="crm_case_helpdesk_act_myhelpdesk"/>
-    </record>    
-<!--    <menuitem parent="menu_crm_case_helpdesk_my_act" id="menu_crm_case_helpdesk_act_myhelpdesk" action="crm_case_helpdesk_act_myhelpdesk" groups="base.group_extended_menu"/>-->
-    
-    <!-- 
-        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_case_tree_view_helpdesk"/>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_help'))+'),(\'state\',\'&lt;&gt;\',\'done\')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>
-        <field name="filter" eval="True"/>
-        <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_case_tree_view_helpdesk"/>
-        <field name="act_window_id" ref="crm_case_helpdesk_act_all3"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_all3">
-        <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_case_form_view_helpdesk"/>
-        <field name="act_window_id" ref="crm_case_helpdesk_act_all3"/>
-    </record>
-<!--    <menuitem parent="menu_crm_case_helpdesk_act_all" id="menu_crm_case_helpdesk_act_myhelpdesk_all3" action="crm_case_helpdesk_act_all3" groups="base.group_extended_menu"/>-->
-
-    <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_case_tree_view_helpdesk"/>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_help'))+'),(\'state\',\'=\',\'draft\')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>
-        <field name="filter" eval="True"/>
-        <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_case_tree_view_helpdesk"/>
-        <field name="act_window_id" ref="crm_case_helpdesk_act_all2"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_all2">
-        <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_case_form_view_helpdesk"/>
-        <field name="act_window_id" ref="crm_case_helpdesk_act_all2"/>
-    </record>
-<!--    <menuitem parent="menu_crm_case_helpdesk_act_all" id="menu_crm_case_helpdesk_act_myhelpdesk_all2" action="crm_case_helpdesk_act_all2" groups="base.group_extended_menu"/>        -->
-
-    <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_case_tree_view_helpdesk"/>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_help'))+'),(\'state\',\'=\',\'pending\')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>
-        <field name="filter" eval="True"/>
-        <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_case_tree_view_helpdesk"/>
-        <field name="act_window_id" ref="crm_case_helpdesk_act_all1"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_all1">
-        <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_case_form_view_helpdesk"/>
-        <field name="act_window_id" ref="crm_case_helpdesk_act_all1"/>
-    </record>
-<!--    <menuitem  parent="menu_crm_case_helpdesk_act_all" id="menu_crm_case_helpdesk_act_myhelpdesk_all1" action="crm_case_helpdesk_act_all1" groups="base.group_extended_menu"/>        -->
-
-
-    <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_case_tree_view_helpdesk"/>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_help'))+'),(\'state\',\'=\',\'open\')]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>
-        <field name="filter" eval="True"/>
-        <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_case_tree_view_helpdesk"/>
-        <field name="act_window_id" ref="crm_case_helpdesk_act_all0"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_all0">
-        <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_case_form_view_helpdesk"/>
-        <field name="act_window_id" ref="crm_case_helpdesk_act_all0"/>
-    </record>
-<!--    <menuitem  parent="menu_crm_case_helpdesk_act_all" id="menu_crm_case_helpdesk_act_myhelpdesk_all0" action="crm_case_helpdesk_act_all0" groups="base.group_extended_menu"/>        -->
-
-    <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_case_tree_view_helpdesk"/>
-        <field name="act_window_id" ref="crm_case_helpdesk_act_allhelpdesk"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_sec_form_view_allhelpdesk">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">form</field>
-        <field name="view_id" ref="crm_case_form_view_helpdesk"/>
-        <field name="act_window_id" ref="crm_case_helpdesk_act_allhelpdesk"/>
-    </record>
-<!--    <menuitem parent="menu_crm_case_helpdesk_act_all" id="menu_crm_case_helpdesk_act_myhelpdesk_allhelpdesk" action="crm_case_helpdesk_act_allhelpdesk" groups="base.group_extended_menu"/>-->
-    
     
 </data>
 </openerp>
diff --git a/addons/crm_configuration/crm_jobs_menu.xml b/addons/crm_configuration/crm_jobs_menu.xml
index d2b7a3b755b..9f2941d08a1 100644
--- a/addons/crm_configuration/crm_jobs_menu.xml
+++ b/addons/crm_configuration/crm_jobs_menu.xml
@@ -42,440 +42,5 @@
         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"/>-->
-    
 </data>
 </openerp>
diff --git a/addons/crm_configuration/crm_lead_menu.xml b/addons/crm_configuration/crm_lead_menu.xml
index 13aa1b0818e..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_opportunity_menu.xml b/addons/crm_configuration/crm_opportunity_menu.xml
index 9f9c22926ee..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_phonecall_menu.xml b/addons/crm_configuration/crm_phonecall_menu.xml
index ec3a289c8df..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>

From 1753014eb2f91a60dd46f0e8faaf625ac9a3c6e4 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 29 Oct 2009 17:34:13 +0530
Subject: [PATCH 24/30] [IMP]: CRM Ergonomy Improvement blueprint: Removed
 buttons in tree views

bzr revid: rpa@tinyerp.com-20091029120413-7qurxa2uc3ewiekv
---
 addons/crm_configuration/crm_lead_view.xml        | 6 ++----
 addons/crm_configuration/crm_opportunity_view.xml | 6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/addons/crm_configuration/crm_lead_view.xml b/addons/crm_configuration/crm_lead_view.xml
index 22055aac619..5efe38fa177 100644
--- a/addons/crm_configuration/crm_lead_view.xml
+++ b/addons/crm_configuration/crm_lead_view.xml
@@ -147,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>
diff --git a/addons/crm_configuration/crm_opportunity_view.xml b/addons/crm_configuration/crm_opportunity_view.xml
index 8faf2a47ff2..22fe5552413 100644
--- a/addons/crm_configuration/crm_opportunity_view.xml
+++ b/addons/crm_configuration/crm_opportunity_view.xml
@@ -147,12 +147,10 @@
                 <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>

From c584e64ec89a660ce7e5a07eb3ff994421cbdc8c Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 29 Oct 2009 17:52:09 +0530
Subject: [PATCH 25/30] [IMP]: crm_configuration: Remaining menu for all jobs
 request

bzr revid: rpa@tinyerp.com-20091029122209-st9btmm8fwdrn2c2
---
 addons/crm_configuration/crm_jobs_menu.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/addons/crm_configuration/crm_jobs_menu.xml b/addons/crm_configuration/crm_jobs_menu.xml
index 9f2941d08a1..71e65c623ae 100644
--- a/addons/crm_configuration/crm_jobs_menu.xml
+++ b/addons/crm_configuration/crm_jobs_menu.xml
@@ -42,5 +42,10 @@
         id="menu_crm_case_job_req_main" 
         parent="menu_hr"/>
 
+ <!-- 
+        ALL JOBS REQUESTS 
+    -->
+    <menuitem parent="menu_crm_case_job_req_main" id="menu_crm_case_categ0_act111" action="crm_case_categ0_act111"/>    
+    
 </data>
 </openerp>

From c74c70d5ad23b06c853b1086920e2463d96a06ec Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 30 Oct 2009 11:19:47 +0530
Subject: [PATCH 26/30] [IMP]: crm_configuration: Renamed jobs action ids that
 was duplicated in helpdesk for the problem of proper form view

bzr revid: rpa@tinyerp.com-20091030054947-kq93jlcxxo1rh2n5
---
 addons/crm_configuration/crm_jobs_menu.xml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/addons/crm_configuration/crm_jobs_menu.xml b/addons/crm_configuration/crm_jobs_menu.xml
index 71e65c623ae..44e6f10661f 100644
--- a/addons/crm_configuration/crm_jobs_menu.xml
+++ b/addons/crm_configuration/crm_jobs_menu.xml
@@ -4,7 +4,7 @@
     <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_jobs">
         <field name="name">All Jobs Requests</field>
         <field name="res_model">crm.case</field>
         <field name="view_mode">tree,calendar,form,graph</field>
@@ -13,29 +13,29 @@
         <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_jobs">
         <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="act_window_id" ref="crm_case_categ0_act_jobs"/>
     </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_jobs">
         <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="act_window_id" ref="crm_case_categ0_act_jobs"/>
     </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_jobs">
         <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="act_window_id" ref="crm_case_categ0_act_jobs"/>
     </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_jobs">
         <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_jobs"/>
     </record>
     <menuitem
         name="Jobs - Hiring Process" 
@@ -45,7 +45,7 @@
  <!-- 
         ALL JOBS REQUESTS 
     -->
-    <menuitem parent="menu_crm_case_job_req_main" id="menu_crm_case_categ0_act111" action="crm_case_categ0_act111"/>    
+    <menuitem parent="menu_crm_case_job_req_main" id="menu_crm_case_categ0_act_jobs" action="crm_case_categ0_act_jobs"/>    
     
 </data>
 </openerp>

From 20784ad745622c9e964a44c2f9a55953e406d1b0 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 30 Oct 2009 11:57:27 +0530
Subject: [PATCH 27/30] [IMP]: CRM Ergonomy Improvement blueprint: Removed
 filters completly from crm and crm_configuration

bzr revid: rpa@tinyerp.com-20091030062727-3h0fr23zf7orj3py
---
 addons/crm/crm_view.xml                       |  3 --
 .../crm_configuration/crm_helpdesk_menu.xml   | 30 -------------------
 2 files changed, 33 deletions(-)

diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 156ac40aa3a..088edfcffa7 100755
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -477,7 +477,6 @@
             <field name="res_model">crm.case</field>
             <field name="view_type">form</field>
             <field name="domain">[('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]</field>
-            <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_crm_case_filter"/>            
         </record>
         <menuitem action="crm_case_categ0-act_open" id="menu_crm_case_categ0-act_open" parent="crm.menu_crm_case_categ0-act" groups="base.group_extended_menu"/>
@@ -488,7 +487,6 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar</field>
             <field name="domain">[('user_id','=',uid)]</field>
-            <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_crm_case_filter"/>            
         </record>
         <menuitem action="crm_case_categ0-act_my" id="menu_crm_case_categ0-act_my" parent="crm.next_id_52" groups="base.group_extended_menu"/>
@@ -498,7 +496,6 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar</field>
             <field name="domain">[('user_id','=',uid),('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]</field>
-            <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_crm_case_filter"/>            
         </record>
         <menuitem action="crm_case_categ0-act_my_open" id="menu_crm_case_categ0-act_my_open" parent="crm.menu_crm_case_categ0-act_my" groups="base.group_extended_menu"/>
diff --git a/addons/crm_configuration/crm_helpdesk_menu.xml b/addons/crm_configuration/crm_helpdesk_menu.xml
index 764a694539f..7cbdeb99443 100644
--- a/addons/crm_configuration/crm_helpdesk_menu.xml
+++ b/addons/crm_configuration/crm_helpdesk_menu.xml
@@ -32,36 +32,6 @@
         <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"/>    
-
-    <record model="ir.actions.act_window" id="crm_case_categ_help_act">
-        <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_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"/>
-        <field name="search_view_id" ref="crm.view_crm_case_filter"/>        
-    </record>
-    <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_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="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_case_form_view_helpdesk"/>
-        <field name="act_window_id" ref="crm_case_categ_help_act"/>
-    </record>
-    
     
 </data>
 </openerp>

From 82ce46422fa237af6f63211d4b1e1d40fda1e11c Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 30 Oct 2009 12:23:18 +0530
Subject: [PATCH 28/30] [IMP]: CRM Ergonomy Improvement blueprint: Added CC
 wizard in all sections views

bzr revid: rpa@tinyerp.com-20091030065318-8f3ceh5a8891eqav
---
 addons/crm/crm_view.xml                           | 2 +-
 addons/crm_configuration/crm_bugs_view.xml        | 6 +++++-
 addons/crm_configuration/crm_claims_view.xml      | 6 +++++-
 addons/crm_configuration/crm_fund_view.xml        | 6 +++++-
 addons/crm_configuration/crm_helpdesk_view.xml    | 6 +++++-
 addons/crm_configuration/crm_jobs_view.xml        | 6 +++++-
 addons/crm_configuration/crm_lead_view.xml        | 6 +++++-
 addons/crm_configuration/crm_opportunity_view.xml | 6 +++++-
 8 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 088edfcffa7..7c054364583 100755
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -422,7 +422,7 @@
                                        <field name="canal_id"/>
                                        <button
                                      string="Add a CC"
-		                                   	name="%(action_view_crm_email_add_cc_wizard)d"
+		                                   	name="%(crm.action_view_crm_email_add_cc_wizard)d"
 		                                   	icon="gtk-add" type="action"/>
                                    </group>
                                    <newline/>
diff --git a/addons/crm_configuration/crm_bugs_view.xml b/addons/crm_configuration/crm_bugs_view.xml
index 612037d1c20..f20b4761ab0 100755
--- a/addons/crm_configuration/crm_bugs_view.xml
+++ b/addons/crm_configuration/crm_bugs_view.xml
@@ -97,10 +97,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="%(crm.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_configuration/crm_claims_view.xml b/addons/crm_configuration/crm_claims_view.xml
index 706e38602de..9bb8647d60d 100755
--- a/addons/crm_configuration/crm_claims_view.xml
+++ b/addons/crm_configuration/crm_claims_view.xml
@@ -111,10 +111,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="%(crm.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_configuration/crm_fund_view.xml b/addons/crm_configuration/crm_fund_view.xml
index 1e96637eee9..7d1c0fac677 100644
--- a/addons/crm_configuration/crm_fund_view.xml
+++ b/addons/crm_configuration/crm_fund_view.xml
@@ -100,10 +100,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="%(crm.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_configuration/crm_helpdesk_view.xml b/addons/crm_configuration/crm_helpdesk_view.xml
index 1a5a71981c1..6ed6154a332 100644
--- a/addons/crm_configuration/crm_helpdesk_view.xml
+++ b/addons/crm_configuration/crm_helpdesk_view.xml
@@ -95,10 +95,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="%(crm.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_configuration/crm_jobs_view.xml b/addons/crm_configuration/crm_jobs_view.xml
index d8608c87437..5953b193ae6 100755
--- a/addons/crm_configuration/crm_jobs_view.xml
+++ b/addons/crm_configuration/crm_jobs_view.xml
@@ -119,10 +119,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="%(crm.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_configuration/crm_lead_view.xml b/addons/crm_configuration/crm_lead_view.xml
index 5efe38fa177..d5da665a399 100644
--- a/addons/crm_configuration/crm_lead_view.xml
+++ b/addons/crm_configuration/crm_lead_view.xml
@@ -111,10 +111,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="%(crm.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_configuration/crm_opportunity_view.xml b/addons/crm_configuration/crm_opportunity_view.xml
index 22fe5552413..5a920ad1df2 100644
--- a/addons/crm_configuration/crm_opportunity_view.xml
+++ b/addons/crm_configuration/crm_opportunity_view.xml
@@ -111,10 +111,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="%(crm.action_view_crm_email_add_cc_wizard)d"
+								    icon="gtk-add" type="action"/>
                             </group>
                             <newline/>
                             <field name="description" colspan="4" nolabel="1"/>

From 3024a25c8ca7f3fbad3ab23b7a28cd81527b60e7 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 30 Oct 2009 13:01:02 +0530
Subject: [PATCH 29/30] [IMP]: crm_configuration: minor improvements

bzr revid: rpa@tinyerp.com-20091030073102-sxbc2vglpl3w5mt4
---
 addons/crm_configuration/crm_helpdesk_view.xml | 2 +-
 addons/crm_configuration/crm_jobs_view.xml     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/crm_configuration/crm_helpdesk_view.xml b/addons/crm_configuration/crm_helpdesk_view.xml
index 6ed6154a332..e7ac7d07def 100644
--- a/addons/crm_configuration/crm_helpdesk_view.xml
+++ b/addons/crm_configuration/crm_helpdesk_view.xml
@@ -3,7 +3,7 @@
 <data>
 
     # ------------------------------------------------------ 
-    # Opportunities
+    # HelpDesk
     # ------------------------------------------------------ 
 
     <record model="ir.ui.view" id="crm_case_form_view_helpdesk">
diff --git a/addons/crm_configuration/crm_jobs_view.xml b/addons/crm_configuration/crm_jobs_view.xml
index 5953b193ae6..57cf785e9b8 100755
--- a/addons/crm_configuration/crm_jobs_view.xml
+++ b/addons/crm_configuration/crm_jobs_view.xml
@@ -169,11 +169,11 @@
 	                   <filter icon="gtk-home" string="   Today   "
 	                   	separator="1"
 	                   	domain="[('create_date::date','=',time.strftime('%%Y-%%m-%%d'))]"
-	                   	help="Todays's Opportunities"
+	                   	help="Todays's Jobs"
 	                   />
 	                   <filter icon="gtk-media-rewind"
 	                   	string="    7 Days    " separator="1" domain="[]"
-	                   	help="Opportunities during last 7 days"
+	                   	help="Jobs during last 7 days"
 	                   />
 	                   <separator orientation="vertical"/>
 	                   <filter icon="gtk-new" string="New Jobs"

From b2db3e43e3c142c6d53b9c95cea80800699623a0 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Fri, 30 Oct 2009 17:41:19 +0530
Subject: [PATCH 30/30] [IMP] crm_configuration : "History of Events" should
 display as a relate button insteand of wizard in case form view

bzr revid: hmo@tinyerp.com-20091030121119-cailsqf2e4ha3ik1
---
 .../crm_configuration/crm_configuration_wizard.xml |  5 ++++-
 .../wizard/wizard_history_event.py                 | 14 ++++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/addons/crm_configuration/crm_configuration_wizard.xml b/addons/crm_configuration/crm_configuration_wizard.xml
index dfd1397902e..379602c39a6 100644
--- a/addons/crm_configuration/crm_configuration_wizard.xml
+++ b/addons/crm_configuration/crm_configuration_wizard.xml
@@ -6,7 +6,10 @@
          string="History of Events"
            name="crm.case.history.events" 
            model="crm.case" 
-           id="wizard_case_history_event" />
+           id="wizard_case_history_event" 
+           keyword="client_action_relate"
+           
+           />
 
         <wizard
             id="wizard_crm_partner_create"
diff --git a/addons/crm_configuration/wizard/wizard_history_event.py b/addons/crm_configuration/wizard/wizard_history_event.py
index 31b7d6e8930..1d254cd4605 100644
--- a/addons/crm_configuration/wizard/wizard_history_event.py
+++ b/addons/crm_configuration/wizard/wizard_history_event.py
@@ -31,16 +31,22 @@ def _open_history_event(self, cr, uid, data, context):
     id = data_obj.read(cr, uid, result, ['res_id'])
     id2 = data_obj._get_id(cr, uid, 'crm_configuration', 'crm_case_calendar_section-view')
     if id2:
-        id2 = data_obj.browse(cr, uid, id2, context=context).res_id     
+        id2 = data_obj.browse(cr, uid, id2, context=context).res_id 
+    res = ''    
+    if data.get('model',False) and data.get('ids',False):           
+        model_obj = pooler.get_pool(cr.dbname).get(data['model'])
+        res = model_obj.browse(cr,uid,data['ids'])
+        if len(res):
+            res = res[0].name       
     return {
-        'name': 'History : ' +  pooler.get_pool(cr.dbname).get(data['model']).browse(cr,uid,data['ids'])[0].name,
+        'name': 'History : ' +  res,
         'view_type': 'form',
         "view_mode": 'calendar, tree, form',
         'view_id' : False,
         'views': [(id2,'calendar'),(False,'form'),(False,'tree'),(False,'graph')],
         'res_model': 'crm.case',
         'type': 'ir.actions.act_window',
-        'domain': "[('case_id','=',%d)]" % (data['id']),
+        'domain': data.get('id',False) and "[('case_id','=',%d)]" % (data['id']) or "[]",
         'search_view_id': id['res_id'] 
     }
     
@@ -52,4 +58,4 @@ class case_history_event(wizard.interface):
         }
     }
     
-case_history_event('crm.case.history.events')
\ No newline at end of file
+case_history_event('crm.case.history.events')