merge

bzr revid: fp@tinyerp.com-20080916120323-cb606frmiefzsp4n

11 files changed, 473 insertions, 40 deletions

diff --git a/addons/association_vertical/__terp__.py b/addons/association_vertical/__terp__.py
index 060e60b01fa..a185405fdf9 100644
--- a/addons/association_vertical/__terp__.py
+++ b/addons/association_vertical/__terp__.py
@@ -8,8 +8,8 @@
         "description": """Simplification of the interface for associations.""",
         "depends" : ["hr","crm_configuration","event"],
         "init_xml" : [],
-        "demo_xml" : ["crm_fund_data.xml"],
-        "update_xml" : ["crm_fund_demo.xml",
+        "demo_xml" : [],
+        "update_xml" : [
                         "aso_data.xml",
                         "aso_vertical_view.xml",
                        ],
diff --git a/addons/crm_configuration/crm_fund_data.xml b/addons/crm_configuration/crm_fund_data.xml
new file mode 100644
index 00000000000..c6965852c6e
--- /dev/null
+++ b/addons/crm_configuration/crm_fund_data.xml
@@ -0,0 +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="association_vertical.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="association_vertical.section_support4"/>
+			<field eval="time.strftime('%Y-%m-01 10:35:50')" name="date"/>
+			<field name="categ_id" ref="association_vertical.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="association_vertical.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="association_vertical.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="association_vertical.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="association_vertical.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="association_vertical.section_support4"/>
+			<field eval="time.strftime('%Y-%m-07 13:50:50')" name="date"/>
+			<field name="categ_id" ref="association_vertical.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="association_vertical.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="association_vertical.section_support4"/>
+			<field eval="time.strftime('%Y-%m-12 15:10:50')" name="date"/>
+			<field name="categ_id" ref="association_vertical.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="association_vertical.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="association_vertical.section_support4"/>
+			<field eval="time.strftime('%Y-%m-17 19:00:15')" name="date"/>
+			<field eval="3" name="duration"/>
+			<field name="categ_id" ref="association_vertical.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="association_vertical.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="association_vertical.section_support4"/>
+			<field eval="time.strftime('%Y-%m-27 09:00:15')" name="date"/>
+			<field eval="12" name="duration"/>
+			<field name="categ_id" ref="association_vertical.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="association_vertical.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="association_vertical.section_support4"/>
+			<field eval="time.strftime('%Y-%m-01 10:00:15')" name="date"/>
+			<field name="categ_id" ref="association_vertical.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="association_vertical.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="association_vertical.section_support4"/>
+			<field eval="time.strftime('%Y-%m-24 22:00:15')" name="date"/>
+			<field name="categ_id" ref="association_vertical.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_demo.xml b/addons/crm_configuration/crm_fund_demo.xml
new file mode 100644
index 00000000000..e5f1a83e6ae
--- /dev/null
+++ b/addons/crm_configuration/crm_fund_demo.xml
@@ -0,0 +1,243 @@
+<?xml version="1.0"?>
+<openerp>
+<data noupdate="1">
+
+	<record model="crm.case.section" id="section_support4">
+		<field name="name">Fund Raising</field>
+		<field name="code">funds</field>
+	</record>
+
+		<!--	CASE CATEGORY(categ_id)		-->
+		
+	<record model="crm.case.categ" id="categ_fund1">
+		<field name="name">Social Rehabilitation And Rural Upliftment</field>
+		<field name="section_id" ref="section_support4"/>
+	</record>
+	
+	<record model="crm.case.categ" id="categ_fund2">
+		<field name="name">Learning And Education</field>
+		<field name="section_id" ref="section_support4"/>
+	</record>	
+	
+	<record model="crm.case.categ" id="categ_fund3">
+		<field name="name">Healthcare</field>
+		<field name="section_id" ref="section_support4"/>
+	</record>		
+	
+	<record model="crm.case.categ" id="categ_fund4">
+		<field name="name">Arts And Culture</field>
+		<field name="section_id" ref="section_support4"/>
+	</record>	
+
+		<!--	CASE CATEGORY2(category2_id)		-->
+		
+	<record model="crm.case.category2" id="categ2_fund1">
+		<field name="name">Cash</field>
+		<field name="section_id" ref="section_support4"/>
+	</record>
+	
+	<record model="crm.case.category2" id="categ2_fund2">
+		<field name="name">Cheque</field>
+		<field name="section_id" ref="section_support4"/>
+	</record>		
+
+	<record model="crm.case.category2" id="categ2_fund3">
+		<field name="name">Credit Card</field>
+		<field name="section_id" ref="section_support4"/>
+	</record>
+	
+	<record model="crm.case.category2" id="categ2_fund4">
+		<field name="name">Demand Draft</field>
+		<field name="section_id" ref="section_support4"/>
+	</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>
+		<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_fund_raise"/>
+	
+	<!-- My Funds -->
+	<record model="ir.actions.act_window" id="crm_case_category_act_fund_my1">
+		<field name="name">My Funds</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,form</field>
+		<field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support4)+'),(\'user_id\',\'=\',uid)]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_fund_my1">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
+		<field name="act_window_id" ref="crm_case_category_act_fund_my1"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_graph_view_fund_my1">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">graph</field>
+		<field name="view_id" ref="crm_configuration.crm_case_graph_view_fund"/>
+		<field name="act_window_id" ref="crm_case_category_act_fund_my1"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_fund_my1">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_configuration.crm_case_form_view_fund"/>
+		<field name="act_window_id" ref="crm_case_category_act_fund_my1"/>
+	</record>
+	<menuitem name="My Funds" id="menu_crm_case_category_act_fund_my1" action="crm_case_category_act_fund_my1"  parent="menu_crm_case_fund_raise"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_fund_my2">
+		<field name="name">My Funds Waiting Validation</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,form,graph</field>
+		<field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support4)+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'draft\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_fund_my2">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
+		<field name="act_window_id" ref="crm_case_category_act_fund_my2"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_fund_my2">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_configuration.crm_case_form_view_fund"/>
+		<field name="act_window_id" ref="crm_case_category_act_fund_my2"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_graph_view_fund_my2">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">graph</field>
+		<field name="view_id" ref="crm_configuration.crm_case_graph_view_fund"/>
+		<field name="act_window_id" ref="crm_case_category_act_fund_my2"/>
+	</record>
+	<menuitem name="My Funds Waiting Validation" id="menu_crm_case_categ0_act_fund_my2" action="crm_case_category_act_fund_my2" parent="menu_crm_case_category_act_fund_my1"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_fund_my3">
+		<field name="name">My Funds To Be Processed</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,form,graph</field>
+		<field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support4)+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'open\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_fund_my3">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
+		<field name="act_window_id" ref="crm_case_category_act_fund_my3"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_fund_my3">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_configuration.crm_case_form_view_fund"/>
+		<field name="act_window_id" ref="crm_case_category_act_fund_my3"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_graph_view_fund_my3">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">graph</field>
+		<field name="view_id" ref="crm_configuration.crm_case_graph_view_fund"/>
+		<field name="act_window_id" ref="crm_case_category_act_fund_my3"/>
+	</record>
+	<menuitem name="My Funds To Be Processed" id="menu_crm_case_categ0_act_fund_my3" action="crm_case_category_act_fund_my3" parent="menu_crm_case_category_act_fund_my1"/>
+
+	<!-- 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">
+		<field name="name">All Funds Waiting Validation</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,form,graph</field>
+		<field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support4)+'),(\'state\',\'=\',\'draft\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_fund_all2">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
+		<field name="act_window_id" ref="crm_case_category_act_fund_all2"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_fund_all2">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_configuration.crm_case_form_view_fund"/>
+		<field name="act_window_id" ref="crm_case_category_act_fund_all2"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_graph_view_fund_all2">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">graph</field>
+		<field name="view_id" ref="crm_configuration.crm_case_graph_view_fund"/>
+		<field name="act_window_id" ref="crm_case_category_act_fund_all2"/>
+	</record>
+	<menuitem name="All Funds Waiting Validation" id="menu_crm_case_categ0_act_fund_all2" action="crm_case_category_act_fund_all2" parent="menu_crm_case_categ0_act_fund_all1"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_fund_all3">
+		<field name="name">All Funds To Be Processed</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,form,graph</field>
+		<field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support4)+'),(\'state\',\'=\',\'open\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_fund_all3">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
+		<field name="act_window_id" ref="crm_case_category_act_fund_all3"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_fund_all3">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_configuration.crm_case_form_view_fund"/>
+		<field name="act_window_id" ref="crm_case_category_act_fund_all3"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_graph_view_fund_all3">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">graph</field>
+		<field name="view_id" ref="crm_configuration.crm_case_graph_view_fund"/>
+		<field name="act_window_id" ref="crm_case_category_act_fund_all3"/>
+	</record>
+	<menuitem name="All Funds To Be Processed" id="menu_crm_case_categ0_act_fund_all3" action="crm_case_category_act_fund_all3" parent="menu_crm_case_categ0_act_fund_all1"/>
+
+</data>
+</openerp>
diff --git a/addons/crm_configuration/crm_jobs_demo.xml b/addons/crm_configuration/crm_jobs_demo.xml
index bc5040472fd..d2aebb803a6 100644
--- a/addons/crm_configuration/crm_jobs_demo.xml
+++ b/addons/crm_configuration/crm_jobs_demo.xml
@@ -400,5 +400,12 @@
 		<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"/>
