diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml
index a9500a37187..c0aeac66920 100644
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@@ -12,10 +12,13 @@
         <menuitem id="menu_finance_legal_statement" name="Legal Statements" parent="account.menu_finance" sequence="8"/>
         <menuitem id="menu_generic_report" name="Generic Reports" parent="account.menu_finance_legal_statement" sequence="8"/>
 
-        <menuitem id="menu_finance_entries" name="Entries Encoding" parent="account.menu_finance" sequence="2"/>
+        <menuitem id="menu_finance_entries" name="Entries Encoding" parent="account.menu_finance" sequence="2"
+            groups="group_account_user"/>
         <menuitem id="account.menu_finance_recurrent_entries" name="Recurrent Entries" parent="account.menu_finance_entries" sequence="15"/>
 
-        <menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="account.menu_finance" sequence="3"/>
+        <menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="account.menu_finance"
+            sequence="3"
+            groups="group_account_user"/>
         <menuitem id="menu_account_end_year_treatments" name="End of Year Treatments" parent="account.menu_finance_periodical_processing" sequence="20"/>
 
     </data>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 404d1371d0b..4e51b8c99b9 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -976,7 +976,13 @@
             <field name="view_mode">form,tree</field>
             <field name="view_id" ref="view_bank_statement_reconcile_form"/>
         </record>
-        <menuitem id="next_id_30" name="Bank Reconciliation" parent="account.menu_finance_periodical_processing"/><menuitem action="action_bank_statement_reconciliation_form" id="menu_action_account_bank_reconcile_tree" parent="next_id_30"/>
+        <menuitem
+            id="next_id_30"
+            name="Bank Reconciliation"
+            parent="account.menu_finance_periodical_processing"
+            groups="group_account_user"/>
+
+        <menuitem action="action_bank_statement_reconciliation_form" id="menu_action_account_bank_reconcile_tree" parent="next_id_30"/>
         <wizard id="action_account_bank_reconcile_tree" menu="False" model="account.move.line" name="account.move.bank.reconcile" string="Bank reconciliation"/>
         <menuitem action="action_account_bank_reconcile_tree" id="menu_action_account_bank_reconcile_check_tree" parent="account.next_id_30" type="wizard"/>
 
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index ebeb8f7811a..bbf747e8b5a 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -79,7 +79,7 @@ class account_invoice(osv.osv):
     def _get_journal_analytic(self, cr, uid, type_inv, context={}):
         type2journal = {'out_invoice': 'sale', 'in_invoice': 'purchase', 'out_refund': 'sale', 'in_refund': 'purchase'}
         tt = type2journal.get(type_inv, 'sale')
-        result = self.pool.get('account_analytic_journal').search(cr, uid, [('type','=',tt)], context=context)
+        result = self.pool.get('account.analytic.journal').search(cr, uid, [('type','=',tt)], context=context)
         if not result:
             raise osv.except_osv(_('No Analytic Journal !'),("You have to define an analytic journal of type '%s' !") % (tt,))
         return result[0]
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
index 71ba2d7bb9e..179c8b2d725 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
@@ -8,7 +8,12 @@
             <field name="view_mode">tree,form,graph</field>
             <field name="domain">[('user_id','=',uid)]</field>
         </record>
-        <menuitem id="next_id_71" name="Financial Project Management" parent="project.menu_main" sequence="20"/>
+        <menuitem
+            id="next_id_71" 
+            name="Financial Project Management"
+            parent="project.menu_main" 
+            groups="account.group_account_invoice"
+            sequence="20"/>
         <menuitem id="menu_account" name="Analytic Accounts" parent="next_id_71" sequence="10"/>
         <menuitem id="menu_invoicing" name="Invoicing" parent="next_id_71" sequence="20"/>
 
diff --git a/addons/base_contact/security/ir.model.access.csv b/addons/base_contact/security/ir.model.access.csv
index fdf7e700c3c..3334990b426 100644
--- a/addons/base_contact/security/ir.model.access.csv
+++ b/addons/base_contact/security/ir.model.access.csv
@@ -1,5 +1,5 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_res_partner_contact","res.partner.contact","model_res_partner_contact","base.group_partner_manager",1,1,1,1
 "access_res_partner_job","res.partner.job","model_res_partner_job","base.group_partner_manager",1,1,1,1
-"access_res_partner_contact_all","res.partner.contact all","model_res_partner_contact",,1,0,0,0
-"access_res_partner_job_all","res.partner.job all","model_res_partner_job",,1,0,0,0
+"access_res_partner_contact_all","res.partner.contact all","model_res_partner_contact",base.group_user,1,0,0,0
+"access_res_partner_job_all","res.partner.job all","model_res_partner_job",base.group_user,1,0,0,0
diff --git a/addons/board/board_view.xml b/addons/board/board_view.xml
index 04d6ae85725..138f75aa676 100644
--- a/addons/board/board_view.xml
+++ b/addons/board/board_view.xml
@@ -83,9 +83,15 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem id="next_id_50" name="Configuration" parent="board.dashboard_menu"/><menuitem action="action_view_board_list_form" id="menu_view_board_form" parent="next_id_50"/>
-        
-        
+        <menuitem
+            id="next_id_50"
+            name="Configuration"
+            parent="board.dashboard_menu"
+            groups="base.group_system"/>
+        <menuitem
+            action="action_view_board_list_form"
+            id="menu_view_board_form"
+            parent="next_id_50"/>
         <act_window context="{'view': active_id}" id="dashboard_open" multi="True" name="Open Dashboard" res_model="board.board" src_model="board.board"/>
         
     </data>
diff --git a/addons/board_account/board_account_view.xml b/addons/board_account/board_account_view.xml
index a90b2da13fe..2efcd318caa 100644
--- a/addons/board_account/board_account_view.xml
+++ b/addons/board_account/board_account_view.xml
@@ -72,6 +72,8 @@
             <field name="view_id" ref="board_account_form"/>
         </record>
         
