From bf462744a66fef7aa24dd99560cd69d704d2f77f Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 31 Oct 2008 15:09:59 +0100
Subject: [PATCH] improvement

bzr revid: fp@tinyerp.com-20081031140959-xksqp0soetfvx6hk
---
 addons/board/board_view.xml                   |    2 +-
 addons/crm/crm.py                             |   15 +-
 addons/crm/crm_view.xml                       |   12 +-
 addons/crm/report/report_businessopp.py       |    2 +-
 addons/crm_configuration/__init__.py          |    2 +-
 addons/crm_configuration/__terp__.py          |   64 +-
 addons/crm_configuration/crm_bugs_menu.xml    | 1254 +++++++++--------
 addons/crm_configuration/crm_bugs_view.xml    |  271 ++--
 addons/crm_configuration/crm_config.py        |    6 +-
 addons/crm_configuration/crm_fund_demo.xml    |  286 ++--
 addons/crm_configuration/crm_fund_view.xml    |  286 ++--
 .../crm_configuration/crm_helpdesk_menu.xml   |  703 ++++-----
 addons/crm_configuration/crm_jobs_menu.xml    |  857 +++++------
 addons/crm_configuration/crm_jobs_view.xml    |  285 ++--
 addons/crm_configuration/crm_lead_data.xml    |    4 -
 addons/crm_configuration/crm_lead_demo.xml    |    2 +-
 addons/crm_configuration/crm_lead_menu.xml    |  790 +++++------
 addons/crm_configuration/crm_lead_view.xml    |  275 ++--
 addons/crm_configuration/crm_meeting_menu.xml |  329 ++---
 addons/crm_configuration/crm_meeting_view.xml |   25 +-
 .../crm_opportunity_demo.xml                  |  196 +--
 .../crm_opportunity_menu.xml                  |  516 +++----
 .../crm_opportunity_view.xml                  |  268 ++--
 addons/crm_configuration/crm_report_view.xml  |  450 +++---
 addons/product/product_view.xml               |    2 +-
 addons/project/project_demo.xml               |    5 +
 addons/report_crm/report_crm_view.xml         |    6 +-
 addons/stock/product.py                       |   10 +-
 addons/stock/stock.py                         |   19 +-
 29 files changed, 3385 insertions(+), 3557 deletions(-)

diff --git a/addons/board/board_view.xml b/addons/board/board_view.xml
index 36c9b128b3a..04d6ae85725 100644
--- a/addons/board/board_view.xml
+++ b/addons/board/board_view.xml
@@ -20,7 +20,7 @@
             <field name="arch" type="xml">
                 <form string="Note">
                     <field name="name" select="1"/>
-                    <field name="type" select="1"/>
+                    <field name="type" select="1" required="1"/>
                     <field name="user_id" select="1"/>
                     <field name="date" select="1"/>
                     <field colspan="4" name="note"/>
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 8fce933c304..0289af0b8bc 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -207,7 +207,7 @@ class crm_case_categ(osv.osv):
     _description = "Category of case"
     _columns = {
         'name': fields.char('Case Category Name', size=64, required=True),
-        'probability': fields.float('Probability', required=True),
+        'probability': fields.float('Probability (%)', required=True),
         'section_id': fields.many2one('crm.case.section', 'Case Section'),
     }
     _defaults = {
@@ -341,7 +341,7 @@ class crm_case(osv.osv):
         'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id)]"),
         'planned_revenue': fields.float('Planned Revenue'),
         'planned_cost': fields.float('Planned Costs'),
-        'probability': fields.float('Probability (0.50)'),
+        'probability': fields.float('Probability (%)'),
         'email_from': fields.char('Partner Email', size=128),
         'email_cc': fields.char('Watchers Emails', size=252),
         'email_last': fields.function(_email_last, method=True,
@@ -354,7 +354,7 @@ class crm_case(osv.osv):
         'date_deadline': fields.datetime('Deadline'),
         'date_closed': fields.datetime('Closed', readonly=True),
         'canal_id': fields.many2one('res.partner.canal', 'Channel'),
-        'user_id': fields.many2one('res.users', 'User Responsible'),
+        'user_id': fields.many2one('res.users', 'Responsible'),
         'history_line': fields.one2many('crm.case.history', 'case_id', 'Communication'),
         'log_ids': fields.one2many('crm.case.log', 'case_id', 'Logs History'),
         'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True),
@@ -392,9 +392,8 @@ class crm_case(osv.osv):
         'partner_id': _get_default_partner,
         'partner_address_id': _get_default_partner_address,
         'email_from': _get_default_email,
-        'state': lambda *a: 'draft',
+        'state': lambda *a: 'open',
         'priority': lambda *a: AVAILABLE_PRIORITIES[2][0],
-        'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
     }
     _order = 'priority, date_deadline desc, date desc,id desc'
 
@@ -557,7 +556,8 @@ class crm_case(osv.osv):
                 'som': case.som.id,
                 'canal_id': case.canal_id.id,
                 'user_id': uid,
-                'case_id': case.id
+                'case_id': case.id,
+                'section_id': case.section_id.id
             }
             obj = self.pool.get('crm.case.log')
             if history and case.description:
@@ -755,13 +755,14 @@ crm_case()
 
 class crm_case_log(osv.osv):
     _name = "crm.case.log"
-    _description = "Case communication history"
+    _description = "Case Communication History"
     _order = "id desc"
     _columns = {
         'name': fields.char('Action', size=64),
         'som': fields.many2one('res.partner.som', 'State of Mind'),
         'date': fields.datetime('Date'),
         'canal_id': fields.many2one('res.partner.canal', 'Channel'),
+        'section_id': fields.many2one('crm.case.section', 'Section'),
         'user_id': fields.many2one('res.users', 'User Responsible', readonly=True),
         'case_id': fields.many2one('crm.case', 'Case', required=True, ondelete='cascade')
     }
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 78f6d3293b1..71e5ba41296 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -2,8 +2,8 @@
 <openerp>
     <data>
         <menuitem icon="terp-crm" id="menu_crm" name="CRM &amp; SRM"/>
-        <menuitem id="menu_crm_configuration" name="Configuration" parent="crm.menu_crm"/>
-        
+        <menuitem id="menu_crm_configuration" name="Configuration" parent="crm.menu_crm" sequence="0"/>
+
         <record id="res_partner_events-wopartner-view" model="ir.ui.view">
             <field name="name">res.partner.events.form</field>
             <field name="model">res.partner.events</field>
@@ -19,7 +19,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <!-- Case Sections --> 
         <record id="crm_case_section_view_form" model="ir.ui.view">
             <field name="name">crm.case.section.form</field>
@@ -61,8 +61,10 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="crm_case_section_view_tree"/>
         </record>
-        <menuitem id="next_id_51" name="Cases" parent="crm.menu_crm_configuration"/><menuitem action="crm_case_section_act" id="menu_crm_case_section_act" parent="next_id_51"/>
+        <menuitem id="next_id_51" name="Cases" parent="crm.menu_crm_configuration"/>
+        <menuitem action="crm_case_section_act" id="menu_crm_case_section_act" parent="next_id_51"/>
 
+        <menuitem id="next_id_52" name="All Cases" parent="crm.menu_crm" sequence="1"/>
         <record id="crm_case_section_act_tree" model="ir.actions.act_window">
             <field name="name">Cases by section</field>
             <field name="res_model">crm.case.section</field>
@@ -70,7 +72,6 @@
             <field name="view_type">tree</field>
             <field name="view_id" ref="crm_case_section_view_tree"/>
         </record>
-        <menuitem id="next_id_52" name="Cases" parent="crm.menu_crm" groups="base.group_extended"/>
         <menuitem action="crm_case_section_act_tree" id="menu_crm_case_section_act_tree" parent="next_id_52"/>
 
         <!-- Case Categories -->
@@ -211,6 +212,7 @@
                     <field name="name"/>
                     <field name="som"/>
                     <field name="user_id"/>
+                    <field name="section_id"/>
                     <field name="canal_id"/>
                 </tree>
             </field>
diff --git a/addons/crm/report/report_businessopp.py b/addons/crm/report/report_businessopp.py
index 31d9f9290ac..026b50252cc 100644
--- a/addons/crm/report/report_businessopp.py
+++ b/addons/crm/report/report_businessopp.py
@@ -68,7 +68,7 @@ class report_custom(report_int):
         res = cr.dictfetchall()
 
         for row in res:
-            proba = row['probability'] or 0
+            proba = row['probability'] or 0 / 100.0
             cost = row['planned_cost'] or 0
             revenue = row['planned_revenue'] or 0
             userid = row['user_id'] or 0
diff --git a/addons/crm_configuration/__init__.py b/addons/crm_configuration/__init__.py
index e5fff24af67..ad922cf5550 100644
--- a/addons/crm_configuration/__init__.py
+++ b/addons/crm_configuration/__init__.py
@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
 import crm_config
 import report
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+import wizard
 
