diff --git a/addons/base_contact/__terp__.py b/addons/base_contact/__terp__.py
index 5d8be6bc885..e9cf95095a6 100644
--- a/addons/base_contact/__terp__.py
+++ b/addons/base_contact/__terp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -40,7 +40,7 @@
     """,
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
-    'depends': ['base', 'process'],
+    'depends': ['base','process','sale'],
     'init_xml': [],
     'update_xml': [
         'security/ir.model.access.csv',
diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml
index 4a2a1c1377f..9dd387c0664 100644
--- a/addons/base_contact/base_contact_view.xml
+++ b/addons/base_contact/base_contact_view.xml
@@ -65,7 +65,7 @@
                                    <field name="email" widget="email"/>
                                    <field name="extension"/>
                                    <field name="other"/>
-                               </group>                                    
+                               </group>
                             </form>
                             <tree string="Functions and Addresses">
                                 <field name="sequence_contact" string="Seq."/>
@@ -90,7 +90,7 @@
                     </page>
                     <page string="Picture">
                         <field name="photo" nolabel="1" colspan="2" widget="image"/>
-                    </page>                    
+                    </page>
                 </notebook>
             </form>
         </field>
@@ -108,7 +108,7 @@
             </search>
         </field>
     </record>
-    
+
     <record model="ir.actions.act_window" id="action_partner_contact_form">
         <field name="name">Contacts</field>
         <field name="res_model">res.partner.contact</field>
@@ -117,8 +117,8 @@
         <field name="view_id" ref="view_partner_contact_tree"/>
         <field name="search_view_id" ref="view_partner_contact_search"/>
     </record>
-    <menuitem name="Partners/" id="menu_partner_contact_form" action="action_partner_contact_form"/>
-    <menuitem name="Partners/Addresses"  id="base.menu_partner_address_form"/>
+    <menuitem name="Contacts" id="menu_partner_contact_form" action="action_partner_contact_form" parent = "base.menu_address_book" sequence="2"/>
+    <menuitem name="Addresses" id="base.menu_partner_address_form" parent = "base.menu_address_book" sequence="3"/>
 
 
     <!-- Views for Partners -->
@@ -141,7 +141,7 @@
                            <field name="country_id" select="2" completion="1"/>
                            <field name="state_id" select="2"/>
                         </group>
-                        <group string="Communication" colspan="2" col="2"> 
+                        <group string="Communication" colspan="2" col="2">
                            <field name="phone"/>
                            <field name="fax"/>
                            <field name="email" widget="email"/>
@@ -159,17 +159,17 @@
                             </tree>
                             <form string="Contacts">
                             <group string="Partner" colspan="2" col="2">
-                                <field name="sequence_partner"/>                            
+                                <field name="sequence_partner"/>
                                 <field name="name"/>
                                 <field name="contact_id"/>
                                 <field name="function_id"/>
                             </group>
-                            <group string="Communication" colspan="2" col="2">    
+                            <group string="Communication" colspan="2" col="2">
                                 <field name="phone"/>
                                 <field name="fax"/>
                                 <field name="extension"/>
                                 <field name="other"/>
-                                <field name="email" widget="email"/>                                
+                                <field name="email" widget="email"/>
                                 <field name="extension"/>
                                 <field name="other"/>
                             </group>
@@ -188,8 +188,8 @@
             </field>
         </field>
     </record>
-    
-    
+
+
 <!-- don't display the categories, since it is displayed in an other tab-->
         <record model="ir.ui.view" id="view_partner_form_inherit2">
             <field name="name">res.partner.form</field>
@@ -341,7 +341,7 @@
             </group>
         </field>
     </record>
-	
+
 	<record id="view_res_partner_address_filter" model="ir.ui.view">
 	    <field name="name">res.partner.address.select</field>
 	    <field name="model">res.partner.address</field>
@@ -353,7 +353,7 @@
 			</search>
 	    </field>
     </record>
-    
+
     <!-- Views for res.partner.job -->
     <record model="ir.ui.view" id="view_partner_job_tree">
         <field name="name">res.partner.job.tree</field>
@@ -408,11 +408,11 @@
         <field name="res_model">res.partner.job</field>
         <field name="view_type">form</field>
     </record>
-    <menuitem
-        name="Partners/Contact's Jobs" 
-        action="action_res_partner_job" 
-        id="menu_action_res_partner_job"
-        groups="base.group_extended"/>
+<!--    <menuitem-->
+<!--        name="Partners/Contact's Jobs"-->
+<!--        action="action_res_partner_job"-->
+<!--        id="menu_action_res_partner_job"-->
+<!--        groups="base.group_extended"/>-->
 
     <!-- Act window defining a shorcut on partners to open all his contacts -->
     <act_window domain="[('name', '=', active_id)]"
diff --git a/addons/base_contact/process/base_contact_process.xml b/addons/base_contact/process/base_contact_process.xml
index 650b832ac4a..f8d28ab8e93 100755
--- a/addons/base_contact/process/base_contact_process.xml
+++ b/addons/base_contact/process/base_contact_process.xml
@@ -5,13 +5,13 @@
 	<!--
 		Process
 	-->
-	
+
 		<record id="process_process_basecontactprocess0" model="process.process">
 			<field eval="&quot;&quot;&quot;Base Contact&quot;&quot;&quot;" name="name"/>
 			<field eval="1" name="active"/>
 			<field name="model_id" ref="base_contact.model_res_partner_contact"/>
 		</record>
-		
+
 	<!--
 		Process node
 	-->
@@ -37,7 +37,7 @@
 		</record>
 
 		<record id="process_node_function0" model="process.node">
-			<field name="menu_id" ref="base_contact.menu_action_res_partner_job"/>
+<!--			<field name="menu_id" ref="base_contact.menu_action_res_partner_job"/>-->
 			<field name="model_id" ref="base_contact.model_res_partner_job"/>
 			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
 			<field eval="&quot;&quot;&quot;Jobs at a same partner address.&quot;&quot;&quot;" name="note"/>
@@ -55,7 +55,7 @@
 			<field name="process_id" ref="process_process_basecontactprocess0"/>
 			<field eval="0" name="flow_start"/>
 		</record>
-		
+
 	<!--
 		Process Transition
 	-->
@@ -86,6 +86,6 @@
 			<field model="process.node" name="target_node_id" ref="process_node_addresses0"/>
 			<field model="process.node" name="source_node_id" ref="process_node_partners0"/>
 		</record>
-		
+
 	</data>
 </openerp>
\ No newline at end of file
diff --git a/addons/crm/__terp__.py b/addons/crm/__terp__.py
index 9ca8e817a97..a27a1a2b822 100644
--- a/addons/crm/__terp__.py
+++ b/addons/crm/__terp__.py
@@ -21,9 +21,9 @@
 
 
 {
-    'name': 'Customer & Supplier Relationship Management', 
-    'version': '1.0', 
-    'category': 'Generic Modules/CRM & SRM', 
+    'name': 'Customer & Supplier Relationship Management',
+    'version': '1.0',
+    'category': 'Generic Modules/CRM & SRM',
     'description': """The generic Open ERP Customer Relationship Management
 system enables a group of people to intelligently and efficiently manage
 leads, opportunities, tasks, issues, requests, bugs, campaign, claims, etc.
