From b45035985942fabc2c36f11713f2b0d26582a9ef Mon Sep 17 00:00:00 2001
From: Sofia <sahibsofia@gmail.com>
Date: Mon, 27 Oct 2008 16:00:00 +0530
Subject: [PATCH] - Menus in calendar view by default for meetings - Changes in
 form views - Arrange the menus as per Invoice menu - Add graph view for
 opportunity and jobs requests

bzr revid: sahibsofia@gmail.com-20081027103000-wf6ez55l95043c0l
---
 addons/crm_configuration/crm_bugs_menu.xml    |  46 +-
 addons/crm_configuration/crm_bugs_view.xml    |  62 +--
 addons/crm_configuration/crm_config_view.xml  |  14 +
 addons/crm_configuration/crm_fund_menu.xml    |  81 ++--
 addons/crm_configuration/crm_fund_view.xml    |  19 +-
 .../crm_configuration/crm_helpdesk_menu.xml   |  76 +--
 addons/crm_configuration/crm_jobs_menu.xml    | 447 +++++++++++-------
 addons/crm_configuration/crm_jobs_view.xml    |  17 +-
 addons/crm_configuration/crm_lead_demo.xml    |   2 +-
 addons/crm_configuration/crm_lead_menu.xml    |  45 +-
 addons/crm_configuration/crm_lead_view.xml    |  12 +-
 addons/crm_configuration/crm_meeting_demo.xml |   2 +-
 addons/crm_configuration/crm_meeting_menu.xml | 151 +++---
 .../crm_opportunity_data.xml                  |   2 +-
 .../crm_opportunity_demo.xml                  |   7 +-
 .../crm_opportunity_menu.xml                  | 102 ++--
 .../crm_opportunity_view.xml                  |  19 +-
 17 files changed, 642 insertions(+), 462 deletions(-)

diff --git a/addons/crm_configuration/crm_bugs_menu.xml b/addons/crm_configuration/crm_bugs_menu.xml
index 4f24f096b47..e2caeb9818e 100644
--- a/addons/crm_configuration/crm_bugs_menu.xml
+++ b/addons/crm_configuration/crm_bugs_menu.xml
@@ -61,31 +61,9 @@
 		<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"/>
+	<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"/>
 
-	<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_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>
@@ -341,6 +319,28 @@
 	</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>
diff --git a/addons/crm_configuration/crm_bugs_view.xml b/addons/crm_configuration/crm_bugs_view.xml
index 14e57133bad..4651825e0c9 100644
--- a/addons/crm_configuration/crm_bugs_view.xml
+++ b/addons/crm_configuration/crm_bugs_view.xml
@@ -14,43 +14,45 @@
 		<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="name" string="Title" colspan="2"/>
-						<field name="section_id" colspan="1"/>
-						<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/>
-						<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"/>
+					<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"/>
 
 					<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>
+				    <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">
-						<field name="date" string="Next Meeting"/>
-						<field name="duration" string="Meeting Duration"/>
 						<button name="add_reply" string="Add Last Mail for Replying"
 							states="open" type="object" colspan="2"/>
 						<field name="description" colspan="2" nolabel="1"/>
diff --git a/addons/crm_configuration/crm_config_view.xml b/addons/crm_configuration/crm_config_view.xml
index 6185d763024..f283c2478f5 100644
--- a/addons/crm_configuration/crm_config_view.xml
+++ b/addons/crm_configuration/crm_config_view.xml
@@ -44,5 +44,19 @@
             <field name="action_id" ref="action_view_config_crm_menu"/>
             <field name="state">open</field>
         </record>
+        
+        <!-- graph view -->
+        <record model="ir.ui.view" id="crm_case_graph_view_stage_cost">
+			<field name="name">CRM -Graph</field>
+			<field name="model">crm.case</field>
+			<field name="type">graph</field>
+			<field name="arch" type="xml">
+				<graph string="Cases By Stage and Estimates" type="bar" orientation="vertical">
+					<field name="stage_id"/>
+					<field name="planned_cost" operator="+"/>
+					<field name="planned_revenue" operator="+"/>
+				</graph>
+			</field>
+		</record>
 	</data>
 </openerp>