diff --git a/addons/crm_configuration/__terp__.py b/addons/crm_configuration/__terp__.py
index 135a5b50f7e..929c327f2eb 100644
--- a/addons/crm_configuration/__terp__.py
+++ b/addons/crm_configuration/__terp__.py
@@ -17,37 +17,41 @@ meetings, eso.
 """,
     "depends" : ["crm","report_crm", "process"],
     "init_xml" : [
-                    "crm_config_view.xml",
-                    "crm_bugs_view.xml",
-                    "crm_jobs_view.xml",
-                    "crm_lead_view.xml",
-                    "crm_meeting_view.xml",
-                    "crm_opportunity_view.xml",
-                    "crm_fund_view.xml",
-                    "crm_report_view.xml"
-                 ],
-    "demo_xml" : [
-#                    "crm_bugs_demo.xml",
-#                    "crm_fund_demo.xml",
-#                    "crm_jobs_demo.xml",
-#                    "crm_meeting_demo.xml",
-#                    "crm_lead_demo.xml",
-#                    "crm_opportunity_demo.xml",
+        "crm_configuration_wizard.xml",
+        "crm_config_view.xml",
+        "crm_bugs_view.xml",
+        "crm_jobs_view.xml",
+        "crm_lead_view.xml",
+        "crm_meeting_view.xml",
+        "crm_opportunity_view.xml",
+        "crm_fund_view.xml",
+        "crm_report_view.xml"
+    ],
+    "demo_xml" : [
+#        "crm_bugs_demo.xml",
+#        "crm_fund_demo.xml",
+#        "crm_jobs_demo.xml",
+#        "crm_meeting_demo.xml",
+#        "crm_lead_demo.xml",
+#        "crm_opportunity_demo.xml",
+   ],
+   "update_xml" : [
+#         "crm_bugs_data.xml",
+#         "crm_fund_data.xml",
+#         "crm_jobs_data.xml",
+#         "crm_meeting_data.xml",
+#         "crm_lead_data.xml",
+#         "crm_bugs_menu.xml",
+#         "crm_fund_menu.xml",
+#         "crm_jobs_menu.xml",
+#         "crm_helpdesk_menu.xml",
+#         "crm_lead_menu.xml",
+#         "crm_meeting_menu.xml",
+#         "crm_opportunity_data.xml",
+#         "crm_opportunity_menu.xml",
+         "security/ir.model.access.csv",
+         "process/crm_configuration_process.xml",
     ],
-    "update_xml" : [
-#                    "crm_bugs_data.xml",  
-#                    "crm_fund_data.xml",                  
-#                    "crm_jobs_data.xml",
-#                    "crm_meeting_data.xml",
-#                    "crm_lead_data.xml",
-#                    "crm_opportunity_data.xml",
-#                    "crm_bugs_menu.xml", "crm_fund_menu.xml",
-#                    "crm_jobs_menu.xml", "crm_opportunity_menu.xml",
-#                    "crm_helpdesk_menu.xml", "crm_lead_menu.xml",
-#                    "crm_meeting_menu.xml",
-                    "security/ir.model.access.csv",
-                    "process/crm_configuration_process.xml",
-                    ],
     "active": False,
     "installable": True
 }
diff --git a/addons/crm_configuration/crm_bugs_menu.xml b/addons/crm_configuration/crm_bugs_menu.xml
index e2caeb9818e..6b4835e5600 100644
--- a/addons/crm_configuration/crm_bugs_menu.xml
+++ b/addons/crm_configuration/crm_bugs_menu.xml
@@ -1,650 +1,652 @@
 <?xml version="1.0"?>
 <openerp>
 <data noupdate="1">
-	<record model="crm.case.section" id="section_support">
-		<field name="name">Bug Tracking</field>
-		<field name="code">BugSup</field>
-	</record>
-	<record model="crm.case.categ" id="categ1">
-		<field name="name">Bugs</field>
-		<field name="section_id" ref="section_support"/>
-	</record>
-	<record model="crm.case.categ" id="categ2">
-		<field name="name">Patches</field>
-		<field name="section_id" ref="section_support"/>
-	</record>
-	<record model="crm.case.categ" id="categ3">
-		<field name="name">Feature Requests</field>
-		<field name="section_id" ref="section_support"/>
-	</record>
-	<record model="crm.case.stage" id="stage2">
-		<field name="name">Fixed</field>
-		<field name="section_id" ref="section_support"/>
-	</record>
-	<record model="crm.case.stage" id="stage5">
-		<field name="name">Awaiting Response</field>
-		<field name="section_id" ref="section_support"/>
-	</record>	
-	<record model="crm.case.stage" id="stage7">
-		<field name="name">Future</field>
-		<field name="section_id" ref="section_support"/>
-	</record>	
-	
-	
-	######################## BUG TRACKING (menu) ###########################
-	<!-- 
-		ALL BUGS
-	-->
-	<record model="ir.actions.act_window" id="crm_case_categ_act0">
-		<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>
-		<field name="view_id" ref="crm_case_tree_view"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view0">
-		<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_categ_act0"/>
-	</record>	
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view0">
-		<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_categ_act0"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view0">
-		<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_categ_act0"/>
-	</record>
-	<menuitem name="Bug Tracking" id="menu_crm_case_bug_track"  parent="crm.menu_crm" 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_aftersale" name="After-Sale Services" parent="crm.menu_crm"/>
 
-	<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\')]'"/>
-	</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"/>
+    <record model="crm.case.section" id="section_support">
+        <field name="name">Bug Tracking</field>
+        <field name="code">BugSup</field>
+    </record>
+    <record model="crm.case.categ" id="categ1">
+        <field name="name">Bugs</field>
+        <field name="section_id" ref="section_support"/>
+    </record>
+    <record model="crm.case.categ" id="categ2">
+        <field name="name">Patches</field>
+        <field name="section_id" ref="section_support"/>
+    </record>
+    <record model="crm.case.categ" id="categ3">
+        <field name="name">Feature Requests</field>
+        <field name="section_id" ref="section_support"/>
+    </record>
+    <record model="crm.case.stage" id="stage2">
+        <field name="name">Fixed</field>
+        <field name="section_id" ref="section_support"/>
+    </record>
+    <record model="crm.case.stage" id="stage5">
+        <field name="name">Awaiting Response</field>
+        <field name="section_id" ref="section_support"/>
+    </record>    
+    <record model="crm.case.stage" id="stage7">
+        <field name="name">Future</field>
+        <field name="section_id" ref="section_support"/>
+    </record>    
+    
+    
+    ######################## BUG TRACKING (menu) ###########################
+    <!-- 
+        ALL BUGS
+    -->
+    <record model="ir.actions.act_window" id="crm_case_categ_act0">
+        <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>
+        <field name="view_id" ref="crm_case_tree_view"/>
+        <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+')]'"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view0">
+        <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_categ_act0"/>
+    </record>    
+    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view0">
+        <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_categ_act0"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_tag_form_view0">
+        <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_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_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\')]'"/>
-	</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"/>
+    <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\')]'"/>
+    </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"/>
 
-	<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\')]'"/>
-	</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"/>
+    <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\')]'"/>
+    </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"/>
 
-	<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\')]'"/>
-	</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"/>
+    <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\')]'"/>
+    </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"/>
 
-	<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\')]'"/>
-	</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"/>
+    <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\')]'"/>
+    </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"/>
 
-	<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\')]'"/>
-	</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"/>
+    <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\')]'"/>
+    </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"/>
+
+    <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\')]'"/>
+    </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"/>
 
 
-	<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\')]'"/>
-	</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"/>
+    <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\')]'"/>
+    </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"/>
 
 
-	<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\')]'"/>
-	</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"/>	<!-- 
-		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)]'"/>
-	</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"/>
-	
-		<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)+')]'"/>
-	</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_categ0_act_my0"/>
-	
-	<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\')]'"/>
-	</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"/>
+    <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\')]'"/>
+    </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"/>    <!-- 
+        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)]'"/>
+    </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"/>
+    
+        <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)+')]'"/>
+    </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"/>
+    
+    <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\')]'"/>
+    </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"/>
 
-	<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\')]'"/>
-	</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"/>
+    <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\')]'"/>
+    </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"/>
 
-	<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\')]'"/>
-	</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"/>
+    <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\')]'"/>
+    </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"/>
 
-	<!-- 
-		ALL FEATURE REQUESTS 
-	-->
-	<record model="ir.actions.act_window" id="crm_case_category_act_f0">
-		<field name="name">All Feature Request</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)+')]'"/>
-	</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)+')]'"/>
-	</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"/>
+    <!-- 
+        ALL FEATURE REQUESTS 
+    -->
+    <record model="ir.actions.act_window" id="crm_case_category_act_f0">
+        <field name="name">All Feature Request</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)+')]'"/>
+    </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)+')]'"/>
+    </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_bug_track" id="menu_crm_case_category_act_f1" action="crm_case_category_act_f1"/>
 
 
-	<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\')]'"/>
-	</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"/>
-	<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\')]'"/>
-	</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"/>
+    <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\')]'"/>
+    </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"/>
+    <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\')]'"/>
+    </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"/>
 
-	<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\')]'"/>
-	</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"/>
+    <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\')]'"/>
+    </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"/>
 
-	<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)+')]'"/>
-	</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"/>
+    <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)+')]'"/>
+    </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"/>
 
-	<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)+')]'"/>
-	</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"/>
+    <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)+')]'"/>
+    </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"/>
 
-	<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\')]'"/>
-	</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"/>
-	
+    <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\')]'"/>
+    </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"/>
+    
 </data>
 </openerp>
diff --git a/addons/crm_configuration/crm_bugs_view.xml b/addons/crm_configuration/crm_bugs_view.xml
index 4651825e0c9..fe7d9e8c4c9 100644
--- a/addons/crm_configuration/crm_bugs_view.xml
+++ b/addons/crm_configuration/crm_bugs_view.xml
@@ -1,145 +1,142 @@
 <?xml version="1.0"?>
 <openerp>
-	<data>
-<!--	<menuitem name="CRM &amp; SRM" icon="terp-crm" id="menu_crm1"/>	-->
+    <data>
+<!--    <menuitem name="CRM &amp; SRM" icon="terp-crm" id="menu_crm1"/>    -->
 
-	# ------------------------------------------------------
-	# Bug Tracking
-	# ------------------------------------------------------
+    # ------------------------------------------------------
+    # Bug Tracking
+    # ------------------------------------------------------
 
 
-	<record model="ir.ui.view" id="crm_case_form_view">
-		<field name="name">CRM - Bug Tracker Form</field>
-		<field name="model">crm.case</field>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-			<form string="Bug Tracker Form">
-				<group colspan="4" col="4">
-					<field name="name" string="Title" colspan="2"/>
-					<field name="section_id" colspan="1"/>
-					<newline/>
-					<field name="date" string="Next Meeting"/>
-					<field name="duration" string="Meeting Duration"/>	
-				</group>
-				<notebook>
-				<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"/>
-				    <field name="user_id" />
-				    <separator colspan="4"/>
-				    <field name="categ_id"  on_change="onchange_categ_id(categ_id)"/>
-				    <field name="priority" string="Severity"/>
-				    <newline/>
-				    <field name="stage_id" string="Resolution" colspan="2"/>
-				    <field name="category2_id" string="Version"/>
+    <record model="ir.ui.view" id="crm_case_form_view">
+        <field name="name">CRM - Bug Tracker Form</field>
+        <field name="model">crm.case</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Bug Tracker Form">
+                <group colspan="4" col="4">
+                    <field name="name" string="Title" colspan="2"/>
+                    <field name="section_id" colspan="1"/>
+                    <field name="stage_id" string="Resolution" colspan="2"/>
+                    <field name="date"/>
+                    <field name="email_from" colspan="2"/>
+                    <field name="user_id" />
+                </group>
+                <notebook>
+                <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/>
+                    <separator colspan="4"/>
+                    <field name="category2_id" string="Version"/>
+                    <field name="categ_id"  on_change="onchange_categ_id(categ_id)"/>
+                    <field name="priority" string="Severity"/>
 
-					<separator colspan="4"/>
-					<field name="history_line" colspan="2" nolabel="1" mode="tree,form">
-				    <form string="Resolution 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" />
-				    </form>
-				    <tree string="Resolution history">
-				    	<field name="description"/>
-				    	<field name="email"/>
-				    	<field name="date"/>
-				    </tree>
-					</field>
-					<group col="2" colspan="2" expand="1">
-						<button name="add_reply" string="Add Last Mail for Replying"
-							states="open" type="object" colspan="2"/>
-						<field name="description" colspan="2" nolabel="1"/>
-						<button name="case_log_reply"
-							string="Send Partner &amp; Historize" states="open"
-							type="object"/>
-						<button name="case_log" string="Historize" states="open"
-							type="object"/>
-					</group>
+                    <separator colspan="4"/>
+                    <field name="history_line" colspan="2" nolabel="1" mode="tree,form">
+                    <form string="Resolution 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" />
+                    </form>
+                    <tree string="Resolution history">
+                        <field name="description"/>
+                        <field name="email"/>
+                        <field name="date"/>
+                    </tree>
+                    </field>
+                    <group col="2" colspan="2" expand="1">
+                        <button name="add_reply" string="Add Last Mail for Replying"
+                            states="open" type="object" colspan="2"/>
+                        <field name="description" colspan="2" nolabel="1"/>
+                        <button name="case_log_reply"
+                            string="Send Partner &amp; Historize" states="open"
+                            type="object"/>
+                        <button name="case_log" string="Historize" states="open"
+                            type="object"/>
+                    </group>
 
-					<separator colspan="4"/>
-					<group col="8" colspan="4">
-						<field name="state" />
-					 	<button name="case_close" string="Done" states="open,draft,pending" type="object"/>
-						<button name="case_open" string="Open" states="draft,pending" type="object"/>
-						<button name="case_cancel" string="Cancel" states="draft,open,pending" type="object"/>
-						<button name="case_pending" string="Pending" states="draft,open" type="object"/>
-						<button name="case_escalate" string="Escalate" states="open,draft,pending" type="object"/>
-						<button name="case_reset" string="Reset to Draft" states="done,cancel" type="object"/>
-					</group>
-				</page>
-				<page string="Internal Notes">
-					<separator string= "Notes" colspan="4"/>
-					<field name="note" nolabel="1"/>
-				</page>
-				<page string="Extra Info">
-					<field name="id" />
-					<field name="active" />
-					<field name="email_cc" colspan="4"/>
-					<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 name="ref" colspan="4"/>
-					<field name="ref2" colspan="4"/>
-				</page>
-				<page string="History">
-					<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>
-				</notebook>
-			</form>
-		</field>
-	</record>
-	<record model="ir.ui.view" id="crm_case_tree_view">
-		<field name="name">CRM - Bug Tracker Tree</field>
-		<field name="model">crm.case</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-			<tree string="Bugs Tree"  colors="red:state=='open'">
-				<field name="id"/>
-				<field name="name" string="Title"/>
-				<field name="partner_id"/>
-				<field name="priority" string="Severity"/>
-				<field name="categ_id"/>
-				<field name="stage_id" string="Resolution"/>
-				<field name="category2_id" string="Version"/>
-				<field name="user_id"/>
-				<field name="state"/>
-			</tree>
-		</field>
-	</record>
-	<record model="ir.ui.view" id="crm_case_calendar_view">
-		<field name="name">CRM - Bug Tracker Calendar</field>
-		<field name="model">crm.case</field>
-		<field name="type">calendar</field>
-		<field name="priority" eval="2"/>
-		<field name="arch" type="xml">
-			<calendar string="Bugs" date_start="date" color="user_id" date_delay="duration">
-				<field name="name"/>
-				<field name="state"/>
-			</calendar>
-		</field>
-	</record>
-	</data>
+                    <separator colspan="4"/>
+                    <group col="8" colspan="4">
+                        <field name="state" />
+                         <button name="case_close" string="Done" states="open,draft,pending" type="object"/>
+                        <button name="case_open" string="Open" states="draft,pending" type="object"/>
+                        <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object"/>
+                        <button name="case_pending" string="Pending" states="draft,open" type="object"/>
+                        <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object"/>
+                        <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object"/>
+                    </group>
+                </page>
+                <page string="Internal Notes">
+                    <separator string= "Notes" colspan="4"/>
+                    <field name="note" nolabel="1"/>
+                </page>
+                <page string="Extra Info">
+                    <field name="id" />
+                    <field name="active" />
+                    <field name="email_cc" colspan="4"/>
+                    <separator colspan="4" string="Dates"/>
+                    <field name="create_date"/>
+                    <field name="date_closed"/>
+                    <field name="date_action_last"/>
+                    <field name="date"/>
+                    <separator colspan="4" string="Estimates"/>
+                    <field name="planned_revenue"/>
+                    <field name="planned_cost"/>
+                    <field name="probability"/>
+                    <separator colspan="4" string="References"/>
+                    <field name="ref" colspan="4"/>
+                    <field name="ref2" colspan="4"/>
+                </page>
+                <page string="History">
+                    <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>
+                </notebook>
+            </form>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="crm_case_tree_view">
+        <field name="name">CRM - Bug Tracker Tree</field>
+        <field name="model">crm.case</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Bugs Tree"  colors="red:state=='open'">
+                <field name="id"/>
+                <field name="name" string="Title"/>
+                <field name="partner_id"/>
+                <field name="priority" string="Severity"/>
+                <field name="categ_id"/>
+                <field name="stage_id" string="Resolution"/>
+                <field name="category2_id" string="Version"/>
+                <field name="user_id"/>
+                <field name="state"/>
+            </tree>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="crm_case_calendar_view">
+        <field name="name">CRM - Bug Tracker Calendar</field>
+        <field name="model">crm.case</field>
+        <field name="type">calendar</field>
+        <field name="priority" eval="2"/>
+        <field name="arch" type="xml">
+            <calendar string="Bugs" date_start="date" color="user_id" date_delay="duration">
+                <field name="name"/>
+                <field name="state"/>
+            </calendar>
+        </field>
+    </record>
+    </data>
 </openerp>
diff --git a/addons/crm_configuration/crm_config.py b/addons/crm_configuration/crm_config.py
index 71d99a581a3..7551d208b8b 100644
--- a/addons/crm_configuration/crm_config.py
+++ b/addons/crm_configuration/crm_config.py
@@ -75,7 +75,6 @@ class crm_cases(osv.osv):
         'partner_phone': fields.char('Phone', size=16),
         'partner_mobile': fields.char('Mobile', size=16),
     }
-
 crm_cases()
 
 class crm_menu_config_wizard(osv.osv_memory):
@@ -103,6 +102,7 @@ class crm_menu_config_wizard(osv.osv_memory):
         if moddemo:
             lst = ('data','menu','demo')
         res = self.read(cr,uid,ids)[0]
+        idref = {}
         for section in ['meeting','lead','opportunity','jobs','bugs','fund','helpdesk'] :
             if (not res[section]):
                 continue
@@ -113,7 +113,9 @@ class crm_menu_config_wizard(osv.osv_memory):
                 except IOError, e:
                     fp = None
                 if fp:
-                    tools.convert_xml_import(cr, 'crm_configuration', fp,  {}, 'init', *args)
+                    tools.convert_xml_import(cr, 'crm_configuration', fp,  idref, 'init', noupdate=True)
+        for name in idref.keys():
+            cr.execute('delete from ir_model_data where name=%s and module=%s', (name, 'crm_configuration'))
         return {
                 'view_type': 'form',
                 "view_mode": 'form',
diff --git a/addons/crm_configuration/crm_fund_demo.xml b/addons/crm_configuration/crm_fund_demo.xml
index e7b6cd2bde5..be402b573c9 100644
--- a/addons/crm_configuration/crm_fund_demo.xml
+++ b/addons/crm_configuration/crm_fund_demo.xml
@@ -1,146 +1,146 @@
 <?xml version="1.0" ?>
 <openerp>
-	<data noupdate="1">
-		<record id="crm_case_helpingstreetchildren0" model="crm.case">
-			<field eval="0.5" name="probability"/>
-			<field name="partner_address_id" ref="base.res_partner_address_1"/>
-			<field eval="1" name="active"/>
-			<field name="category2_id" ref="categ2_fund3"/>
-			<field eval="3.0" name="duration"/>
-			<field name="partner_id" ref="base.res_partner_9"/>
-			<field eval="&quot;3&quot;" name="priority"/>
-			<field name="user_id" ref="base.user_demo"/>
-			<field eval="&quot;open&quot;" name="state"/>
-			<field eval="250000.0" name="planned_cost"/>
-			<field name="section_id" ref="section_support4"/>
-			<field eval="time.strftime('%Y-%m-01 10:35:50')" name="date"/>
-			<field name="categ_id" ref="categ_fund1"/>
-			<field eval="&quot;Helping Street Children&quot;" name="name"/>
-			<field eval="&quot;info@opensides.be&quot;" name="email_from"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="crm_case_helpingearthquakevictims0" model="crm.case">
-			<field eval="0.8" name="probability"/>
-			<field name="partner_address_id" ref="base.main_address"/>
-			<field eval="1" name="active"/>
-			<field name="category2_id" ref="categ2_fund4"/>
-			<field name="partner_id" ref="base.main_partner"/>
-			<field eval="&quot;3&quot;" name="priority"/>
-			<field name="user_id" ref="base.user_root"/>
-			<field eval="&quot;draft&quot;" name="state"/>
-			<field eval="2000000.0" name="planned_cost"/>
-			<field name="section_id" ref="section_support4"/>
-			<field eval="time.strftime('%Y-%m-05 12:35:50')" name="date"/>
-			<field eval="8.0" name="duration"/>
-			<field name="categ_id" ref="categ_fund1"/>
-			<field eval="&quot;Helping earthquake victims&quot;" name="name"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="crm_case_donatingbookstoschoollibraries0" model="crm.case">
-			<field name="partner_address_id" ref="base.res_partner_address_zen"/>
-			<field eval="1" name="active"/>
-			<field name="category2_id" ref="categ2_fund1"/>
-			<field eval="5.0" name="duration"/>
-			<field name="partner_id" ref="base.res_partner_3"/>
-			<field eval="&quot;3&quot;" name="priority"/>
-			<field name="user_id" ref="base.user_root"/>
-			<field eval="&quot;open&quot;" name="state"/>
-			<field eval="500000.0" name="planned_cost"/>
-			<field name="section_id" ref="section_support4"/>
-			<field eval="time.strftime('%Y-%m-07 13:50:50')" name="date"/>
-			<field name="categ_id" ref="categ_fund2"/>
-			<field eval="&quot;Donating books to school libraries&quot;" name="name"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="crm_case_renovatinggovernmentschools0" model="crm.case">
-			<field name="partner_address_id" ref="base.res_partner_address_7"/>
-			<field eval="1" name="active"/>
-			<field name="category2_id" ref="categ2_fund2"/>
-			<field eval="3.0" name="duration"/>
-			<field name="partner_id" ref="base.res_partner_4"/>
-			<field eval="&quot;3&quot;" name="priority"/>
-			<field name="user_id" ref="base.user_demo"/>
-			<field eval="&quot;draft&quot;" name="state"/>
-			<field eval="1000000.0" name="planned_cost"/>
-			<field name="section_id" ref="section_support4"/>
-			<field eval="time.strftime('%Y-%m-12 15:10:50')" name="date"/>
-			<field name="categ_id" ref="categ_fund2"/>
-			<field eval="4.3" name="duration"/>
-			<field eval="&quot;Renovating government schools&quot;" name="name"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="crm_case_donatingambulancestohospitals0" model="crm.case">
-			<field name="partner_address_id" ref="base.res_partner_address_13"/>
-			<field eval="1" name="active"/>
-			<field name="category2_id" ref="categ2_fund4"/>
-			<field name="partner_id" ref="base.res_partner_14"/>
-			<field eval="&quot;3&quot;" name="priority"/>
-			<field name="user_id" ref="base.user_root"/>
-			<field eval="&quot;open&quot;" name="state"/>
-			<field eval="5000000.0" name="planned_cost"/>
-			<field name="section_id" ref="section_support4"/>
-			<field eval="time.strftime('%Y-%m-17 19:00:15')" name="date"/>
-			<field eval="3" name="duration"/>
-			<field name="categ_id" ref="categ_fund3"/>
-			<field eval="&quot;Donating ambulances to hospitals&quot;" name="name"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="crm_case_donatinghospitalequipments0" model="crm.case">
-			<field name="partner_address_id" ref="base.res_partner_address_2"/>
-			<field eval="1" name="active"/>
-			<field name="category2_id" ref="categ2_fund3"/>
-			<field name="partner_id" ref="base.res_partner_10"/>
-			<field eval="&quot;3&quot;" name="priority"/>
-			<field name="user_id" ref="base.user_root"/>
-			<field eval="&quot;done&quot;" name="state"/>
-			<field eval="10000000.0" name="planned_cost"/>
-			<field name="section_id" ref="section_support4"/>
-			<field eval="time.strftime('%Y-%m-27 09:00:15')" name="date"/>
-			<field eval="12" name="duration"/>
-			<field name="categ_id" ref="categ_fund3"/>
-			<field eval="&quot;Donating hospital equipments&quot;" name="name"/>
-			<field eval="&quot;contact@tecsas.fr&quot;" name="email_from"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="crm_case_encouragingarts0" model="crm.case">
-			<field name="partner_address_id" ref="base.res_partner_address_14"/>
-			<field eval="1" name="active"/>
-			<field name="category2_id" ref="categ2_fund2"/>
-			<field eval="7.0" name="duration"/>
-			<field name="partner_id" ref="base.res_partner_15"/>
-			<field eval="&quot;3&quot;" name="priority"/>
-			<field name="user_id" ref="base.user_demo"/>
-			<field eval="&quot;draft&quot;" name="state"/>
-			<field eval="10000.0" name="planned_cost"/>
-			<field name="section_id" ref="section_support4"/>
-			<field eval="time.strftime('%Y-%m-01 10:00:15')" name="date"/>
-			<field name="categ_id" ref="categ_fund4"/>
-			<field eval="&quot;Encouraging arts&quot;" name="name"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="crm_case_promotingculturalprogramsandpreservingdyingartforms0" model="crm.case">
-			<field eval="1.0" name="probability"/>
-			<field name="partner_address_id" ref="base.res_partner_address_1"/>
-			<field eval="1" name="active"/>
-			<field name="category2_id" ref="categ2_fund1"/>
-			<field eval="6.0" name="duration"/>
-			<field name="partner_id" ref="base.res_partner_9"/>
-			<field eval="&quot;3&quot;" name="priority"/>
-			<field name="user_id" ref="base.user_root"/>
-			<field eval="&quot;open&quot;" name="state"/>
-			<field eval="800000.0" name="planned_cost"/>
-			<field name="section_id" ref="section_support4"/>
-			<field eval="time.strftime('%Y-%m-24 22:00:15')" name="date"/>
-			<field name="categ_id" ref="categ_fund4"/>
-			<field eval="&quot;Promoting cultural programs and preserving dying art forms&quot;" name="name"/>
-			<field eval="&quot;info@opensides.be&quot;" name="email_from"/>
-		</record>
-	</data>
+    <data noupdate="1">
+        <record id="crm_case_helpingstreetchildren0" model="crm.case">
+            <field eval="50" name="probability"/>
+            <field name="partner_address_id" ref="base.res_partner_address_1"/>
+            <field eval="1" name="active"/>
+            <field name="category2_id" ref="categ2_fund3"/>
+            <field eval="3.0" name="duration"/>
+            <field name="partner_id" ref="base.res_partner_9"/>
+            <field eval="&quot;3&quot;" name="priority"/>
+            <field name="user_id" ref="base.user_demo"/>
+            <field eval="&quot;open&quot;" name="state"/>
+            <field eval="250000.0" name="planned_cost"/>
+            <field name="section_id" ref="section_support4"/>
+            <field eval="time.strftime('%Y-%m-01 10:35:50')" name="date"/>
+            <field name="categ_id" ref="categ_fund1"/>
+            <field eval="&quot;Helping Street Children&quot;" name="name"/>
+            <field eval="&quot;info@opensides.be&quot;" name="email_from"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="crm_case_helpingearthquakevictims0" model="crm.case">
+            <field eval="80" name="probability"/>
+            <field name="partner_address_id" ref="base.main_address"/>
+            <field eval="1" name="active"/>
+            <field name="category2_id" ref="categ2_fund4"/>
+            <field name="partner_id" ref="base.main_partner"/>
+            <field eval="&quot;3&quot;" name="priority"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field eval="&quot;draft&quot;" name="state"/>
+            <field eval="2000000.0" name="planned_cost"/>
+            <field name="section_id" ref="section_support4"/>
+            <field eval="time.strftime('%Y-%m-05 12:35:50')" name="date"/>
+            <field eval="8.0" name="duration"/>
+            <field name="categ_id" ref="categ_fund1"/>
+            <field eval="&quot;Helping earthquake victims&quot;" name="name"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="crm_case_donatingbookstoschoollibraries0" model="crm.case">
+            <field name="partner_address_id" ref="base.res_partner_address_zen"/>
+            <field eval="1" name="active"/>
+            <field name="category2_id" ref="categ2_fund1"/>
+            <field eval="5.0" name="duration"/>
+            <field name="partner_id" ref="base.res_partner_3"/>
+            <field eval="&quot;3&quot;" name="priority"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field eval="&quot;open&quot;" name="state"/>
+            <field eval="500000.0" name="planned_cost"/>
+            <field name="section_id" ref="section_support4"/>
+            <field eval="time.strftime('%Y-%m-07 13:50:50')" name="date"/>
+            <field name="categ_id" ref="categ_fund2"/>
+            <field eval="&quot;Donating books to school libraries&quot;" name="name"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="crm_case_renovatinggovernmentschools0" model="crm.case">
+            <field name="partner_address_id" ref="base.res_partner_address_7"/>
+            <field eval="1" name="active"/>
+            <field name="category2_id" ref="categ2_fund2"/>
+            <field eval="3.0" name="duration"/>
+            <field name="partner_id" ref="base.res_partner_4"/>
+            <field eval="&quot;3&quot;" name="priority"/>
+            <field name="user_id" ref="base.user_demo"/>
+            <field eval="&quot;draft&quot;" name="state"/>
+            <field eval="1000000.0" name="planned_cost"/>
+            <field name="section_id" ref="section_support4"/>
+            <field eval="time.strftime('%Y-%m-12 15:10:50')" name="date"/>
+            <field name="categ_id" ref="categ_fund2"/>
+            <field eval="4.3" name="duration"/>
+            <field eval="&quot;Renovating government schools&quot;" name="name"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="crm_case_donatingambulancestohospitals0" model="crm.case">
+            <field name="partner_address_id" ref="base.res_partner_address_13"/>
+            <field eval="1" name="active"/>
+            <field name="category2_id" ref="categ2_fund4"/>
+            <field name="partner_id" ref="base.res_partner_14"/>
+            <field eval="&quot;3&quot;" name="priority"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field eval="&quot;open&quot;" name="state"/>
+            <field eval="5000000.0" name="planned_cost"/>
+            <field name="section_id" ref="section_support4"/>
+            <field eval="time.strftime('%Y-%m-17 19:00:15')" name="date"/>
+            <field eval="3" name="duration"/>
+            <field name="categ_id" ref="categ_fund3"/>
+            <field eval="&quot;Donating ambulances to hospitals&quot;" name="name"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="crm_case_donatinghospitalequipments0" model="crm.case">
+            <field name="partner_address_id" ref="base.res_partner_address_2"/>
+            <field eval="1" name="active"/>
+            <field name="category2_id" ref="categ2_fund3"/>
+            <field name="partner_id" ref="base.res_partner_10"/>
+            <field eval="&quot;3&quot;" name="priority"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field eval="&quot;done&quot;" name="state"/>
+            <field eval="10000000.0" name="planned_cost"/>
+            <field name="section_id" ref="section_support4"/>
+            <field eval="time.strftime('%Y-%m-27 09:00:15')" name="date"/>
+            <field eval="12" name="duration"/>
+            <field name="categ_id" ref="categ_fund3"/>
+            <field eval="&quot;Donating hospital equipments&quot;" name="name"/>
+            <field eval="&quot;contact@tecsas.fr&quot;" name="email_from"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="crm_case_encouragingarts0" model="crm.case">
+            <field name="partner_address_id" ref="base.res_partner_address_14"/>
+            <field eval="1" name="active"/>
+            <field name="category2_id" ref="categ2_fund2"/>
+            <field eval="7.0" name="duration"/>
+            <field name="partner_id" ref="base.res_partner_15"/>
+            <field eval="&quot;3&quot;" name="priority"/>
+            <field name="user_id" ref="base.user_demo"/>
+            <field eval="&quot;draft&quot;" name="state"/>
+            <field eval="10000.0" name="planned_cost"/>
+            <field name="section_id" ref="section_support4"/>
+            <field eval="time.strftime('%Y-%m-01 10:00:15')" name="date"/>
+            <field name="categ_id" ref="categ_fund4"/>
+            <field eval="&quot;Encouraging arts&quot;" name="name"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="crm_case_promotingculturalprogramsandpreservingdyingartforms0" model="crm.case">
+            <field eval="10" name="probability"/>
+            <field name="partner_address_id" ref="base.res_partner_address_1"/>
+            <field eval="1" name="active"/>
+            <field name="category2_id" ref="categ2_fund1"/>
+            <field eval="6.0" name="duration"/>
+            <field name="partner_id" ref="base.res_partner_9"/>
+            <field eval="&quot;3&quot;" name="priority"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field eval="&quot;open&quot;" name="state"/>
+            <field eval="800000.0" name="planned_cost"/>
+            <field name="section_id" ref="section_support4"/>
+            <field eval="time.strftime('%Y-%m-24 22:00:15')" name="date"/>
+            <field name="categ_id" ref="categ_fund4"/>
+            <field eval="&quot;Promoting cultural programs and preserving dying art forms&quot;" name="name"/>
+            <field eval="&quot;info@opensides.be&quot;" name="email_from"/>
+        </record>
+    </data>
 </openerp>
diff --git a/addons/crm_configuration/crm_fund_view.xml b/addons/crm_configuration/crm_fund_view.xml
index 8385c45b088..070a39f55bd 100644
--- a/addons/crm_configuration/crm_fund_view.xml
+++ b/addons/crm_configuration/crm_fund_view.xml
@@ -1,149 +1,149 @@
 <?xml version="1.0"?>
 <openerp>
-<data noupdate="1">
+<data>
 
-	# ------------------------------------------------------ 
-	# Fund Raising
-	# ------------------------------------------------------ 
-	<record model="ir.ui.view" id="crm_case_tree_view_fund">
-		<field name="name">CRM - Funds Tree</field>
-		<field name="model">crm.case</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-			<tree string="Funds Tree"  colors="red:state=='open'">
-				<field name="id"/>
-				<field name="name" string="Funds"/>
-				<field name="categ_id"/>
-				<field name="category2_id" string="Payment Mode"/>
-				<field name="planned_cost" string="Amount"/>
-				<field name="probability"/>
-				<field name="user_id"/>
-				<field name="state"/>
-			</tree>
-		</field>
-	</record>
-	<record model="ir.ui.view" id="crm_case_form_view_fund">
-		<field name="name">CRM - Funds Form</field>
-		<field name="model">crm.case</field>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-			<form string="Funds Form">
-				<group colspan="4" col="6">
-					<field name="name" select="1" string="Name" colspan="2"/>
-					<field name="section_id" colspan="1"/>
-					<field name="categ_id" select="1" on_change="onchange_categ_id(categ_id)"/>
-					<newline/>
-					<field name="date" string="Next Meeting"/>
-					<field name="duration" string="Meeting Duration"/>
-					<field name="category2_id" select="1" string="Payment Mode"/>
-				</group>
-				<notebook>
-				<page string="Funds">
-					<field name="partner_id" select="1" 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"/>
-					<field name="user_id" select="2" string="Responsible"/>
-					<separator colspan="4" string="Estimates"/>
-					<field name="planned_cost"/>
-					<field name="planned_revenue"/>
-					<field name="probability" colspan="4"/>
-					<separator colspan="4" string="Description Information"/>
-						<field name="note" nolabel="1" colspan="4"/>
-					<separator colspan="4"/>
-					<group col="8" colspan="4">
-						<field name="state" select="2"/> 
-					 	<button name="case_close" string="Done" states="open,draft,pending" type="object"/>
-						<button name="case_open" string="Open" states="draft,pending" type="object"/>
-						<button name="case_cancel" string="Cancel" states="draft,open,pending" type="object"/>
-						<button name="case_pending" string="Pending" states="draft,open" type="object"/>
-						<button name="case_escalate" string="Escalate" states="open,draft,pending" type="object"/>
-						<button name="case_reset" string="Reset to Draft" states="done,cancel" type="object"/>
-					</group>
-				</page>
-				<page string="Extra Info">
-					<field name="id"/>
-					<field name="active"/>
-					<field name="email_cc"/>
-					<field name="priority" string="Priority"/>
-					<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"/>
-					<field name="history_line" colspan="2" nolabel="1" mode="tree,form">
-						<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"/>
-						</form>
-						<tree string="Communication history">
-							<field name="description"/>
-							<field name="email"/>
-							<field name="date"/>
-						</tree>
-					</field>
-					<group col="2" colspan="2" expand="1">
-						<field name="canal_id"/>
-						<field name="som"/>
-						<button name="add_reply" string="Add Last Mail for Replying"
-							states="open" type="object" colspan="2"/>
-						<field name="description" colspan="2" nolabel="1"/>
-						<button name="case_log_reply"
-							string="Send Partner &amp; Historize" states="open"
-							type="object"/>
-						<button name="case_log" string="Historize" states="open"
-							type="object"/>
-					</group>
+    # ------------------------------------------------------ 
+    # Fund Raising
+    # ------------------------------------------------------ 
+    <record model="ir.ui.view" id="crm_case_tree_view_fund">
+        <field name="name">CRM - Funds Tree</field>
+        <field name="model">crm.case</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Funds Tree"  colors="red:state=='open'">
+                <field name="id"/>
+                <field name="name" string="Funds"/>
+                <field name="categ_id"/>
+                <field name="category2_id" string="Payment Mode"/>
+                <field name="planned_cost" string="Amount"/>
+                <field name="probability"/>
+                <field name="user_id"/>
+                <field name="state"/>
+            </tree>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="crm_case_form_view_fund">
+        <field name="name">CRM - Funds Form</field>
+        <field name="model">crm.case</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Funds Form">
+                <group colspan="4" col="6">
+                    <field name="name" select="1" string="Name" colspan="2"/>
+                    <field name="section_id" colspan="1"/>
+                    <field name="categ_id" select="1" on_change="onchange_categ_id(categ_id)"/>
+                    <newline/>
+                    <field name="date" string="Next Meeting"/>
+                    <field name="duration"/>
+                    <field name="category2_id" select="1" string="Payment Mode"/>
+                </group>
+                <notebook>
+                <page string="Funds">
+                    <field name="partner_id" select="1" 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"/>
+                    <field name="user_id" select="2" string="Responsible"/>
+                    <separator colspan="4" string="Estimates"/>
+                    <field name="planned_cost"/>
+                    <field name="planned_revenue"/>
+                    <field name="probability"/>
+                    <separator colspan="4" string="Description Information"/>
+                        <field name="note" nolabel="1" colspan="4"/>
+                    <separator colspan="4"/>
+                    <group col="8" colspan="4">
+                        <field name="state" select="2"/> 
+                         <button name="case_close" string="Done" states="open,draft,pending" type="object"/>
+                        <button name="case_open" string="Open" states="draft,pending" type="object"/>
+                        <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object"/>
+                        <button name="case_pending" string="Pending" states="draft,open" type="object"/>
+                        <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object"/>
+                        <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object"/>
+                    </group>
+                </page>
+                <page string="Extra Info">
+                    <field name="id"/>
+                    <field name="active"/>
+                    <field name="email_cc"/>
+                    <field name="priority" string="Priority"/>
+                    <separator colspan="4" string="Dates"/>
+                    <field name="create_date"/>
+                    <field name="date_closed"/>
+                    <field name="date_action_last"/>
+                    <field name="date"/>
+                    <separator colspan="4"/>
+                    <field name="history_line" colspan="2" nolabel="1" mode="tree,form">
+                        <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"/>
+                        </form>
+                        <tree string="Communication history">
+                            <field name="description"/>
+                            <field name="email"/>
+                            <field name="date"/>
+                        </tree>
+                    </field>
+                    <group col="2" colspan="2" expand="1">
+                        <field name="canal_id"/>
+                        <field name="som"/>
+                        <button name="add_reply" string="Add Last Mail for Replying"
+                            states="open" type="object" colspan="2"/>
+                        <field name="description" colspan="2" nolabel="1"/>
+                        <button name="case_log_reply"
+                            string="Send Partner &amp; Historize" states="open"
+                            type="object"/>
+                        <button name="case_log" string="Historize" states="open"
+                            type="object"/>
+                    </group>
 
-					<separator colspan="4" string="References"/>
-					<field name="ref" colspan="4"/>
-					<field name="ref2" colspan="4"/>
-				</page>
-				<page string="History">
-					<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>
-				</notebook>
-			</form>
-		</field>
-	</record>
-	<record model="ir.ui.view" id="crm_case_calendar_view_fund">
-		<field name="name">CRM - Funds Calendar</field>
-		<field name="model">crm.case</field>
-		<field name="type">calendar</field>
-		<field name="priority" eval="2"/>
-		<field name="arch" type="xml">
-			<calendar string="Funds" date_start="date" color="user_id" date_delay="duration">
-				<field name="name"/>
-				<field name="section_id"/>
-			</calendar>
-		</field>
-	</record>
-	<record model="ir.ui.view" id="crm_case_graph_view_fund">
-		<field name="name">CRM - Funds Graph</field>
-		<field name="model">crm.case</field>
-		<field name="type">graph</field>
-		<field name="arch" type="xml">
-			<graph string="Funds by Categories" type="bar" orientation="horizontal">
-				<field name="categ_id"/>
-				<field name="planned_cost" operator="+"/>
-				<field name="state" group="True"/>
-			</graph>
-		</field>
-	</record>
+                    <separator colspan="4" string="References"/>
+                    <field name="ref" colspan="4"/>
+                    <field name="ref2" colspan="4"/>
+                </page>
+                <page string="History">
+                    <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>
+                </notebook>
+            </form>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="crm_case_calendar_view_fund">
+        <field name="name">CRM - Funds Calendar</field>
+        <field name="model">crm.case</field>
+        <field name="type">calendar</field>
+        <field name="priority" eval="2"/>
+        <field name="arch" type="xml">
+            <calendar string="Funds" date_start="date" color="user_id" date_delay="duration">
+                <field name="name"/>
+                <field name="section_id"/>
+            </calendar>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="crm_case_graph_view_fund">
+        <field name="name">CRM - Funds Graph</field>
+        <field name="model">crm.case</field>
+        <field name="type">graph</field>
+        <field name="arch" type="xml">
+            <graph string="Funds by Categories" type="bar" orientation="horizontal">
+                <field name="categ_id"/>
+                <field name="planned_cost" operator="+"/>
+                <field name="state" group="True"/>
+            </graph>
+        </field>
+    </record>
 </data>
 </openerp>
diff --git a/addons/crm_configuration/crm_helpdesk_menu.xml b/addons/crm_configuration/crm_helpdesk_menu.xml
index 6a3c21d347e..9413bc08496 100644
--- a/addons/crm_configuration/crm_helpdesk_menu.xml
+++ b/addons/crm_configuration/crm_helpdesk_menu.xml
@@ -1,372 +1,373 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
-	<record id="crm.section_support_help" model="crm.case.section">
+    <menuitem id="menu_aftersale" name="After-Sale Services" parent="crm.menu_crm"/>
+    <record id="crm.section_support_help" model="crm.case.section">
             <field name="name">Helpdesk and Support</field>
             <field name="code">support</field>
     </record>
     ######################## Help Desk (menu) ###########################
-	<record model="ir.actions.act_window" id="crm_case_helpdesk_act111">
-		<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="domain" eval="'[(\'section_id\',\'=\','+str(ref('crm.section_support_help'))+')]'"/>
-	</record>
-	<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="act_window_id" ref="crm_case_helpdesk_act111"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_act111">
-		<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_act111"/>
-	</record>
-	<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="act_window_id" ref="crm_case_helpdesk_act111"/>
-	</record>   
-	<menuitem name="Helpdesk and Support" id="menu_help_support_main" parent="crm.menu_crm" 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.crm_case_tree-view"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('crm.section_support_help'))+'),(\'user_id\',\'=\',uid)]'"/>
-	</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.crm_case_tree-view"/>
-		<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.crm_case-view"/>
-		<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"/>
-	
-	<record model="ir.actions.act_window" id="crm_case_categ_help_new_act">
-		<field name="name">New Helpdesk</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">form,tree</field>
-		<field name="view_id" ref="crm.crm_case-view"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('crm.section_support_help'))+')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_helpdesk_tree_view1">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm.crm_case_tree-view"/>
-		<field name="act_window_id" ref="crm_case_categ_help_new_act"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_helpdesk_tree_view2">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm.crm_case-view"/>
-		<field name="act_window_id" ref="crm_case_categ_help_new_act"/>
-	</record>
-	
-	<menuitem parent="menu_crm_case_helpdesk_my_act" id="menu_crm_case_categ_help_new_act" action="crm_case_categ_help_new_act" sequence="1"/>
+    <record model="ir.actions.act_window" id="crm_case_helpdesk_act111">
+        <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="domain" eval="'[(\'section_id\',\'=\','+str(ref('crm.section_support_help'))+')]'"/>
+    </record>
+    <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="act_window_id" ref="crm_case_helpdesk_act111"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_act111">
+        <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_act111"/>
+    </record>
+    <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="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_helpdesk_act_my1">
-		<field name="name">My Unclosed Requests</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,calendar,form</field>
-		<field name="view_id" ref="crm.crm_case_tree-view"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('crm.section_support_help'))+'),(\'user_id\',\'=\',uid),(\'state\',\'&lt;&gt;\',\'done\')]'"/>
-	</record>
-	
-	<record model="ir.actions.act_window.view" id="action_crm_helpdesk_tree_view_my1">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm.crm_case_tree-view"/>
-		<field name="act_window_id" ref="crm_case_helpdesk_act_my1"/>
-	</record>
-	
-	<record model="ir.actions.act_window.view" id="action_crm_helpdesk_calendar_view_my1">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm.crm_case_calendar-view"/>
-		<field name="act_window_id" ref="crm_case_helpdesk_act_my1"/>
-	</record>
-	
-	<record model="ir.actions.act_window.view" id="action_crm_helpdesk_form_view_my1">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm.crm_case-view"/>
-		<field name="act_window_id" ref="crm_case_helpdesk_act_my1"/>
-	</record>
-	
-	<menuitem parent="menu_crm_case_helpdesk_my_act" id="menu_crm_case_helpdesk_act_my_helpdesk" action="crm_case_helpdesk_act_my1"/>	
+    <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.crm_case_tree-view"/>
+        <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('crm.section_support_help'))+'),(\'user_id\',\'=\',uid)]'"/>
+    </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.crm_case_tree-view"/>
+        <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.crm_case-view"/>
+        <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"/>
+    
+    <record model="ir.actions.act_window" id="crm_case_categ_help_new_act">
+        <field name="name">New Helpdesk</field>
+        <field name="res_model">crm.case</field>
+        <field name="view_mode">form,tree</field>
+        <field name="view_id" ref="crm.crm_case-view"/>
+        <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('crm.section_support_help'))+')]'"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_helpdesk_tree_view1">
+        <field name="sequence" eval="2"/>
+        <field name="view_mode">tree</field>
+        <field name="view_id" ref="crm.crm_case_tree-view"/>
+        <field name="act_window_id" ref="crm_case_categ_help_new_act"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_helpdesk_tree_view2">
+        <field name="sequence" eval="1"/>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="crm.crm_case-view"/>
+        <field name="act_window_id" ref="crm_case_categ_help_new_act"/>
+    </record>
+    
+    <menuitem parent="menu_help_support_main" id="menu_crm_case_categ_help_new_act" action="crm_case_categ_help_new_act" sequence="1"/>
 
-	<record model="ir.actions.act_window" id="crm_case_helpdesk_act_my2">
-		<field name="name">My helpdesk Propositions to Review</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,calendar,form</field>
-		<field name="view_id" ref="crm.crm_case_tree-view"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('crm.section_support_help'))+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'draft\')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_my2">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm.crm_case_tree-view"/>
-		<field name="act_window_id" ref="crm_case_helpdesk_act_my2"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_my2">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm.crm_case_calendar-view"/>
-		<field name="act_window_id" ref="crm_case_helpdesk_act_my2"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_form_view_my2">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm.crm_case-view"/>
-		<field name="act_window_id" ref="crm_case_helpdesk_act_my2"/>
-	</record>
-	<menuitem parent="menu_crm_case_helpdesk_my_act" id="menu_crm_case_helpdesk_act_myhelpdesk2" action="crm_case_helpdesk_act_my2"/>	
+    <record model="ir.actions.act_window" id="crm_case_helpdesk_act_my1">
+        <field name="name">My Unclosed Requests</field>
+        <field name="res_model">crm.case</field>
+        <field name="view_mode">tree,calendar,form</field>
+        <field name="view_id" ref="crm.crm_case_tree-view"/>
+        <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('crm.section_support_help'))+'),(\'user_id\',\'=\',uid),(\'state\',\'&lt;&gt;\',\'done\')]'"/>
+    </record>
+    
+    <record model="ir.actions.act_window.view" id="action_crm_helpdesk_tree_view_my1">
+        <field name="sequence" eval="1"/>
+        <field name="view_mode">tree</field>
+        <field name="view_id" ref="crm.crm_case_tree-view"/>
+        <field name="act_window_id" ref="crm_case_helpdesk_act_my1"/>
+    </record>
+    
+    <record model="ir.actions.act_window.view" id="action_crm_helpdesk_calendar_view_my1">
+        <field name="sequence" eval="3"/>
+        <field name="view_mode">calendar</field>
+        <field name="view_id" ref="crm.crm_case_calendar-view"/>
+        <field name="act_window_id" ref="crm_case_helpdesk_act_my1"/>
+    </record>
+    
+    <record model="ir.actions.act_window.view" id="action_crm_helpdesk_form_view_my1">
+        <field name="sequence" eval="2"/>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="crm.crm_case-view"/>
+        <field name="act_window_id" ref="crm_case_helpdesk_act_my1"/>
+    </record>
+    
+    <menuitem parent="menu_crm_case_helpdesk_my_act" id="menu_crm_case_helpdesk_act_my_helpdesk" action="crm_case_helpdesk_act_my1"/>    
 
-	<record model="ir.actions.act_window" id="crm_case_helpdesk_act_my1">
-		<field name="name">My Pending helpdesk Requests</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,calendar,form</field>
-		<field name="view_id" ref="crm.crm_case_tree-view"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('crm.section_support_help'))+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'pending\')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_my1">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm.crm_case_tree-view"/>
-		<field name="act_window_id" ref="crm_case_helpdesk_act_my1"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_my1">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm.crm_case_calendar-view"/>
-		<field name="act_window_id" ref="crm_case_helpdesk_act_my1"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_form_view_my1">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm.crm_case-view"/>
-		<field name="act_window_id" ref="crm_case_helpdesk_act_my1"/>
-	</record>
-	<menuitem parent="menu_crm_case_helpdesk_my_act" id="menu_crm_case_helpdesk_act_myhelpdesk1" action="crm_case_helpdesk_act_my1"/>		
+    <record model="ir.actions.act_window" id="crm_case_helpdesk_act_my2">
+        <field name="name">My helpdesk Propositions to Review</field>
+        <field name="res_model">crm.case</field>
+        <field name="view_mode">tree,calendar,form</field>
+        <field name="view_id" ref="crm.crm_case_tree-view"/>
+        <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('crm.section_support_help'))+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'draft\')]'"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_my2">
+        <field name="sequence" eval="1"/>
+        <field name="view_mode">tree</field>
+        <field name="view_id" ref="crm.crm_case_tree-view"/>
+        <field name="act_window_id" ref="crm_case_helpdesk_act_my2"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_my2">
+        <field name="sequence" eval="2"/>
+        <field name="view_mode">calendar</field>
+        <field name="view_id" ref="crm.crm_case_calendar-view"/>
+        <field name="act_window_id" ref="crm_case_helpdesk_act_my2"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_sec_form_view_my2">
+        <field name="sequence" eval="3"/>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="crm.crm_case-view"/>
+        <field name="act_window_id" ref="crm_case_helpdesk_act_my2"/>
+    </record>
+    <menuitem parent="menu_crm_case_helpdesk_my_act" id="menu_crm_case_helpdesk_act_myhelpdesk2" action="crm_case_helpdesk_act_my2"/>    
 
-	<record model="ir.actions.act_window" id="crm_case_helpdesk_act_my0">
-		<field name="name">My Open Helpdesk Requests</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,calendar,form</field>
-		<field name="view_id" ref="crm.crm_case_tree-view"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('crm.section_support_help'))+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'open\')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_my0">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm.crm_case_tree-view"/>
-		<field name="act_window_id" ref="crm_case_helpdesk_act_my0"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_my0">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm.crm_case_calendar-view"/>
-		<field name="act_window_id" ref="crm_case_helpdesk_act_my0"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_form_view_my0">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm.crm_case-view"/>
-		<field name="act_window_id" ref="crm_case_helpdesk_act_my0"/>
-	</record>
-	<menuitem parent="menu_crm_case_helpdesk_my_act" id="menu_crm_case_helpdesk_act_myhelpdesk0" action="crm_case_helpdesk_act_my0"/>	
-		
-	
-	<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('crm.section_support_help'))+'),(\'state\',\'=\',\'done\'),(\'user_id\',\'=\',uid)]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_myhelpdesk">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm.crm_case_calendar-view"/>
-		<field name="act_window_id" ref="crm_case_helpdesk_act_myhelpdesk"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_myhelpdesk">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm.crm_case_tree-view"/>
-		<field name="act_window_id" ref="crm_case_helpdesk_act_myhelpdesk"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_form_view_myhelpdesk">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm.crm_case-view"/>
-		<field name="act_window_id" ref="crm_case_helpdesk_act_myhelpdesk"/>
-	</record>	
-	<menuitem parent="menu_crm_case_helpdesk_my_act" id="menu_crm_case_helpdesk_act_myhelpdesk" action="crm_case_helpdesk_act_myhelpdesk"/>
-	
-	<!-- 
-		ALL Helpdesk REQUESTS 
-	-->
+    <record model="ir.actions.act_window" id="crm_case_helpdesk_act_my1">
+        <field name="name">My Pending helpdesk Requests</field>
+        <field name="res_model">crm.case</field>
+        <field name="view_mode">tree,calendar,form</field>
+        <field name="view_id" ref="crm.crm_case_tree-view"/>
+        <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('crm.section_support_help'))+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'pending\')]'"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_my1">
+        <field name="sequence" eval="1"/>
+        <field name="view_mode">tree</field>
+        <field name="view_id" ref="crm.crm_case_tree-view"/>
+        <field name="act_window_id" ref="crm_case_helpdesk_act_my1"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_my1">
+        <field name="sequence" eval="2"/>
+        <field name="view_mode">calendar</field>
+        <field name="view_id" ref="crm.crm_case_calendar-view"/>
+        <field name="act_window_id" ref="crm_case_helpdesk_act_my1"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_sec_form_view_my1">
+        <field name="sequence" eval="3"/>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="crm.crm_case-view"/>
+        <field name="act_window_id" ref="crm_case_helpdesk_act_my1"/>
+    </record>
+    <menuitem parent="menu_crm_case_helpdesk_my_act" id="menu_crm_case_helpdesk_act_myhelpdesk1" action="crm_case_helpdesk_act_my1"/>        
 
-	<menuitem parent="menu_help_support_main" id="menu_crm_case_helpdesk_act_all" action="crm_case_helpdesk_act111"/>	
-	
+    <record model="ir.actions.act_window" id="crm_case_helpdesk_act_my0">
+        <field name="name">My Open Helpdesk Requests</field>
+        <field name="res_model">crm.case</field>
+        <field name="view_mode">tree,calendar,form</field>
+        <field name="view_id" ref="crm.crm_case_tree-view"/>
+        <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('crm.section_support_help'))+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'open\')]'"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_my0">
+        <field name="sequence" eval="1"/>
+        <field name="view_mode">tree</field>
+        <field name="view_id" ref="crm.crm_case_tree-view"/>
+        <field name="act_window_id" ref="crm_case_helpdesk_act_my0"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_my0">
+        <field name="sequence" eval="2"/>
+        <field name="view_mode">calendar</field>
+        <field name="view_id" ref="crm.crm_case_calendar-view"/>
+        <field name="act_window_id" ref="crm_case_helpdesk_act_my0"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_sec_form_view_my0">
+        <field name="sequence" eval="3"/>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="crm.crm_case-view"/>
+        <field name="act_window_id" ref="crm_case_helpdesk_act_my0"/>
+    </record>
+    <menuitem parent="menu_crm_case_helpdesk_my_act" id="menu_crm_case_helpdesk_act_myhelpdesk0" action="crm_case_helpdesk_act_my0"/>    
+        
+    
+    <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('crm.section_support_help'))+'),(\'state\',\'=\',\'done\'),(\'user_id\',\'=\',uid)]'"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_myhelpdesk">
+        <field name="sequence" eval="1"/>
+        <field name="view_mode">calendar</field>
+        <field name="view_id" ref="crm.crm_case_calendar-view"/>
+        <field name="act_window_id" ref="crm_case_helpdesk_act_myhelpdesk"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_myhelpdesk">
+        <field name="sequence" eval="2"/>
+        <field name="view_mode">tree</field>
+        <field name="view_id" ref="crm.crm_case_tree-view"/>
+        <field name="act_window_id" ref="crm_case_helpdesk_act_myhelpdesk"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_sec_form_view_myhelpdesk">
+        <field name="sequence" eval="3"/>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="crm.crm_case-view"/>
+        <field name="act_window_id" ref="crm_case_helpdesk_act_myhelpdesk"/>
+    </record>    
+    <menuitem parent="menu_crm_case_helpdesk_my_act" id="menu_crm_case_helpdesk_act_myhelpdesk" action="crm_case_helpdesk_act_myhelpdesk"/>
+    
+    <!-- 
+        ALL Helpdesk REQUESTS 
+    -->
 
-	<record model="ir.actions.act_window" id="crm_case_helpdesk_act_all3">
-		<field name="name">All Unclosed Requests</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,calendar,form</field>
-		<field name="view_id" ref="crm.crm_case_tree-view"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('crm.section_support_help'))+'),(\'state\',\'&lt;&gt;\',\'done\')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_all3">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm.crm_case_tree-view"/>
-		<field name="act_window_id" ref="crm_case_helpdesk_act_all3"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_all3">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm.crm_case_calendar-view"/>
-		<field name="act_window_id" ref="crm_case_helpdesk_act_all3"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_form_view_all3">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm.crm_case-view"/>
-		<field name="act_window_id" ref="crm_case_helpdesk_act_all3"/>
-	</record>
-	<menuitem parent="menu_crm_case_helpdesk_act_all" id="menu_crm_case_helpdesk_act_myhelpdesk_all3" action="crm_case_helpdesk_act_all3"/>
+    <menuitem parent="menu_help_support_main" id="menu_crm_case_helpdesk_act_all" action="crm_case_helpdesk_act111"/>    
+    
 
-	<record model="ir.actions.act_window" id="crm_case_helpdesk_act_all2">
-		<field name="name">All Helpdesk Propositions</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,calendar,form</field>
-		<field name="view_id" ref="crm.crm_case_tree-view"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('crm.section_support_help'))+'),(\'state\',\'=\',\'draft\')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_all2">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm.crm_case_tree-view"/>
-		<field name="act_window_id" ref="crm_case_helpdesk_act_all2"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_all2">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm.crm_case_calendar-view"/>
-		<field name="act_window_id" ref="crm_case_helpdesk_act_all2"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_form_view_all2">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm.crm_case-view"/>
-		<field name="act_window_id" ref="crm_case_helpdesk_act_all2"/>
-	</record>
-	<menuitem parent="menu_crm_case_helpdesk_act_all" id="menu_crm_case_helpdesk_act_myhelpdesk_all2" action="crm_case_helpdesk_act_all2"/>	
+    <record model="ir.actions.act_window" id="crm_case_helpdesk_act_all3">
+        <field name="name">All Unclosed Requests</field>
+        <field name="res_model">crm.case</field>
+        <field name="view_mode">tree,calendar,form</field>
+        <field name="view_id" ref="crm.crm_case_tree-view"/>
+        <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('crm.section_support_help'))+'),(\'state\',\'&lt;&gt;\',\'done\')]'"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_all3">
+        <field name="sequence" eval="1"/>
+        <field name="view_mode">tree</field>
+        <field name="view_id" ref="crm.crm_case_tree-view"/>
+        <field name="act_window_id" ref="crm_case_helpdesk_act_all3"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_all3">
+        <field name="sequence" eval="2"/>
+        <field name="view_mode">calendar</field>
+        <field name="view_id" ref="crm.crm_case_calendar-view"/>
+        <field name="act_window_id" ref="crm_case_helpdesk_act_all3"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_sec_form_view_all3">
+        <field name="sequence" eval="3"/>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="crm.crm_case-view"/>
+        <field name="act_window_id" ref="crm_case_helpdesk_act_all3"/>
+    </record>
+    <menuitem parent="menu_crm_case_helpdesk_act_all" id="menu_crm_case_helpdesk_act_myhelpdesk_all3" action="crm_case_helpdesk_act_all3"/>
 
-	<record model="ir.actions.act_window" id="crm_case_helpdesk_act_all1">
-		<field name="name">All Pending Helpdesk Requests</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,calendar,form</field>
-		<field name="view_id" ref="crm.crm_case_tree-view"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('crm.section_support_help'))+'),(\'state\',\'=\',\'pending\')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_all1">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm.crm_case_tree-view"/>
-		<field name="act_window_id" ref="crm_case_helpdesk_act_all1"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_all1">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm.crm_case_calendar-view"/>
-		<field name="act_window_id" ref="crm_case_helpdesk_act_all1"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_form_view_all1">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm.crm_case-view"/>
-		<field name="act_window_id" ref="crm_case_helpdesk_act_all1"/>
-	</record>
-	<menuitem  parent="menu_crm_case_helpdesk_act_all" id="menu_crm_case_helpdesk_act_myhelpdesk_all1" action="crm_case_helpdesk_act_all1"/>	
+    <record model="ir.actions.act_window" id="crm_case_helpdesk_act_all2">
+        <field name="name">All Helpdesk Propositions</field>
+        <field name="res_model">crm.case</field>
+        <field name="view_mode">tree,calendar,form</field>
+        <field name="view_id" ref="crm.crm_case_tree-view"/>
+        <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('crm.section_support_help'))+'),(\'state\',\'=\',\'draft\')]'"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_all2">
+        <field name="sequence" eval="1"/>
+        <field name="view_mode">tree</field>
+        <field name="view_id" ref="crm.crm_case_tree-view"/>
+        <field name="act_window_id" ref="crm_case_helpdesk_act_all2"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_all2">
+        <field name="sequence" eval="2"/>
+        <field name="view_mode">calendar</field>
+        <field name="view_id" ref="crm.crm_case_calendar-view"/>
+        <field name="act_window_id" ref="crm_case_helpdesk_act_all2"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_sec_form_view_all2">
+        <field name="sequence" eval="3"/>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="crm.crm_case-view"/>
+        <field name="act_window_id" ref="crm_case_helpdesk_act_all2"/>
+    </record>
+    <menuitem parent="menu_crm_case_helpdesk_act_all" id="menu_crm_case_helpdesk_act_myhelpdesk_all2" action="crm_case_helpdesk_act_all2"/>    
+
+    <record model="ir.actions.act_window" id="crm_case_helpdesk_act_all1">
+        <field name="name">All Pending Helpdesk Requests</field>
+        <field name="res_model">crm.case</field>
+        <field name="view_mode">tree,calendar,form</field>
+        <field name="view_id" ref="crm.crm_case_tree-view"/>
+        <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('crm.section_support_help'))+'),(\'state\',\'=\',\'pending\')]'"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_all1">
+        <field name="sequence" eval="1"/>
+        <field name="view_mode">tree</field>
+        <field name="view_id" ref="crm.crm_case_tree-view"/>
+        <field name="act_window_id" ref="crm_case_helpdesk_act_all1"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_all1">
+        <field name="sequence" eval="2"/>
+        <field name="view_mode">calendar</field>
+        <field name="view_id" ref="crm.crm_case_calendar-view"/>
+        <field name="act_window_id" ref="crm_case_helpdesk_act_all1"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_sec_form_view_all1">
+        <field name="sequence" eval="3"/>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="crm.crm_case-view"/>
+        <field name="act_window_id" ref="crm_case_helpdesk_act_all1"/>
+    </record>
+    <menuitem  parent="menu_crm_case_helpdesk_act_all" id="menu_crm_case_helpdesk_act_myhelpdesk_all1" action="crm_case_helpdesk_act_all1"/>    
 
 
-	<record model="ir.actions.act_window" id="crm_case_helpdesk_act_all0">
-		<field name="name">All Open Helpdesk Requests</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,calendar,form</field>
-		<field name="view_id" ref="crm.crm_case_tree-view"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('crm.section_support_help'))+'),(\'state\',\'=\',\'open\')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_all0">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm.crm_case_tree-view"/>
-		<field name="act_window_id" ref="crm_case_helpdesk_act_all0"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_all0">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm.crm_case_calendar-view"/>
-		<field name="act_window_id" ref="crm_case_helpdesk_act_all0"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_form_view_all0">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm.crm_case-view"/>
-		<field name="act_window_id" ref="crm_case_helpdesk_act_all0"/>
-	</record>
-	<menuitem  parent="menu_crm_case_helpdesk_act_all" id="menu_crm_case_helpdesk_act_myhelpdesk_all0" action="crm_case_helpdesk_act_all0"/>	
+    <record model="ir.actions.act_window" id="crm_case_helpdesk_act_all0">
+        <field name="name">All Open Helpdesk Requests</field>
+        <field name="res_model">crm.case</field>
+        <field name="view_mode">tree,calendar,form</field>
+        <field name="view_id" ref="crm.crm_case_tree-view"/>
+        <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('crm.section_support_help'))+'),(\'state\',\'=\',\'open\')]'"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_all0">
+        <field name="sequence" eval="1"/>
+        <field name="view_mode">tree</field>
+        <field name="view_id" ref="crm.crm_case_tree-view"/>
+        <field name="act_window_id" ref="crm_case_helpdesk_act_all0"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_all0">
+        <field name="sequence" eval="2"/>
+        <field name="view_mode">calendar</field>
+        <field name="view_id" ref="crm.crm_case_calendar-view"/>
+        <field name="act_window_id" ref="crm_case_helpdesk_act_all0"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_sec_form_view_all0">
+        <field name="sequence" eval="3"/>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="crm.crm_case-view"/>
+        <field name="act_window_id" ref="crm_case_helpdesk_act_all0"/>
+    </record>
+    <menuitem  parent="menu_crm_case_helpdesk_act_all" id="menu_crm_case_helpdesk_act_myhelpdesk_all0" action="crm_case_helpdesk_act_all0"/>    
 
-	<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('crm.section_support_help'))+'),(\'state\',\'=\',\'done\')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_allhelpdesk">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm.crm_case_calendar-view"/>
-		<field name="act_window_id" ref="crm_case_helpdesk_act_allhelpdesk"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_allhelpdesk">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm.crm_case_tree-view"/>
-		<field name="act_window_id" ref="crm_case_helpdesk_act_allhelpdesk"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_form_view_allhelpdesk">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm.crm_case-view"/>
-		<field name="act_window_id" ref="crm_case_helpdesk_act_allhelpdesk"/>
-	</record>
-	<menuitem parent="menu_crm_case_helpdesk_act_all" id="menu_crm_case_helpdesk_act_myhelpdesk_allhelpdesk" action="crm_case_helpdesk_act_allhelpdesk"/>
-	
-	
+    <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('crm.section_support_help'))+'),(\'state\',\'=\',\'done\')]'"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_allhelpdesk">
+        <field name="sequence" eval="1"/>
+        <field name="view_mode">calendar</field>
+        <field name="view_id" ref="crm.crm_case_calendar-view"/>
+        <field name="act_window_id" ref="crm_case_helpdesk_act_allhelpdesk"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_allhelpdesk">
+        <field name="sequence" eval="2"/>
+        <field name="view_mode">tree</field>
+        <field name="view_id" ref="crm.crm_case_tree-view"/>
+        <field name="act_window_id" ref="crm_case_helpdesk_act_allhelpdesk"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_sec_form_view_allhelpdesk">
+        <field name="sequence" eval="3"/>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="crm.crm_case-view"/>
+        <field name="act_window_id" ref="crm_case_helpdesk_act_allhelpdesk"/>
+    </record>
+    <menuitem parent="menu_crm_case_helpdesk_act_all" id="menu_crm_case_helpdesk_act_myhelpdesk_allhelpdesk" action="crm_case_helpdesk_act_allhelpdesk"/>
+    
+    
 </data>
 </openerp>
         
diff --git a/addons/crm_configuration/crm_jobs_menu.xml b/addons/crm_configuration/crm_jobs_menu.xml
index be91b1357a4..f5b2075d8de 100644
--- a/addons/crm_configuration/crm_jobs_menu.xml
+++ b/addons/crm_configuration/crm_jobs_menu.xml
@@ -1,439 +1,454 @@
 <?xml version="1.0"?>
 <openerp>
 <data noupdate="1">
-	<record model="crm.case.section" id="section_support0">
-		<field name="name">Jobs</field>
-		<field name="code">jobs</field>
-	</record>
+    <menuitem icon="terp-hr" id="menu_hr" name="Human Resources"/>
 
-	######################## JOB OPPORTUNITIES (menu) ###########################
-	 <record model="ir.actions.act_window" id="crm_case_categ0_act111">
-		<field name="name">All Jobs Requests</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,calendar,form,graph</field>
-		<field name="view_id" ref="crm_case_tree_view11"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support0)+')]'"/>
-	</record>
-	<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_case_tree_view11"/>
-		<field name="act_window_id" ref="crm_case_categ0_act111"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_act111">
-		<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"/>
-	</record>
-	<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_case_form_view11"/>
-		<field name="act_window_id" ref="crm_case_categ0_act111"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_graph_view_act111">
-		<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"/>
-	</record>
-	<menuitem name="Jobs Requests" id="menu_crm_case_job_req_main" parent="crm.menu_crm" action="crm_case_categ0_act111"/>	
+    <record model="crm.case.section" id="section_support0">
+        <field name="name">Jobs</field>
+        <field name="code">jobs</field>
+    </record>
 
-	<!-- 
-		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="'[(\'section_id\',\'=\','+str(section_support0)+'),(\'user_id\',\'=\',uid)]'"/>
-	</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"/>
+    ######################## JOB OPPORTUNITIES (menu) ###########################
+     <record model="ir.actions.act_window" id="crm_case_categ0_act111">
+        <field name="name">All Jobs Requests</field>
+        <field name="res_model">crm.case</field>
+        <field name="view_mode">tree,calendar,form,graph</field>
+        <field name="view_id" ref="crm_case_tree_view11"/>
+        <field name="domain" eval="'[]'"/>
+    </record>
+    <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_case_tree_view11"/>
+        <field name="act_window_id" ref="crm_case_categ0_act111"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_act111">
+        <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"/>
+    </record>
+    <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_case_form_view11"/>
+        <field name="act_window_id" ref="crm_case_categ0_act111"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_sec_graph_view_act111">
+        <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"/>
+    </record>
+    <menuitem
+        name="Jobs - Hiring Process" 
+        id="menu_crm_case_job_req_main" 
+        parent="menu_hr"/>
 
-	<record model="ir.actions.act_window" id="crm_case_categ0_act_my_new3">
-		<field name="name">New Jobs Requests</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="'[(\'section_id\',\'=\','+str(section_support0)+'),(\'user_id\',\'=\',uid),(\'state\',\'&lt;&gt;\',\'done\')]'"/>
-	</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_categ0_act11" id="menu_crm_case_categ0_act_my_new3" action="crm_case_categ0_act_my_new3"/>	
+    <!-- 
+        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)]'"/>
+    </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"/>
 
-	<record model="ir.actions.act_window" id="crm_case_categ0_act_my3">
-		<field name="name">My Unclosed 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="'[(\'section_id\',\'=\','+str(section_support0)+'),(\'user_id\',\'=\',uid),(\'state\',\'&lt;&gt;\',\'done\')]'"/>
-	</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"/>	
+    <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)]'"/>
+    </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_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="'[(\'section_id\',\'=\','+str(section_support0)+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'draft\')]'"/>
-	</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"/>	
+    <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\'))]'"/>
+    </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"/>
 
-	<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="'[(\'section_id\',\'=\','+str(section_support0)+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'pending\')]'"/>
-	</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"/>		
+    <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\')]'"/>
+    </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"/>
 
-	<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="'[(\'section_id\',\'=\','+str(section_support0)+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'open\')]'"/>
-	</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"/>	
-		
-	
-	<record model="ir.actions.act_window" id="crm_case_categ0_act_myjobs">
-		<field name="name">Calendar Of Jobs Meetings</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="'[(\'section_id\',\'=\','+str(section_support0)+'),(\'state\',\'=\',\'done\'),(\'user_id\',\'=\',uid)]'"/>
-	</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"/>
-	
-	<!-- 
-		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_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\')]'"/>
+    </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"/>
 
-	<record model="ir.actions.act_window" id="crm_case_categ0_act_all3">
-		<field name="name">All Unclosed 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="'[(\'section_id\',\'=\','+str(section_support0)+'),(\'state\',\'&lt;&gt;\',\'done\')]'"/>
-	</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"/>
+    <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\')]'"/>
+    </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"/>
 
-	<record model="ir.actions.act_window" id="crm_case_categ0_act_all2">
-		<field name="name">All Jobs Propositions</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="'[(\'section_id\',\'=\','+str(section_support0)+'),(\'state\',\'=\',\'draft\')]'"/>
-	</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"/>	
+    <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)]'"/>
+    </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"/>
+    
+    <!-- 
+        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_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="'[(\'section_id\',\'=\','+str(section_support0)+'),(\'state\',\'=\',\'pending\')]'"/>
-	</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"/>	
+    <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\')]'"/>
+    </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"/>
 
+    <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\')]'"/>
+    </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"/>    
 
-	<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="'[(\'section_id\',\'=\','+str(section_support0)+'),(\'state\',\'=\',\'open\')]'"/>
-	</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"/>	
+    <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\')]'"/>
+    </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"/>    
 
-	<record model="ir.actions.act_window" id="crm_case_categ0_act_alljobs">
-		<field name="name">Calendar Of Jobs Meetings</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="'[(\'section_id\',\'=\','+str(section_support0)+'),(\'state\',\'=\',\'done\')]'"/>
-	</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"/>
-	
+    <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\')]'"/>
+    </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"/>    
+
+    <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\')]'"/>
+    </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"/>
+    
 </data>
 </openerp>
diff --git a/addons/crm_configuration/crm_jobs_view.xml b/addons/crm_configuration/crm_jobs_view.xml
index 78c0757a375..9593bf4f1b2 100644
--- a/addons/crm_configuration/crm_jobs_view.xml
+++ b/addons/crm_configuration/crm_jobs_view.xml
@@ -1,150 +1,149 @@
 <?xml version="1.0"?>
 <openerp>
-	<data>
-	# ------------------------------------------------------ 
-	# Jobs
-	# ------------------------------------------------------ 
+    <data>
+    # ------------------------------------------------------ 
+    # Jobs
+    # ------------------------------------------------------ 
 
-	<record model="ir.ui.view" id="crm_case_tree_view11">
-		<field name="name">CRM - Jobs Requests Tree</field>
-		<field name="model">crm.case</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-			<tree string="Jobs - Recruitment Tree"  colors="red:state=='open'">
-				<field name="id"/>
-				<field name="name" string="Jobs Description"/>
-				<field name="partner_name" string="Employee Name"/>
-				<field name="partner_phone"/>
-				<field name="categ_id" string="Applied Job" select="1"/>
-				<field name="category2_id" string="Degree" select="1"/>
-				<field name="stage_id"/>
-				<field name="user_id"/>
-				<field name="state"/>
-			</tree>
-		</field>
-	</record>
+    <record model="ir.ui.view" id="crm_case_tree_view11">
+        <field name="name">CRM - Jobs Requests Tree</field>
+        <field name="model">crm.case</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <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="categ_id" string="Applied Job" select="1"/>
+                <field name="category2_id" string="Degree" select="1"/>
+                <field name="stage_id"/>
+                <field name="user_id"/>
+                <field name="state"/>
+            </tree>
+        </field>
+    </record>
 
-	<record model="ir.ui.view" id="crm_case_form_view11">
-		<field name="name">CRM - Jobs Requests Form</field>
-		<field name="model">crm.case</field>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-			<form string="Jobs - Recruitment Form">
-				<group colspan="4" col="6">
-					<field name="partner_name"/>
-					<field name="section_id" colspan="1"/>
-					<field name="categ_id" string="Applied Job" select="1" on_change="onchange_categ_id(categ_id)"/>
-					<newline/>
-					<field name="date" string="Next Meeting"/>
-					<field name="duration" string="Meeting Duration" widget="float_time"/>
-					<field name="category2_id" string="Degree" select="1"/>
-				</group>
-				<notebook>
-				<page string="Job Info">
-						<field name="name" string="Jobs Description" colspan="2"/>
-						<field name="partner_name2"/>
-						<newline/>
-						<field name="partner_phone"/>
-						<field name="partner_mobile"/>
-						<newline/>
-						<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/>
-						<separator colspan="4"/>
-						<field name="priority" string="Quality"/>
-						<field name="probability" string="Availability (weeks)"/>
-						<newline/>
-						<field name="planned_cost" string="Expected Salary"/>
-						<field name="planned_revenue" string="Proposed Salary"/>
-						<field name="stage_id" colspan="2"/>
-						<field name="user_id" string="Responsible" select="2"/>
-						<newline/>
-						<separator colspan="4"/>
-						<field name="history_line" colspan="2" nolabel="1" mode="tree,form">
-							<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"/>
-							</form>
-							<tree string="Communication history">
-								<field name="description"/>
-								<field name="email"/>
-								<field name="date"/>
-							</tree>
-						</field>
-						<group col="2" colspan="2" expand="1">
-							<field name="som"/>
-							<button name="add_reply" string="Add Last Mail for Replying"
-								states="open" type="object" colspan="2"/>
-							<field name="description" colspan="2" nolabel="1"/>
-							<button name="case_log_reply"
-								string="Send Partner &amp; Historize" states="open"
-								type="object"/>
-							<button name="case_log" string="Historize" states="open"
-								type="object"/>
-						</group>
+    <record model="ir.ui.view" id="crm_case_form_view11">
+        <field name="name">CRM - Jobs Requests Form</field>
+        <field name="model">crm.case</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Jobs - Recruitment Form">
+                <group colspan="4" col="7">
+                    <field name="name" string="Description" colspan="2"/>
+                    <field name="section_id" colspan="1"/>
+                    <field name="user_id" string="Responsible" select="2"/>
+                    <button name="set_partner" string="Convert to Quote" icon="terp-sale"/>
+                    <newline/>
+                    <field name="stage_id"/>
+                    <field name="date" string="Next Interview"/>
+                    <field name="duration" widget="float_time"/>
+                    <button name="set_meeting" string="Schedule Meeting" icon="terp-crm"/>
+                </group>
+                <notebook colspan="4">
+                    <page string="Job Info">
+                        <field name="partner_name"/>
+                        <field name="partner_name2"/>
+                        <newline/>
+                        <field name="partner_phone"/>
+                        <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"/>
+                        <field name="partner_address_id" string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="1"/>
+                        <separator colspan="4" string="Contract Data"/>
+                        <field name="probability" string="Availability (weeks)"/>
+                        <newline/>
+                        <field name="planned_cost" string="Expected Salary"/>
+                        <field name="planned_revenue" string="Proposed Salary"/>
+                        <field name="categ_id" string="Applied Job" select="1" on_change="onchange_categ_id(categ_id)"/>
+                        <field name="category2_id" string="Degree" select="1"/>
+                        <separator colspan="4" string="Qualication"/>
+                        <field name="priority" string="Priority"/>
 
-						<separator colspan="4"/>
-						<group col="8" colspan="4">
-							<field name="state" select="1"/> 
-					 		<button name="case_close" string="Done" states="open,draft,pending" type="object"/>
-							<button name="case_open" string="Open" states="draft,pending" type="object"/>
-							<button name="case_cancel" string="Refuse Job" states="draft,open,pending" type="object"/>
-							<button name="case_pending" string="Pending" states="draft,open" type="object"/>
-							<button name="case_reset" string="Reset to Draft" states="done,cancel" type="object"/>
-						</group>
-				</page>
-				<page string="Internal Notes">
-					<separator string= "Notes" colspan="4"/>
-					<field name="note" nolabel="1"/>
-				</page>
-				<page string="Extra Info">
-					<field name="id"/>
-					<field name="active"/>
-					<field name="email_cc"/>
-					<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"/>
-					<separator colspan="4" string="References"/>
-					<field name="ref" colspan="4"/>
-					<field name="ref2" colspan="4"/>
-				</page>
-				<page string="History">
-					<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>
-				</notebook>
-			</form>
-		</field>
-	</record>
+                        <separator colspan="4" string="Status"/>
+                        <group col="8" colspan="4">
+                            <field name="state" select="1"/> 
+                             <button name="case_close" string="Done" states="open,draft,pending" type="object"/>
+                            <button name="case_open" string="Open" states="draft,pending" type="object"/>
+                            <button name="case_cancel" string="Refuse Candidate" states="draft,open,pending" type="object"/>
+                            <button name="case_pending" string="Pending" states="draft,open" type="object"/>
+                            <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object"/>
+                        </group>
+                   </page><page string="Communication">
+                        <separator colspan="4" string="Communication"/>
+                        <group col="2" colspan="4" expand="1">
+                            <field name="description" colspan="2" nolabel="1"/>
+                            <button name="case_log_reply"
+                                string="Send Candidate &amp; Historize" states="open"
+                                type="object" icon="terp-crm"/>
+                            <button name="case_log" string="Historize" states="open"
+                                type="object" icon="gtk-go-forward"/>
+                        </group>
+                         <field name="history_line" colspan="4" nolabel="1" mode="tree,form">
+                            <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"/>
+                            </form>
+                            <tree string="Communication history">
+                                <field name="description"/>
+                                <field name="email"/>
+                                <field name="date"/>
+                            </tree>
+                        </field>
+                </page>
+                <page string="Internal Notes">
+                    <field name="note" nolabel="1" colspan="4"/>
+                </page>
+                <page string="Extra Info">
+                    <field name="id"/>
+                    <field name="active"/>
+                    <field name="email_cc"/>
+                    <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"/>
+                    <separator colspan="4" string="References"/>
+                    <field name="ref" colspan="4"/>
+                    <field name="ref2" colspan="4"/>
+                </page>
+                <page string="History">
+                    <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>
+                </notebook>
+            </form>
+        </field>
+    </record>
 
-	<record model="ir.ui.view" id="crm_case_calendar_view11">
-		<field name="name">CRM - Jobs Requests Calendar</field>
-		<field name="model">crm.case</field>
-		<field name="type">calendar</field>
-		<field name="priority" eval="2"/>
-		<field name="arch" type="xml">
-			<calendar string="Meeting With Future Employees" date_start="date" color="user_id" date_delay="duration">
-				<field name="name"/>
-				<field name="partner_name"/>
-				<field name="partner_name2"/>
-			</calendar>
-		</field>
-	</record>
-	</data>
+    <record model="ir.ui.view" id="crm_case_calendar_view11">
+        <field name="name">CRM - Jobs Requests Calendar</field>
+        <field name="model">crm.case</field>
+        <field name="type">calendar</field>
+        <field name="priority" eval="2"/>
+        <field name="arch" type="xml">
+            <calendar string="Meeting With Candidates" date_start="date" color="user_id" date_delay="duration">
+                <field name="name"/>
+                <field name="partner_name"/>
+                <field name="partner_name2"/>
+            </calendar>
+        </field>
+    </record>
+    </data>
 </openerp>
diff --git a/addons/crm_configuration/crm_lead_data.xml b/addons/crm_configuration/crm_lead_data.xml
index a761961968c..b7ea4c05c98 100644
--- a/addons/crm_configuration/crm_lead_data.xml
+++ b/addons/crm_configuration/crm_lead_data.xml
@@ -24,10 +24,6 @@
 		<field name="name">Partner</field>
 		<field name="section_id" ref="section_support2"/>
 	</record>
-	<record model="crm.case.categ" id="categ_lead5">
-		<field name="name">Campaign</field>
-		<field name="section_id" ref="section_support2"/>
-	</record>	
 	<record model="crm.case.categ" id="categ_lead6">
 		<field name="name">Website</field>
 		<field name="section_id" ref="section_support2"/>
diff --git a/addons/crm_configuration/crm_lead_demo.xml b/addons/crm_configuration/crm_lead_demo.xml
index 7ba46a406a8..2711c8ef84b 100644
--- a/addons/crm_configuration/crm_lead_demo.xml
+++ b/addons/crm_configuration/crm_lead_demo.xml
@@ -20,7 +20,7 @@
 			<field eval="&quot;(726) 782-0636&quot;" name="partner_mobile"/>
 			<field eval="1" name="active"/>
 			<field eval="16.1" name="duration"/>
-			<field name="categ_id" ref="crm_configuration.categ_lead5"/>
+			<field name="categ_id" ref="crm_configuration.category_lead5"/>
 			<field name="stage_id" ref="crm_configuration.stage_lead1"/>
 			<field eval="&quot;President&quot;" name="partner_name"/>
 			<field eval="&quot;(769) 703-274&quot;" name="partner_phone"/>
diff --git a/addons/crm_configuration/crm_lead_menu.xml b/addons/crm_configuration/crm_lead_menu.xml
index 06eb2a12b3c..d0be061dd06 100644
--- a/addons/crm_configuration/crm_lead_menu.xml
+++ b/addons/crm_configuration/crm_lead_menu.xml
@@ -1,461 +1,383 @@
 <?xml version="1.0"?>
 <openerp>
 <data noupdate="1">
-	<record model="crm.case.section" id="section_support2">
-		<field name="name">Leads</field>
-		<field name="code">leads</field>
-	</record>
-	
-<!--		MENU		-->
+    <menuitem id="menu_presale" name="Pre-Sales" parent="crm.menu_crm" sequence="4"/>
 
-	<record model="ir.actions.act_window" id="crm_case_category_act_leads_all">
-		<field name="name">All Leads</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_leads"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_all">
-		<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_all"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_all">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view_leads"/>
-		<field name="act_window_id" ref="crm_case_category_act_leads_all"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_all">
-		<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_all"/>
-	</record>
-	<menuitem parent="crm.menu_crm" name="Leads" 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"/>
+    <record model="crm.case.section" id="section_support2">
+        <field name="name">Leads</field>
+        <field name="code">leads</field>
+    </record>
 
-	<record model="ir.actions.act_window" id="crm_case_category_act_leads_all1">
-		<field name="name">All Unclosed Leads</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_leads"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'state\',\'&lt;&gt;\',\'done\'),(\'state\',\'&lt;&gt;\',\'cancel\')]'"/>
-	</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_calendar_view_leads_all1">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_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"/>
+<!--        MENU        -->
 
-	<record model="ir.actions.act_window" id="crm_case_category_act_leads_all2">
-		<field name="name">All Draft Leads</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_leads"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'state\',\'=\',\'draft\')]'"/>
-	</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_calendar_view_leads_all2">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_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"/>
+    <record model="ir.actions.act_window" id="crm_case_category_act_leads_all">
+        <field name="name">All Leads</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_leads"/>
+        <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+')]'"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_all">
+        <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_all"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_all">
+        <field name="sequence" eval="2"/>
+        <field name="view_mode">calendar</field>
+        <field name="view_id" ref="crm_case_calendar_view_leads"/>
+        <field name="act_window_id" ref="crm_case_category_act_leads_all"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_all">
+        <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_all"/>
+    </record>
+    <menuitem parent="menu_presale" name="Leads" 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"/>
 
-	<record model="ir.actions.act_window" id="crm_case_category_act_leads_all3">
-		<field name="name">All Open Leads</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_leads"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'state\',\'=\',\'open\')]'"/>
-	</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_calendar_view_leads_all3">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_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"/>
+    <record model="ir.actions.act_window" id="crm_case_category_act_leads_all1">
+        <field name="name">Current Leads</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_leads"/>
+        <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'state\',\'&lt;&gt;\',\'done\'),(\'state\',\'&lt;&gt;\',\'cancel\')]'"/>
+    </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_calendar_view_leads_all1">
+        <field name="sequence" eval="2"/>
+        <field name="view_mode">calendar</field>
+        <field name="view_id" ref="crm_case_calendar_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"/>
 
-	<record model="ir.actions.act_window" id="crm_case_category_act_leads_all4">
-		<field name="name">All Pending Leads</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_leads"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'state\',\'=\',\'pending\')]'"/>
-	</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_calendar_view_leads_all4">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_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"/>
+    <record model="ir.actions.act_window" id="crm_case_category_act_leads_unassigned">
+        <field name="name">Unassigned Leads</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_leads"/>
+        <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'state\',\'&lt;&gt;\',\'done\'),(\'state\',\'&lt;&gt;\',\'cancel\'),(\'user_id\',\'=\',False)]'"/>
+    </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_calendar_view_leads_unassigned">
+        <field name="sequence" eval="2"/>
+        <field name="view_mode">calendar</field>
+        <field name="view_id" ref="crm_case_calendar_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"/>
 
-	<record model="ir.actions.act_window" id="crm_case_category_act_leads_all5">
-		<field name="name">All Cancelled Leads</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_leads"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'state\',\'=\',\'cancel\')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_all5">
-		<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_all5"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_all5">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view_leads"/>
-		<field name="act_window_id" ref="crm_case_category_act_leads_all5"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_all5">
-		<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_all5"/>
-	</record>
-	<menuitem parent="menu_crm_case_categ0_act_leads_all" id="menu_crm_case_categ0_act_leads_all5" action="crm_case_category_act_leads_all5"/>
+    <record model="ir.actions.act_window" id="crm_case_category_act_leads_all2">
+        <field name="name">All Draft Leads</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_leads"/>
+        <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'state\',\'=\',\'draft\')]'"/>
+    </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_calendar_view_leads_all2">
+        <field name="sequence" eval="2"/>
+        <field name="view_mode">calendar</field>
+        <field name="view_id" ref="crm_case_calendar_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"/>
 
-	<record model="ir.actions.act_window" id="crm_case_category_act_leads_all6">
-		<field name="name">Calendar Of All Leads Meetings</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">calendar,tree,form</field>
-		<field name="view_id" ref="crm_case_calendar_view_leads"/>
-		<field name="domain" eval="[('section_id','=',section_support2),('date','>=',time.strftime('%Y-%m-%d'))]"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_all6">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view_leads"/>
-		<field name="act_window_id" ref="crm_case_category_act_leads_all6"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_all6">
-		<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_all6"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_all6">
-		<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_all6"/>
-	</record>
-	<menuitem parent="menu_crm_case_categ0_act_leads_all" id="menu_crm_case_categ0_act_leads_all6" action="crm_case_category_act_leads_all6"/>
+    <record model="ir.actions.act_window" id="crm_case_category_act_leads_all3">
+        <field name="name">All Open Leads</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_leads"/>
+        <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'state\',\'=\',\'open\')]'"/>
+    </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_calendar_view_leads_all3">
+        <field name="sequence" eval="2"/>
+        <field name="view_mode">calendar</field>
+        <field name="view_id" ref="crm_case_calendar_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"/>
+
+    <record model="ir.actions.act_window" id="crm_case_category_act_leads_all4">
+        <field name="name">All Pending Leads</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_leads"/>
+        <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'state\',\'=\',\'pending\')]'"/>
+    </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_calendar_view_leads_all4">
+        <field name="sequence" eval="2"/>
+        <field name="view_mode">calendar</field>
+        <field name="view_id" ref="crm_case_calendar_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"/>
 
 <!-- =================================================================== -->
-	<record model="ir.actions.act_window" id="crm_case_category_act_leads_my">
-		<field name="name">My Leads</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_leads"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'user_id\',\'=\',uid)]'"/>
-	</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_calendar_view_leads_my">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_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"/>
+    <record model="ir.actions.act_window" id="crm_case_category_act_leads_my">
+        <field name="name">My Leads</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_leads"/>
+        <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'user_id\',\'=\',uid)]'"/>
+    </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_calendar_view_leads_my">
+        <field name="sequence" eval="2"/>
+        <field name="view_mode">calendar</field>
+        <field name="view_id" ref="crm_case_calendar_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"/>
 
-	<record model="ir.actions.act_window" id="crm_case_category_act_leads_my_new">
-		<field name="name">New Leads</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)+')]'"/>
-	</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_my" id="menu_crm_case_category_act_leads_my_new" action="crm_case_category_act_leads_my_new"/>
+    <record model="ir.actions.act_window" id="crm_case_category_act_leads_my_new">
+        <field name="name">New Lead</field>
+        <field name="res_model">crm.case</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">form,tree,calendar</field>
+        <field name="view_id" ref="crm_case_form_view_leads"/>
+        <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+')]'"/>
+    </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 Unclosed Leads</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_leads"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'user_id\',\'=\',uid),(\'state\',\'&lt;&gt;\',\'done\'),(\'state\',\'&lt;&gt;\',\'cancel\')]'"/>
-	</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_calendar_view_leads_my1">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_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"/>
+    <record model="ir.actions.act_window" id="crm_case_category_act_leads_my1">
+        <field name="name">My Current Leads</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_leads"/>
+        <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'user_id\',\'=\',uid),(\'state\',\'&lt;&gt;\',\'done\'),(\'state\',\'&lt;&gt;\',\'cancel\')]'"/>
+    </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_calendar_view_leads_my1">
+        <field name="sequence" eval="2"/>
+        <field name="view_mode">calendar</field>
+        <field name="view_id" ref="crm_case_calendar_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"/>
 
-	<record model="ir.actions.act_window" id="crm_case_category_act_leads_my2">
-		<field name="name">My Draft Leads</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_leads"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'draft\')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_my2">
-		<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_my2"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_my2">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view_leads"/>
-		<field name="act_window_id" ref="crm_case_category_act_leads_my2"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_my2">
-		<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_my2"/>
-	</record>
-	<menuitem parent="menu_crm_case_categ0_act_leads_my1" id="menu_crm_case_categ0_act_leads_my2" action="crm_case_category_act_leads_my2"/>
+    <record model="ir.actions.act_window" id="crm_case_category_act_leads_my2">
+        <field name="name">My Draft Leads</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_leads"/>
+        <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'draft\')]'"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_my2">
+        <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_my2"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_my2">
+        <field name="sequence" eval="2"/>
+        <field name="view_mode">calendar</field>
+        <field name="view_id" ref="crm_case_calendar_view_leads"/>
+        <field name="act_window_id" ref="crm_case_category_act_leads_my2"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_my2">
+        <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_my2"/>
+    </record>
+    <menuitem parent="menu_crm_case_categ0_act_leads_my1" id="menu_crm_case_categ0_act_leads_my2" action="crm_case_category_act_leads_my2"/>
 
-	<record model="ir.actions.act_window" id="crm_case_category_act_leads_my3">
-		<field name="name">My Open Leads</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_leads"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'open\')]'"/>
-	</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_calendar_view_leads_my3">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_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"/>
+    <record model="ir.actions.act_window" id="crm_case_category_act_leads_my3">
+        <field name="name">My Open Leads</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_leads"/>
+        <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'open\')]'"/>
+    </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_calendar_view_leads_my3">
+        <field name="sequence" eval="2"/>
+        <field name="view_mode">calendar</field>
+        <field name="view_id" ref="crm_case_calendar_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"/>
 
-	<record model="ir.actions.act_window" id="crm_case_category_act_leads_my4">
-		<field name="name">My Pending Leads</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_leads"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'pending\')]'"/>
-	</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_calendar_view_leads_my4">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_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"/>
+    <record model="ir.actions.act_window" id="crm_case_category_act_leads_my4">
+        <field name="name">My Pending Leads</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_leads"/>
+        <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'pending\')]'"/>
+    </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_calendar_view_leads_my4">
+        <field name="sequence" eval="2"/>
+        <field name="view_mode">calendar</field>
+        <field name="view_id" ref="crm_case_calendar_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"/>
 
-	<record model="ir.actions.act_window" id="crm_case_category_act_leads_my5">
-		<field name="name">My Cancelled Leads</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_leads"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'cancel\')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_my5">
-		<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_my5"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_my5">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view_leads"/>
-		<field name="act_window_id" ref="crm_case_category_act_leads_my5"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_my5">
-		<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_my5"/>
-	</record>
-	<menuitem parent="menu_crm_case_categ0_act_leads_my" id="menu_crm_case_categ0_act_leads_my5" action="crm_case_category_act_leads_my5"/>
+<!--        REPORTS        -->
+    <menuitem name="Leads"  id="menu_action_report_crm_case_lead" parent="report_crm.next_id_64"/>    
 
-	<record model="ir.actions.act_window" id="crm_case_category_act_leads_my6">
-		<field name="name">Calendar Of My Leads Meetings</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">calendar,tree,form</field>
-		<field name="view_id" ref="crm_case_calendar_view_leads"/>
-		<field name="domain" eval="[('section_id','=',section_support2),('user_id','=','admin'),('date','>=',time.strftime('%Y-%m-%d'))]"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_my6">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view_leads"/>
-		<field name="act_window_id" ref="crm_case_category_act_leads_my6"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_my6">
-		<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_my6"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_my6">
-		<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_my6"/>
-	</record>
-	<menuitem parent="menu_crm_case_categ0_act_leads_my" id="menu_crm_case_category_act_leads_my6" action="crm_case_category_act_leads_my6"/>
+    <record model="ir.actions.act_window" id="action_report_crm_case_lead_user">
+        <field name="res_model">report.crm.case.user</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">graph,tree</field>
+        <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+')]'"/>
+    </record>
+    <menuitem name="Cases by Leads and User" parent="menu_action_report_crm_case_lead" action="action_report_crm_case_lead_user" id="menu_action_report_crm_case_lead_user"/>
 
 
+    <record model="ir.actions.act_window" id="action_report_crm_case_lead_categ">
+        <field name="res_model">report.crm.case.section.categ2</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">graph,tree</field>
+        <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+')]'"/>
+    </record>
+    <menuitem parent="menu_action_report_crm_case_lead" name="Cases by Leads and Category2" action="action_report_crm_case_lead_categ" id="menu_action_report_crm_case_lead_categ"/>
 
-<!--		REPORTS		-->
-	<menuitem name="Leads"  id="menu_action_report_crm_case_lead" parent="report_crm.next_id_64"/>	
+    <record model="ir.actions.act_window" id="action_report_crm_case_lead_stage">
+        <field name="res_model">report.crm.case.section.stage</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">graph,tree</field>
+        <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+')]'"/>
+    </record>
+    <menuitem name="Cases by Leads and Stage" parent="menu_action_report_crm_case_lead" action="action_report_crm_case_lead_stage" id="menu_action_report_crm_case_lead_stage"/>
 
-	<record model="ir.actions.act_window" id="action_report_crm_case_lead_user">
-		<field name="res_model">report.crm.case.user</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">graph,tree</field>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+')]'"/>
-	</record>
-	<menuitem name="Cases by Leads and User" parent="menu_action_report_crm_case_lead" action="action_report_crm_case_lead_user" id="menu_action_report_crm_case_lead_user"/>
+    <record model="ir.actions.act_window" id="action_report_crm_case_lead_categ_stage">
+        <field name="res_model">report.crm.case.section.categ.stage</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree</field>
+        <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+')]'"/>
+    </record>
+    <menuitem name="Cases by Section, Category and Stage" parent="menu_action_report_crm_case_lead"  action="action_report_crm_case_lead_categ_stage" id="menu_action_report_crm_case_lead_categ_stage"/>
 
+    <record model="ir.actions.act_window" id="action_report_crm_case_lead_categ_categ2">
+        <field name="res_model">report.crm.case.section.categ.categ2</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree</field>
+        <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+')]'"/>
+    </record>
+    <menuitem name="Cases by Section, Category and Category2" parent="menu_action_report_crm_case_lead" action="action_report_crm_case_lead_categ_categ2" id="menu_action_report_crm_case_lead_categ_categ2"/>
 
-	<record model="ir.actions.act_window" id="action_report_crm_case_lead_categ">
-		<field name="res_model">report.crm.case.section.categ2</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">graph,tree</field>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+')]'"/>
-	</record>
-	<menuitem parent="menu_action_report_crm_case_lead" name="Cases by Leads and Category2" action="action_report_crm_case_lead_categ" id="menu_action_report_crm_case_lead_categ"/>
-
-	<record model="ir.actions.act_window" id="action_report_crm_case_lead_stage">
-		<field name="res_model">report.crm.case.section.stage</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">graph,tree</field>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+')]'"/>
-	</record>
-	<menuitem name="Cases by Leads and Stage" parent="menu_action_report_crm_case_lead" action="action_report_crm_case_lead_stage" id="menu_action_report_crm_case_lead_stage"/>
-
-	<record model="ir.actions.act_window" id="action_report_crm_case_lead_categ_stage">
-		<field name="res_model">report.crm.case.section.categ.stage</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree</field>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+')]'"/>
-	</record>
-	<menuitem name="Cases by Section, Category and Stage" parent="menu_action_report_crm_case_lead"  action="action_report_crm_case_lead_categ_stage" id="menu_action_report_crm_case_lead_categ_stage"/>
-
-	<record model="ir.actions.act_window" id="action_report_crm_case_lead_categ_categ2">
-		<field name="res_model">report.crm.case.section.categ.categ2</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree</field>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+')]'"/>
-	</record>
-	<menuitem name="Cases by Section, Category and Category2" parent="menu_action_report_crm_case_lead" action="action_report_crm_case_lead_categ_categ2" id="menu_action_report_crm_case_lead_categ_categ2"/>
-
-	
+    
 </data>
 </openerp>
diff --git a/addons/crm_configuration/crm_lead_view.xml b/addons/crm_configuration/crm_lead_view.xml
index 61191290563..473e5952e80 100644
--- a/addons/crm_configuration/crm_lead_view.xml
+++ b/addons/crm_configuration/crm_lead_view.xml
@@ -1,147 +1,146 @@
 <?xml version="1.0"?>
 <openerp>
-<data noupdate="1">
+<data>
 
-	# ------------------------------------------------------ 
-	# Leads
-	# ------------------------------------------------------ 
+    # ------------------------------------------------------ 
+    # Leads
+    # ------------------------------------------------------ 
 
-	<record model="ir.ui.view" id="crm_case_form_view_leads">
-		<field name="name">CRM - Leads Form</field>
-		<field name="model">crm.case</field>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-			<form string="Leads Form">
-				<group colspan="4" col="4">
-					<field name="name" select="1" string="Name"/>
-				 	<field name="section_id" colspan="1"/>
-				 	<newline/>
-				 	<field name="date" string="Next Meeting"/>
-					<field name="duration" string="Meeting Duration" widget="float_time"/>
-				</group>
-				<notebook>
-				 <page string="Leads">
-				 	<field name="partner_name" string="Designation"/>
-					<field name="partner_name2" string="Email"/>
-					<newline/>
-					<field name="partner_phone"/>
-					<field name="partner_mobile"/>
-					<newline/>
-					<field name="categ_id" select="1" on_change="onchange_categ_id(categ_id)" string="Lead Source"/>
-					<field name="user_id" select="2" string="Responsible"/>
-					<newline/>
-					<field name="partner_id" select="1" on_change="onchange_partner_id(partner_id, email_from)"/>
-					<field name="partner_address_id" string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)"/>
-					<field name="stage_id" string="Status" select="1"/>
-					<field name="email_from"/>
-					<field name="priority" string="Priority"/>
-					<field name="category2_id" string="Campaign Type" select="1"/>
-					<newline/>
-					<separator colspan="4" string="Description Information"/>
-						<field name="note" nolabel="1" colspan="4"/>
+    <record model="ir.ui.view" id="crm_case_form_view_leads">
+        <field name="name">CRM - Leads Form</field>
+        <field name="model">crm.case</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Leads Form">
+                <group colspan="4" col="7">
+                    <field name="name" select="1" string="Lead"/>
+                    <field name="section_id" colspan="1"/>
+                    <field name="stage_id" select="1"/>
+                    <button string="Create Partner" name="button_partner_set" icon="gtk-new"/>
+                    <field name="user_id" select="2"/>
+                    <field name="categ_id" select="1" on_change="onchange_categ_id(categ_id)" string="Lead Source"/>
+                    <field name="category2_id" string="Campaign Type" select="1"/>
+                    <button string="Convert to Opportunity" name="button_partner_set" icon="gtk-go-forward"/>
+                </group>
+                <notebook colspan="4">
+                <page string="Leads">
+                    <separator string="Prospect Information" colspan="4"/>
+                    <field name="partner_name" string="Partner Name"/>
+                    <field name="partner_name2" string="Contact Name"/>
+                    <field name="partner_phone"/>
+                    <field name="partner_mobile"/>
+                    <field name="email_from"/>
+                    <newline/>
+                    <field name="partner_id" select="1" on_change="onchange_partner_id(partner_id, email_from)"/>
+                    <field name="partner_address_id" string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)"/>
 
-					<separator colspan="4"/>
-					<group col="8" colspan="4">
-						<field name="state" select="2"/> 
-					 	<button name="case_close" string="Done" states="open,draft,pending" type="object"/>
-						<button name="case_open" string="Open" states="draft,pending" type="object"/>
-						<button name="case_cancel" string="Cancel" states="draft,open,pending" type="object"/>
-						<button name="case_pending" string="Pending" states="draft,open" type="object"/>
-						<button name="case_escalate" string="Escalate" states="open,draft,pending" type="object"/>
-						<button name="case_reset" string="Reset to Draft" states="done,cancel" type="object"/>
-					</group>
-				 </page>
+                    <field name="priority" string="Priority"/>
+                    <newline/>
+                    <separator colspan="4" string="Lead Details"/>
+                    <field name="note" nolabel="1" colspan="4"/>
 
-				 <page string="Extra Info">
-					<field name="id"/>
-					<field name="active" select="2"/>
-					<field name="email_cc" colspan="2"/>
-					<field name="probability"/>
-					<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"/>
-					<field name="history_line" colspan="2" nolabel="1" mode="tree,form">
-						<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"/>
-						</form>
-						<tree string="Communication history">
-							<field name="description"/>
-							<field name="email"/>
-							<field name="date"/>
-						</tree>
-					</field>
-					<group col="2" colspan="2" expand="1">
-						<field name="canal_id"/>
-						<field name="som"/>
-						<button name="add_reply" string="Add Last Mail for Replying"
-							states="open" type="object" colspan="2"/>
-						<field name="description" colspan="2" nolabel="1"/>
-						<button name="case_log_reply"
-							string="Send Partner &amp; Historize" states="open"
-							type="object"/>
-						<button name="case_log" string="Historize" states="open"
-							type="object"/>
-					</group>
+                    <separator colspan="4"/>
+                    <group col="8" colspan="4">
+                        <field name="state" select="2"/> 
+                        <button name="case_close" string="Done" states="open,draft,pending" type="object"/>
+                        <button name="case_open" string="Open" states="draft,pending" type="object"/>
+                        <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object"/>
+                        <button name="case_pending" string="Pending" states="draft,open" type="object"/>
+                        <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object"/>
+                        <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object"/>
+                    </group>
+                 </page>
 
-					<separator colspan="4" string="References"/>
-					<field name="ref" colspan="4"/>
-					<field name="ref2" colspan="4"/>
-				 </page>
-				 <page string="History">
-					<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>
-				</notebook>
-			</form>
-		</field>
-	</record>
-	<record model="ir.ui.view" id="crm_case_tree_view_leads">
-		<field name="name">CRM - Leads Tree</field>
-		<field name="model">crm.case</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-			<tree string="Leads Tree"  colors="red:state=='open'">
-				<field name="id"/>
-				<field name="name" string="Name"/>
-				<field name="partner_phone"/>
-				<field name="partner_name2" string="Email"/>
-				<field name="stage_id"  string="Status"/>
-				<field name="categ_id" string="Lead Source"/>
-				<field name="category2_id" string="Campaign Type"/>
-				<field name="user_id"/>
-				<field name="state"/>
-			</tree>
-		</field>
-	</record>
-	<record model="ir.ui.view" id="crm_case_calendar_view_leads">
-		<field name="name">CRM - Leads Calendar</field>
-		<field name="model">crm.case</field>
-		<field name="type">calendar</field>
-		<field name="priority" eval="2"/>
-		<field name="arch" type="xml">
-			<calendar string="Meeting For Leads Generation" date_start="date" color="user_id" date_delay="duration">
-				<field name="name"/>
-				<field name="partner_name"/>
-				<field name="partner_name2"/>
-			</calendar>
-		</field>
-	</record>
+                 <page string="Extra Info">
+                    <field name="id"/>
+                    <field name="active" select="2"/>
+                    <field name="email_cc" colspan="2"/>
+                    <field name="probability"/>
+                    <separator colspan="4" string="Dates"/>
+                    <field name="create_date"/>
+                    <field name="date_closed"/>
+                    <field name="date_action_last"/>
+                    <field name="date"/>
+                    <separator colspan="4"/>
+                    <field name="history_line" colspan="2" nolabel="1" mode="tree,form">
+                        <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"/>
+                        </form>
+                        <tree string="Communication history">
+                            <field name="description"/>
+                            <field name="email"/>
+                            <field name="date"/>
+                        </tree>
+                    </field>
+                    <group col="2" colspan="2" expand="1">
+                        <field name="canal_id"/>
+                        <field name="som"/>
+                        <button name="add_reply" string="Add Last Mail for Replying"
+                            states="open" type="object" colspan="2"/>
+                        <field name="description" colspan="2" nolabel="1"/>
+                        <button name="case_log_reply"
+                            string="Send Partner &amp; Historize" states="open"
+                            type="object"/>
+                        <button name="case_log" string="Historize" states="open"
+                            type="object"/>
+                    </group>
+
+                    <separator colspan="4" string="References"/>
+                    <field name="ref" colspan="4"/>
+                    <field name="ref2" colspan="4"/>
+                 </page>
+                 <page string="History">
+                    <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>
+                </notebook>
+            </form>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="crm_case_tree_view_leads">
+        <field name="name">CRM - Leads Tree</field>
+        <field name="model">crm.case</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Leads Tree"  colors="red:state=='open'">
+                <field name="id"/>
+                <field name="name" string="Name"/>
+                <field name="partner_phone"/>
+                <field name="partner_name2" string="Email"/>
+                <field name="stage_id"  string="Status"/>
+                <field name="categ_id" string="Lead Source"/>
+                <field name="category2_id" string="Campaign Type"/>
+                <field name="user_id"/>
+                <field name="state"/>
+            </tree>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="crm_case_calendar_view_leads">
+        <field name="name">CRM - Leads Calendar</field>
+        <field name="model">crm.case</field>
+        <field name="type">calendar</field>
+        <field name="priority" eval="2"/>
+        <field name="arch" type="xml">
+            <calendar string="Meeting For Leads Generation" date_start="date" color="user_id" date_delay="duration">
+                <field name="name"/>
+                <field name="partner_name"/>
+                <field name="partner_name2"/>
+            </calendar>
+        </field>
+    </record>
 </data>
 </openerp>
diff --git a/addons/crm_configuration/crm_meeting_menu.xml b/addons/crm_configuration/crm_meeting_menu.xml
index 8e547559416..7a165e096d7 100644
--- a/addons/crm_configuration/crm_meeting_menu.xml
+++ b/addons/crm_configuration/crm_meeting_menu.xml
@@ -1,230 +1,123 @@
 <?xml version="1.0"?>
 <openerp>
 <data noupdate="1">
-	<record model="crm.case.section" id="section_support1">
-		<field name="name">Meetings</field>
-		<field name="code">Mtngs</field>
-	</record>	
-	
-	######################## MEETINGS (menu) ###########################
-	<record model="ir.actions.act_window" id="crm_case_categ_meet">
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">calendar,tree,form</field>
-		<field name="view_id" ref="crm_case_calendar_view"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_meet">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view_meet"/>
-		<field name="act_window_id" ref="crm_case_categ_meet"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_meet">
-		<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_categ_meet"/>
-	</record>	
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form__meet">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view_meet"/>
-		<field name="act_window_id" ref="crm_case_categ_meet"/>
-	</record>
-	<menuitem parent="crm.menu_crm" name="Meetings" id="menu_crm_case_category_act_meetings" action="crm_case_categ_meet"/>
+    <record model="crm.case.section" id="section_support1">
+        <field name="name">Calendar</field>
+        <field name="code">Mtngs</field>
+    </record>
 
-	<!-- 
-		MY MEETINGS 
-	-->
-	<record model="ir.actions.act_window" id="crm_case_categ_meetmy">
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">calendar,tree,form</field>
-		<field name="view_id" ref="crm_case_calendar_view_meet"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support1)+'),(\'user_id\',\'=\',uid)]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_meet_my">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view_meet"/>
-		<field name="act_window_id" ref="crm_case_categ_meetmy"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_meet_my">
-		<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_categ_meetmy"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_meet_my">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_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"/>
+    ######################## MEETINGS (menu) ###########################
+    <record model="ir.actions.act_window" id="crm_case_categ_meet">
+        <field name="res_model">crm.case</field>
+        <field name="view_mode">calendar,tree,form</field>
+        <field name="view_id" ref="crm_case_calendar_view"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_meet">
+        <field name="sequence" eval="1"/>
+        <field name="view_mode">calendar</field>
+        <field name="view_id" ref="crm_case_calendar_view_meet"/>
+        <field name="act_window_id" ref="crm_case_categ_meet"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_meet">
+        <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_categ_meet"/>
+    </record>    
+    <record model="ir.actions.act_window.view" id="action_crm_tag_form__meet">
+        <field name="sequence" eval="3"/>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="crm_case_form_view_meet"/>
+        <field name="act_window_id" ref="crm_case_categ_meet"/>
+    </record>
+    <menuitem parent="crm.menu_crm" name="Calendar" id="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="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_categ_meet_my" id="menu_crm_case_category_act_meetings_new" action="crm_case_category_act_meetings" sequence="1"/>
+    <!-- 
+        MY MEETINGS 
+    -->
+    <record model="ir.actions.act_window" id="crm_case_categ_meetmy">
+        <field name="res_model">crm.case</field>
+        <field name="view_mode">calendar,tree,form,graph</field>
+        <field name="view_id" ref="crm_case_calendar_view_meet"/>
+        <field name="domain" eval="'[(\'user_id\',\'=\',uid)]'"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_meet_my">
+        <field name="sequence" eval="1"/>
+        <field name="view_mode">calendar</field>
+        <field name="view_id" ref="crm_case_calendar_view_meet"/>
+        <field name="act_window_id" ref="crm_case_categ_meetmy"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_meet_my">
+        <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_categ_meetmy"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_tag_form_meet_my">
+        <field name="sequence" eval="3"/>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="crm_case_form_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"/>
 
-	<record model="ir.actions.act_window" id="crm_case_category_act_meetmy1">
-		<field name="name">Draft Meetings</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">calendar,tree,form</field>
-		<field name="view_id" ref="crm_case_calendar_view_meet"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support1)+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'draft\')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_meet_my1">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view_meet"/>
-		<field name="act_window_id" ref="crm_case_category_act_meetmy1"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_meetmy1">
-		<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_meetmy1"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_meetmy1">
-		<field name="sequence" eval="3"/>
-		<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_meetmy1"/>
-	</record>
-	<menuitem name="Draft Meetings" id="menu_crm_case_categ0_act_meetmy1" action="crm_case_category_act_meetmy1" parent="menu_crm_case_categ_meet_my"/>
+    <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_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"/>
 
 
-	<record model="ir.actions.act_window" id="crm_case_category_act_meetmy2">
-		<field name="name">Confirmed Meetings</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">calendar,tree,form</field>
-		<field name="view_id" ref="crm_case_calendar_view_meet"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support1)+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'done\')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_meetmy2">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view_meet"/>
-		<field name="act_window_id" ref="crm_case_category_act_meetmy2"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_meetmy2">
-		<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_meetmy2"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_meetmy2">
-		<field name="sequence" eval="3"/>
-		<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_meetmy2"/>
-	</record>
-	<menuitem  parent="menu_crm_case_categ_meet_my" name="Confirmed Meetings" id="menu_crm_case_categ0_act_meetmy2" action="crm_case_category_act_meetmy2"/>
+    <!-- 
+        ALL MEETINGS 
+    -->
+    <menuitem name="All Meetings" id="menu_crm_case_categ_meet" action="crm_case_categ_meet" parent="menu_crm_case_category_act_meetings"/>
 
+    <record model="ir.actions.act_window" id="crm_case_category_act_meetall3">
+        <field name="name">Next Meetings</field>
+        <field name="res_model">crm.case</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,calendar,form</field>
+        <field name="view_id" ref="crm_case_calendar_view_meet"/>
+        <field name="domain" eval="[('state','in',('pending','draft','open')),('date','>=',time.strftime('%Y-%m-%d'))]"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_meetall3">
+        <field name="sequence" eval="2"/>
+        <field name="view_mode">calendar</field>
+        <field name="view_id" ref="crm_case_calendar_view_meet"/>
+        <field name="act_window_id" ref="crm_case_category_act_meetall3"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_meetall3">
+        <field name="sequence" eval="1"/>
+        <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_meetall3"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_meetall3">
+        <field name="sequence" eval="3"/>
+        <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_meetall3"/>
+    </record>
 
-	<!-- 
-		ALL MEETINGS 
-	-->
-	<menuitem name="All Meetings" id="menu_crm_case_categ_meet" action="crm_case_categ_meet" parent="menu_crm_case_category_act_meetings"/>
-
-	<record model="ir.actions.act_window" id="crm_case_category_act_meetall1">
-		<field name="name">Draft Meetings</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">calendar,tree,form</field>
-		<field name="view_id" ref="crm_case_calendar_view_meet"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support1)+'),(\'state\',\'=\',\'draft\')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_meetall1">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view_meet"/>
-		<field name="act_window_id" ref="crm_case_category_act_meetall1"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_meetall1">
-		<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_meetall1"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_meetall1">
-		<field name="sequence" eval="3"/>
-		<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_meetall1"/>
-	</record>
-	<menuitem name="Draft Meetings" id="menu_crm_case_categ0_act_meetall1" action="crm_case_category_act_meetall1" parent="menu_crm_case_categ_meet"/>
-
-	<record model="ir.actions.act_window" id="crm_case_category_act_meetall2">
-		<field name="name">Confirmed Meetings</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">calendar,tree,form</field>
-		<field name="view_id" ref="crm_case_calendar_view_meet"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support1)+'),(\'state\',\'=\',\'done\')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_meetall2">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view_meet"/>
-		<field name="act_window_id" ref="crm_case_category_act_meetall2"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_meetall2">
-		<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_meetall2"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_meetall2">
-		<field name="sequence" eval="3"/>
-		<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_meetall2"/>
-	</record>
-	<menuitem name="Confirmed Meetings" parent="menu_crm_case_categ_meet" id="menu_crm_case_categ0_act_meetall2" action="crm_case_category_act_meetall2"/>
-	
-	<record model="ir.actions.act_window" id="crm_case_category_act_meetall3">
-		<field name="name">Next Deadlines</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">calendar,tree,form</field>
-		<field name="view_id" ref="crm_case_calendar_view_meet"/>
-		<field name="domain" eval="[('section_id','=',str(section_support1)),('state','!=','done'),('date','>=',time.strftime('%Y-%m-%d'))]"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_meetall3">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view_meet"/>
-		<field name="act_window_id" ref="crm_case_category_act_meetall3"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_meetall3">
-		<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_meetall3"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_meetall3">
-		<field name="sequence" eval="3"/>
-		<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_meetall3"/>
-	</record>
-	<menuitem name="Next Deadlines" parent="menu_crm_case_categ_meet" id="menu_crm_case_categ0_act_meetall3" action="crm_case_category_act_meetall3"/>
-
-	
 </data>
 </openerp>
diff --git a/addons/crm_configuration/crm_meeting_view.xml b/addons/crm_configuration/crm_meeting_view.xml
index 5e2de1d0de4..b506241d087 100644
--- a/addons/crm_configuration/crm_meeting_view.xml
+++ b/addons/crm_configuration/crm_meeting_view.xml
@@ -13,35 +13,29 @@
             <form string="Meetings Form">
                 <group colspan="4" col="6">
                     <field name="name" select="1" string="Title"/>
-                    <field name="partner_id" on_change="onchange_partner_id(partner_id, email_from)" />
                     <field name="section_id"/>
+                    <field name="user_id" select="2" string="Responsible" required="1"/>
                     <newline/>
-                    <field name="date" string="Next Meeting"/>
-                    <field name="duration" colspan="1" string="Meeting Duration"/>
-                    <field name="categ_id" select="2" on_change="onchange_categ_id(categ_id)"/>
+                    <field name="date" string="Meeting Date" required="1"/>
+                    <field name="duration" colspan="1" widget="float_time" required="1"/>
+                    <field name="partner_id" on_change="onchange_partner_id(partner_id, email_from)" />
                 </group>
-                <notebook>
+                <notebook colspan="4">
                 <page string="Meeting">
                     <field name="partner_address_id" on_change="onchange_partner_address_id(partner_address_id, email_from)"/>
-                    <field name="priority" select="2"/>
-                    <newline/>
-                    <field name="user_id" select="2" string="Responsible"/>
                     <field name="email_from"/>
-                    <newline/>
-                    <field name="stage_id" select="1"/>
+                    <field name="categ_id" select="2" on_change="onchange_categ_id(categ_id)"/>
                     <field name="category2_id" select="1" string="Location"/>
+                    <field name="priority" select="2"/>
                     <newline/>
                     <separator string="Description" colspan="4"/>
                     <field name="note"  nolabel="1" colspan="4" />
                     <separator colspan="4"/>
                     <group col="8" colspan="4">
                         <field name="state" select="2"/> 
-                        <button name="case_close" string="Done" states="open,draft,pending" type="object"/>
-                        <button name="case_open" string="Open" states="draft,pending" type="object"/>
+                        <button name="case_open" string="Confirm Meeting" states="draft,cancel,pending" type="object"/>
                         <button name="case_cancel" string="Cancel Meeting" states="draft,open,pending" type="object"/>
-                        <button name="case_pending" string="Pending" states="draft,open" type="object"/>
-                        <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object"/>
-                        <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object"/>
+                        <button name="case_reset" string="Reset to Unconfirmed" states="done,open,cancel" type="object"/>
                     </group>
                 </page>
                 <page string="Extra Info">
@@ -119,7 +113,6 @@
                 <field name="date" string="Next Meeting"/>
                 <field name="section_id"/>
                 <field name="priority"/>
-                <field name="stage_id"/>
                 <field name="categ_id"/>
                 <field name="category2_id" string="Type"/>
                 <field name="user_id"/>
diff --git a/addons/crm_configuration/crm_opportunity_demo.xml b/addons/crm_configuration/crm_opportunity_demo.xml
index b22c69ede6c..6dd7edd22f6 100644
--- a/addons/crm_configuration/crm_opportunity_demo.xml
+++ b/addons/crm_configuration/crm_opportunity_demo.xml
@@ -1,103 +1,103 @@
 <?xml version="1.0"?>
 <openerp>
-	<data noupdate="1">
-	<!-- 
-		((((((((((( Demo Cases ))))))))))) 
-	-->
+    <data noupdate="1">
+    <!-- 
+        ((((((((((( Demo Cases ))))))))))) 
+    -->
 
-	<!--For Opportunity-->
+    <!--For Opportunity-->
 
-		<record id="crm_case_construstazunits0" model="crm.case">
-			<field eval="0.6" name="probability"/>
-			<field name="partner_address_id" ref="base.res_partner_address_zen"/>
-			<field eval="1" name="active"/>
-			<field eval="17.0" name="duration"/>
-			<field name="category2_id" ref="crm_configuration.category_oppor1"/>
-			<field name="partner_id" ref="base.res_partner_3"/>
-			<field eval="&quot;3&quot;" name="priority"/>
-			<field name="user_id" ref="base.user_root"/>
-			<field eval="&quot;open&quot;" name="state"/>
-			<field eval="75000.0" name="planned_cost"/>
-			<field eval="85000.0" name="planned_revenue"/>
-			<field name="section_id" ref="crm_configuration.section_support3"/>
-			<field eval="time.strftime('%Y-%m-07 10:05:15')" name="date"/>
-			<field name="categ_id" ref="crm_configuration.categ_oppor1"/>
-			<field name="stage_id" ref="crm_configuration.stage_oppor3"/>
-			<field eval="&quot;CONS TRUST (AZ) 529701 - 1000 units&quot;" name="name"/>
-		</record>
-		<record id="crm_case_rdroundfundingunits0" model="crm.case">
-			<field name="partner_address_id" ref="base.res_partner_address_15"/>
-			<field eval="1" name="active"/>
-			<field name="category2_id" ref="crm_configuration.category_oppor2"/>
-			<field name="partner_id" ref="base.res_partner_11"/>
-			<field eval="&quot;3&quot;" name="priority"/>
-			<field name="user_id" ref="base.user_root"/>
-			<field eval="&quot;draft&quot;" name="state"/>
-			<field eval="30000.0" name="planned_cost"/>
-			<field eval="45000.0" name="planned_revenue"/>
-			<field eval="0.5" name="probability"/>
-			<field eval="8.0" name="duration"/>
-			<field name="section_id" ref="crm_configuration.section_support3"/>
-			<field eval="time.strftime('%Y-%m-05 12:25:15')" name="date"/>
-			<field name="categ_id" ref="crm_configuration.categ_oppor5"/>
-			<field name="stage_id" ref="crm_configuration.stage_oppor1"/>
-			<field eval="&quot;3rd Round Funding - 1000 units &quot;" name="name"/>
-		</record>
-		<record id="crm_case_mediapoleunits0" model="crm.case">
-			<field eval="0.1" name="probability"/>
-			<field name="partner_address_id" ref="base.res_partner_address_3"/>
-			<field eval="1" name="active"/>
-			<field name="category2_id" ref="crm_configuration.category_oppor1"/>
-			<field name="partner_id" ref="base.res_partner_8"/>
-			<field eval="&quot;3&quot;" name="priority"/>
-			<field name="user_id" ref="base.user_root"/>
-			<field eval="&quot;pending&quot;" name="state"/>
-			<field eval="50000.0" name="planned_cost"/>
-			<field eval="55000.0" name="planned_revenue"/>
-			<field eval="0.75" name="probability"/>
-			<field eval="10.0" name="duration"/>
-			<field name="section_id" ref="crm_configuration.section_support3"/>
-			<field eval="time.strftime('%Y-%m-14 13:55:10')" name="date"/>
-			<field name="categ_id" ref="crm_configuration.categ_oppor7"/>
-			<field name="stage_id" ref="crm_configuration.stage_oppor5"/>
-			<field eval="&quot;Mediapole - 5000 units&quot;" name="name"/>
-			<field eval="&quot;info@mediapole.net&quot;" name="email_from"/>
-		</record>
-		<record id="crm_case_abcfuelcounits0" model="crm.case">
-			<field eval="0.4" name="probability"/>
-			<field name="partner_address_id" ref="base.res_partner_address_1"/>
-			<field eval="1" name="active"/>
-			<field name="category2_id" ref="crm_configuration.category_oppor1"/>
-			<field name="partner_id" ref="base.res_partner_9"/>
-			<field eval="&quot;3&quot;" name="priority"/>
-			<field name="user_id" ref="base.user_demo"/>
-			<field eval="&quot;open&quot;" name="state"/>
-			<field eval="50000.0" name="planned_cost"/>
-			<field eval="45000.0" name="planned_revenue"/>
-			<field eval="24.0" name="duration"/>
-			<field name="section_id" ref="crm_configuration.section_support3"/>
-			<field eval="time.strftime('%Y-%m-23 16:32:23')" name="date"/>
-			<field name="categ_id" ref="crm_configuration.categ_oppor5"/>
-			<field name="stage_id" ref="crm_configuration.stage_oppor4"/>
-			<field eval="&quot;ABC FUEL CO 829264 - 1000 units &quot;" name="name"/>
-			<field eval="&quot;info@opensides.be&quot;" name="email_from"/>
-		</record>
-		<record id="crm_case_dirtminingltdunits0" model="crm.case">
-			<field eval="0.8" name="probability"/>
-			<field name="partner_address_id" ref="base.res_partner_address_wong"/>
-			<field eval="1" name="active"/>
-			<field eval="2.25" name="duration"/>
-			<field name="partner_id" ref="base.res_partner_maxtor"/>
-			<field eval="&quot;3&quot;" name="priority"/>
-			<field name="user_id" ref="base.user_root"/>
-			<field eval="&quot;done&quot;" name="state"/>
-			<field eval="25000.0" name="planned_cost"/>
-			<field eval="42000.0" name="planned_revenue"/>
-			<field name="section_id" ref="crm_configuration.section_support3"/>
-			<field eval="time.strftime('%Y-%m-25 16:05:15')" name="date"/>
-			<field name="categ_id" ref="crm_configuration.categ_oppor2"/>
-			<field name="stage_id" ref="crm_configuration.stage_oppor6"/>
-			<field eval="&quot;Dirt Mining Ltd 271742 - 1000 units&quot;" name="name"/>
-		</record>
-	</data>
+        <record id="crm_case_construstazunits0" model="crm.case">
+            <field eval="60" name="probability"/>
+            <field name="partner_address_id" ref="base.res_partner_address_zen"/>
+            <field eval="1" name="active"/>
+            <field eval="17.0" name="duration"/>
+            <field name="category2_id" ref="crm_configuration.category_oppor1"/>
+            <field name="partner_id" ref="base.res_partner_3"/>
+            <field eval="&quot;3&quot;" name="priority"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field eval="&quot;open&quot;" name="state"/>
+            <field eval="75000.0" name="planned_cost"/>
+            <field eval="85000.0" name="planned_revenue"/>
+            <field name="section_id" ref="crm_configuration.section_support3"/>
+            <field eval="time.strftime('%Y-%m-07 10:05:15')" name="date"/>
+            <field name="categ_id" ref="crm_configuration.categ_oppor1"/>
+            <field name="stage_id" ref="crm_configuration.stage_oppor3"/>
+            <field eval="&quot;CONS TRUST (AZ) 529701 - 1000 units&quot;" name="name"/>
+        </record>
+        <record id="crm_case_rdroundfundingunits0" model="crm.case">
+            <field name="partner_address_id" ref="base.res_partner_address_15"/>
+            <field eval="1" name="active"/>
+            <field name="category2_id" ref="crm_configuration.category_oppor2"/>
+            <field name="partner_id" ref="base.res_partner_11"/>
+            <field eval="&quot;3&quot;" name="priority"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field eval="&quot;draft&quot;" name="state"/>
+            <field eval="30000.0" name="planned_cost"/>
+            <field eval="45000.0" name="planned_revenue"/>
+            <field eval="50" name="probability"/>
+            <field eval="8.0" name="duration"/>
+            <field name="section_id" ref="crm_configuration.section_support3"/>
+            <field eval="time.strftime('%Y-%m-05 12:25:15')" name="date"/>
+            <field name="categ_id" ref="crm_configuration.categ_oppor5"/>
+            <field name="stage_id" ref="crm_configuration.stage_oppor1"/>
+            <field eval="&quot;3rd Round Funding - 1000 units &quot;" name="name"/>
+        </record>
+        <record id="crm_case_mediapoleunits0" model="crm.case">
+            <field eval="10" name="probability"/>
+            <field name="partner_address_id" ref="base.res_partner_address_3"/>
+            <field eval="1" name="active"/>
+            <field name="category2_id" ref="crm_configuration.category_oppor1"/>
+            <field name="partner_id" ref="base.res_partner_8"/>
+            <field eval="&quot;3&quot;" name="priority"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field eval="&quot;pending&quot;" name="state"/>
+            <field eval="50000.0" name="planned_cost"/>
+            <field eval="55000.0" name="planned_revenue"/>
+            <field eval="70" name="probability"/>
+            <field eval="10.0" name="duration"/>
+            <field name="section_id" ref="crm_configuration.section_support3"/>
+            <field eval="time.strftime('%Y-%m-14 13:55:10')" name="date"/>
+            <field name="categ_id" ref="crm_configuration.categ_oppor7"/>
+            <field name="stage_id" ref="crm_configuration.stage_oppor5"/>
+            <field eval="&quot;Mediapole - 5000 units&quot;" name="name"/>
+            <field eval="&quot;info@mediapole.net&quot;" name="email_from"/>
+        </record>
+        <record id="crm_case_abcfuelcounits0" model="crm.case">
+            <field eval="40" name="probability"/>
+            <field name="partner_address_id" ref="base.res_partner_address_1"/>
+            <field eval="1" name="active"/>
+            <field name="category2_id" ref="crm_configuration.category_oppor1"/>
+            <field name="partner_id" ref="base.res_partner_9"/>
+            <field eval="&quot;3&quot;" name="priority"/>
+            <field name="user_id" ref="base.user_demo"/>
+            <field eval="&quot;open&quot;" name="state"/>
+            <field eval="50000.0" name="planned_cost"/>
+            <field eval="45000.0" name="planned_revenue"/>
+            <field eval="24.0" name="duration"/>
+            <field name="section_id" ref="crm_configuration.section_support3"/>
+            <field eval="time.strftime('%Y-%m-23 16:32:23')" name="date"/>
+            <field name="categ_id" ref="crm_configuration.categ_oppor5"/>
+            <field name="stage_id" ref="crm_configuration.stage_oppor4"/>
+            <field eval="&quot;ABC FUEL CO 829264 - 1000 units &quot;" name="name"/>
+            <field eval="&quot;info@opensides.be&quot;" name="email_from"/>
+        </record>
+        <record id="crm_case_dirtminingltdunits0" model="crm.case">
+            <field eval="80" name="probability"/>
+            <field name="partner_address_id" ref="base.res_partner_address_wong"/>
+            <field eval="1" name="active"/>
+            <field eval="2.25" name="duration"/>
+            <field name="partner_id" ref="base.res_partner_maxtor"/>
+            <field eval="&quot;3&quot;" name="priority"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field eval="&quot;done&quot;" name="state"/>
+            <field eval="25000.0" name="planned_cost"/>
+            <field eval="42000.0" name="planned_revenue"/>
+            <field name="section_id" ref="crm_configuration.section_support3"/>
+            <field eval="time.strftime('%Y-%m-25 16:05:15')" name="date"/>
+            <field name="categ_id" ref="crm_configuration.categ_oppor2"/>
+            <field name="stage_id" ref="crm_configuration.stage_oppor6"/>
+            <field eval="&quot;Dirt Mining Ltd 271742 - 1000 units&quot;" name="name"/>
+        </record>
+    </data>
 </openerp>
diff --git a/addons/crm_configuration/crm_opportunity_menu.xml b/addons/crm_configuration/crm_opportunity_menu.xml
index 7de69cdc896..b973c4fc76d 100644
--- a/addons/crm_configuration/crm_opportunity_menu.xml
+++ b/addons/crm_configuration/crm_opportunity_menu.xml
@@ -1,280 +1,282 @@
 <?xml version="1.0"?>
 <openerp>
 <data noupdate="1">
-	<record model="crm.case.section" id="section_support3">
-		<field name="name">Opportunities</field>
-		<field name="code">oppor</field>
-	</record>	
+    <menuitem id="menu_presale" name="Pre-Sales" parent="crm.menu_crm" sequence="4"/>
 
-	<record model="ir.actions.act_window" id="crm_case_category_act_oppor11">
-		<field name="name">All Opportunities</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,form,calendar,graph</field>
-		<field name="view_id" ref="crm_case_tree_view_oppor"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_oppor11">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view_oppor"/>
-		<field name="act_window_id" ref="crm_case_category_act_oppor11"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_oppor11">
-		<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_oppor11"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_oppor11">
-		<field name="sequence" eval="2"/>
-		<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_oppor11"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_graph_view_oppor11">
-		<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_oppor11"/>
-	</record>	
-	<menuitem name="Opportunities" id="menu_crm_case_opp" parent="crm.menu_crm" action="crm_case_category_act_oppor11"/>
+     <record model="crm.case.section" id="section_support3">
+          <field name="name">Opportunities</field>
+          <field name="code">oppor</field>
+     </record>
+
+     <record model="ir.actions.act_window" id="crm_case_category_act_oppor11">
+          <field name="name">All Opportunities</field>
+          <field name="res_model">crm.case</field>
+          <field name="view_mode">tree,form,calendar,graph</field>
+          <field name="view_id" ref="crm_case_tree_view_oppor"/>
+          <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+')]'"/>
+     </record>
+     <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_oppor11">
+          <field name="sequence" eval="3"/>
+          <field name="view_mode">calendar</field>
+          <field name="view_id" ref="crm_case_calendar_view_oppor"/>
+          <field name="act_window_id" ref="crm_case_category_act_oppor11"/>
+     </record>
+     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_oppor11">
+          <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_oppor11"/>
+     </record>
+     <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_oppor11">
+          <field name="sequence" eval="2"/>
+          <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_oppor11"/>
+     </record>
+     <record model="ir.actions.act_window.view" id="action_crm_tag_graph_view_oppor11">
+          <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_oppor11"/>
+     </record>
+     <menuitem name="Opportunities" id="menu_crm_case_opp" parent="menu_presale" action="crm_case_category_act_oppor11"/>
 
 
-<!--		MENU		-->
-	<menuitem parent="menu_crm_case_opp" id="menu_crm_case_categ0_act_oppor11" action="crm_case_category_act_oppor11"/>
+<!--          MENU          -->
+     <menuitem parent="menu_crm_case_opp" id="menu_crm_case_categ0_act_oppor11" action="crm_case_category_act_oppor11"/>
 
-	<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,calendar,form,graph</field>
-		<field name="view_id" ref="crm_case_tree_view_oppor"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+'),(\'state\',\'=\',\'open\')]'"/>
-	</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_calendar_view_oppor1">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_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"/>
+     <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,calendar,form,graph</field>
+          <field name="view_id" ref="crm_case_tree_view_oppor"/>
+          <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+'),(\'state\',\'=\',\'open\')]'"/>
+     </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_calendar_view_oppor1">
+          <field name="sequence" eval="2"/>
+          <field name="view_mode">calendar</field>
+          <field name="view_id" ref="crm_case_calendar_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"/>
 
 
-	<record model="ir.actions.act_window" id="crm_case_category_act_oppor_all2">
-		<field name="name">All Pending Opportunities</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_view_oppor"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+'),(\'state\',\'=\',\'pending\')]'"/>
-	</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_calendar_view_oppor_all2">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_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"/>
+     <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,calendar,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)]'"/>
+     </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_calendar_view_oppor_all2">
+          <field name="sequence" eval="2"/>
+          <field name="view_mode">calendar</field>
+          <field name="view_id" ref="crm_case_calendar_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"/>
 
 
 <!-- ======================================================== -->
-	<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,calendar,form,graph</field>
-		<field name="view_id" ref="crm_case_calendar_view_oppor"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+'),(\'user_id\',\'=\',uid)]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_oppor22">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_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_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"/>
+     <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,calendar,form,graph</field>
+          <field name="view_id" ref="crm_case_calendar_view_oppor"/>
+          <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+'),(\'user_id\',\'=\',uid)]'"/>
+     </record>
+     <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_oppor22">
+          <field name="sequence" eval="2"/>
+          <field name="view_mode">calendar</field>
+          <field name="view_id" ref="crm_case_calendar_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_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"/>
 
-	<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)+')]'"/>
-	</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_categ0_act_oppor22" id="menu_crm_case_categ0_act_oppor" action="crm_case_category_act_oppor"/>
+     <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,calendar</field>
+          <field name="view_id" ref="crm_case_form_view_oppor"/>
+          <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+')]'"/>
+     </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,calendar,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)]'"/>
-	</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_calendar_view_oppor2">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_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"/>
+     <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,calendar,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)]'"/>
+     </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_calendar_view_oppor2">
+          <field name="sequence" eval="2"/>
+          <field name="view_mode">calendar</field>
+          <field name="view_id" ref="crm_case_calendar_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"/>
 
-	<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,calendar,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)]'"/>
-	</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_calendar_view_oppor_my2">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_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"/>
+     <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,calendar,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)]'"/>
+     </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_calendar_view_oppor_my2">
+          <field name="sequence" eval="2"/>
+          <field name="view_mode">calendar</field>
+          <field name="view_id" ref="crm_case_calendar_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"/>
 
-<!--		REPORTS			-->
-	<record model="ir.actions.act_window" id="action_report_crm_case_oppor_user">
-		<field name="res_model">report.crm.case.user</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">graph,tree</field>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+')]'"/>
-	</record>
-	<menuitem name="Opportunity" parent="report_crm.next_id_64" id="menu_action_report_crm_case_oppor"/>
-	<menuitem name="Cases by Opportunities and User" parent="menu_action_report_crm_case_oppor" action="action_report_crm_case_oppor_user" id="menu_action_report_crm_case_oppor_user"/>
+<!--          REPORTS               -->
+     <record model="ir.actions.act_window" id="action_report_crm_case_oppor_user">
+          <field name="res_model">report.crm.case.user</field>
+          <field name="view_type">form</field>
+          <field name="view_mode">graph,tree</field>
+          <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+')]'"/>
+     </record>
+     <menuitem name="Opportunity" parent="report_crm.next_id_64" id="menu_action_report_crm_case_oppor"/>
+     <menuitem name="Cases by Opportunities and User" parent="menu_action_report_crm_case_oppor" action="action_report_crm_case_oppor_user" id="menu_action_report_crm_case_oppor_user"/>
 
-	<record model="ir.actions.act_window" id="action_report_crm_case_oppor_categ">
-		<field name="res_model">report.crm.case.section.categ2</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">graph,tree</field>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+')]'"/>
-	</record>
-	<menuitem name="Cases by Opportunities and Category2"  parent="menu_action_report_crm_case_oppor" action="action_report_crm_case_oppor_categ" id="menu_action_report_crm_case_oppor_categ"/>
+     <record model="ir.actions.act_window" id="action_report_crm_case_oppor_categ">
+          <field name="res_model">report.crm.case.section.categ2</field>
+          <field name="view_type">form</field>
+          <field name="view_mode">graph,tree</field>
+          <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+')]'"/>
+     </record>
+     <menuitem name="Cases by Opportunities and Category2"  parent="menu_action_report_crm_case_oppor" action="action_report_crm_case_oppor_categ" id="menu_action_report_crm_case_oppor_categ"/>
 
-	<record model="ir.actions.act_window" id="action_report_crm_case_oppor_stage">
-		<field name="res_model">report.crm.case.section.stage</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">graph,tree</field>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+')]'"/>
-	</record>
-	<menuitem name="Cases by Opportunities and Stage" parent="menu_action_report_crm_case_oppor"  action="action_report_crm_case_oppor_stage" id="menu_action_report_crm_case_oppor_stage"/>
+     <record model="ir.actions.act_window" id="action_report_crm_case_oppor_stage">
+          <field name="res_model">report.crm.case.section.stage</field>
+          <field name="view_type">form</field>
+          <field name="view_mode">graph,tree</field>
+          <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+')]'"/>
+     </record>
+     <menuitem name="Cases by Opportunities and Stage" parent="menu_action_report_crm_case_oppor"  action="action_report_crm_case_oppor_stage" id="menu_action_report_crm_case_oppor_stage"/>
 
-	<record model="ir.actions.act_window" id="action_report_crm_case_oppor_categ_stage">
-		<field name="res_model">report.crm.case.section.categ.stage</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree</field>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+')]'"/>
-	</record>
-	<menuitem name="Cases by Section, Category and Stage" parent="menu_action_report_crm_case_oppor" action="action_report_crm_case_oppor_categ_stage" id="menu_action_report_crm_case_oppor_categ_stage"/>
+     <record model="ir.actions.act_window" id="action_report_crm_case_oppor_categ_stage">
+          <field name="res_model">report.crm.case.section.categ.stage</field>
+          <field name="view_type">form</field>
+          <field name="view_mode">tree</field>
+          <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+')]'"/>
+     </record>
+     <menuitem name="Cases by Section, Category and Stage" parent="menu_action_report_crm_case_oppor" action="action_report_crm_case_oppor_categ_stage" id="menu_action_report_crm_case_oppor_categ_stage"/>
+
+     <record model="ir.actions.act_window" id="action_report_crm_case_oppor_categ_categ2">
+          <field name="res_model">report.crm.case.section.categ.categ2</field>
+          <field name="view_type">form</field>
+          <field name="view_mode">tree</field>
+          <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+')]'"/>
+     </record>
+     <menuitem name="Cases by Section, Category and Category2" parent="menu_action_report_crm_case_oppor" action="action_report_crm_case_oppor_categ_categ2" id="menu_action_report_crm_case_oppor_categ_categ2"/>
 
-	<record model="ir.actions.act_window" id="action_report_crm_case_oppor_categ_categ2">
-		<field name="res_model">report.crm.case.section.categ.categ2</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree</field>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+')]'"/>
-	</record>
-	<menuitem name="Cases by Section, Category and Category2" parent="menu_action_report_crm_case_oppor" action="action_report_crm_case_oppor_categ_categ2" id="menu_action_report_crm_case_oppor_categ_categ2"/>
-	
 
 </data>
 </openerp>
diff --git a/addons/crm_configuration/crm_opportunity_view.xml b/addons/crm_configuration/crm_opportunity_view.xml
index 9bc414319b5..52486198741 100644
--- a/addons/crm_configuration/crm_opportunity_view.xml
+++ b/addons/crm_configuration/crm_opportunity_view.xml
@@ -1,145 +1,141 @@
 <?xml version="1.0"?>
 <openerp>
-<data noupdate="1">
+<data>
 
-	# ------------------------------------------------------ 
-	# Opportunities
-	# ------------------------------------------------------ 
+    # ------------------------------------------------------ 
+    # Opportunities
+    # ------------------------------------------------------ 
 
-	<record model="ir.ui.view" id="crm_case_form_view_oppor">
-		<field name="name">CRM - Opportunities Form</field>
-		<field name="model">crm.case</field>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-			<form string="Opportunities Form">
-				<group colspan="4" col="6">
-					<field name="name" select="1" string="Name" colspan="2"/>
-					<field name="section_id" colspan="1"/>
-					<field name="categ_id" select="1" on_change="onchange_categ_id(categ_id)" string="Lead Source"/>
-					<newline/>
-					<field name="date" string="Next Meeting"/>
-					<field name="duration" string="Meeting Duration"/>
-					<field name="stage_id" select="1" string="Sales Stage"/>
-				</group>
-				<notebook>
-				<page string="Opportunities">
-					<field name="partner_id" select="1" 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"/>
-					<field name="user_id" select="2" string="Responsible"/>
-					<separator colspan="4"/>
-					<field name="category2_id" select="1" string="Type"/>
-					<field name="priority" string="Priority"/>
-					<newline/>
-					<separator colspan="4" string="Estimates"/>
-					<field name="planned_cost"/>
-					<field name="planned_revenue"/>
-					<field name="probability" colspan="4"/>
-					<separator colspan="4" string="Description Information"/>
-						<field name="note" nolabel="1" colspan="4"/>
+    <record model="ir.ui.view" id="crm_case_form_view_oppor">
+        <field name="name">CRM - Opportunities Form</field>
+        <field name="model">crm.case</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Opportunities">
+                <group colspan="4" col="7">
+                    <field name="name" select="1" string="Opportunity" colspan="2"/>
+                    <field name="section_id" colspan="1"/>
+                    <field name="user_id" select="2" string="Responsible"/>
+                    <field name="stage_id" select="1" string="Sales Stage"/>
+                    <field name="date" string="Next Meeting"/>
+                    <field name="duration"/>
+                    <button string="Schedule Meeting" icon="terp-crm" name="%(wizard_crm_meeting)d" type="action"/>
+                </group>
+                <notebook colspan="4">
+                <page string="Description">
+                    <field name="partner_id" select="1" 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"/>
+                    <field name="email_from" colspan="2"/>
+                    <field name="categ_id" select="1" on_change="onchange_categ_id(categ_id)" string="Source"/>
+                    <field name="priority" string="Priority"/>
+                    <field name="category2_id" select="1" string="Category"/>
+                    <separator colspan="4" string="Estimates"/>
+                    <field name="planned_revenue"/>
+                    <field name="planned_cost"/>
+                    <field name="probability"/>
+                    <separator colspan="4" string="Description Information"/>
+                        <field name="note" nolabel="1" colspan="4"/>
 
-					<separator colspan="4"/>
-					<group col="8" colspan="4">
-						<field name="state" select="2"/> 
-					 	<button name="case_close" string="Done" states="open,draft,pending" type="object"/>
-						<button name="case_open" string="Open" states="draft,pending" type="object"/>
-						<button name="case_cancel" string="Cancel" states="draft,open,pending" type="object"/>
-						<button name="case_pending" string="Pending" states="draft,open" type="object"/>
-						<button name="case_escalate" string="Escalate" states="open,draft,pending" type="object"/>
-						<button name="case_reset" string="Reset to Draft" states="done,cancel" type="object"/>
-					</group>
-				</page>
+                    <separator colspan="4"/>
+                    <group col="8" colspan="4">
+                        <field name="state" select="2"/> 
+                         <button name="case_close" string="Done" states="open,draft,pending" type="object"/>
+                        <button name="case_open" string="Open" states="draft,pending" type="object"/>
+                        <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object"/>
+                        <button name="case_pending" string="Pending" states="draft,open" type="object"/>
+                        <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object"/>
+                        <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object"/>
+                    </group>
+                </page>
 
-				<page string="Extra Info">
-					<field name="id"/>
-					<field name="active"/>
-					<field name="email_cc" colspan="4"/>
-					
-					<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"/>
-					<field name="history_line" colspan="2" nolabel="1" mode="tree,form">
-						<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"/>
-						</form>
-						<tree string="Communication history">
-							<field name="description"/>
-							<field name="email"/>
-							<field name="date"/>
-						</tree>
-					</field>
-					<group col="2" colspan="2" expand="1">
-						<field name="canal_id"/>
-						<field name="som"/>
-						<button name="add_reply" string="Add Last Mail for Replying"
-							states="open" type="object" colspan="2"/>
-						<field name="description" colspan="2" nolabel="1"/>
-						<button name="case_log_reply"
-							string="Send Partner &amp; Historize" states="open"
-							type="object"/>
-						<button name="case_log" string="Historize" states="open"
-							type="object"/>
-					</group>
+                <page string="Extra Info">
+                    <field name="id"/>
+                    <field name="active"/>
+                    <field name="email_cc" colspan="4"/>
+                    
+                    <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"/>
+                    <field name="history_line" colspan="2" nolabel="1" mode="tree,form">
+                        <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"/>
+                        </form>
+                        <tree string="Communication history">
+                            <field name="description"/>
+                            <field name="email"/>
+                            <field name="date"/>
+                        </tree>
+                    </field>
+                    <group col="2" colspan="2" expand="1">
+                        <field name="canal_id"/>
+                        <field name="som"/>
+                        <button name="add_reply" string="Add Last Mail for Replying"
+                            states="open" type="object" colspan="2"/>
+                        <field name="description" colspan="2" nolabel="1"/>
+                        <button name="case_log_reply"
+                            string="Send Partner &amp; Historize" states="open"
+                            type="object"/>
+                        <button name="case_log" string="Historize" states="open"
+                            type="object"/>
+                    </group>
 
-					<separator colspan="4" string="References"/>
-					<field name="ref" colspan="4"/>
-					<field name="ref2" colspan="4"/>
-				</page>
-				<page string="History">
-					<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>
-				</notebook>
-			</form>
-		</field>
-	</record>
-	<record model="ir.ui.view" id="crm_case_tree_view_oppor">
-		<field name="name">CRM - Opportunities Tree</field>
-		<field name="model">crm.case</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-			<tree string="Opportunities Tree"  colors="red:state=='open'">
-				<field name="id"/>
-				<field name="name" string="Opportunities"/>
-				<field name="stage_id"  string="Sales Stage"/>
-				<field name="categ_id" string="Lead Source"/>
-				<field name="category2_id" string="Type"/>
-				<field name="planned_cost"/>
-				<field name="planned_revenue"/>
-				<field name="user_id"/>
-				<field name="state"/>
-			</tree>
-		</field>
-	</record>
-	<record model="ir.ui.view" id="crm_case_calendar_view_oppor">
-		<field name="name">CRM - Opportunities Calendar</field>
-		<field name="model">crm.case</field>
-		<field name="type">calendar</field>
-		<field name="priority" eval="2"/>
-		<field name="arch" type="xml">
-			<calendar string="Opportunities" date_start="date" color="user_id" date_delay="duration">
-				<field name="name"/>
-				<field name="partner_id"/>
-			</calendar>
-		</field>
-	</record>
+                    <separator colspan="4" string="References"/>
+                    <field name="ref" colspan="4"/>
+                    <field name="ref2" colspan="4"/>
+                </page>
+                <page string="History">
+                    <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>
+                </notebook>
+            </form>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="crm_case_tree_view_oppor">
+        <field name="name">CRM - Opportunities Tree</field>
+        <field name="model">crm.case</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Opportunities Tree"  colors="red:state=='open'">
+                <field name="id"/>
+                <field name="name" string="Opportunities"/>
+                <field name="stage_id"  string="Sales Stage"/>
+                <field name="partner_id" string="Partner"/>
+                <field name="planned_revenue"/>
+                <field name="probability"/>
+                <field name="user_id"/>
+                <field name="state"/>
+            </tree>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="crm_case_calendar_view_oppor">
+        <field name="name">CRM - Opportunities Calendar</field>
+        <field name="model">crm.case</field>
+        <field name="type">calendar</field>
+        <field name="priority" eval="2"/>
+        <field name="arch" type="xml">
+            <calendar string="Opportunities" date_start="date" color="user_id" date_delay="duration">
+                <field name="name"/>
+                <field name="partner_id"/>
+            </calendar>
+        </field>
+    </record>
 </data>
 </openerp>
diff --git a/addons/crm_configuration/crm_report_view.xml b/addons/crm_configuration/crm_report_view.xml
index 1f71e321279..fc4a95e1610 100644
--- a/addons/crm_configuration/crm_report_view.xml
+++ b/addons/crm_configuration/crm_report_view.xml
@@ -1,242 +1,242 @@
 <?xml version="1.0"?>
 <openerp>
 <data>
-	#
-	# Cases by section and category2 of case
-	#
+    #
+    # Cases by section and category2 of case
+    #
 
-	<record model="ir.ui.view" id="view_crm_case_section_categ_tree">
-		<field name="name">CRM Report - Sections and Category2(Tree)</field>
-		<field name="model">report.crm.case.section.categ2</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-			<tree string="Cases by Section and Category2">
-				<field name="name"/>
-				<field name="user_id"/>
-				<field name="section_id"/>
-				<field name="category2_id"/>
-				<field name="stage_id"/>
-				<field name="nbr"/>
-				<field name="delay_close"/>
-				<field name="state"/>
-				
-			</tree>
-		</field>
-	</record>
-	<record model="ir.ui.view" id="view_crm_case_section_categ_form">
-		<field name="name">CRM Report - Sections and Category2(Form)</field>
-		<field name="model">report.crm.case.section.categ2</field>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-			<form string="Cases by Section and Category2">
-				<field name="name"/>
-				<field name="user_id"/>
-				<field name="section_id" select="1"/>
-				<field name="category2_id" select="1"/>
-				<field name="stage_id"/>
-				<field name="nbr" select="1"/>
-				<field name="state" select="1"/>
-				<field name="delay_close"/>
-			</form>
-		</field>
-	</record>
-	<record model="ir.ui.view" id="view_crm_case_section_categ_graph">
-		<field name="name">CRM Report - Sections and Category2(Graph)</field>
-		<field name="model">report.crm.case.section.categ2</field>
-		<field name="type">graph</field>
-		<field name="arch" type="xml">
-			<graph string="Cases by Section and Category2" type="bar" orientation="horizontal">
-				<field name="category2_id"/>
-				<field name="nbr" operator="+"/>
-				<field name="section_id" group="True"/>
-			</graph>
-		</field>
-	</record>
+    <record model="ir.ui.view" id="view_crm_case_section_categ_tree">
+        <field name="name">CRM Report - Sections and Category2(Tree)</field>
+        <field name="model">report.crm.case.section.categ2</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Cases by Section and Category2">
+                <field name="name"/>
+                <field name="user_id"/>
+                <field name="section_id"/>
+                <field name="category2_id"/>
+                <field name="stage_id"/>
+                <field name="nbr"/>
+                <field name="delay_close"/>
+                <field name="state"/>
+                
+            </tree>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_crm_case_section_categ_form">
+        <field name="name">CRM Report - Sections and Category2(Form)</field>
+        <field name="model">report.crm.case.section.categ2</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Cases by Section and Category2">
+                <field name="name"/>
+                <field name="user_id"/>
+                <field name="section_id" select="1"/>
+                <field name="category2_id" select="1"/>
+                <field name="stage_id"/>
+                <field name="nbr" select="1"/>
+                <field name="state" select="1"/>
+                <field name="delay_close"/>
+            </form>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_crm_case_section_categ_graph">
+        <field name="name">CRM Report - Sections and Category2(Graph)</field>
+        <field name="model">report.crm.case.section.categ2</field>
+        <field name="type">graph</field>
+        <field name="arch" type="xml">
+            <graph string="Cases by Section and Category2" type="bar" orientation="horizontal">
+                <field name="category2_id"/>
+                <field name="nbr" operator="+"/>
+                <field name="section_id" group="True"/>
+            </graph>
+        </field>
+    </record>
 
-	<record model="ir.actions.act_window" id="action_report_crm_case_section_categ_tree_month">
-		<field name="res_model">report.crm.case.section.categ2</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">graph,tree</field>
-		<field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
-	</record>
-	<menuitem parent="report_crm.next_id_65" name="Cases by Section and Category2" action="action_report_crm_case_section_categ_tree_month" id="menu_crm_case_section_categ_tree_month"/>
+    <record model="ir.actions.act_window" id="action_report_crm_case_section_categ_tree_month">
+        <field name="res_model">report.crm.case.section.categ2</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">graph,tree</field>
+        <field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
+    </record>
+    <menuitem parent="report_crm.next_id_65" name="Cases by Section and Category2" action="action_report_crm_case_section_categ_tree_month" id="menu_crm_case_section_categ_tree_month"/>
 
-	<record model="ir.actions.act_window" id="action_report_crm_case_section_categ_tree">
-		<field name="res_model">report.crm.case.section.categ2</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">graph,tree</field>
-	</record>
-	<menuitem parent="report_crm.next_id_66" name="Cases by Section and Category2" action="action_report_crm_case_section_categ_tree" id="menu_crm_case_section_categ_tree"/>
+    <record model="ir.actions.act_window" id="action_report_crm_case_section_categ_tree">
+        <field name="res_model">report.crm.case.section.categ2</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">graph,tree</field>
+    </record>
+    <menuitem parent="report_crm.next_id_66" name="Cases by Section and Category2" action="action_report_crm_case_section_categ_tree" id="menu_crm_case_section_categ_tree"/>
 
-	#
-	# Cases by section and stage
-	#
+    #
+    # Cases by section and stage
+    #
 
-	<record model="ir.ui.view" id="view_crm_case_section_stage_tree">
-		<field name="name">CRM Report - Sections and Stage(Tree)</field>
-		<field name="model">report.crm.case.section.stage</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-			<tree string="Cases by Section and Stage">
-				<field name="name"/>
-				<field name="user_id"/>
-				<field name="section_id"/>
-				<field name="stage_id"/>
-				<field name="nbr"/>
-				<field name="delay_close"/>
-				<field name="state"/>
-			</tree>
-		</field>
-	</record>
-	<record model="ir.ui.view" id="view_crm_case_section_stage_form">
-		<field name="name">CRM Report - Sections and Stage(Form)</field>
-		<field name="model">report.crm.case.section.stage</field>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-			<form string="Cases by Section and Stage">
-				<field name="name"/>
-				<field name="user_id"/>
-				<field name="section_id" select="1"/>
-				<field name="stage_id"/>
-				<field name="nbr" select="1"/>
-				<field name="state" select="1"/>
-				<field name="delay_close"/>
-			</form>
-		</field>
-	</record>
-	<record model="ir.ui.view" id="view_crm_case_section_stage_graph">
-		<field name="name">CRM Report - Sections and Stage(Graph)</field>
-		<field name="model">report.crm.case.section.stage</field>
-		<field name="type">graph</field>
-		<field name="arch" type="xml">
-			<graph string="Cases by Section and Stage" type="bar" orientation="horizontal">
-				<field name="stage_id"/>
-				<field name="nbr" operator="+"/>
-				<field name="section_id" group="True"/>
-			</graph>
-		</field>
-	</record>
+    <record model="ir.ui.view" id="view_crm_case_section_stage_tree">
+        <field name="name">CRM Report - Sections and Stage(Tree)</field>
+        <field name="model">report.crm.case.section.stage</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Cases by Section and Stage">
+                <field name="name"/>
+                <field name="user_id"/>
+                <field name="section_id"/>
+                <field name="stage_id"/>
+                <field name="nbr"/>
+                <field name="delay_close"/>
+                <field name="state"/>
+            </tree>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_crm_case_section_stage_form">
+        <field name="name">CRM Report - Sections and Stage(Form)</field>
+        <field name="model">report.crm.case.section.stage</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Cases by Section and Stage">
+                <field name="name"/>
+                <field name="user_id"/>
+                <field name="section_id" select="1"/>
+                <field name="stage_id"/>
+                <field name="nbr" select="1"/>
+                <field name="state" select="1"/>
+                <field name="delay_close"/>
+            </form>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_crm_case_section_stage_graph">
+        <field name="name">CRM Report - Sections and Stage(Graph)</field>
+        <field name="model">report.crm.case.section.stage</field>
+        <field name="type">graph</field>
+        <field name="arch" type="xml">
+            <graph string="Cases by Section and Stage" type="bar" orientation="horizontal">
+                <field name="stage_id"/>
+                <field name="nbr" operator="+"/>
+                <field name="section_id" group="True"/>
+            </graph>
+        </field>
+    </record>
 
-	<record model="ir.actions.act_window" id="action_report_crm_case_section_stage_tree_month">
-		<field name="res_model">report.crm.case.section.stage</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">graph,tree</field>
-		<field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
-	</record>
-	<menuitem parent="report_crm.next_id_65" name="Cases by Section and Stage" action="action_report_crm_case_section_stage_tree_month" id="menu_crm_case_section_stage_tree_month"/>
-	<record model="ir.actions.act_window" id="action_report_crm_case_section_stage_tree">
-		<field name="res_model">report.crm.case.section.stage</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">graph,tree</field>
-	</record>
-	<menuitem parent="report_crm.next_id_66" name="Cases by Section and Stage" action="action_report_crm_case_section_stage_tree" id="menu_crm_case_section_stage_tree"/>
+    <record model="ir.actions.act_window" id="action_report_crm_case_section_stage_tree_month">
+        <field name="res_model">report.crm.case.section.stage</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">graph,tree</field>
+        <field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
+    </record>
+    <menuitem parent="report_crm.next_id_65" name="Cases by Section and Stage" action="action_report_crm_case_section_stage_tree_month" id="menu_crm_case_section_stage_tree_month"/>
+    <record model="ir.actions.act_window" id="action_report_crm_case_section_stage_tree">
+        <field name="res_model">report.crm.case.section.stage</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">graph,tree</field>
+    </record>
+    <menuitem parent="report_crm.next_id_66" name="Cases by Section and Stage" action="action_report_crm_case_section_stage_tree" id="menu_crm_case_section_stage_tree"/>
 
-	#
-	# Cases by section, category and stage
-	#
+    #
+    # Cases by section, category and stage
+    #
 
-	<record model="ir.ui.view" id="view_crm_case_section_categ_stage_tree">
-		<field name="name">CRM Report - Section, Category and Stage(Tree)</field>
-		<field name="model">report.crm.case.section.categ.stage</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-			<tree string="Cases by Section, Category and Stage">
-				<field name="name"/>
-				<field name="user_id"/>
-				<field name="section_id"/>
-				<field name="categ_id"/>
-				<field name="stage_id"/>
-				<field name="nbr"/>
-				<field name="delay_close"/>
-				<field name="state"/>
-			</tree>
-		</field>
-	</record>
-	<record model="ir.ui.view" id="view_crm_case_section_categ_stage_form">
-		<field name="name">CRM Report - Section, Category and Stage(Form)</field>
-		<field name="model">report.crm.case.section.categ.stage</field>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-			<form string="Cases by Section, Category and Stage">
-				<field name="name"/>
-				<field name="user_id"/>
-				<field name="section_id" select="1"/>
-				<field name="categ_id"/>
-				<field name="stage_id"/>
-				<field name="nbr" select="1"/>
-				<field name="state" select="1"/>
-				<field name="delay_close"/>
-			</form>
-		</field>
-	</record>
+    <record model="ir.ui.view" id="view_crm_case_section_categ_stage_tree">
+        <field name="name">CRM Report - Section, Category and Stage(Tree)</field>
+        <field name="model">report.crm.case.section.categ.stage</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Cases by Section, Category and Stage">
+                <field name="name"/>
+                <field name="user_id"/>
+                <field name="section_id"/>
+                <field name="categ_id"/>
+                <field name="stage_id"/>
+                <field name="nbr"/>
+                <field name="delay_close"/>
+                <field name="state"/>
+            </tree>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_crm_case_section_categ_stage_form">
+        <field name="name">CRM Report - Section, Category and Stage(Form)</field>
+        <field name="model">report.crm.case.section.categ.stage</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Cases by Section, Category and Stage">
+                <field name="name"/>
+                <field name="user_id"/>
+                <field name="section_id" select="1"/>
+                <field name="categ_id"/>
+                <field name="stage_id"/>
+                <field name="nbr" select="1"/>
+                <field name="state" select="1"/>
+                <field name="delay_close"/>
+            </form>
+        </field>
+    </record>
 
-	<record model="ir.actions.act_window" id="action_report_crm_case_section_categ_stage_tree_month">
-		<field name="res_model">report.crm.case.section.categ.stage</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree</field>
-		<field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
-	</record>
-	<menuitem parent="report_crm.next_id_65" name="Cases by Section, Category and Stage" action="action_report_crm_case_section_categ_stage_tree_month" id="menu_crm_case_section_categ_stage_tree_month"/>
-	<record model="ir.actions.act_window" id="action_report_crm_case_section_categ_stage_tree">
-		<field name="res_model">report.crm.case.section.categ.stage</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree</field>
-	</record>
-	<menuitem parent="report_crm.next_id_66" name="Cases by Section, Category and Stage" action="action_report_crm_case_section_categ_stage_tree" id="menu_crm_case_section_categ_stage_tree"/>
+    <record model="ir.actions.act_window" id="action_report_crm_case_section_categ_stage_tree_month">
+        <field name="res_model">report.crm.case.section.categ.stage</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree</field>
+        <field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
+    </record>
+    <menuitem parent="report_crm.next_id_65" name="Cases by Section, Category and Stage" action="action_report_crm_case_section_categ_stage_tree_month" id="menu_crm_case_section_categ_stage_tree_month"/>
+    <record model="ir.actions.act_window" id="action_report_crm_case_section_categ_stage_tree">
+        <field name="res_model">report.crm.case.section.categ.stage</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree</field>
+    </record>
+    <menuitem parent="report_crm.next_id_66" name="Cases by Section, Category and Stage" action="action_report_crm_case_section_categ_stage_tree" id="menu_crm_case_section_categ_stage_tree"/>
 
-	#
-	# Cases by section, category and category2
-	#
+    #
+    # Cases by section, category and category2
+    #
 
-	<record model="ir.ui.view" id="view_crm_case_section_categ_categ2_tree">
-		<field name="name">CRM Report - Section, Category and Category2(Tree)</field>
-		<field name="model">report.crm.case.section.categ.categ2</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-			<tree string="Cases by Section, Category and Category2">
-				<field name="name"/>
-				<field name="user_id"/>
-				<field name="section_id"/>
-				<field name="categ_id"/>
-				<field name="category2_id"/>
-				<field name="stage_id"/>
-				<field name="nbr"/>
-				<field name="delay_close"/>
-				<field name="state"/>
-			</tree>
-		</field>
-	</record>
-	<record model="ir.ui.view" id="view_crm_case_section_categ_categ2_form">
-		<field name="name">CRM Report - Section, Category and Category2(Form)</field>
-		<field name="model">report.crm.case.section.categ.categ2</field>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-			<form string="Cases by Section, Category and Category2">
-				<field name="name"/>
-				<field name="user_id"/>
-				<field name="section_id" select="1"/>
-				<field name="categ_id"/>
-				<field name="category2_id"/>
-				<field name="stage_id"/>
-				<field name="nbr" select="1"/>
-				<field name="state" select="1"/>
-				<field name="delay_close"/>
-			</form>
-		</field>
-	</record>
+    <record model="ir.ui.view" id="view_crm_case_section_categ_categ2_tree">
+        <field name="name">CRM Report - Section, Category and Category2(Tree)</field>
+        <field name="model">report.crm.case.section.categ.categ2</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Cases by Section, Category and Category2">
+                <field name="name"/>
+                <field name="user_id"/>
+                <field name="section_id"/>
+                <field name="categ_id"/>
+                <field name="category2_id"/>
+                <field name="stage_id"/>
+                <field name="nbr"/>
+                <field name="delay_close"/>
+                <field name="state"/>
+            </tree>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_crm_case_section_categ_categ2_form">
+        <field name="name">CRM Report - Section, Category and Category2(Form)</field>
+        <field name="model">report.crm.case.section.categ.categ2</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Cases by Section, Category and Category2">
+                <field name="name"/>
+                <field name="user_id"/>
+                <field name="section_id" select="1"/>
+                <field name="categ_id"/>
+                <field name="category2_id"/>
+                <field name="stage_id"/>
+                <field name="nbr" select="1"/>
+                <field name="state" select="1"/>
+                <field name="delay_close"/>
+            </form>
+        </field>
+    </record>
 
-	<record model="ir.actions.act_window" id="action_report_crm_case_section_categ_categ2_tree_month">
-		<field name="res_model">report.crm.case.section.categ.categ2</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree</field>
-		<field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
-	</record>
-	<menuitem  parent="report_crm.next_id_65" name="Cases by Section, Category and Category2" action="action_report_crm_case_section_categ_categ2_tree_month" id="menu_crm_case_section_categ_categ2_tree_month"/>
-	<record model="ir.actions.act_window" id="action_report_crm_case_section_categ_categ2_tree">
-		<field name="res_model">report.crm.case.section.categ.categ2</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree</field>
-	</record>
-	<menuitem parent="report_crm.next_id_66" name="Cases by Section, Category and Category2" action="action_report_crm_case_section_categ_categ2_tree" id="menu_crm_case_section_categ_categ2_tree"/>
+    <record model="ir.actions.act_window" id="action_report_crm_case_section_categ_categ2_tree_month">
+        <field name="res_model">report.crm.case.section.categ.categ2</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree</field>
+        <field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
+    </record>
+    <menuitem  parent="report_crm.next_id_65" name="Cases by Section, Category and Category2" action="action_report_crm_case_section_categ_categ2_tree_month" id="menu_crm_case_section_categ_categ2_tree_month"/>
+    <record model="ir.actions.act_window" id="action_report_crm_case_section_categ_categ2_tree">
+        <field name="res_model">report.crm.case.section.categ.categ2</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree</field>
+    </record>
+    <menuitem parent="report_crm.next_id_66" name="Cases by Section, Category and Category2" action="action_report_crm_case_section_categ_categ2_tree" id="menu_crm_case_section_categ_categ2_tree"/>
 </data>
 </openerp>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 15a3969cf3c..89a8efc770f 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -99,7 +99,7 @@
                             </group>
 
                         </page>
-                        <page string="Prices">
+                        <page string="Prices &amp; Suppliers">
                             <separator string="Base Prices" colspan="4"/>
                             <field name="standard_price"/>
                             <field name="list_price"/>
diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index 876534f61e8..9a25d722689 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -98,6 +98,7 @@
             <field name="type" ref="project_tt_feature"/>
             <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="priority">2</field>
+            <field name="state">open</field>
             <field name="project_id" ref="project_project_21"/>
             <field name="name">Analysis, Data Importation</field>
         </record>
@@ -105,6 +106,7 @@
             <field name="sequence">20</field>
             <field name="planned_hours">16.0</field>
             <field name="remaining_hours">16.0</field>
+            <field name="state">open</field>
             <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="project_project_23"/>
             <field name="name">Parameters</field>
@@ -114,6 +116,7 @@
             <field name="planned_hours">32.0</field>
             <field name="remaining_hours">32.0</field>
             <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
+            <field name="state">open</field>
             <field name="project_id" ref="project_project_21"/>
             <field name="name">Start of the doc redaction + MRP</field>
         </record>
@@ -123,6 +126,7 @@
             <field name="remaining_hours">24.0</field>
             <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="project_project_21"/>
+            <field name="state">done</field>
             <field name="name">MRP Tests</field>
         </record>
         <record id="project_task_193" model="project.task">
@@ -197,6 +201,7 @@
             <field name="remaining_hours">32.0</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="project_id" ref="project_project_23"/>
+            <field name="state">open</field>
             <field name="name">In house trainings</field>
             <field name="date_deadline">2007-06-06</field>
         </record>
diff --git a/addons/report_crm/report_crm_view.xml b/addons/report_crm/report_crm_view.xml
index e1d81f7212c..38ba36a077e 100644
--- a/addons/report_crm/report_crm_view.xml
+++ b/addons/report_crm/report_crm_view.xml
@@ -62,7 +62,11 @@
             <field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
         </record>
         
-        <menuitem id="next_id_64" name="Reporting" parent="crm.menu_crm"/><menuitem id="next_id_65" name="This Month" parent="next_id_64"/><menuitem action="action_report_crm_case_user_tree_month" id="menu_crm_case_user_tree_month" parent="next_id_65"/>
+        <menuitem id="next_id_64" name="Reporting" parent="crm.menu_crm" sequence="50"/>
+
+        <menuitem id="crm.next_id_52" name="All Cases" parent="next_id_64" sequence="0"/>
+
+        <menuitem id="next_id_65" name="This Month" parent="next_id_64"/><menuitem action="action_report_crm_case_user_tree_month" id="menu_crm_case_user_tree_month" parent="next_id_65"/>
         
         <record id="action_report_crm_case_user_tree" model="ir.actions.act_window">
             <field name="name">Cases by User and Section</field>
diff --git a/addons/stock/product.py b/addons/stock/product.py
index de035b213de..5b89a4cd2df 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -41,7 +41,7 @@ class product_product(osv.osv):
 
     def get_product_available(self,cr,uid,ids,context=None):
         if not context:
-            context = {}        
+            context = {}
         states=context.get('states',[])
         what=context.get('what',())
         if not ids:
@@ -69,7 +69,7 @@ class product_product(osv.osv):
                 location_ids = context['location']
         else:
             cr.execute("select lot_stock_id from stock_warehouse")
-            location_ids = [id for (id,) in cr.fetchall()]            
+            location_ids = [id for (id,) in cr.fetchall()]
 
         # build the list of ids of children of the location given by id
         child_location_ids = self.pool.get('stock.location').search(cr, uid, [('location_id', 'child_of', location_ids)])
@@ -90,11 +90,11 @@ class product_product(osv.osv):
         to_date=context.get('to_date',False)
         date_str=False
         if from_date and to_date:
-            date_str="date>='%s' and date<='%s'"%(from_date,to_date)
+            date_str="date_planned>='%s' and date_planned<='%s'"%(from_date,to_date)
         elif from_date:
-            date_str="date>='%s'"%(from_date)
+            date_str="date_planned>='%s'"%(from_date)
         elif to_date:
-            date_str="date<='%s'"%(to_date)
+            date_str="date_planned<='%s'"%(to_date)
 
         if 'in' in what:
             # all moves from a location out of the set to a location in the set
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 409c040a752..412a4b84272 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -900,7 +900,6 @@ class stock_move(osv.osv):
         'price_unit': fields.float('Unit Price',
             digits=(16, int(config['price_accuracy']))),
     }
-    
     _constraints = [
         (_check_tracking,
             'You must assign a production lot for this product',
@@ -908,7 +907,6 @@ class stock_move(osv.osv):
         (_check_product_lot,
             'You try to assign a lot which is not from the same product',
             ['prodlot_id'])]
-    
     def _default_location_destination(self, cr, uid, context={}):
         if context.get('move_line', []):
             return context['move_line'][0][2]['location_dest_id']
@@ -1195,16 +1193,13 @@ class stock_move(osv.osv):
                                 'ref': ref,
                                 'date': date})
                     ]
-                    self.pool.get('account.move').create(cr, uid,
-                            {
-                                'name': move.name,
-                                'journal_id': journal_id,
-                                'line_id': lines,
-                                'ref': ref,
-                            })
-            
-        self.write(cr, uid, ids, {'state':'done'})
-
+                    self.pool.get('account.move').create(cr, uid, {
+                        'name': move.name,
+                        'journal_id': journal_id,
+                        'line_id': lines,
+                        'ref': ref,
+                    })
+        self.write(cr, uid, ids, {'state':'done','date_planned':time.strftime('%Y-%m-%d %H:%M:%S')})
         wf_service = netsvc.LocalService("workflow")
         for id in ids:
             wf_service.trg_trigger(uid, 'stock.move', id, cr)