@@ -41,67 +41,68 @@ appropriate staff, and making sure all future correspondence gets to the right
 place.
 
 The CRM module has a email gateway for the synchronisation interface
-between mails and Open ERP.""", 
-    'author': 'Tiny', 
-    'website': 'http://www.openerp.com', 
-    'depends': ['base', 
-                        'caldav', 
-                        'process', 
-                        'mail_gateway', 
-                    ], 
-    'init_xml': ['crm_data.xml', 
-                'crm_meeting_data.xml', 
-                 'crm_claims_data.xml', 
-                 'crm_fund_data.xml', 
-                 'crm_helpdesk_data.xml', 
-                 'crm_jobs_data.xml', 
-                 'crm_lead_data.xml', 
-                 'crm_meeting_data.xml', 
-                 'crm_opportunity_data.xml', 
-                 'crm_phonecall_data.xml', 
-    ], 
+between mails and Open ERP.""",
+    'author': 'Tiny',
+    'website': 'http://www.openerp.com',
+    'depends': ['base', 'sale',
+                        'caldav',
+                        'process',
+                        'mail_gateway',
+                    ],
+    'init_xml': ['crm_data.xml',
+                'crm_meeting_data.xml',
+                 'crm_claims_data.xml',
+                 'crm_fund_data.xml',
+                 'crm_helpdesk_data.xml',
+                 'crm_jobs_data.xml',
+                 'crm_lead_data.xml',
+                 'crm_meeting_data.xml',
+                 'crm_opportunity_data.xml',
+                 'crm_phonecall_data.xml',
+    ],
     'update_xml': [
-        'crm_wizard.xml', 
-        'crm_view.xml', 
-        'crm_config_view.xml', 
-        'crm_job_wizard.xml', 
-        'crm_jobs_view.xml', 
-        'crm_jobs_menu.xml', 
-        'crm_lead_wizard.xml', 
-        'crm_lead_view.xml', 
-        'crm_lead_menu.xml', 
-        'crm_meeting_wizard.xml', 
-        'crm_meeting_view.xml', 
-        'crm_meeting_menu.xml', 
-        'crm_opportunity_wizard.xml', 
-        'crm_opportunity_view.xml', 
-        'crm_opportunity_menu.xml', 
-        'crm_fund_view.xml', 
-        'crm_fund_menu.xml', 
-        'crm_claims_view.xml', 
-        'crm_claims_menu.xml', 
-        'crm_phonecall_wizard.xml', 
-        'crm_phonecall_view.xml', 
-        'crm_phonecall_menu.xml', 
-        'crm_report_view.xml', 
-        'crm_helpdesk_view.xml', 
-        'crm_report.xml', 
-        'security/crm_security.xml', 
-        'security/ir.model.access.csv', 
+        'crm_wizard.xml',
+        'crm_view.xml',
+        'crm_config_view.xml',
+        'crm_job_wizard.xml',
+        'crm_jobs_view.xml',
+        'crm_jobs_menu.xml',
+        'crm_lead_wizard.xml',
+        'crm_lead_view.xml',
+        'crm_lead_menu.xml',
+        'crm_meeting_wizard.xml',
+        'crm_meeting_view.xml',
+        'crm_meeting_menu.xml',
+        'crm_opportunity_wizard.xml',
+        'crm_opportunity_view.xml',
+        'crm_opportunity_menu.xml',
+        'crm_fund_view.xml',
+        'crm_fund_menu.xml',
+        'crm_claims_view.xml',
+        'crm_claims_menu.xml',
+        'crm_phonecall_wizard.xml',
+        'crm_phonecall_view.xml',
+        'crm_phonecall_menu.xml',
+        'crm_report_view.xml',
+        'crm_helpdesk_view.xml',
+        'crm_report.xml',
+        'security/crm_security.xml',
+        'security/ir.model.access.csv',
         'process/crm_configuration_process.xml'
-    ], 
+    ],
     'demo_xml': [
-        'crm_demo.xml', 
-        'crm_claims_demo.xml', 
-        'crm_fund_demo.xml', 
-        'crm_helpdesk_demo.xml', 
-        'crm_jobs_demo.xml', 
-        'crm_lead_demo.xml', 
-        'crm_meeting_demo.xml', 
-        'crm_opportunity_demo.xml', 
-        'crm_phonecall_demo.xml'], 
-    'installable': True, 
-    'active': False, 
-    'certificate': '0079056041421', 
+        'crm_demo.xml',
+        'crm_meeting_demo.xml',
+        'crm_claims_demo.xml',
+        'crm_fund_demo.xml',
+        'crm_helpdesk_demo.xml',
+        'crm_jobs_demo.xml',
+        'crm_lead_demo.xml',
+        'crm_meeting_demo.xml',
+        'crm_opportunity_demo.xml',
+        'crm_phonecall_demo.xml'],
+    'installable': True,
+    'active': False,
+    'certificate': '0079056041421',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index f528d6f2904..583104365b1 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
 <data noupdate="1">
