diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 5ce369ff8f8..ba86fc1facc 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -4,11 +4,93 @@
 
         <menuitem icon="terp-mrp" id="base.menu_mrp_root" name="Manufacturing"
             groups="group_mrp_user,group_mrp_manager" sequence="3"/>
-		<menuitem id="menu_mrp_manufacturing" name="Manufacturing" parent="base.menu_mrp_root" sequence="1"/>
+        <menuitem id="menu_mrp_reordering" name="Automatic Procurements" parent="stock.menu_stock_root" sequence="4"/>
+        <menuitem id="menu_mrp_manufacturing" name="Manufacturing" parent="base.menu_mrp_root" sequence="1"/>
+
+        <menuitem name="Control" id="menu_mrp_control" parent="base.menu_mrp_root"  sequence="3" />
         <menuitem name="Master Data"
                   id="menu_mrp_bom"
                   parent="base.menu_mrp_root"
                   sequence="5" />
+        
+        <!--
+        Property / Property Group
+        -->
+
+        <record id="mrp_property_group_form_view" model="ir.ui.view">
+            <field name="name">mrp.property.group.form</field>
+            <field name="model">mrp.property.group</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Properties categories">
+                    <separator colspan="4" string="General Information"/>
+                    <field colspan="4" name="name" select="1"/>
+                    <field colspan="4" name="description"/>
+                </form>
+            </field>
+        </record>
+        <record id="mrp_property_group_action" model="ir.actions.act_window">
+            <field name="name">Property Categories</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">mrp.property.group</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+        <menuitem
+            id="menu_mrp_configuration"
+            name="Configuration"
+            parent="base.menu_mrp_root"
+            groups="base.group_extended"
+            sequence="50" />
+
+        <record id="mrp_property_tree_view" model="ir.ui.view">
+            <field name="name">mrp.property.tree</field>
+            <field name="model">mrp.property</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Properties">
+                    <field name="name"/>
+                    <field name="composition"/>
+                    <field name="group_id"/>
+                </tree>
+            </field>
+        </record>
+        <record id="mrp_property_form_view" model="ir.ui.view">
+            <field name="name">mrp.property.form</field>
+            <field name="model">mrp.property</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Properties">
+                    <separator colspan="4" string="General Information"/>
+                    <field colspan="4" name="name" select="1"/>
+                    <field name="group_id" select="1"/>
+                    <field name="composition" select="1"/>
+                    <separator colspan="4" string="Description"/>
+                    <field colspan="4" name="description"/>
+                </form>
+            </field>
+        </record>
+        <record id="mrp_property_action" model="ir.actions.act_window">
+            <field name="name">Properties</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">mrp.property</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+        <menuitem name="Properties"
+            id="menu_mrp_property"
+            parent="menu_mrp_configuration"
+            groups="base.group_extended"
+            sequence="20" />
+        <menuitem
+            action="mrp_property_action"
+            id="menu_mrp_property_action"
+            parent="menu_mrp_property"
+            groups="base.group_extended" />
+        <menuitem
+            action="mrp_property_group_action"
+            id="menu_mrp_property_group_action"
+            parent="menu_mrp_property"/>
 
         <!--
         Work Centers
@@ -297,10 +379,27 @@
                 </form>
             </field>
         </record>
-
+		
+		<!--
+        Procurement
+        -->
+	
+		<menuitem action="mrp_procurement.mrp_procurement_action" id="menu_mrp_procurement_action"
+        		  parent="mrp.menu_mrp_manufacturing" sequence="2" />
+        <menuitem action="mrp_procurement.mrp_procurement_action5" id="menu_mrp_procurement_exception_action" 
+        		  parent="mrp.menu_mrp_control" sequence="1" />
+     	
+     	<menuitem id="menu_mrp_scheduler" name="Schedulers" parent="base.menu_mrp_root" sequence="4"/>
+        <menuitem action="mrp_procurement.action_compute_schedulers" id="mrp_Sched_all" parent="mrp.menu_mrp_scheduler" sequence="90"/>
+	
+		<!-- 
+		Order Point 
+		-->	
+		<menuitem action="mrp_procurement.action_orderpoint_form" id="menu_action_orderpoint_form" parent="mrp.menu_mrp_reordering"/>
+        
         <!--
-    Production Management
-    -->
+	    Production Management
+	    -->
 
         <record id="mrp_production_tree_view" model="ir.ui.view">
             <field name="name">mrp.production.tree</field>
diff --git a/addons/mrp/process/procurement_process.xml b/addons/mrp/process/procurement_process.xml
index b96bf11229f..08d66570b1f 100644
--- a/addons/mrp/process/procurement_process.xml
+++ b/addons/mrp/process/procurement_process.xml
@@ -1,6 +1,17 @@
 <?xml version="1.0" ?>
 <openerp>
     <data>