+	<!-- short cut -->
+	<record id="ir_ui_view_sc_myjobsrequests0" model="ir.ui.view_sc">
+			<field ref="crm_configuration.menu_crm_case_categ0_act11" name="res_id"/>
+			<field eval="&quot;ir.ui.menu&quot;" name="resource"/>
+			<field eval="&quot;My Jobs Requests&quot;" name="name"/>
+			<field name="user_id" ref="base.user_root"/>
+   </record>
 </data>
 </openerp>
diff --git a/addons/crm_configuration/crm_lead_demo.xml b/addons/crm_configuration/crm_lead_demo.xml
index 5716d19be19..17acce86078 100644
--- a/addons/crm_configuration/crm_lead_demo.xml
+++ b/addons/crm_configuration/crm_lead_demo.xml
@@ -551,5 +551,12 @@
 	</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"/>
 
+	<!-- short cut -->
+	<record id="ir_ui_view_sc_myleads0" model="ir.ui.view_sc">
+			<field ref="crm_configuration.menu_crm_case_categ0_act_leads_my" name="res_id"/>
+			<field eval="&quot;ir.ui.menu&quot;" name="resource"/>
+			<field eval="&quot;My Leads&quot;" name="name"/>
+			<field name="user_id" ref="base.user_root"/>
+	</record>
 </data>
 </openerp>