-    <menuitem id="menu_presale" name="Sales" parent="crm.menu_crm" sequence="4"/>
+<!--    <menuitem id="menu_presale" name="Sales" parent="crm.menu_crm" sequence="4"/>-->
 
 <!--        MENU        -->
 
@@ -9,7 +9,7 @@
         <field name="name">All Leads</field>
         <field name="res_model">crm.lead</field>
         <field name="view_mode">tree,form</field>
-        <field name="view_id" ref="crm_case_tree_view_leads"/>        
+        <field name="view_id" ref="crm_case_tree_view_leads"/>
         <field name="context" eval="{'default_state':'open'}"/>
         <field name="search_view_id" ref="crm.view_crm_case_leads_filter"/>
     </record>
@@ -25,29 +25,29 @@
         <field name="view_id" ref="crm_case_form_view_leads"/>
         <field name="act_window_id" ref="crm_case_category_act_leads_all"/>
     </record>
-    <menuitem parent="menu_presale" name="Leads" id="menu_crm_case_categ0_act_leads" action="crm_case_category_act_leads_all"/>
+	<menuitem parent="sale.menu_sales" name="Leads" id="menu_crm_case_categ0_act_leads" action="crm_case_category_act_leads_all" sequence="1"/>
 
 <!--        REPORTS        -->
-	
-	<menuitem id="next_id_64" name="Reporting" parent="crm.menu_crm" sequence="50"/>
 