+    
+    	<record id="process_node_procureproducts0" model="process.node">
+            <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
+            <field name="model_id" ref="mrp_procurement.model_mrp_procurement"/>
+            <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
+            <field eval="&quot;&quot;&quot;The way to procurement depends on the product type.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Procure Products&quot;&quot;&quot;" name="name"/>
+            <field name="process_id" ref="mrp_procurement.process_process_procurementprocess0"/>
+            <field eval="&quot;&quot;&quot;object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')&quot;&quot;&quot;" name="model_states"/>
+            <field eval="0" name="flow_start"/>
+        </record>
 
         <record id="process_node_productionorder0" model="process.node">
             <field name="menu_id" ref="mrp.menu_mrp_production_action"/>
@@ -14,7 +25,7 @@
         </record>
 
         <record id="process_node_procureproducts0" model="process.node">
-            <field name="menu_id" ref="mrp_procurement.menu_mrp_procurement_action"/>
+            <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
             <field name="model_id" ref="mrp.model_mrp_procurement"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;The way to procurement depends on the product type.&quot;&quot;&quot;" name="note"/>
@@ -25,7 +36,7 @@
         </record>
         
         <record id="process_node_minimumstockrule0" model="process.node">
-            <field name="menu_id" ref="mrp_procurement.menu_action_orderpoint_form"/>
+            <field name="menu_id" ref="mrp.menu_action_orderpoint_form"/>
             <field name="model_id" ref="mrp_procurement.model_stock_warehouse_orderpoint"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Linked to the 'Minimum stock rule' supplying method.&quot;&quot;&quot;" name="note"/>
@@ -35,7 +46,7 @@
         </record>
 
         <record id="process_node_stockproduct0" model="process.node">
-            <field name="menu_id" ref="mrp_procurement.menu_mrp_procurement_action"/>
+            <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
             <field name="model_id" ref="mrp.model_mrp_procurement"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Product type is Stockable or Consumable.&quot;&quot;&quot;" name="note"/>
@@ -47,7 +58,7 @@
         </record>
         
         <record id="process_node_stockproduct1" model="process.node">
-            <field name="menu_id" ref="mrp_procurement.menu_mrp_procurement_action"/>
+            <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
             <field name="model_id" ref="mrp.model_mrp_procurement"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;For stockable products and consumables&quot;&quot;&quot;" name="note"/>
@@ -59,7 +70,7 @@
         </record>
 
         <record id="process_node_serviceproduct0" model="process.node">
-            <field name="menu_id" ref="mrp_procurement.menu_mrp_procurement_action"/>
+            <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
             <field name="model_id" ref="mrp.model_mrp_procurement"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Product type is service&quot;&quot;&quot;" name="note"/>
@@ -71,7 +82,7 @@
         </record>
         
         <record id="process_node_serviceproduct1" model="process.node">
-            <field name="menu_id" ref="mrp_procurement.menu_mrp_procurement_action"/>
+            <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
             <field name="model_id" ref="mrp.model_mrp_procurement"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;For Services.&quot;&quot;&quot;" name="note"/>
@@ -83,7 +94,7 @@
         </record>
 
         <record id="process_node_purchaseprocure0" model="process.node">
-            <field name="menu_id" ref="mrp_procurement.menu_mrp_procurement_action"/>
+            <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
             <field name="model_id" ref="mrp.model_mrp_procurement"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Procurement Orders&quot;&quot;&quot;" name="name"/>
@@ -94,7 +105,7 @@
         </record>
 
         <record id="process_node_productminimumstockrule0" model="process.node">
-            <field name="menu_id" ref="mrp_procurement.menu_action_orderpoint_form"/>
+            <field name="menu_id" ref="mrp.menu_action_orderpoint_form"/>
             <field name="model_id" ref="mrp_procurement.model_stock_warehouse_orderpoint"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Minimum Stock&quot;&quot;&quot;" name="name"/>
diff --git a/addons/mrp/process/service_product_process.xml b/addons/mrp/process/service_product_process.xml
index 42650a5ad24..60bf3b562b9 100644
--- a/addons/mrp/process/service_product_process.xml
+++ b/addons/mrp/process/service_product_process.xml
@@ -17,7 +17,7 @@
 		-->
 
 		<record id="process_node_serviceonorder0" model="process.node">
-			<field name="menu_id" ref="mrp_procurement.menu_mrp_procurement_action"/>
+			<field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
 			<field name="model_id" ref="mrp.model_mrp_procurement"/>
 			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
 			<field eval="&quot;&quot;&quot;Assignment from Production or Purchase Order.&quot;&quot;&quot;" name="note"/>
@@ -28,7 +28,7 @@
 		</record>
 
 		<record id="process_node_servicemts0" model="process.node">