-        <menuitem id="next_id_68" name="Accounting" parent="board.dashboard_menu"/><menuitem action="open_board_account" icon="terp-graph" id="menu_board_account" parent="next_id_68" sequence="1"/>
+        <menuitem id="next_id_68" name="Accounting" parent="board.dashboard_menu"
+            groups="account.group_account_manager"/>
+        <menuitem action="open_board_account" icon="terp-graph" id="menu_board_account" parent="next_id_68" sequence="1"/>
     </data>
 </openerp>
diff --git a/addons/board_auction/board_auction_demo.xml b/addons/board_auction/board_auction_demo.xml
index f44e2e6d723..504a02263da 100644
--- a/addons/board_auction/board_auction_demo.xml
+++ b/addons/board_auction/board_auction_demo.xml
@@ -1,17 +1,14 @@
 <?xml version="1.0"?>
 
 <openerp>
-	<data noupdate="1">
-	<record model="ir.ui.view_sc" id="sc_auction_dash">
-			<field name="name">Auction dashboard</field>
-			<field name="user_id" ref="base.user_root"/>
-			<field name="resource">ir.ui.menu</field>
-			<field name="sequence">4</field>
-			<field name="res_id" ref="menu_board_auction"/>
-		</record>
-		<record model="res.users" id="base.user_demo">
-			<field name="action_id" ref="open_board_auction"/>
-		</record>
+    <data noupdate="1">
+    <record model="ir.ui.view_sc" id="sc_auction_dash">
+            <field name="name">Auction dashboard</field>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="resource">ir.ui.menu</field>
+            <field name="sequence">4</field>
+            <field name="res_id" ref="menu_board_auction"/>
+        </record>
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/board_crm_configuration/board_crm_statistical_view.xml b/addons/board_crm_configuration/board_crm_statistical_view.xml
index 51585130bfe..f5e9015a66b 100644
--- a/addons/board_crm_configuration/board_crm_statistical_view.xml
+++ b/addons/board_crm_configuration/board_crm_statistical_view.xml
@@ -1,124 +1,125 @@
 <?xml version="1.0"?>
 <openerp>
-	<data>
-		<!--
-		 Board for statistical view of the sections
-		 -->
-		<record model="ir.ui.view" id="view_crm_lead_stage_graph1">
-			<field name="name">Leads By Stage - Graph</field>
-			<field name="model">report.crm.case.section.stage</field>
-			<field name="type">graph</field>
-			<field name="arch" type="xml">
-				<graph string="Leads By Stage" type="pie">
-					<field name="stage_id"/>
-					<field name="nbr" operator="+"/>
-					<field name="state" group="True"/>
-				</graph>
-			</field>
-		</record>
-		
-		<record model="ir.ui.view" id="view_crm_case_categ_graph">
-			<field name="name">report.crm.case.categ.graph</field>
-			<field name="model">report.crm.case.categ</field>
-			<field name="type">graph</field>
-			<field name="arch" type="xml">
-				<graph string="Cases by Sections and Categories" type="bar" orientation="horizontal">
-					<field name="categ_id"/>
-					<field name="nbr" operator="+"/>
-					<field name="state" group="True"/>
-				</graph>
-			</field>
-		</record>		 
-		
-		<act_window name="Opportunities By Categories"
-			domain="[('section_id', '=', 'Opportunities'),('state','!=','done'),('state','!=','cancel')]"
-			res_model="report.crm.case.categ"
-			view_type="form"
-			view_mode="graph,tree,form"
-			view_id="view_crm_case_categ_graph"
-			id="act_oppor_categ"/>		 
-			
-		<record model="ir.actions.act_window" id="act_leads_state">
-			<field name="res_model">report.crm.case.section.stage</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">graph,tree,form</field>
-			<field name="view_id" ref="view_crm_lead_stage_graph1"/>
-			<field name="domain">[('section_id', '=', 'Leads'),('state','!=','done'),('state','!=','cancel')]</field>
-		</record>	
-		
-		<act_window name="Jobs Requests Of The Month by Applied Job"
-			domain="[('section_id', '=', 'Jobs'),('name','=',time.strftime('%Y-%m-01')),('state','!=','done'),('state','!=','cancel')]"
-			res_model="report.crm.case.categ"
-			view_type="form"
-			view_mode="graph,tree,form"
-			view_id="view_crm_case_categ_graph"
-			id="act_jobs_categ"/>
-			
-		<act_window name="Leads Of The Month By User"
-			domain="[('section_id', '=', 'Leads'),('name','=',time.strftime('%Y-%m-01')),('state','!=','cancel')]"
-			res_model="report.crm.case.user"
-			view_type="form"
-			view_mode="graph,tree,form"
-			id="act_leads_month_user"/>
-			
-		<record model="ir.ui.view" id="board_crm_statistical_form">
-			<field name="name">CRM - Statistical Dashboard Form</field>
-			<field name="model">board.board</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Statistics Dashboard">
-					<hpaned>
-						<child1>
-							<action
-								string="Opportunities By Categories"
-								name="%(act_oppor_categ)d"
-								colspan="4"
-								height="200"
-								width="250"/>
+    <data>
+        <!--
+         Board for statistical view of the sections
+         -->
+        <record model="ir.ui.view" id="view_crm_lead_stage_graph1">
+            <field name="name">Leads By Stage - Graph</field>
+            <field name="model">report.crm.case.section.stage</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Leads By Stage" type="pie">
+                    <field name="stage_id"/>
+                    <field name="nbr" operator="+"/>
+                    <field name="state" group="True"/>
+                </graph>
+            </field>
+        </record>
+        
+        <record model="ir.ui.view" id="view_crm_case_categ_graph">
+            <field name="name">report.crm.case.categ.graph</field>
+            <field name="model">report.crm.case.categ</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Cases by Sections and Categories" type="bar" orientation="horizontal">
+                    <field name="categ_id"/>
+                    <field name="nbr" operator="+"/>
+                    <field name="state" group="True"/>
+                </graph>
+            </field>
+        </record>         
+        
+        <act_window name="Opportunities By Categories"
+            domain="[('section_id', '=', 'Opportunities'),('state','!=','done'),('state','!=','cancel')]"
+            res_model="report.crm.case.categ"
+            view_type="form"
+            view_mode="graph,tree,form"
+            view_id="view_crm_case_categ_graph"
+            id="act_oppor_categ"/>         
+            
+        <record model="ir.actions.act_window" id="act_leads_state">
+            <field name="res_model">report.crm.case.section.stage</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree,form</field>
+            <field name="view_id" ref="view_crm_lead_stage_graph1"/>
+            <field name="domain">[('section_id', '=', 'Leads'),('state','!=','done'),('state','!=','cancel')]</field>
+        </record>    
+        
+        <act_window name="Jobs Requests Of The Month by Applied Job"
+            domain="[('section_id', '=', 'Jobs'),('name','=',time.strftime('%Y-%m-01')),('state','!=','done'),('state','!=','cancel')]"
+            res_model="report.crm.case.categ"
+            view_type="form"
+            view_mode="graph,tree,form"
+            view_id="view_crm_case_categ_graph"
+            id="act_jobs_categ"/>
+            
+        <act_window name="Leads Of The Month By User"
+            domain="[('section_id', '=', 'Leads'),('name','=',time.strftime('%Y-%m-01')),('state','!=','cancel')]"
+            res_model="report.crm.case.user"
+            view_type="form"
+            view_mode="graph,tree,form"
+            id="act_leads_month_user"/>
+            
+        <record model="ir.ui.view" id="board_crm_statistical_form">
+            <field name="name">CRM - Statistical Dashboard Form</field>
+            <field name="model">board.board</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Statistics Dashboard">
+                    <hpaned>
+                        <child1>
+                            <action
+                                string="Opportunities By Categories"
+                                name="%(act_oppor_categ)d"
+                                colspan="4"
+                                height="200"
+                                width="250"/>
 