-    <menuitem name="Leads"  id="menu_action_report_crm_case_lead" parent="next_id_64"/>    
+	<!--<menuitem id="next_id_64" name="Reporting" parent="crm.menu_crm" sequence="50"/>
+
+    <menuitem name="Leads"  id="menu_action_report_crm_case_lead" parent="next_id_64"/>
+
+    <record model="ir.actions.act_window" id="action_report_crm_case_lead_user">
+        <field name="res_model">report.crm.case.user</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">graph,tree</field>
+        <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+    </record>
+    <menuitem name="Cases by Leads and User" parent="menu_action_report_crm_case_lead" action="action_report_crm_case_lead_user" id="menu_action_report_crm_case_lead_user"/>
 
-<!--    <record model="ir.actions.act_window" id="action_report_crm_case_lead_user">-->
-<!--        <field name="res_model">report.crm.case.user</field>-->
-<!--        <field name="view_type">form</field>-->
-<!--        <field name="view_mode">graph,tree</field>-->
-<!--        <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+')]'"/>-->
-<!--        <field name="context" eval="{'default_state':'open'}"/>-->
-<!--    </record>-->
-<!--    <menuitem name="Cases by Leads and User" parent="menu_action_report_crm_case_lead" action="action_report_crm_case_lead_user" id="menu_action_report_crm_case_lead_user"/>-->
-<!--    -->
 
 
     <record model="ir.actions.act_window" id="action_report_crm_case_lead_categ">
         <field name="res_model">report.crm.case.section.categ2</field>
         <field name="view_type">form</field>
-        <field name="view_mode">graph,tree</field>        
+        <field name="view_mode">graph,tree</field>
         <field name="context" eval="{'default_state':'open'}"/>
     </record>
     <menuitem parent="menu_action_report_crm_case_lead" name="Cases by Leads and Type" action="action_report_crm_case_lead_categ" id="menu_action_report_crm_case_lead_categ"/>
@@ -55,7 +55,7 @@
     <record model="ir.actions.act_window" id="action_report_crm_case_lead_stage">
         <field name="res_model">report.crm.case.section.stage</field>
         <field name="view_type">form</field>
-        <field name="view_mode">graph,tree</field>        
+        <field name="view_mode">graph,tree</field>
         <field name="context" eval="{'default_state':'open'}"/>
     </record>
     <menuitem name="Cases by Leads and Stage" parent="menu_action_report_crm_case_lead" action="action_report_crm_case_lead_stage" id="menu_action_report_crm_case_lead_stage"/>
@@ -63,7 +63,7 @@
     <record model="ir.actions.act_window" id="action_report_crm_case_lead_categ_stage">
         <field name="res_model">report.crm.case.section.categ.stage</field>
         <field name="view_type">form</field>
-        <field name="view_mode">tree</field>        
+        <field name="view_mode">tree</field>
         <field name="context" eval="{'default_state':'open'}"/>
     </record>
     <menuitem name="Cases by Section, Category and Stage" parent="menu_action_report_crm_case_lead"  action="action_report_crm_case_lead_categ_stage" id="menu_action_report_crm_case_lead_categ_stage"/>
@@ -71,11 +71,11 @@
     <record model="ir.actions.act_window" id="action_report_crm_case_lead_categ_categ2">
         <field name="res_model">report.crm.case.section.categ.categ2</field>
         <field name="view_type">form</field>
-        <field name="view_mode">tree</field>        
+        <field name="view_mode">tree</field>
         <field name="context" eval="{'default_state':'open'}"/>
     </record>
     <menuitem name="Cases by Section, Category and Type" parent="menu_action_report_crm_case_lead" action="action_report_crm_case_lead_categ_categ2" id="menu_action_report_crm_case_lead_categ_categ2"/>
 
 
-</data>
+--></data>
 </openerp>
diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml
index 794d4fc8b1d..408d62d9464 100755
--- a/addons/crm/crm_meeting_menu.xml
+++ b/addons/crm/crm_meeting_menu.xml
@@ -12,7 +12,7 @@
     />
 
 
-    <record model="ir.actions.act_window" id="crm_case_categ_meet_create_partner">        
+    <record model="ir.actions.act_window" id="crm_case_categ_meet_create_partner">
         <field name="context" eval="{'default_state':'open'}"/>
     </record>
 
@@ -49,11 +49,11 @@
         src_model="crm.case"
         view_mode="calendar,tree,form,gantt"
         context="{'default_case_id': active_id, 'default_duration': 4.0}"
-        />	
+        />
 
-    <record model="ir.actions.act_window" id="crm_case_categ_meet_case">        
+    <record model="ir.actions.act_window" id="crm_case_categ_meet_case">
         <field name="context" eval="{'default_state':'open'}"/>