diff --git a/addons/crm_configuration/crm_fund_menu.xml b/addons/crm_configuration/crm_fund_menu.xml
index 40c3e9fdee7..a911bbb91bf 100644
--- a/addons/crm_configuration/crm_fund_menu.xml
+++ b/addons/crm_configuration/crm_fund_menu.xml
@@ -7,28 +7,33 @@
 	</record>
 	
 	<!-- MENU -->
-	<menuitem name="Fund Raising" id="menu_crm_case_fund_raise" parent="crm.menu_crm"/>
-	
-	<record model="ir.actions.act_window" id="crm_case_category_act_fund1">
-		<field name="name">Funds</field>
+	<record model="ir.actions.act_window" id="crm_case_category_act_fund_all1">
+		<field name="name">All Funds</field>
 		<field name="res_model">crm.case</field>
-		<field name="view_mode">form,graph</field>
-		<field name="view_id" ref="crm_configuration.crm_case_form_view_fund"/>
+		<field name="view_mode">tree,form,graph</field>
+		<field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
 		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support4)+')]'"/>
 	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_fund1">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">graph</field>
-		<field name="view_id" ref="crm_configuration.crm_case_graph_view_fund"/>
-		<field name="act_window_id" ref="crm_case_category_act_fund1"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_fund1">
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_fund_all1">
 		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
+		<field name="act_window_id" ref="crm_case_category_act_fund_all1"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_fund_all1">
+		<field name="sequence" eval="2"/>
 		<field name="view_mode">form</field>
 		<field name="view_id" ref="crm_configuration.crm_case_form_view_fund"/>
-		<field name="act_window_id" ref="crm_case_category_act_fund1"/>
+		<field name="act_window_id" ref="crm_case_category_act_fund_all1"/>
 	</record>
-	<menuitem name="New Fund Opportunity" id="menu_crm_case_categ0_act_fund" action="crm_case_category_act_fund1" parent="menu_crm_case_fund_raise"/>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_fund_all1">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">graph</field>
+		<field name="view_id" ref="crm_configuration.crm_case_graph_view_fund"/>
+		<field name="act_window_id" ref="crm_case_category_act_fund_all1"/>
+	</record>
+
+	<menuitem name="Fund Raising" id="menu_crm_case_fund_raise" parent="crm.menu_crm" action="crm_case_category_act_fund_all1"/>
 	
 	<!-- My Funds -->
 	<record model="ir.actions.act_window" id="crm_case_category_act_fund_my1">
@@ -58,6 +63,27 @@
 	</record>
 	<menuitem name="My Funds" id="menu_crm_case_category_act_fund_my1" action="crm_case_category_act_fund_my1"  parent="menu_crm_case_fund_raise"/>
 
+	<record model="ir.actions.act_window" id="crm_case_category_act_fund1">
+		<field name="name">Funds</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">form,graph</field>
+		<field name="view_id" ref="crm_configuration.crm_case_form_view_fund"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support4)+')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_fund1">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">graph</field>
+		<field name="view_id" ref="crm_configuration.crm_case_graph_view_fund"/>
+		<field name="act_window_id" ref="crm_case_category_act_fund1"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_fund1">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_configuration.crm_case_form_view_fund"/>
+		<field name="act_window_id" ref="crm_case_category_act_fund1"/>
+	</record>
+	<menuitem name="New Fund Opportunity" id="menu_crm_case_categ0_act_fund" action="crm_case_category_act_fund1" parent="menu_crm_case_category_act_fund_my1"/>
+
 	<record model="ir.actions.act_window" id="crm_case_category_act_fund_my2">
 		<field name="name">My Funds Waiting Validation</field>
 		<field name="res_model">crm.case</field>
@@ -113,31 +139,6 @@
 	<menuitem name="My Funds To Be Processed" id="menu_crm_case_categ0_act_fund_my3" action="crm_case_category_act_fund_my3" parent="menu_crm_case_category_act_fund_my1"/>
 
 	<!-- All Funds -->