diff --git a/addons/crm_configuration/crm_meeting_demo.xml b/addons/crm_configuration/crm_meeting_demo.xml
index d6dc11a4465..f931633e4c6 100644
--- a/addons/crm_configuration/crm_meeting_demo.xml
+++ b/addons/crm_configuration/crm_meeting_demo.xml
@@ -276,5 +276,13 @@
 		<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"/>
+
+	<!-- short cut -->
+	<record id="ir_ui_view_sc_mymeetings0" model="ir.ui.view_sc">
+			<field ref="crm_configuration.menu_crm_case_categ_meet_my" name="res_id"/>
+			<field eval="&quot;ir.ui.menu&quot;" name="resource"/>
+			<field eval="&quot;My Meetings&quot;" name="name"/>
+			<field name="user_id" ref="base.user_root"/>
+	</record>
 </data>
 </openerp>
diff --git a/addons/crm_configuration/crm_opportunity_demo.xml b/addons/crm_configuration/crm_opportunity_demo.xml
index b2c011b3bf1..964da43ba5f 100644
--- a/addons/crm_configuration/crm_opportunity_demo.xml
+++ b/addons/crm_configuration/crm_opportunity_demo.xml
@@ -313,6 +313,13 @@
 		<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"/>
+	<!-- short cut -->
+	<record id="ir_ui_view_sc_openopportunities0" model="ir.ui.view_sc">
+			<field ref="crm_configuration.menu_crm_case_categ0_act_oppor1" name="res_id"/>
+			<field eval="&quot;ir.ui.menu&quot;" name="resource"/>
+			<field eval="&quot;Open Opportunities&quot;" name="name"/>
+			<field name="user_id" ref="base.user_root"/>
+	</record>
 
 </data>
 </openerp>
diff --git a/addons/crm_vertical/__terp__.py b/addons/crm_vertical/__terp__.py
index c2f13427df3..d30dae92963 100644
--- a/addons/crm_vertical/__terp__.py
+++ b/addons/crm_vertical/__terp__.py
@@ -9,7 +9,7 @@
         "depends" : ["crm_configuration"],
         "init_xml" : [ ],
         "demo_xml" : [ ],