-    </record>    
+    </record>
 
     <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_meet_case">
         <field name="sequence" eval="1"/>
@@ -86,6 +86,7 @@
         <field name="view_id" ref="crm_case_calendar_view_meet"/>
         <field name="context" eval="{'default_state':'open'}"/>
         <field name="search_view_id" ref="view_crm_case_meetings_filter"/>
+        <field name="domain" eval="[('section_id.calendar','=',1)]"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_meet">
         <field name="sequence" eval="1"/>
@@ -98,7 +99,7 @@
         <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>
     <record model="ir.actions.act_window.view" id="action_crm_tag_form__meet">
         <field name="sequence" eval="3"/>
         <field name="view_mode">form</field>
@@ -111,16 +112,13 @@
         <field name="view_id" ref="crm_case_gantt_view_meet"/>
         <field name="act_window_id" ref="crm_case_categ_meet"/>
     </record>
-    <menuitem parent="crm.menu_crm" name="Calendar" id="menu_crm_case_category_act_meetings"/>
-	
-	<menuitem parent="crm.menu_crm_case_category_act_meetings"
-	 	name="My Invitations" id="menu_crm_meetings_invitation"
-	 			action="caldav.action_view_attendee_form" />
+<!--    <menuitem parent="crm.menu_crm" name="Calendar" id="menu_crm_case_category_act_meetings"/>-->
 
-    <!-- 
-        ALL MEETINGS 
+    <!--
+        ALL MEETINGS
     -->
-    <menuitem name="All Meetings" id="menu_crm_case_categ_meet" action="crm_case_categ_meet" parent="menu_crm_case_category_act_meetings"/>
+    <menuitem name="Meetings" id="menu_meeting_sale" parent="base.menu_base_partner" sequence="3"/>
+    <menuitem name="Meetings" id="menu_crm_case_categ_meet" action="crm_case_categ_meet" parent="menu_meeting_sale" sequence="1"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_meetall3">
         <field name="name">Next Meetings</field>
diff --git a/addons/crm/crm_opportunity_menu.xml b/addons/crm/crm_opportunity_menu.xml
index 8f64a729107..9630b957550 100644
--- a/addons/crm/crm_opportunity_menu.xml
+++ b/addons/crm/crm_opportunity_menu.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
 <openerp>
 <data noupdate="1">
-    <menuitem id="menu_presale" name="Sales" parent="crm.menu_crm" sequence="4"/>
+<!--    <menuitem id="menu_presale" name="Sales" parent="crm.menu_crm" sequence="4"/>-->
 
      <record model="ir.actions.act_window" id="crm_case_category_act_oppor11">
           <field name="name">All Opportunities</field>
           <field name="res_model">crm.opportunity</field>
           <field name="view_mode">tree,form,graph</field>
-          <field name="view_id" ref="crm_case_tree_view_oppor"/>          
+          <field name="view_id" ref="crm_case_tree_view_oppor"/>
           <field name="context" eval="{'default_state':'open'}"/>
           <field name="search_view_id" ref="crm.view_crm_case_opportunities_filter"/>
      </record>
@@ -26,33 +26,33 @@
      <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_opportunity"/>
+          <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
           <field name="act_window_id" ref="crm_case_category_act_oppor11"/>
      </record>
-     <menuitem name="Opportunities" id="menu_crm_case_opp" parent="menu_presale" action="crm_case_category_act_oppor11"/>
+     <menuitem name="Opportunities" id="menu_crm_case_opp" parent="sale.menu_sales" action="crm_case_category_act_oppor11" sequence="2"/><!--
 
 
-<!--          MENU          -->
+          MENU
+
+          REPORTS
+     <record model="ir.actions.act_window" id="action_report_crm_case_oppor_user">
+          <field name="res_model">report.crm.case.user</field>
+          <field name="view_type">form</field>
+          <field name="view_mode">graph,tree</field>
+          <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+')]'"/>
+          <field name="context" eval="{'default_state':'open'}"/>
+     </record>
 
-<!--          REPORTS               -->
-<!--     <record model="ir.actions.act_window" id="action_report_crm_case_oppor_user">-->
-<!--          <field name="res_model">report.crm.case.user</field>-->
-<!--          <field name="view_type">form</field>-->
-<!--          <field name="view_mode">graph,tree</field>-->
-<!--          <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+')]'"/>-->
-<!--          <field name="context" eval="{'default_state':'open'}"/>-->
-<!--     </record>-->
-<!--     -->
 	<menuitem id="next_id_64" name="Reporting" parent="crm.menu_crm" sequence="50"/>