-	<record model="ir.actions.act_window" id="crm_case_category_act_fund_all1">
-		<field name="name">All Funds</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,form,graph</field>
-		<field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support4)+')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_fund_all1">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
-		<field name="act_window_id" ref="crm_case_category_act_fund_all1"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_fund_all1">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_configuration.crm_case_form_view_fund"/>
-		<field name="act_window_id" ref="crm_case_category_act_fund_all1"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_graph_view_fund_all1">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">graph</field>
-		<field name="view_id" ref="crm_configuration.crm_case_graph_view_fund"/>
-		<field name="act_window_id" ref="crm_case_category_act_fund_all1"/>
-	</record>
 	<menuitem name="All Funds" id="menu_crm_case_categ0_act_fund_all1" action="crm_case_category_act_fund_all1" parent="menu_crm_case_fund_raise"/>
 
 	<record model="ir.actions.act_window" id="crm_case_category_act_fund_all2">
diff --git a/addons/crm_configuration/crm_fund_view.xml b/addons/crm_configuration/crm_fund_view.xml
index 86048399e06..8385c45b088 100644
--- a/addons/crm_configuration/crm_fund_view.xml
+++ b/addons/crm_configuration/crm_fund_view.xml
@@ -28,28 +28,28 @@
 		<field name="type">form</field>
 		<field name="arch" type="xml">
 			<form string="Funds Form">
-				<notebook>
-				<page string="Funds">
+				<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"/>
-					<field name="categ_id" select="1" on_change="onchange_categ_id(categ_id)"/>
-					<field name="category2_id" select="1" string="Payment Mode"/>
-					<newline/>
 					<separator colspan="4" string="Estimates"/>
-					<field name="planned_cost" string="Amount"/>
-					<field name="probability"/>
+					<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"/> 
@@ -61,7 +61,6 @@
 						<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"/>
diff --git a/addons/crm_configuration/crm_helpdesk_menu.xml b/addons/crm_configuration/crm_helpdesk_menu.xml
index 9d40a9b700f..6a3c21d347e 100644
--- a/addons/crm_configuration/crm_helpdesk_menu.xml
+++ b/addons/crm_configuration/crm_helpdesk_menu.xml
@@ -6,8 +6,32 @@
             <field name="code">support</field>
     </record>
     ######################## Help Desk (menu) ###########################
-    
-	<menuitem name="Helpdesk and Support" id="menu_help_support_main" parent="crm.menu_crm"/>	
+	<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>
@@ -37,6 +61,28 @@
 	
 	<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_act_my1">
 		<field name="name">My Unclosed Requests</field>
 		<field name="res_model">crm.case</field>
@@ -180,31 +226,7 @@
 	<!-- 
 		ALL Helpdesk REQUESTS 
 	-->
-	 <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 parent="menu_help_support_main" id="menu_crm_case_helpdesk_act_all" action="crm_case_helpdesk_act111"/>	
 	
 
diff --git a/addons/crm_configuration/crm_jobs_menu.xml b/addons/crm_configuration/crm_jobs_menu.xml
index 44ac99da6de..be91b1357a4 100644
--- a/addons/crm_configuration/crm_jobs_menu.xml
+++ b/addons/crm_configuration/crm_jobs_menu.xml
@@ -7,181 +7,10 @@
 	</record>
 
 	######################## JOB OPPORTUNITIES (menu) ###########################
-	<menuitem name="Jobs Requests" id="menu_crm_case_job_req_main" parent="crm.menu_crm"/>	
-
-	<!-- 
-		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</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>
-	<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</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>
-	<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_my2">
-		<field name="name">My Jobs Propositions to Review</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,calendar,form</field>
-		<field name="view_id" ref="crm_case_tree_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>
-	<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_my1">
-		<field name="name">My Pending Jobs Requests</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,calendar,form</field>
-		<field name="view_id" ref="crm_case_tree_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>
-	<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_my0">
-		<field name="name">My Open Jobs Requests</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,calendar,form</field>
-		<field name="view_id" ref="crm_case_tree_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>
-	<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</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>	
-	<menuitem parent="menu_crm_case_categ0_act11" id="menu_crm_case_categ0_act_myjobs_myjobs" action="crm_case_categ0_act_myjobs"/>
-	
-	<!-- 
-		ALL JOBS REQUESTS 
-	-->
 	 <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</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>