-							<action
-								string="Leads By Stage"
-								name="%(act_leads_state)d"
-								height="200"
-								colspan="4"/>
-							
-						</child1>
-						<child2>
-							<action
-								string="Jobs Requests Of The Month by Applied Job"
-								name="%(act_jobs_categ)d"
-								colspan="4"/>
+                            <action
+                                string="Leads By Stage"
+                                name="%(act_leads_state)d"
+                                height="200"
+                                colspan="4"/>
+                            
+                        </child1>
+                        <child2>
+                            <action
+                                string="Jobs Requests Of The Month by Applied Job"
+                                name="%(act_jobs_categ)d"
+                                colspan="4"/>
 
 
-							<action
-								string="Leads Of The Month By User"
-								name="%(act_leads_month_user)d"
-								colspan="4"/>
+                            <action
+                                string="Leads Of The Month By User"
+                                name="%(act_leads_month_user)d"
+                                colspan="4"/>
 
-						</child2>
-					</hpaned>
-				</form>
-			</field>
-		</record>
+                        </child2>
+                    </hpaned>
+                </form>
+            </field>
+        </record>
 
-		<record model="ir.actions.act_window" id="open_board_statistical_dash">
-			<field name="name">CRM - Statistics Dashboard</field>
-			<field name="res_model">board.board</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">form</field>
-			<field name="usage">menu</field>
-			<field name="view_id" ref="board_crm_statistical_form"/>
-		</record>
+        <record model="ir.actions.act_window" id="open_board_statistical_dash">
+            <field name="name">CRM - Statistics Dashboard</field>
+            <field name="res_model">board.board</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="usage">menu</field>
+            <field name="view_id" ref="board_crm_statistical_form"/>
+        </record>
 
-		<menuitem 
-			name="CRM Configuration" parent="board.dashboard_menu"
-			id="menu_board_crm_config" />
-		<menuitem
-			name="Statistics Dashboard" parent="menu_board_crm_config"
-			action="open_board_statistical_dash"
-			sequence="2"
-			id="menu_board_statistics_dash"
-			icon="terp-graph"/>
+        <menuitem 
+            name="CRM Configuration" parent="board.dashboard_menu"
+            id="menu_board_crm_config"
+            groups="crm.group_crm_manager"/>
+        <menuitem
+            name="Statistics Dashboard" parent="menu_board_crm_config"
+            action="open_board_statistical_dash"
+            sequence="2"
+            id="menu_board_statistics_dash"
+            icon="terp-graph"/>
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/board_document/board_document_demo.xml b/addons/board_document/board_document_demo.xml
index 07d6ed92f38..6f8f8ffa39e 100644
--- a/addons/board_document/board_document_demo.xml
+++ b/addons/board_document/board_document_demo.xml
@@ -1,20 +1,17 @@
 <?xml version="1.0"?>
 <openerp>
-	<data noupdate="1">
+    <data noupdate="1">
 
-		<!--
-			Administrator shortcut
-			Demo user startup menu
-		-->
- 		<record model="ir.ui.view_sc" id="sc_document_dash">
-			<field name="name">Documents dashboard</field>
- 			<field name="user_id" ref="base.user_root"/>
- 			<field name="resource">ir.ui.menu</field>
- 			<field name="sequence">1</field>
-			<field name="res_id" ref="menu_board_document_manager"/>
- 		</record>
- 		<record model="res.users" id="base.user_demo">
-			<field name="action_id" ref="open_board_document_manager"/>
- 		</record>
- 	</data>
+        <!--
+            Administrator shortcut
+            Demo user startup menu
+        -->
+         <record model="ir.ui.view_sc" id="sc_document_dash">
+            <field name="name">Documents dashboard</field>
+             <field name="user_id" ref="base.user_root"/>
+             <field name="resource">ir.ui.menu</field>
+             <field name="sequence">1</field>
+            <field name="res_id" ref="menu_board_document_manager"/>
+         </record>
+     </data>
  </openerp>
diff --git a/addons/board_document/board_document_view.xml b/addons/board_document/board_document_view.xml
index 794b79590f4..d5d701680e1 100644
--- a/addons/board_document/board_document_view.xml
+++ b/addons/board_document/board_document_view.xml
@@ -1,106 +1,112 @@
 <?xml version="1.0"?>
  <openerp>