-    
+
      <menuitem name="Opportunity" parent="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"/>-->
+
+     <menuitem name="Cases by Opportunities and User" parent="menu_action_report_crm_case_oppor" action="action_report_crm_case_oppor_user" id="menu_action_report_crm_case_oppor_user"/>
 
      <record model="ir.actions.act_window" id="action_report_crm_case_oppor_categ">
           <field name="res_model">report.crm.case.section.categ2</field>
           <field name="view_type">form</field>
-          <field name="view_mode">graph,tree</field>          
+          <field name="view_mode">graph,tree</field>
           <field name="context" eval="{'default_state':'open'}"/>
      </record>
      <menuitem name="Cases by Opportunities and Type"  parent="menu_action_report_crm_case_oppor" action="action_report_crm_case_oppor_categ" id="menu_action_report_crm_case_oppor_categ"/>
@@ -60,7 +60,7 @@
      <record model="ir.actions.act_window" id="action_report_crm_case_oppor_stage">
           <field name="res_model">report.crm.case.section.stage</field>
           <field name="view_type">form</field>
-          <field name="view_mode">graph,tree</field>          
+          <field name="view_mode">graph,tree</field>
           <field name="context" eval="{'default_state':'open'}"/>
      </record>
      <menuitem name="Cases by Opportunities and Stage" parent="menu_action_report_crm_case_oppor"  action="action_report_crm_case_oppor_stage" id="menu_action_report_crm_case_oppor_stage"/>
@@ -68,7 +68,7 @@
      <record model="ir.actions.act_window" id="action_report_crm_case_oppor_categ_stage">
           <field name="res_model">report.crm.case.section.categ.stage</field>
           <field name="view_type">form</field>
-          <field name="view_mode">tree</field>          
+          <field name="view_mode">tree</field>
           <field name="context" eval="{'default_state':'open'}"/>
      </record>
      <menuitem name="Cases by Opportunities, Category and Stage" parent="menu_action_report_crm_case_oppor" action="action_report_crm_case_oppor_categ_stage" id="menu_action_report_crm_case_oppor_categ_stage"/>
@@ -76,11 +76,11 @@
      <record model="ir.actions.act_window" id="action_report_crm_case_oppor_categ_categ2">
           <field name="res_model">report.crm.case.section.categ.categ2</field>
           <field name="view_type">form</field>
-          <field name="view_mode">tree</field>          
+          <field name="view_mode">tree</field>
           <field name="context" eval="{'default_state':'open'}"/>
      </record>
      <menuitem name="Cases by Opportunities, Category and Type" parent="menu_action_report_crm_case_oppor" action="action_report_crm_case_oppor_categ_categ2" id="menu_action_report_crm_case_oppor_categ_categ2"/>
 
 
-</data>
+--></data>
 </openerp>
diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index 30265a6338a..7dd81c34665 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
 <data noupdate="1">
-    
+
     <act_window
         id="crm_case_categ_phone_create_partner"
         name="Schedule Phone Call"
@@ -11,14 +11,14 @@
         context="{'default_partner_id': active_id, 'default_duration': 1.0}"
         />
 
-    
+
     ######################## PHONE CALLS (menu) ###########################
     <record model="ir.actions.act_window" id="crm_case_categ_phone0">
         <field name="name">Phone Calls</field>
         <field name="res_model">crm.phonecall</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,calendar</field>
-        <field name="view_id" ref="crm_case_phone_tree_view"/>        
+        <field name="view_id" ref="crm_case_phone_tree_view"/>
         <field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_phone0">
@@ -26,7 +26,7 @@
         <field name="view_mode">tree</field>
         <field name="view_id" ref="crm_case_phone_tree_view"/>
         <field name="act_window_id" ref="crm_case_categ_phone0"/>
-    </record>    
+    </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_phone0">
         <field name="sequence" eval="2"/>
         <field name="view_mode">calendar</field>
@@ -39,8 +39,8 @@
         <field name="view_id" ref="crm_case_phone_form_view"/>
         <field name="act_window_id" ref="crm_case_categ_phone0"/>
     </record>
-    <menuitem name="Phone Calls" id="menu_crm_case_phone"  parent="crm.menu_crm" action="crm_case_categ_phone0"/>
-    
+    <menuitem name="Phone Calls" id="menu_crm_case_phone"  parent="base.menu_base_partner" action="crm_case_categ_phone0" sequence="5"/>
+
 
     <record model="ir.actions.act_window" id="crm_case_categ_phone_incoming0">
         <field name="name">Inbound</field>