@@ -203,13 +32,247 @@
 		<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"/>	
+
+	<!-- 
+		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"/>
+
+	<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"/>	
+
+	<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_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_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_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_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_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>
@@ -231,12 +294,18 @@
 		<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</field>
 		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,calendar,form</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>
@@ -258,12 +327,18 @@
 		<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_all1">
 		<field name="name">All Pending Jobs Requests</field>
 		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,calendar,form</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>
@@ -285,13 +360,19 @@
 		<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_all0">
 		<field name="name">All Open Jobs Requests</field>
 		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,calendar,form</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>
@@ -313,12 +394,18 @@
 		<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 Jobs Meetings</field>
 		<field name="res_model">crm.case</field>
-		<field name="view_mode">calendar,tree,form</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>
@@ -340,6 +427,12 @@
 		<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>
diff --git a/addons/crm_configuration/crm_jobs_view.xml b/addons/crm_configuration/crm_jobs_view.xml
index b2d8fb1efd4..78c0757a375 100644
--- a/addons/crm_configuration/crm_jobs_view.xml
+++ b/addons/crm_configuration/crm_jobs_view.xml
@@ -30,12 +30,18 @@
 		<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="section_id" colspan="1"/>
-						<newline/>
-						<field name="partner_name"/>
 						<field name="partner_name2"/>
 						<newline/>
 						<field name="partner_phone"/>
@@ -45,8 +51,6 @@
 						<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="categ_id" string="Applied Job" select="1" on_change="onchange_categ_id(categ_id)"/>
-						<field name="category2_id" string="Degree" select="1"/>
 						<field name="priority" string="Quality"/>
 						<field name="probability" string="Availability (weeks)"/>
 						<newline/>
@@ -54,9 +58,6 @@
 						<field name="planned_revenue" string="Proposed Salary"/>
 						<field name="stage_id" colspan="2"/>
 						<field name="user_id" string="Responsible" select="2"/>
-						<field name="date" string="Next Meeting"/>
-						<field name="duration" string="Meeting Duration" widget="float_time"/>
-						
 						<newline/>
 						<separator colspan="4"/>
 						<field name="history_line" colspan="2" nolabel="1" mode="tree,form">
diff --git a/addons/crm_configuration/crm_lead_demo.xml b/addons/crm_configuration/crm_lead_demo.xml
index c53098b6518..7ba46a406a8 100644
--- a/addons/crm_configuration/crm_lead_demo.xml
+++ b/addons/crm_configuration/crm_lead_demo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
-<data noupdate="1">
+	<data noupdate="1">
 	<!-- 
 		((((((((((( Demo Cases ))))))))))) 
 	-->
diff --git a/addons/crm_configuration/crm_lead_menu.xml b/addons/crm_configuration/crm_lead_menu.xml
index 277b0dd2fa0..06eb2a12b3c 100644
--- a/addons/crm_configuration/crm_lead_menu.xml
+++ b/addons/crm_configuration/crm_lead_menu.xml
@@ -7,28 +7,6 @@
 	</record>
 	
 <!--		MENU		-->
-	<record model="ir.actions.act_window" id="crm_case_category_act_leads">
-		<field name="name">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">
-		<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"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads">
-		<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"/>
-	</record>
-	<menuitem parent="crm.menu_crm" id="menu_crm_case_categ0_act_leads" action="crm_case_category_act_leads"/>
-
 
 	<record model="ir.actions.act_window" id="crm_case_category_act_leads_all">
 		<field name="name">All Leads</field>
@@ -55,6 +33,7 @@
 		<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="ir.actions.act_window" id="crm_case_category_act_leads_all1">
@@ -247,6 +226,28 @@
 	</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_my1">
 		<field name="name">My Unclosed Leads</field>
 		<field name="res_model">crm.case</field>
diff --git a/addons/crm_configuration/crm_lead_view.xml b/addons/crm_configuration/crm_lead_view.xml
index 3c35f82629c..61191290563 100644
--- a/addons/crm_configuration/crm_lead_view.xml
+++ b/addons/crm_configuration/crm_lead_view.xml
@@ -12,11 +12,15 @@
 		<field name="type">form</field>
 		<field name="arch" type="xml">
 			<form string="Leads Form">