-			<field name="menu_id" ref="mrp_procurement.menu_mrp_procurement_action"/>
+			<field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
 			<field name="model_id" ref="mrp.model_mrp_procurement"/>
 			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
 			<field eval="&quot;&quot;&quot;Assignment from stock.&quot;&quot;&quot;" name="note"/>
diff --git a/addons/mrp/process/stockable_product_process.xml b/addons/mrp/process/stockable_product_process.xml
index 57c19ae7d90..c053103f476 100644
--- a/addons/mrp/process/stockable_product_process.xml
+++ b/addons/mrp/process/stockable_product_process.xml
@@ -17,7 +17,7 @@
 		-->
 
 		<record id="process_node_mts0" model="process.node">
-			<field name="menu_id" ref="mrp_procurement.menu_mrp_procurement_action"/>
+			<field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
 			<field name="model_id" ref="mrp.model_mrp_procurement"/>
 			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
 			<field eval="&quot;&quot;&quot;Assignment from stock.&quot;&quot;&quot;" name="note"/>
@@ -28,7 +28,7 @@
 		</record>
 
 		<record id="process_node_stock0" model="process.node">
-			<field name="menu_id" ref="mrp_procurement.menu_mrp_procurement_action"/>
+			<field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
 			<field name="model_id" ref="mrp.model_mrp_procurement"/>
 			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
 			<field eval="&quot;&quot;&quot;Assignment from Production or Purchase Order.&quot;&quot;&quot;" name="note"/>
diff --git a/addons/mrp/security/mrp_security.xml b/addons/mrp/security/mrp_security.xml
index 98e199f733b..4d47e374e02 100644
--- a/addons/mrp/security/mrp_security.xml
+++ b/addons/mrp/security/mrp_security.xml
@@ -11,7 +11,7 @@
 
 
 	<!-- restrict access to menu -->
-	<record model='ir.ui.menu' id="mrp_procurement.mrp_Sched_all">
+	<record model='ir.ui.menu' id="mrp_Sched_all">
 		<field eval="[(6,0,[ref('group_mrp_manager')])]" name="groups_id"/>
   	</record>
 
diff --git a/addons/mrp_procurement/mrp_procurement_view.xml b/addons/mrp_procurement/mrp_procurement_view.xml
index 8acbf2e8c29..84b47ee516d 100644
--- a/addons/mrp_procurement/mrp_procurement_view.xml
+++ b/addons/mrp_procurement/mrp_procurement_view.xml
@@ -5,91 +5,6 @@
         Procurement
         -->
         
-        <menuitem id="menu_mrp_procurement" name="Procurements" 
-        	      parent="base.menu_base_partner" sequence="5"/>
-        	      
-        <menuitem name="Procurement Control" id="menu_mrp_control" 
-                  parent="mrp_procurement.menu_mrp_procurement"  sequence="3" />
-
-		<!--
-        Property / Property Group
-        -->
-
-        <record id="mrp_property_group_form_view" model="ir.ui.view">
-            <field name="name">mrp.property.group.form</field>
-            <field name="model">mrp.property.group</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Properties categories">
-                    <separator colspan="4" string="General Information"/>
-                    <field colspan="4" name="name" select="1"/>
-                    <field colspan="4" name="description"/>
-                </form>
-            </field>
-        </record>
-        <record id="mrp_property_group_action" model="ir.actions.act_window">
-            <field name="name">Property Categories</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">mrp.property.group</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-        <menuitem
-            id="menu_mrp_configuration"
-            name="Configuration"
-            parent="mrp_procurement.menu_mrp_procurement"
-            groups="base.group_extended"
-            sequence="50" />
-
-        <record id="mrp_property_tree_view" model="ir.ui.view">
-            <field name="name">mrp.property.tree</field>
-            <field name="model">mrp.property</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Properties">
-                    <field name="name"/>
-                    <field name="composition"/>
-                    <field name="group_id"/>
-                </tree>
-            </field>
-        </record>
-        <record id="mrp_property_form_view" model="ir.ui.view">
-            <field name="name">mrp.property.form</field>
-            <field name="model">mrp.property</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Properties">
-                    <separator colspan="4" string="General Information"/>
-                    <field colspan="4" name="name" select="1"/>
-                    <field name="group_id" select="1"/>
-                    <field name="composition" select="1"/>
-                    <separator colspan="4" string="Description"/>
-                    <field colspan="4" name="description"/>
-                </form>
-            </field>
-        </record>
-        <record id="mrp_property_action" model="ir.actions.act_window">
-            <field name="name">Properties</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">mrp.property</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-        <menuitem name="Properties"
-            id="menu_mrp_property"
-            parent="menu_mrp_configuration"
-            groups="base.group_extended"
-            sequence="20" />
-        <menuitem
-            action="mrp_property_action"
-            id="menu_mrp_property_action"
-            parent="menu_mrp_property"
-            groups="base.group_extended" />
-        <menuitem
-            action="mrp_property_group_action"
-            id="menu_mrp_property_group_action"
-            parent="menu_mrp_property"/>
-
         <record id="mrp_procurement_tree_view" model="ir.ui.view">
             <field name="name">mrp.procurement.tree</field>
             <field name="model">mrp.procurement</field>