@@ -57,7 +57,7 @@
         <field name="view_mode">tree</field>
         <field name="view_id" ref="crm_case_phone_incomming_tree_view"/>
         <field name="act_window_id" ref="crm_case_categ_phone_incoming0"/>
-    </record>    
+    </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_phone_incoming0">
         <field name="sequence" eval="2"/>
         <field name="view_mode">calendar</field>
@@ -86,7 +86,7 @@
         <field name="view_mode">tree</field>
         <field name="view_id" ref="crm_case_phone_tree_view"/>
         <field name="act_window_id" ref="crm_case_categ_phone_outgoing0"/>
-    </record>    
+    </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_phone_outgoing0">
         <field name="sequence" eval="2"/>
         <field name="view_mode">calendar</field>
@@ -98,7 +98,7 @@
         <field name="view_mode">form</field>
         <field name="view_id" ref="crm_case_phone_form_view"/>
         <field name="act_window_id" ref="crm_case_categ_phone_outgoing0"/>
-    </record>    
+    </record>
 
     <menuitem name="Outbound" id="menu_crm_case_phone_outbound"  parent="crm.menu_crm_case_phone" action="crm_case_categ_phone_outgoing0"/>
 
diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index df83c9253cf..9b725c3aff7 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-        <menuitem groups="base.group_extended" id="menu_product_pricelist_main" name="Pricelists" parent="product.menu_config_product" sequence="2"/>
+        <menuitem groups="base.group_extended" id="menu_product_pricelist_main" name="Pricelists" parent="base.menu_base_config" sequence="50"/>
 
         <record id="product_pricelist_version_form_view" model="ir.ui.view">
             <field name="name">product.pricelist.version.form</field>
diff --git a/addons/report_sale/report_sale_view.xml b/addons/report_sale/report_sale_view.xml
index c20153f0d10..485f0740e72 100644
--- a/addons/report_sale/report_sale_view.xml
+++ b/addons/report_sale/report_sale_view.xml
@@ -77,7 +77,7 @@
             <field name="search_view_id" ref="view_order_product_search"/>
         </record>
 
-        <menuitem id="next_id_80" name="Reporting" parent="sale.menu_sale_root"/>
+        <menuitem id="next_id_80" name="Reporting" parent="base.menu_base_partner" sequence="7"/>
         <menuitem action="action_order_product_tree_all" id="menu_report_order_product_all" parent="next_id_80"/>
 
         <!-- Sales by category by month -->
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 1ca092441ad..38f48ec71b0 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="terp-sale" id="menu_sale_root" name="Sales Management"
-            groups="group_sale_user"/>
+<!--        <menuitem icon="terp-sale" id="menu_sale_root" name="Sales Management"-->
+<!--            groups="group_sale_user"/>-->
+		<menuitem id="menu_sales" name="Sales" parent="base.menu_base_partner" sequence="1"/>
+
+		<menuitem id="menu_product" name="Products" parent="base.menu_base_partner" sequence="4"/>
+		<menuitem action="product.product_normal_action" id="product.menu_products" parent="menu_product" sequence="1"/>
 
         <record id="view_shop_form" model="ir.ui.view">
             <field name="name">sale.shop</field>
@@ -41,8 +45,7 @@
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_shop_tree"/>
         </record>
-        <menuitem id="menu_shop_configuration" name="Configuration" parent="sale.menu_sale_root" sequence="1"/>
-        <menuitem action="action_shop_form" id="menu_action_shop_form" parent="sale.menu_shop_configuration"/>
+        <menuitem action="action_shop_form" id="menu_action_shop_form" parent="base.menu_base_config" sequence="60"/>
 
         <record id="view_sale_order_calendar" model="ir.ui.view">
             <field name="name">sale.order.calendar</field>
@@ -251,7 +254,7 @@
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="search_view_id" ref="view_sales_order_filter"/>
         </record>
-        <menuitem action="action_order_form" id="menu_sale_order" parent="sale.menu_sale_root"/>
+        <menuitem action="action_order_form" id="menu_sale_order" parent="sale.menu_sales" sequence="3"/>
 
         <record id="action_order_tree2" model="ir.actions.act_window">
             <field name="name">Sales in Exception</field>
@@ -265,7 +268,7 @@
         </record>
 
         <record id="action_order_tree3" model="ir.actions.act_window">
-            <field name="name">Sales Order To Be Invoiced</field>
+            <field name="name">Sales To Invoice</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sale.order</field>
             <field name="view_type">form</field>
@@ -282,7 +285,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="domain">[('state','in',('progress','waiting_date','manual'))]</field>
-            <field name="search_view_id" ref="view_sales_order_filter"/>            
+            <field name="search_view_id" ref="view_sales_order_filter"/>
         </record>
 
 