-				<notebook>
-				 <page string="Leads">
-				 	<field name="name" select="1" string="Name"/>
+				<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/>
@@ -32,8 +36,6 @@
 					<field name="email_from"/>
 					<field name="priority" string="Priority"/>
 					<field name="category2_id" string="Campaign Type" select="1"/>
-					<field name="date" string="Next Meeting"/>
-					<field name="duration" string="Meeting Duration" widget="float_time"/>
 					<newline/>
 					<separator colspan="4" string="Description Information"/>
 						<field name="note" nolabel="1" colspan="4"/>
diff --git a/addons/crm_configuration/crm_meeting_demo.xml b/addons/crm_configuration/crm_meeting_demo.xml
index 4444573e9b7..fd8cd4b55dd 100644
--- a/addons/crm_configuration/crm_meeting_demo.xml
+++ b/addons/crm_configuration/crm_meeting_demo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
-<data noupdate="1">
+	<data noupdate="1">
 	<!-- 
 		((((((((((( Demo Cases ))))))))))) 
 	-->
diff --git a/addons/crm_configuration/crm_meeting_menu.xml b/addons/crm_configuration/crm_meeting_menu.xml
index 4611cbb1763..8e547559416 100644
--- a/addons/crm_configuration/crm_meeting_menu.xml
+++ b/addons/crm_configuration/crm_meeting_menu.xml
@@ -7,8 +7,62 @@
 	</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"/>
+
+	<!-- 
+		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"/>
+
 	<record model="ir.actions.act_window" id="crm_case_category_act_meetings">
-		<field name="name">Meetings</field>
+		<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>
@@ -26,59 +80,29 @@
 		<field name="view_id" ref="crm_case_tree_view_meet"/>
 		<field name="act_window_id" ref="crm_case_category_act_meetings"/>
 	</record>
-	<menuitem parent="crm.menu_crm" id="menu_crm_case_category_act_meetings" action="crm_case_category_act_meetings"/>
-
-	<!-- 
-		MY MEETINGS 
-	-->
-	<record model="ir.actions.act_window" id="crm_case_categ_meetmy">
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,form,calendar</field>
-		<field name="view_id" ref="crm_case_tree_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="3"/>
-		<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="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_categ_meetmy"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_meet_my">
-		<field name="sequence" eval="2"/>
-		<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"/>
-
+	<menuitem parent="menu_crm_case_categ_meet_my" id="menu_crm_case_category_act_meetings_new" action="crm_case_category_act_meetings" sequence="1"/>
 
 	<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">tree,form,calendar</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="3"/>
+		<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="1"/>
+		<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="2"/>
+		<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"/>
@@ -89,24 +113,24 @@
 	<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">tree,form,calendar</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="3"/>
+		<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="1"/>
+		<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="2"/>
+		<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"/>
@@ -117,52 +141,29 @@
 	<!-- 
 		ALL MEETINGS 
 	-->
-	<record model="ir.actions.act_window" id="crm_case_categ_meet">
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,form,calendar</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="3"/>
-		<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="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_categ_meet"/>
-	</record>	
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form__meet">
-		<field name="sequence" eval="2"/>
-		<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 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">tree,form,calendar</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="3"/>
+		<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="1"/>
+		<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="2"/>
+		<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"/>
@@ -172,24 +173,24 @@
 	<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">tree,form,calendar</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="3"/>
+		<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="1"/>
+		<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="2"/>
+		<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"/>
@@ -200,24 +201,24 @@
 		<field name="name">Next Deadlines</field>
 		<field name="res_model">crm.case</field>
 		<field name="view_type">form</field>
-		<field name="view_mode">tree,form,calendar</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="3"/>
+		<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="1"/>
+		<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="2"/>
+		<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"/>
diff --git a/addons/crm_configuration/crm_opportunity_data.xml b/addons/crm_configuration/crm_opportunity_data.xml
index 41ef8714aa5..f2addebb408 100644
--- a/addons/crm_configuration/crm_opportunity_data.xml
+++ b/addons/crm_configuration/crm_opportunity_data.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
 <data noupdate="1">