- 	<data>
-		<record model="board.note.type" id="note_document_type">
-			<field name="name">Document</field>
- 		</record>
+     <data>
+        <record model="board.note.type" id="note_document_type">
+            <field name="name">Document</field>
+         </record>
 
-		<record model="ir.ui.view" id="board_document_manager_form">
-			<field name="name">board.document.manager.form</field>
- 			<field name="model">board.board</field>
- 			<field name="type">form</field>
- 			<field name="arch" type="xml">
-				<form string="Document board">
- 					<hpaned position="100">
-						<child1>
-							<action
-								string="New Files"
-								name="%(report_document.action_view_all_document_tree)d"
-								view_mode="tree"/>
-	 							
-							<action
-								string="File Size by Month"
-								name="%(report_document.action_view_size_month)d"
-								view_mode="graph,tree"/>
-						</child1>
-						<child2>
-							<action
-								string="Files by Resource Type"
-								name="%(report_document.action_view_document_by_resourcetype_graph)d"
-								view_mode="graph,tree"/>			
-								
-							<action
-								string="Files by Partner"
-								name="%(report_document.action_view_files_by_partner)d"
-								view_mode="graph,tree"/>
-						</child2>
- 					</hpaned>
- 				</form>
- 			</field>
- 		</record>
+        <record model="ir.ui.view" id="board_document_manager_form">
+            <field name="name">board.document.manager.form</field>
+             <field name="model">board.board</field>
+             <field name="type">form</field>
+             <field name="arch" type="xml">
+                <form string="Document board">
+                     <hpaned position="100">
+                        <child1>
+                            <action
+                                string="New Files"
+                                name="%(report_document.action_view_all_document_tree)d"
+                                view_mode="tree"/>
+                                 
+                            <action
+                                string="File Size by Month"
+                                name="%(report_document.action_view_size_month)d"
+                                view_mode="graph,tree"/>
+                        </child1>
+                        <child2>
+                            <action
+                                string="Files by Resource Type"
+                                name="%(report_document.action_view_document_by_resourcetype_graph)d"
+                                view_mode="graph,tree"/>            
+                                
+                            <action
+                                string="Files by Partner"
+                                name="%(report_document.action_view_files_by_partner)d"
+                                view_mode="graph,tree"/>
+                        </child2>
+                     </hpaned>
+                 </form>
+             </field>
+         </record>
 
 
-		<record model="ir.actions.act_window" id="open_board_document_manager">
-			<field name="name">Document Dashboard</field>
- 			<field name="res_model">board.board</field>
- 			<field name="view_type">form</field>
- 			<field name="view_mode">form</field>
+        <record model="ir.actions.act_window" id="open_board_document_manager">
+            <field name="name">Document Dashboard</field>
+             <field name="res_model">board.board</field>
+             <field name="view_type">form</field>
+             <field name="view_mode">form</field>
 
-			<field name="view_id" ref="board_document_manager_form"/>
- 		</record>
+            <field name="view_id" ref="board_document_manager_form"/>
+         </record>
 
- 		<menuitem
-			name="Dashboards/Document/Document Manager"
-			action="open_board_document_manager"
- 			sequence="1"
-			id="menu_board_document_manager"
- 			icon="terp-graph"/>
-
-	<record model="ir.ui.view" id="board_document_manager_form1">
-			<field name="name">board.document.manager.form1</field>
- 			<field name="model">board.board</field>
- 			<field name="type">form</field>
- 			<field name="arch" type="xml">
-				<form string="Document board">
- 					<hpaned position="100">
-						<child1>
-							<action
-								string="Wall of Shame"
-								name="%(report_document.action_view_wall)d"
-								view_mode="tree"/>
-								
-						</child1>
-						<child2>
-							<action
-								string="Files by Users"
-								name="%(report_document.action_view_user_graph)d"
-								view_mode="graph,tree"/>
-
-							<action
-								string="Files by Month"
-								name="%(report_document.action_view_files_by_month_graph)d"
-								view_mode="graph,tree"/>
-								
-						</child2>
- 					</hpaned>
- 				</form>
- 			</field>
- 		</record>
+         <menuitem
+            name="Document"
+            id="menu_board_document"
+            parent="board.dashboard_menu"
+            groups="document.group_document_manager"/>
 
 
-		<record model="ir.actions.act_window" id="open_board_document_manager1">
-			<field name="name">Document Dashboard</field>
- 			<field name="res_model">board.board</field>
- 			<field name="view_type">form</field>
- 			<field name="view_mode">form</field>
-			<field name="view_id" ref="board_document_manager_form1"/>
- 		</record>
+         <menuitem
+            parent="menu_board_document"
+            action="open_board_document_manager"
+            sequence="1"
+            id="menu_board_document_manager"
+            icon="terp-graph"/>
 
- 		<menuitem
-			name="Dashboards/Document/Wall of Shame"
-			action="open_board_document_manager1"
- 			sequence="1"
-			id="menu_board_document_manager1"
- 			icon="terp-graph"/>
- 	</data>
+        <record model="ir.ui.view" id="board_document_manager_form1">
+            <field name="name">board.document.manager.form1</field>
+             <field name="model">board.board</field>
+             <field name="type">form</field>
+             <field name="arch" type="xml">
+                <form string="Document board">
+                     <hpaned position="100">
+                        <child1>
+                            <action
+                                string="Wall of Shame"
+                                name="%(report_document.action_view_wall)d"
+                                view_mode="tree"/>
+                                
+                        </child1>
+                        <child2>
+                            <action
+                                string="Files by Users"
+                                name="%(report_document.action_view_user_graph)d"
+                                view_mode="graph,tree"/>
+
+                            <action
+                                string="Files by Month"
+                                name="%(report_document.action_view_files_by_month_graph)d"
+                                view_mode="graph,tree"/>
+                        </child2>
+                     </hpaned>
+                 </form>
+            </field>
+        </record>
+
+
+        <record model="ir.actions.act_window" id="open_board_document_manager1">
+            <field name="name">Statistics by User</field>
+            <field name="res_model">board.board</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="board_document_manager_form1"/>
+        </record>
+
+        <menuitem
+            parent="menu_board_document"
+            action="open_board_document_manager1"
+            sequence="1"
+            id="menu_board_document_manager1"
+            icon="terp-graph"/>
+     </data>
  </openerp>