@@ -199,8 +114,6 @@
             <field name="view_id" eval="False"/>
             <field name="search_view_id" ref="view_mrp_procurement_filter"/>
         </record>
-        <menuitem action="mrp_procurement_action" id="menu_mrp_procurement_action" 
-        		  parent="mrp_procurement.menu_mrp_procurement" sequence="2" />
 
         <record id="mrp_procurement_action3" model="ir.actions.act_window">
             <field name="name">Procurements</field>
@@ -222,8 +135,6 @@
             <field name="domain">[('state','=','exception')]</field>
         </record>
 
-        <menuitem action="mrp_procurement_action5" id="menu_mrp_procurement_exception_action" 
-        		  parent="mrp_procurement.menu_mrp_control" sequence="1" />
         <record id="mrp_procurement_action4" model="ir.actions.act_window">
             <field name="name">Procurement Exceptions to Fix</field>
             <field name="type">ir.actions.act_window</field>
@@ -324,8 +235,6 @@
             <field name="view_id" ref="view_warehouse_orderpoint_tree"/>
             <field name="search_view_id" ref="warehouse_orderpoint_search" />
         </record>
-        <menuitem id="menu_mrp_reordering" name="Automatic Procurements" parent="stock.menu_stock_root" sequence="4"/>
-        <menuitem action="action_orderpoint_form" id="menu_action_orderpoint_form" parent="menu_mrp_reordering"/>
 
         <act_window domain="[('warehouse_id', '=', active_id)]" id="act_stock_warehouse_2_stock_warehouse_orderpoint" name="Minimum Stock Rules" res_model="stock.warehouse.orderpoint" src_model="stock.warehouse"/>
 
diff --git a/addons/mrp_procurement/process/procurement_process.xml b/addons/mrp_procurement/process/procurement_process.xml
index 0b39dca3a0c..21f953c6a6f 100644
--- a/addons/mrp_procurement/process/procurement_process.xml
+++ b/addons/mrp_procurement/process/procurement_process.xml
@@ -16,16 +16,6 @@
             Process Node
         -->
 
-        <record id="process_node_procureproducts0" model="process.node">
-            <field name="menu_id" ref="mrp_procurement.menu_mrp_procurement_action"/>
-            <field name="model_id" ref="mrp_procurement.model_mrp_procurement"/>
-            <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;The way to procurement depends on the product type.&quot;&quot;&quot;" name="note"/>
-            <field eval="&quot;&quot;&quot;Procure Products&quot;&quot;&quot;" name="name"/>
-            <field name="process_id" ref="process_process_procurementprocess0"/>
-            <field eval="&quot;&quot;&quot;object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')&quot;&quot;&quot;" name="model_states"/>
-            <field eval="0" name="flow_start"/>
-        </record>
         
     </data>
 </openerp>
diff --git a/addons/mrp_procurement/wizard/schedulers_all_view.xml b/addons/mrp_procurement/wizard/schedulers_all_view.xml
index 2866eb97275..33861287278 100644
--- a/addons/mrp_procurement/wizard/schedulers_all_view.xml
+++ b/addons/mrp_procurement/wizard/schedulers_all_view.xml
@@ -30,8 +30,5 @@
             key2="client_action_multi"    
 		    id="action_compute_schedulers"/>            
         
-        <menuitem id="menu_mrp_scheduler" name="Schedulers" parent="menu_mrp_procurement" sequence="4"/>
-        <menuitem action="action_compute_schedulers" id="mrp_Sched_all" parent="mrp_procurement.menu_mrp_scheduler" sequence="90"/>
-		
 	</data>
 </openerp>	
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 79030850e84..a7d69159873 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -770,7 +770,7 @@ class mrp_procurement(osv.osv):
                 'fiscal_position': partner.property_account_position and partner.property_account_position.id or False
             })
             res[procurement.id] = purchase_id
-            self.write(cr, uid, [procurement.id], {'state': 'running'}) #, 'purchase_id': purchase_id
+            self.write(cr, uid, [procurement.id], {'state': 'running', 'purchase_id': purchase_id})
         return res
 mrp_procurement()
 
diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index 987b333888f..23e72c60775 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -57,7 +57,7 @@
         'report/sale_report_view.xml',
         'sale_report.xml',
         'stock_view.xml',
-        'process/sale_process.xml',
+#        'process/sale_process.xml',
     ],
     'demo_xml': ['sale_demo.xml'],
     'installable': True,