-<record model="crm.case.section" id="section_support3">
+	<record model="crm.case.section" id="section_support3">
 		<field name="name">Opportunities</field>
 		<field name="code">oppor</field>
 	</record>
diff --git a/addons/crm_configuration/crm_opportunity_demo.xml b/addons/crm_configuration/crm_opportunity_demo.xml
index c20cb450468..b22c69ede6c 100644
--- a/addons/crm_configuration/crm_opportunity_demo.xml
+++ b/addons/crm_configuration/crm_opportunity_demo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
-<data noupdate="1">
+	<data noupdate="1">
 	<!-- 
 		((((((((((( Demo Cases ))))))))))) 
 	-->
@@ -18,6 +18,7 @@
 			<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"/>
@@ -33,6 +34,7 @@
 			<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"/>
@@ -51,6 +53,7 @@
 			<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"/>
@@ -70,6 +73,7 @@
 			<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"/>
@@ -88,6 +92,7 @@
 			<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"/>
diff --git a/addons/crm_configuration/crm_opportunity_menu.xml b/addons/crm_configuration/crm_opportunity_menu.xml
index 2104d39f415..7de69cdc896 100644
--- a/addons/crm_configuration/crm_opportunity_menu.xml
+++ b/addons/crm_configuration/crm_opportunity_menu.xml
@@ -1,18 +1,15 @@
 <?xml version="1.0"?>
 <openerp>
 <data noupdate="1">
-		<record model="crm.case.section" id="section_support3">
+	<record model="crm.case.section" id="section_support3">
 		<field name="name">Opportunities</field>
 		<field name="code">oppor</field>
 	</record>	
-<menuitem name="Opportunities" id="menu_crm_case_opp" parent="crm.menu_crm"/>
 
-
-<!--		MENU		-->
 	<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</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>
@@ -34,34 +31,22 @@
 		<field name="view_id" ref="crm_case_form_view_oppor"/>
 		<field name="act_window_id" ref="crm_case_category_act_oppor11"/>
 	</record>
-	<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.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="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_oppor11" id="menu_crm_case_categ0_act_oppor" action="crm_case_category_act_oppor"/>
+
+<!--		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</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>
@@ -83,13 +68,19 @@
 		<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</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>
@@ -111,6 +102,12 @@
 		<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"/>
 
 
@@ -118,7 +115,7 @@
 	<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</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>
@@ -140,13 +137,40 @@
 		<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_oppor2">
 		<field name="name">My Open Opportunities</field>
 		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,calendar,form</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>
@@ -168,12 +192,18 @@
 		<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</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>
@@ -195,6 +225,12 @@
 		<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			-->
@@ -204,7 +240,7 @@
 		<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="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">
diff --git a/addons/crm_configuration/crm_opportunity_view.xml b/addons/crm_configuration/crm_opportunity_view.xml
index 05658f6374b..9bc414319b5 100644
--- a/addons/crm_configuration/crm_opportunity_view.xml
+++ b/addons/crm_configuration/crm_opportunity_view.xml
@@ -12,27 +12,30 @@
 		<field name="type">form</field>
 		<field name="arch" type="xml">
 			<form string="Opportunities Form">
-				<notebook>
-				<page string="Opportunities">
+				<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="categ_id" select="1" on_change="onchange_categ_id(categ_id)" string="Lead Source"/>
-					<field name="stage_id" select="1" string="Sales Stage"/>
 					<field name="category2_id" select="1" string="Type"/>
 					<field name="priority" string="Priority"/>
 					<newline/>
 					<separator colspan="4" string="Estimates"/>
-					<field name="planned_cost" string="Amount"/>
-					<field name="probability"/>
+					<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"/>
 
@@ -119,8 +122,8 @@
 				<field name="stage_id"  string="Sales Stage"/>
 				<field name="categ_id" string="Lead Source"/>
 				<field name="category2_id" string="Type"/>
-				<field name="planned_cost" string="Amount"/>
-				<field name="probability"/>
+				<field name="planned_cost"/>
+				<field name="planned_revenue"/>
 				<field name="user_id"/>
 				<field name="state"/>
 			</tree>