diff --git a/addons/board_manufacturing/board_manufacturing_demo.xml b/addons/board_manufacturing/board_manufacturing_demo.xml
index 82bffd3178c..080467eb8b7 100644
--- a/addons/board_manufacturing/board_manufacturing_demo.xml
+++ b/addons/board_manufacturing/board_manufacturing_demo.xml
@@ -11,9 +11,6 @@
         <record id="base.user_root" model="res.users">
             <field name="action_id" ref="open_board_manufacturing"/>
         </record>
-        <record id="base.user_demo" model="res.users">
-            <field name="action_id" ref="open_board_manufacturing"/>
-        </record>
-        
+
     </data>
 </openerp>
diff --git a/addons/board_manufacturing/board_manufacturing_view.xml b/addons/board_manufacturing/board_manufacturing_view.xml
index 9befd988f84..731a79e09b0 100644
--- a/addons/board_manufacturing/board_manufacturing_view.xml
+++ b/addons/board_manufacturing/board_manufacturing_view.xml
@@ -36,8 +36,16 @@
             <field name="view_mode">form</field>
             <field name="view_id" ref="board_mrp_manager_form"/>
         </record>
-        
-        <menuitem id="next_id_87" name="Production" parent="board.dashboard_menu"/><menuitem action="open_board_manufacturing" icon="terp-graph" id="menu_board_manufacturing" parent="next_id_87" sequence="1"/>
-        
+        <menuitem
+            id="next_id_87"
+            name="Production"
+            parent="board.dashboard_menu"
+            groups="mrp.group_mrp_manager"/>
+        <menuitem
+            action="open_board_manufacturing"
+            icon="terp-graph"
+            id="menu_board_manufacturing"
+            parent="next_id_87"
+            sequence="1"/>
     </data>
 </openerp>
diff --git a/addons/board_project/board_project_manager_view.xml b/addons/board_project/board_project_manager_view.xml
index 01e934e38d3..a0cadfaa58e 100644
--- a/addons/board_project/board_project_manager_view.xml
+++ b/addons/board_project/board_project_manager_view.xml
@@ -83,10 +83,7 @@
             <field name="view_id" ref="board_project_manager_form"/>
         </record>
         
-        <menuitem action="open_board_project_manager" icon="terp-graph" id="menu_board_project_manager" parent="board_project.next_id_86" sequence="1"/>
-        
-        
-        
-        
+        <menuitem action="open_board_project_manager" icon="terp-graph" id="menu_board_project_manager" parent="board_project.next_id_86" sequence="1" groups="project.group_project_user"/>
+
     </data>
 </openerp>
diff --git a/addons/board_project/board_project_view.xml b/addons/board_project/board_project_view.xml
index 5d1c8151964..eda8fd50cb5 100644
--- a/addons/board_project/board_project_view.xml
+++ b/addons/board_project/board_project_view.xml
@@ -76,8 +76,16 @@
             <field name="usage">menu</field>
             <field name="view_id" ref="board_project_form"/>
         </record>
-        
-        <menuitem id="next_id_86" name="Project" parent="board.dashboard_menu"/><menuitem action="open_board_project" icon="terp-graph" id="menu_board_project" parent="next_id_86" sequence="1"/>
-        
+
+        <menuitem
+            id="next_id_86"
+            name="Project"
+            parent="board.dashboard_menu"/>
+        <menuitem
+            action="open_board_project" 
+            icon="terp-graph" 
+            id="menu_board_project" 
+            parent="next_id_86" 
+            sequence="1"/>
     </data>
 </openerp>
diff --git a/addons/board_sale/board_sale_demo.xml b/addons/board_sale/board_sale_demo.xml
index 0630a1db3bd..996821c02e1 100644
--- a/addons/board_sale/board_sale_demo.xml
+++ b/addons/board_sale/board_sale_demo.xml
@@ -13,8 +13,5 @@
             <field name="sequence">1</field>
             <field name="res_id" ref="menu_board_sales_manager"/>
         </record>
-        <record id="base.user_demo" model="res.users">
-            <field name="action_id" ref="open_board_sales_manager"/>
-        </record>
     </data>
 </openerp>
diff --git a/addons/crm/security/crm_security.xml b/addons/crm/security/crm_security.xml
index aa91246e872..a097147fec2 100644
--- a/addons/crm/security/crm_security.xml
+++ b/addons/crm/security/crm_security.xml
@@ -10,13 +10,13 @@
         <field name="name">CRM / User</field>
     </record>
 
-	<record model='ir.ui.menu' id='menu_crm'>
-		<field name="groups_id" eval="[(6,0,[ref('group_crm_manager'),ref('group_crm_user')])]"/>
-	</record>
+    <record model='ir.ui.menu' id='menu_crm'>
+        <field name="groups_id" eval="[(6,0,[ref('group_crm_manager'),ref('group_crm_user')])]"/>
+    </record>
 
-	<record model='ir.ui.menu' id='menu_crm_configuration'>
-		<field name="groups_id" eval="[(6,0,[ref('group_crm_manager')])]"/>
-	</record>
+    <record model='ir.ui.menu' id='menu_crm_configuration'>
+        <field name="groups_id" eval="[(6,0,[ref('group_crm_manager')])]"/>
+    </record>
 
 </data>
 </openerp>