-        "update_xml" : ["crm_vertical_view.xml","crm_vertical_shortcuts.xml"],
+        "update_xml" : ["crm_vertical_view.xml"],
         "installable": True
 } 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_vertical/crm_vertical_shortcuts.xml b/addons/crm_vertical/crm_vertical_shortcuts.xml
deleted file mode 100644
index bbbe96c4751..00000000000
--- a/addons/crm_vertical/crm_vertical_shortcuts.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" ?>
-<openerp>
-	<data noupdate="1">
-		<record id="ir_ui_view_sc_mymeetings0" model="ir.ui.view_sc">
-			<field ref="crm_configuration.menu_crm_case_categ_meet_my" name="res_id"/>
-			<field eval="&quot;ir.ui.menu&quot;" name="resource"/>
-			<field eval="&quot;My Meetings&quot;" name="name"/>
-			<field name="user_id" ref="base.user_root"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="ir_ui_view_sc_myleads0" model="ir.ui.view_sc">
-			<field ref="crm_configuration.menu_crm_case_categ0_act_leads_my" name="res_id"/>
-			<field eval="&quot;ir.ui.menu&quot;" name="resource"/>
-			<field eval="&quot;My Leads&quot;" name="name"/>
-			<field name="user_id" ref="base.user_root"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="ir_ui_view_sc_myjobsrequests0" model="ir.ui.view_sc">
-			<field ref="crm_configuration.menu_crm_case_categ0_act11" name="res_id"/>
-			<field eval="&quot;ir.ui.menu&quot;" name="resource"/>
-			<field eval="&quot;My Jobs Requests&quot;" name="name"/>
-			<field name="user_id" ref="base.user_root"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="ir_ui_view_sc_openopportunities0" model="ir.ui.view_sc">
-			<field ref="crm_configuration.menu_crm_case_categ0_act_oppor1" name="res_id"/>
-			<field eval="&quot;ir.ui.menu&quot;" name="resource"/>
-			<field eval="&quot;Open Opportunities&quot;" name="name"/>
-			<field name="user_id" ref="base.user_root"/>
-		</record>
-	</data>
-</openerp>
diff --git a/addons/process/__terp__.py b/addons/process/__terp__.py
index 96bcdb30723..cc8edbe5848 100644
--- a/addons/process/__terp__.py
+++ b/addons/process/__terp__.py
@@ -13,8 +13,8 @@ This module allows you to manage your process for the end-users.
     "demo_xml" : [],
     "update_xml" : [
         "security/ir.model.access.csv",
-        'process_view.xml',
-        "process_report.xml"],
+        'process_view.xml'
+    ],
     "active": False,
     "installable": True
 }
diff --git a/addons/process/process_view.xml b/addons/process/process_view.xml
index 2f38b3b5713..aa9ea99d49e 100644
--- a/addons/process/process_view.xml
+++ b/addons/process/process_view.xml
@@ -109,5 +109,55 @@
         action="action_process_form"
         parent="menu_process"/>
 
+    <!-- Transitions -->
+
+    <record model="ir.ui.view" id="view_process_transition_tree">
+        <field name="name">process.transition.tree</field>
+        <field name="model">process.transition</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Process Transition">
+                <field name="name"/>
+                <field name="source_node_id"/>
+                <field name="target_node_id"/>
+            </tree>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="view_process_transition_form">
+        <field name="name">process.transition.form</field>
+        <field name="model">process.transition</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Process Transition">
+                <field name="name" select="1"/>
+                <newline/>
+                <field name="source_node_id" select="1"/>
+                <field name="target_node_id" select="1"/>
+                <notebook colspan="4">
+                <page string="Actions">
+                    <field name="action_ids" nolabel="1" colspan="4"/>
+                </page><page string="Roles">
+                    <field name="role_ids" nolabel="1" colspan="4"/>
+                </page><page string="Notes">
+                    <field name="note" nolabel="1" colspan="4"/>
+                </page>
+                </notebook>
+            </form>
+        </field>
+    </record>
+
+    <record model="ir.actions.act_window" id="action_process_transition_form">
+        <field name="name">Process Transitions</field>
+        <field name="res_model">process.transition</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+    <menuitem
+        id="menu_process_transition_form"
+        action="action_process_transition_form"
+        parent="menu_process"/>
+
+
 </data>
 </openerp>