@@ -293,7 +296,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="domain">[('state','=','draft')]</field>
-            <field name="search_view_id" ref="view_sales_order_filter"/>            
+            <field name="search_view_id" ref="view_sales_order_filter"/>
         </record>
 
 		<record id="action_order_tree" model="ir.actions.act_window">
@@ -415,8 +418,8 @@
             <field name="view_id" eval="False"/>
             <field name="search_view_id" ref="view_sales_order_line_filter"/>
         </record>
-        <menuitem action="action_order_line_tree1" id="menu_action_order_line_tree1" parent="sale.menu_sale_root"
-            groups="base.group_extended"/>
+        <menuitem action="action_order_line_tree1" id="menu_action_order_line_tree1" parent="sale.menu_sales"
+            groups="base.group_extended" sequence="4"/>
 
         <record id="action_order_line_tree2" model="ir.actions.act_window">
             <field name="name">Uninvoiced Lines</field>
@@ -442,6 +445,9 @@
 
         <act_window domain="[('product_id','=',active_id)]" id="action_order_line_product_tree" name="Product sales" res_model="sale.order.line" src_model="product.product"/>
 
+		<menuitem id="menu_invoiced" name="Invoicing" parent="base.menu_base_partner" sequence="6"/>
+		<menuitem action="action_order_tree3" id="menu_invoicing_sales_order" parent="menu_invoiced" sequence="1"/>
+		<menuitem action="action_order_line_tree2" id="menu_invoicing_sales_order_lines" parent="menu_invoiced" sequence="2"/>
         <!-- configartion view -->
 
         <record id="view_config_picking_policy" model="ir.ui.view">
@@ -482,6 +488,5 @@
             <field name="action_id" ref="action_config_picking_policy"/>
         </record>
 
-
     </data>
 </openerp>
diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml
index cd95e9398bf..6f9bcc52bb1 100644
--- a/addons/sale/security/sale_security.xml
+++ b/addons/sale/security/sale_security.xml
@@ -10,7 +10,7 @@
     </record>
 
 
-    <record model='ir.ui.menu' id='menu_shop_configuration'>
+    <record model='ir.ui.menu' id='menu_action_shop_form'>
         <field name="groups_id" eval="[(6,0,[ref('group_sale_manager')])]"/>
     </record>
 
diff --git a/addons/sale_journal/sale_journal_view.xml b/addons/sale_journal/sale_journal_view.xml
index 86212fc6591..7783f646292 100644
--- a/addons/sale_journal/sale_journal_view.xml
+++ b/addons/sale_journal/sale_journal_view.xml
@@ -31,7 +31,7 @@
         <field name="view_mode">tree,form</field>
     </record>
 
-    <menuitem name="Invoicing Methods" id="menu_definition_journal_invoice_type" parent="sale.menu_shop_configuration" action="action_definition_journal_invoice_type"/>
+<!--    <menuitem name="Invoicing Methods" id="menu_definition_journal_invoice_type" parent="sale.menu_shop_configuration" action="action_definition_journal_invoice_type"/>-->
 
     <record model="ir.ui.view" id="view_sale_journal_form">
         <field name="name">sale_journal.sale.journal.form</field>
@@ -118,7 +118,9 @@
         <field name="search_view_id" ref="view_sale_journal_search"/>
     </record>
 
-    <menuitem name="Sales Journals" id="menu_definition_journal" parent="sale.menu_shop_configuration" action="action_definition_journal"/>
+<!--    <menuitem name="Sales Journals" id="menu_definition_journal" parent="sale.menu_shop_configuration" action="action_definition_journal"/>-->
+	<menuitem id="menu_sale_journal" name="Journal" parent="base.menu_base_config" sequence="60" />
+	<menuitem name="Sales Journals" id="menu_definition_journal" parent="menu_sale_journal" action="action_definition_journal"/>
 
     <record model="ir.ui.view" id="sale_journal_sale_order">
         <field name="name">sale.order.journal.view.form</field>
@@ -321,7 +323,7 @@
         <field name="search_view_id" ref="view_sale_journal_sale_stats_search"/>
     </record>
 
-	<menuitem name="Reporting" id="menu_definition_report_sales" parent="sale.menu_sale_root"/>
+	<menuitem name="Reporting" id="menu_definition_report_sales" parent="base.menu_base_partner" sequence="8"/>
     <menuitem name="Sales by Journal" id="menu_sale_sale_stats_open_all" parent="menu_definition_report_sales" action="action_sale_sale_stats_open_menu_all"/>
 
     <act_window name="Monthly sales"