diff --git a/addons/crm_configuration/crm_meeting_view.xml b/addons/crm_configuration/crm_meeting_view.xml
index b506241d087..b9fbc98016b 100644
--- a/addons/crm_configuration/crm_meeting_view.xml
+++ b/addons/crm_configuration/crm_meeting_view.xml
@@ -46,6 +46,10 @@
                         <field name="email_cc" colspan="1"/>
                         <field name="date_deadline" select="2" string="Deadlines"/>
                         <newline/>
+
+                        <field name="planned_revenue"/>
+                        <field name="planned_cost"/>
+                        <field name="probability"/>
                         <separator colspan="4" string="Dates"/>
                         <field name="create_date"/>
                         <field name="date_closed"/>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 822def153df..89403b4344a 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -2,8 +2,17 @@
 <openerp>
     <data>
         <menuitem icon="terp-hr" id="menu_hr_root" name="Human Resources"/>
-        <menuitem id="menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" sequence="40"/>
-        <menuitem id="menu_hr_configuration" name="Configuration" parent="hr.menu_hr_root"/>
+        <menuitem 
+            id="menu_hr_reporting" 
+            name="Reporting" 
+            parent="hr.menu_hr_root" 
+            sequence="40"
+            groups="group_hr_manager"/>
+        <menuitem 
+            id="menu_hr_configuration" 
+            name="Configuration" 
+            parent="hr.menu_hr_root"
+            sequence="5" groups="group_hr_manager"/>
         
         <!--
         ==========
@@ -93,20 +102,22 @@
             <field name="view_id" eval="False"/>
         </record>
         <menuitem
-			action="open_view_employee_list"
-			id="menu_open_view_employee_list"
-			parent="hr.menu_hr_root"/>
+            id="menu_open_view_employee_list"
+            name="Employees"
+            groups="group_hr_manager"
+            parent="hr.menu_hr_root"/>
+
         <menuitem
-			action="open_view_employee_tree"
-			id="menu_open_view_employee_tree"
-			parent="menu_open_view_employee_list"/>
+            action="open_view_employee_tree"
+            id="menu_open_view_employee_tree"
+            parent="menu_open_view_employee_list"/>
 
        <record id="open_view_employee_list_my" model="ir.actions.act_window">
-            <field name="name">My Employees</field>
+            <field name="name">All Employees</field>
             <field name="res_model">hr.employee</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="domain">[('parent_id.user_id','=',uid)]</field>
+            <field name="domain">[]</field>
         </record>
         <menuitem
             action="open_view_employee_list_my"
@@ -120,9 +131,9 @@
             <field name="view_mode">form,tree</field>
         </record>
         <menuitem
-			action="open_view_employee_new"
-			id="menu_open_view_employee_new" 
-			parent="menu_open_view_employee_list"/>
+            action="open_view_employee_new"
+            id="menu_open_view_employee_new" 
+            parent="menu_open_view_employee_list"/>
 
         <!--
         =======================
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index cf32eaef485..45d11269f48 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -49,8 +49,8 @@
             <field name="view_mode">tree,form</field>
         </record>
         <menuitem id="menu_hr_attendance" name="Attendances" parent="hr.menu_hr_root"/>
-        <menuitem action="open_view_attendance" id="menu_open_view_attendance" parent="menu_hr_attendance"/>
-        
+        <menuitem action="open_view_attendance" id="menu_open_view_attendance"
+            parent="menu_hr_attendance" groups="hr.group_hr_manager"/>
         
         <record id="edit_attendance_reason" model="ir.ui.view">
             <field name="name">hr.action.reason.form</field>
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index a2b0ef91dd0..5282704748c 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -95,7 +95,15 @@
             <field name="res_model">hr.expense.expense</field>
             <field name="view_type">form</field>
         </record>
-        <menuitem id="next_id_49" name="Expenses" parent="hr.menu_hr_root"/><menuitem action="expense_all" id="menu_expense_all" parent="next_id_49"/>
+        <menuitem
+            id="next_id_49"
+            name="Expenses"
+            parent="hr.menu_hr_root"/>
+        <menuitem
+            action="expense_all"
+            id="menu_expense_all"
+            parent="next_id_49"
+            groups="hr.group_hr_manager"/>
         <record id="expense_all_draft" model="ir.actions.act_window">
             <field name="name">Draft expenses</field>
             <field name="res_model">hr.expense.expense</field>
@@ -136,10 +144,21 @@
             <field name="name">My Expenses</field>
             <field name="res_model">hr.expense.expense</field>
             <field name="view_type">form</field>
-            <field name="view_mode">form,tree</field>
+            <field name="view_mode">tree,form</field>
             <field name="domain">[('user_id','=',uid)]</field>
         </record>
         <menuitem action="expense_my" id="menu_expense_my" parent="hr_expense.next_id_49"/>
+
+        <record id="expense_my_new" model="ir.actions.act_window">
+            <field name="name">New Expenses Sheet</field>
+            <field name="res_model">hr.expense.expense</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
+            <field name="domain">[('user_id','=',uid)]</field>
+        </record>
+        <menuitem action="expense_my_new" id="menu_expense_my_new" parent="hr_expense.next_id_49"/>
+
+
         <record id="expense_my_draft" model="ir.actions.act_window">
             <field name="name">My Draft expenses</field>
             <field name="res_model">hr.expense.expense</field>
diff --git a/addons/hr_holidays/hr_view.xml b/addons/hr_holidays/hr_view.xml
index 8e9222cedd4..b69b2373d3a 100644
--- a/addons/hr_holidays/hr_view.xml
+++ b/addons/hr_holidays/hr_view.xml
@@ -101,7 +101,10 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem action="open_view_holiday_status" id="menu_open_view_holiday_status" parent="hr.menu_hr_configuration"/>
+        <menuitem
+            action="open_view_holiday_status"
+            id="menu_open_view_holiday_status"
+            parent="hr.menu_hr_configuration"/>
 
         <!-- holidays per user -->
         <record model="ir.ui.view" id="view_holidays_per_user_form">
@@ -156,7 +159,17 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="edit_holiday_inherit_new" />
         </record>
-        <menuitem name="Holidays Request" parent="hr.menu_hr_root" id="menu_open_ask_holidays" action="open_ask_holidays"/>
+
+        <menuitem
+            name="Holidays Management"
+            parent="hr.menu_hr_root"
+            id="menu_open_ask_holidays"/>
+
+        <menuitem
+            name="New Holidays Request"
+            parent="menu_open_ask_holidays"
+            id="menu_open_ask_holidays_new"
+            action="open_ask_holidays"/>
 
         <record model="ir.actions.act_window" id="action_all_holiday">
             <field name="type">ir.actions.act_window</field>
@@ -164,7 +177,11 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem name="All Holidays Requests" parent="menu_open_ask_holidays" id="menu_action_all_holiday" action="action_all_holiday" />
+        <menuitem name="All Holidays Requests"
+            parent="menu_open_ask_holidays"
+            id="menu_action_all_holiday"
+            action="action_all_holiday"
+            groups="hr.group_hr_manager"/>
 
         <record model="ir.actions.act_window" id="action_my_holiday">
             <field name="name">My Holidays Request</field>
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 2a45fe33512..e44a50ace19 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -40,7 +40,7 @@
                 </form>
             </field>
         </record>
-        <menuitem id="menu_act_hr_timesheet_line_today_form" parent="hr.menu_hr_root" name="Working Hours"/>
+        <menuitem id="menu_act_hr_timesheet_line_today_form" parent="hr.menu_hr_root" name="Working Hours" />
         
         <record id="act_hr_timesheet_line_me_all_form" model="ir.actions.act_window">
             <field name="name">My Working Hours</field>
@@ -70,8 +70,12 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem action="act_hr_timesheet_line_evry1_all_form" id="menu_act_hr_timesheet_line_evry1_all_form" parent="hr_timesheet.menu_act_hr_timesheet_line_today_form"/>
-         
+        <menuitem
+            action="act_hr_timesheet_line_evry1_all_form"
+            id="menu_act_hr_timesheet_line_evry1_all_form"
+            parent="hr_timesheet.menu_act_hr_timesheet_line_today_form"
+            groups="hr.group_hr_manager"/>
+
         <record id="act_hr_timesheet_line_evry1_today_form" model="ir.actions.act_window">
             <field name="name">Working Hours of The Day</field>
             <field name="type">ir.actions.act_window</field>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index e456a9db2eb..37b53c1f030 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -168,7 +168,9 @@
             <field name="view_type">form</field>
             <field name="view_id" eval="False"/>
         </record>
-        <menuitem id="next_id_60" name="Timesheets" parent="hr.menu_hr_root"/><menuitem action="act_hr_timesheet_sheet_form" id="menu_act_hr_timesheet_sheet_form" parent="next_id_60"/>
+        <menuitem id="next_id_60" name="Timesheets" parent="hr.menu_hr_root"/>
+        <menuitem action="act_hr_timesheet_sheet_form" id="menu_act_hr_timesheet_sheet_form" parent="next_id_60"
+            groups="hr.group_hr_manager"/>
         
         <record id="act_hr_timesheet_sheet_form_my" model="ir.actions.act_window">
             <field name="name">My timesheets</field>
@@ -196,7 +198,12 @@
             name="hr_timesheet_sheet.department.open" 
             string="My Department's Timesheet"
             multi="True"/>
-        <menuitem action="act_hr_timesheet_sheet_form_department_current" icon="STOCK_JUSTIFY_FILL" id="menu_act_hr_timesheet_sheet_form_department_current" parent="hr_timesheet_sheet.next_id_60" type="wizard"/>
+        <menuitem action="act_hr_timesheet_sheet_form_department_current" 
+            icon="STOCK_JUSTIFY_FILL" 
+            id="menu_act_hr_timesheet_sheet_form_department_current" 
+            parent="hr_timesheet_sheet.next_id_60" 
+            groups="hr.group_hr_manager"
+            type="wizard"/>
         
         <wizard
             id="act_hr_timesheet_sheet_form_department_validate" 
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index c1a5dd334e5..1796495078d 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -2,7 +2,8 @@
 <openerp>
     <data>
 
-        <menuitem icon="terp-mrp" id="menu_mrp_root" name="Manufacturing"/>
+        <menuitem icon="terp-mrp" id="menu_mrp_root" name="Manufacturing"
+            groups="group_mrp_user,group_mrp_manager"/>
         <menuitem id="menu_mrp_reordering" name="Automatic Procurements" parent="stock.menu_stock_root" sequence="4"/>
 
         <!--
diff --git a/addons/process/process_view.xml b/addons/process/process_view.xml
index cee536def7d..3f294ef0302 100644
--- a/addons/process/process_view.xml
+++ b/addons/process/process_view.xml
@@ -39,7 +39,7 @@
                                     <field name="kind" select="1"/>
                                     <field name="help_url" widget="url"/>
                                     <field name="model_states"/>
-                                    <field name="subflow_id" domain="[('name', '!=', parent.name)]"/>
+                                    <field name="subflow_id" domain="[('name', '!=', parent.name)]" attrs="{'readonly':[('kind','=','state')]}"/>
                                 </group>
                                 <notebook colspan="4">
                                     <page string="Outgoing Transitions">
@@ -169,7 +169,7 @@
                     <field name="kind" select="1"/>
                     <field name="help_url" widget="url"/>
                     <field name="model_states"/>
-                    <field name="subflow_id"/>
+                    <field name="subflow_id" attrs="{'readonly':[('kind','=','state')]}"/>
                 </group>
                 <notebook colspan="4">
                     <page string="Outgoing Transitions">
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 89a8efc770f..a0bfee6fd3a 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -2,7 +2,12 @@
 <openerp>
     <data>
         <menuitem icon="terp-product" id="menu_main_product" name="Products"/>
-        <menuitem id="menu_config_product" name="Configuration" parent="product.menu_main_product" sequence="1"/>
+        <menuitem
+            id="menu_config_product"
+            name="Configuration"
+            parent="product.menu_main_product"
+            sequence="1"
+            groups="group_product_manager"/>
         <record id="product_product_tree_view" model="ir.ui.view">
             <field name="name">product.product.tree</field>
             <field name="model">product.product</field>
diff --git a/addons/product_margin/product_margin_view.xml b/addons/product_margin/product_margin_view.xml
index 5b018115dc6..7195392a114 100644
--- a/addons/product_margin/product_margin_view.xml
+++ b/addons/product_margin/product_margin_view.xml
@@ -4,7 +4,9 @@
 
     <wizard id="action_open_margin" menu="False" model="product.product" name="product.margins" string="Product Margins"/>
 
-    <menuitem id="menu_product_reporting" name="Reporting" parent ="product.menu_main_product" />
+    <menuitem id="menu_product_reporting"
+        name="Reporting" parent ="product.menu_main_product"
+        groups="product.group_product_manager"/>
 
     <menuitem icon="STOCK_JUSTIFY_FILL" action="action_open_margin" id="menu_action_product_margin" type="wizard" sequence="5" parent="menu_product_reporting" />
 
diff --git a/addons/profile_service/profile_service.py b/addons/profile_service/profile_service.py
index 27f086443b2..cf82f23c246 100644
--- a/addons/profile_service/profile_service.py
+++ b/addons/profile_service/profile_service.py
@@ -44,7 +44,7 @@ class profile_service_config_install_modules_wizard(osv.osv_memory):
                     help= "The Document Management System of Open ERP allows you to store, browse, automatically index, search and preview all kind of documents (internal documents, printed reports, calendar system). It opens an FTP access for the users to easily browse association's document."),
         'project_gtd':fields.boolean('Getting Things Done', help="GTD is a methodology to efficiently organise yourself and your tasks. This module fully integrates GTD principle with OpenERP's project management."),
         'scrum':fields.boolean('Scrum Methodology', help="Scrum is an 'agile development methodology', mainly used in IT projects. It helps you to manage teams, long term roadmaps, sprints, and so on."),
-        'base_contact':fields.boolean('Contacts Management', help="Allows you to manage partners (enterprises), addresses of partners and contacts of these partners (employee/people). Install this if you plan to manage your relationships with partners and contacts."),
+        'base_contact':fields.boolean('Advanced Contacts Management', help="Allows you to manage partners (enterprises), addresses of partners and contacts of these partners (employee/people). Install this if you plan to manage your relationships with partners and contacts, with contacts having different jobs in different companies."),
         'portal': fields.boolean('Portal',
             help="This module allows you to manage a Portal system.")
     }
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index ecb83894624..c30aa71069b 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -28,6 +28,7 @@
                             <field name="active" select="2"/>
                             <field name="planned_hours" widget="float_time"/>
                             <field name="effective_hours" widget="float_time"/>
+                            <field name="category_id" select="2"/>
                             <newline/>
                             <separator colspan="4" string="Project's members"/>
                             <field colspan="4" name="members" nolabel="1"/>
@@ -48,7 +49,6 @@
                         <page groups="base.group_extended" string="Partner Info">
                             <field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id)" select="1"/>
                             <field domain="[('partner_id','=',partner_id)]" name="contact_id" select="2"/>
-                            <field name="category_id" select="2"/>
                             <field name="warn_customer"/>
                             <newline/>
                             <separator colspan="2" string="Mail Header"/>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 745722aca18..69f677fa15e 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="terp-purchase" id="menu_purchase_root" name="Purchase Management"/>
+        <menuitem icon="terp-purchase" id="menu_purchase_root" name="Purchase Management"
+            groups="group_purchase_user"/>
 
        <record model="ir.ui.view" id="purchase_order_calendar">
             <field name="name">purchase.order.calendar</field>
diff --git a/addons/report_analytic_planning/report_analytic_planning_view.xml b/addons/report_analytic_planning/report_analytic_planning_view.xml
index 2676b3abb5f..933c022e682 100644
--- a/addons/report_analytic_planning/report_analytic_planning_view.xml
+++ b/addons/report_analytic_planning/report_analytic_planning_view.xml
@@ -91,7 +91,10 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">[('user_id','=',uid)]</field>
         </record>
-        <menuitem action="action_account_analytic_planning_form_my" id="menu_report_account_analytic_planning_my2" parent="report_analytic_planning.menu_report_account_analytic_planning"/>
+        <menuitem
+            action="action_account_analytic_planning_form_my"
+            id="menu_report_account_analytic_planning_my2" 
+            parent="planning_main"/>
         
         <record id="action_account_analytic_planning_form_current_my" model="ir.actions.act_window">
             <field name="name">My Current Plannings</field>
@@ -117,7 +120,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">form,tree</field>
         </record>
-        <menuitem action="action_account_analytic_planning_form_new" id="menu_report_account_analytic_planning_new" parent="report_analytic_planning.menu_report_account_analytic_planning"/>
+        <menuitem action="action_account_analytic_planning_form_new" id="menu_report_account_analytic_planning_new" parent="planning_main"/>
         
         
         
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 5c2f0d0f256..f7871d0d234 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="terp-sale" id="menu_sale_root" name="Sales Management"/>
+        <menuitem icon="terp-sale" id="menu_sale_root" name="Sales Management"
+            groups="group_sale_user"/>
 
         <record id="view_shop_form" model="ir.ui.view">
             <field name="name">sale.shop</field>
diff --git a/addons/sale_journal/sale_journal_view.xml b/addons/sale_journal/sale_journal_view.xml
index 65029e4ad1b..34b7591a415 100644
--- a/addons/sale_journal/sale_journal_view.xml
+++ b/addons/sale_journal/sale_journal_view.xml
@@ -134,9 +134,9 @@
         <field name="model">sale.order</field>
         <field name="inherit_id" ref="sale.view_order_form" />
         <field name="arch" type="xml">
-            <field name="client_order_ref" position="after">
-                <field name="invoice_type_id" select="1"/>
+            <field name="invoiced" position="after">
                 <field name="journal_id" select="1"/>
+                <field name="invoice_type_id" select="1"/>
             </field>
         </field>
     </record>