[IMP] procurment: Task ID-819: mrp_procurement should be renamed in procurement : renamed files

bzr revid: uco@tinyerp.com-20100527054542-0jq7fam3f6ga071f

43 files changed, 62 insertions, 62 deletions

diff --git a/addons/board_manufacturing/board_manufacturing_view.xml b/addons/board_manufacturing/board_manufacturing_view.xml
index 191f1818612..b223f12e614 100644
--- a/addons/board_manufacturing/board_manufacturing_view.xml
+++ b/addons/board_manufacturing/board_manufacturing_view.xml
@@ -14,8 +14,8 @@
                     <hpaned position="100">
                         <child1>
                             <action colspan="4" height="200" name="%(mrp.mrp_production_action2)d" string="Next production orders" width="510"/>
-                            <action colspan="4" name="%(stock.action_picking_all)d" string="Deliveries (Out picking)" domain="[('state','=','assigned'),('type','=','out')]"/>
-                            <action colspan="4" name="%(mrp_procurement.mrp_procurement_action4)d" string="Procurements in Exception"/>
+                            <action colspan="4" name="%(stock.action_picking_tree)d" string="Deliveries (Out picking)" domain="[('state','=','assigned'),('type','=','out')]"/>
+                            <action colspan="4" name="%(procurement.mrp_procurement_action4)d" string="Procurements in Exception"/>
                         </child1>
 
 
diff --git a/addons/board_warehouse/board_warehouse_view.xml b/addons/board_warehouse/board_warehouse_view.xml
index af797401935..4ce02a71dc4 100644
--- a/addons/board_warehouse/board_warehouse_view.xml
+++ b/addons/board_warehouse/board_warehouse_view.xml
@@ -23,7 +23,7 @@
                 <form string="Warehouse board">
                     <hpaned position="100">
                         <child1>
-					    	<action colspan="4" name="%(mrp_procurement.mrp_procurement_action5)d" string="Procurement Exceptions" width="510" />
+					    	<action colspan="4" name="%(procurement.mrp_procurement_action5)d" string="Procurement Exceptions" width="510" />
 					    	<action colspan="4" name="%(action_reception_picking_move_board)d" string="Products To Receive" />
                         </child1>
 
diff --git a/addons/mrp/__init__.py b/addons/mrp/__init__.py
index d23cee8d565..30367ec35f8 100644
--- a/addons/mrp/__init__.py
+++ b/addons/mrp/__init__.py
@@ -26,6 +26,6 @@ import installer
 import wizard
 import report
 import company
-import mrp_procurement
+import procurement
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp/__openerp__.py b/addons/mrp/__openerp__.py
index 97e23f3488d..45b35d54605 100644
--- a/addons/mrp/__openerp__.py
+++ b/addons/mrp/__openerp__.py
@@ -26,7 +26,7 @@
     "author" : "Tiny",
     "website" : "http://www.openerp.com",
     "category" : "Generic Modules/Production",
-    "depends" : ["mrp_procurement", "stock", "resource", "purchase", "product","process"],
+    "depends" : ["procurement", "stock", "resource", "purchase", "product","process"],
     "description": """
     This is the base module to manage the manufacturing process in Open ERP.
 
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 80587c6956c..6ee63420fae 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -406,18 +406,18 @@
         Procurement
         -->
 
-		<menuitem action="mrp_procurement.mrp_procurement_action" id="menu_mrp_procurement_action"
+		<menuitem action="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"-->
+<!--        <menuitem action="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"/>
+        <menuitem action="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"/>
+		<menuitem action="procurement.action_orderpoint_form" id="menu_action_orderpoint_form" parent="mrp.menu_mrp_reordering"/>
 
         <!--
 	    Production Management
@@ -815,7 +815,7 @@
         <record id="view_procurement_form_inherit" model="ir.ui.view">
         	<field name="name">mrp.procurement.form.inherit</field>
         	<field name="model">mrp.procurement</field>
-        	<field name="inherit_id" ref="mrp_procurement.mrp_procurement_form_view"/>
+        	<field name="inherit_id" ref="procurement.mrp_procurement_form_view"/>
         	<field name="type">form</field>
         	<field name="arch" type="xml">
         		<xpath expr="/form/notebook/page/field[@name='move_id']" position="before">
diff --git a/addons/mrp/mrp_workflow.xml b/addons/mrp/mrp_workflow.xml
index a9c83b23b7e..0a55ccdd610 100644
--- a/addons/mrp/mrp_workflow.xml
+++ b/addons/mrp/mrp_workflow.xml
@@ -117,7 +117,7 @@
         <!-- Procurement -->
 
         <record id="act_produce" model="workflow.activity">
-            <field name="wkf_id" ref="mrp_procurement.wkf_procurement"/>
+            <field name="wkf_id" ref="procurement.wkf_procurement"/>
             <field name="name">produce</field>
             <field name="kind">subflow</field>
             <field name="subflow_id" search="[('osv','=','mrp.production')]"/>
@@ -125,20 +125,20 @@
         </record>
         
         <record id="trans_product_check_produce" model="workflow.transition">
-            <field name="act_from" ref="mrp_procurement.act_produce_check"/>
+            <field name="act_from" ref="procurement.act_produce_check"/>
             <field name="act_to" ref="act_produce"/>
             <field name="condition">check_product()</field>
         </record>
         
         <record id="trans_produce_cancel" model="workflow.transition">
             <field name="act_from" ref="act_produce"/>
-            <field name="act_to" ref="mrp_procurement.act_cancel"/>
+            <field name="act_to" ref="procurement.act_cancel"/>
             <field name="signal">subflow.cancel</field>
         </record>
         
         <record id="trans_produce_make_done" model="workflow.transition">
             <field name="act_from" ref="act_produce"/>
-            <field name="act_to" ref="mrp_procurement.act_make_done"/>
+            <field name="act_to" ref="procurement.act_make_done"/>
             <field name="signal">subflow.done</field>
         </record>
         
diff --git a/addons/mrp/process/procurement_process.xml b/addons/mrp/process/procurement_process.xml
index 08d66570b1f..25c204a2705 100644
--- a/addons/mrp/process/procurement_process.xml
+++ b/addons/mrp/process/procurement_process.xml
@@ -4,11 +4,11 @@
     
     	<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 name="model_id" ref="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 name="process_id" ref="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>
@@ -19,7 +19,7 @@
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Drives the procurement orders for raw material.&quot;&quot;&quot;" name="note"/>
             <field eval="&quot;&quot;&quot;Production Order&quot;&quot;&quot;" name="name"/>
-            <field name="process_id" ref="mrp_procurement.process_process_procurementprocess0"/>
+            <field name="process_id" ref="procurement.process_process_procurementprocess0"/>
             <field eval="&quot;&quot;&quot;object.state in ('draft', 'picking_except', 'confirmed', 'ready', 'in_production', 'cancel', 'done')&quot;&quot;&quot;" name="model_states"/>
             <field eval="1" name="flow_start"/>
         </record>
@@ -30,18 +30,18 @@
             <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 name="process_id" ref="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_minimumstockrule0" model="process.node">
             <field name="menu_id" ref="mrp.menu_action_orderpoint_form"/>
-            <field name="model_id" ref="mrp_procurement.model_stock_warehouse_orderpoint"/>
+            <field name="model_id" ref="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"/>
             <field eval="&quot;&quot;&quot;Minimum Stock&quot;&quot;&quot;" name="name"/>
-            <field name="process_id" ref="mrp_procurement.process_process_procurementprocess0"/>
+            <field name="process_id" ref="procurement.process_process_procurementprocess0"/>
             <field eval="1" name="flow_start"/>
         </record>
 
@@ -52,7 +52,7 @@
             <field eval="&quot;&quot;&quot;Product type is Stockable or Consumable.&quot;&quot;&quot;" name="note"/>
             <field eval="&quot;&quot;&quot;Stockable Product&quot;&quot;&quot;" name="name"/>
             <field name="subflow_id" ref="process_process_stockableproductprocess0"/>
-            <field name="process_id" ref="mrp_procurement.process_process_procurementprocess0"/>
+            <field name="process_id" ref="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>
@@ -64,7 +64,7 @@
             <field eval="&quot;&quot;&quot;For stockable products and consumables&quot;&quot;&quot;" name="note"/>
             <field eval="&quot;&quot;&quot;Stockable Product&quot;&quot;&quot;" name="name"/>
             <field name="process_id" ref="mrp.process_process_stockableproductprocess0"/>
-            <field name="subflow_id" ref="mrp_procurement.process_process_procurementprocess0"/>
+            <field name="subflow_id" ref="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="1" name="flow_start"/>
         </record>
@@ -76,7 +76,7 @@
             <field eval="&quot;&quot;&quot;Product type is service&quot;&quot;&quot;" name="note"/>
             <field eval="&quot;&quot;&quot;Service&quot;&quot;&quot;" name="name"/>
             <field name="subflow_id" ref="process_process_serviceproductprocess0"/>
-            <field name="process_id" ref="mrp_procurement.process_process_procurementprocess0"/>
+            <field name="process_id" ref="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>
@@ -88,7 +88,7 @@
             <field eval="&quot;&quot;&quot;For Services.&quot;&quot;&quot;" name="note"/>
             <field eval="&quot;&quot;&quot;Service&quot;&quot;&quot;" name="name"/>
             <field name="process_id" ref="mrp.process_process_serviceproductprocess0"/>
-            <field name="subflow_id" ref="mrp_procurement.process_process_procurementprocess0"/>
+            <field name="subflow_id" ref="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="1" name="flow_start"/>
         </record>
@@ -99,14 +99,14 @@
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Procurement Orders&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;For purchased material&quot;&quot;&quot;" name="note"/>
-            <field name="subflow_id" ref="mrp_procurement.process_process_procurementprocess0"/>
+            <field name="subflow_id" ref="procurement.process_process_procurementprocess0"/>
             <field name="process_id" ref="purchase.process_process_purchaseprocess0"/>
             <field eval="1" name="flow_start"/>
         </record>
 
         <record id="process_node_productminimumstockrule0" model="process.node">
             <field name="menu_id" ref="mrp.menu_action_orderpoint_form"/>
-            <field name="model_id" ref="mrp_procurement.model_stock_warehouse_orderpoint"/>
+            <field name="model_id" ref="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"/>
             <field eval="&quot;&quot;&quot;Automatic procurement rule&quot;&quot;&quot;" name="note"/>
diff --git a/addons/mrp/mrp_procurement.py b/addons/mrp/procurement.py
index 4ebd11f3949..4ebd11f3949 100644
--- a/addons/mrp/mrp_procurement.py
+++ b/addons/mrp/procurement.py
diff --git a/addons/mrp_jit/__openerp__.py b/addons/mrp_jit/__openerp__.py
index d9a862f5ddd..497a81352f3 100644
--- a/addons/mrp_jit/__openerp__.py
+++ b/addons/mrp_jit/__openerp__.py
@@ -40,7 +40,7 @@
     
     """,
     'author': 'Tiny',
-    'depends': ['mrp_procurement'],
+    'depends': ['procurement'],
     'update_xml': ['mrp_jit.xml'],
     'demo_xml': [],
     'installable': True,
diff --git a/addons/mrp_jit/mrp_jit.xml b/addons/mrp_jit/mrp_jit.xml
index bab0d62b495..99f74a19517 100644
--- a/addons/mrp_jit/mrp_jit.xml
+++ b/addons/mrp_jit/mrp_jit.xml
@@ -2,7 +2,7 @@
 <openerp>
 <data>
 
-    <record model="workflow.transition" id="mrp_procurement.trans_confirm_confirm_wait">
+    <record model="workflow.transition" id="procurement.trans_confirm_confirm_wait">
         <field name="signal" eval="False"/>
     </record>
 
diff --git a/addons/point_of_sale/posrule_data.xml b/addons/point_of_sale/posrule_data.xml
index 80c06670243..494571122ac 100644
--- a/addons/point_of_sale/posrule_data.xml
+++ b/addons/point_of_sale/posrule_data.xml
@@ -95,7 +95,7 @@
       ref('stock.menu_action_picking_tree7'),
 	 		ref('stock.menu_action_picking_tree8'),
       ref('stock.menu_action_picking_tree9'),
-	 		ref('mrp_procurement.menu_mrp_procurement_action3'),
+	 		ref('procurement.menu_mrp_procurement_action3'),
 	 		ref('point_of_sale.menu_point_root')])]" name="menu_access"/>
 			<field eval="[(6,0,[ref('res_users_shopuser0'),ref('res_users_shopuser1')])]" name="users"/>
  				<field eval="[(6,0,[ref('point_of_sale.ir_rule_group_point0'),ref('point_of_sale.ir_rule_group_poslinecompany0'),ref('point_of_sale.ir_rule_group_posreporting0')])]" name="rule_groups"/>
@@ -132,7 +132,7 @@
 		</record>
 
 		<record id="ir_modelsmrp_pdt0" model="ir.model.access">
-			<field name="model_id" ref="mrp_procurement.model_mrp_procurement"/>
+			<field name="model_id" ref="procurement.model_mrp_procurement"/>
 			<field eval="1" name="perm_read"/>
 			<field eval="&quot;&quot;&quot;MRP - Procurement&quot;&quot;&quot;" name="name"/>
 			<field eval="0" name="perm_unlink"/>
@@ -206,7 +206,7 @@
 			<field name="group_id" ref="res_groups_posuser0"/>
 		</record>
 		<record id="ir_model_access_stockwarehouseorderpoint0" model="ir.model.access">
-			<field name="model_id" ref="mrp_procurement.model_stock_warehouse_orderpoint"/>
+			<field name="model_id" ref="procurement.model_stock_warehouse_orderpoint"/>
 			<field eval="1" name="perm_read"/>
 			<field eval="&quot;&quot;&quot;stock.warehouse.orderpoint&quot;&quot;&quot;" name="name"/>
 			<field eval="0" name="perm_unlink"/>
@@ -474,7 +474,7 @@
 			<field name="group_id" ref="res_groups_posuser0"/>
 		</record>
         <record id="ir_model_access_procurement0" model="ir.model.access">
-            <field name="model_id" ref="mrp_procurement.model_mrp_procurement" />
+            <field name="model_id" ref="procurement.model_mrp_procurement" />
             <field eval="1" name="perm_read" />
             <field eval="1" name="perm_write" />
             <field eval="1" name="perm_create" />
@@ -497,7 +497,7 @@
             name="Reporting"
             parent="stock.menu_stock_root" groups="base.group_user"/>
 		<menuitem action="stock.action_picking_tree" id="stock.menu_action_picking_tree" parent="stock.menu_stock_warehouse_mgmt" sequence="19" groups="res_groups_posuser0"/>
-<!--        <menuitem id="mrp_procurement.menu_mrp_reordering" name="Automatic Procurements" parent="stock.menu_stock_root" sequence="4" groups="base.group_user"/>-->
+<!--        <menuitem id="procurement.menu_mrp_reordering" name="Automatic Procurements" parent="stock.menu_stock_root" sequence="4" groups="base.group_user"/>-->
         <menuitem parent="stock.next_id_61" action="stock.action_stock_line_date" id="stock.menu_report_stock_line_date" groups="base.group_user"/>
 
 	</data>
diff --git a/addons/point_of_sale/posrule_data2.xml b/addons/point_of_sale/posrule_data2.xml
index 927584e92ce..da802669d59 100644
--- a/addons/point_of_sale/posrule_data2.xml
+++ b/addons/point_of_sale/posrule_data2.xml
@@ -177,7 +177,7 @@
       ref('stock.menu_action_picking_tree7'),
 	 		ref('stock.menu_action_picking_tree8'),
       ref('stock.menu_action_picking_tree9'),
-	 		ref('mrp_procurement.menu_mrp_procurement_action3'),
+	 		ref('procurement.menu_mrp_procurement_action3'),
 	 		ref('point_of_sale.menu_point_root')])]" name="menu_access"/>
  				<field eval="[(6,0,[ref('point_of_sale.ir_rule_group_point0'),ref('point_of_sale.ir_rule_group_poslinecompany0'),ref('point_of_sale.ir_rule_group_posreporting0')])]" name="rule_groups"/>
 			<field eva="[(6,0,[ref('res_users_shopuser0'),ref('res_users_shopuser1')])]" name="users"/>
@@ -214,7 +214,7 @@
 		</record>
 
 		<record id="ir_modelsmrp_pdt0" model="ir.model.access">
-			<field name="model_id" ref="mrp_procurement.model_mrp_procurement"/>
+			<field name="model_id" ref="procurement.model_mrp_procurement"/>
 			<field eval="1" name="perm_read"/>
 			<field eval="&quot;&quot;&quot;MRP - Procurement&quot;&quot;&quot;" name="name"/>
 			<field eval="0" name="perm_unlink"/>
diff --git a/addons/point_of_sale/statement_data.xml b/addons/point_of_sale/statement_data.xml
index 67c94170666..5172e0e70d4 100644
--- a/addons/point_of_sale/statement_data.xml
+++ b/addons/point_of_sale/statement_data.xml
@@ -33,7 +33,7 @@
 			<field eval="1" name="global"/>
 		</record>
 		<record id="point_of_sale.res_groups_posuser0" model="res.groups">
- 		<field eval="[(6,0,[ref('product.menu_config_product'),ref('product.menu_product_category_action_form'),ref('point_of_sale.menu_point_ofsale'),ref('point_of_sale.menu_point_config'),ref('point_of_sale.menu_statement_tree_all'),ref('stock.menu_stock_root'),ref('stock.menu_action_location_form'),ref('stock.menu_action_location_tree'),ref('stock.menu_picking_waiting'),ref('stock.menu_action_picking_tree3'),ref('stock.menu_action_picking_tree5'),ref('stock.menu_action_picking_form'),ref('stock.menu_action_picking_tree7'),ref('stock.menu_action_picking_tree8'),ref('stock.menu_action_picking_tree9'),ref('mrp_procurement.menu_mrp_procurement_action3'),ref('mrp_procurement.menu_mrp_procurement_new'),ref('mrp.next_id_77'),ref('mrp.menu_report_workcenter_load'),ref('mrp.menu_report_in_out_picking'),ref('base.menu_sales'),ref('sale.menu_action_shop_form'),ref('sale.menu_sale_order'),ref('sale.menu_action_order_tree'),ref('sale.menu_action_order_tree_all'),ref('sale.menu_action_order_tree2'),ref('sale.menu_action_order_tree3'),ref('sale.menu_action_order_tree7'),ref('sale.menu_action_order_tree8'),ref('sale.menu_action_order_line_tree1'),ref('delivery.menu_action_delivery_carrier_form'),ref('delivery.menu_action_delivery_grid_form'),ref('point_of_sale.menu_point_root')])]" name="menu_access"/>
+ 		<field eval="[(6,0,[ref('product.menu_config_product'),ref('product.menu_product_category_action_form'),ref('point_of_sale.menu_point_ofsale'),ref('point_of_sale.menu_point_config'),ref('point_of_sale.menu_statement_tree_all'),ref('stock.menu_stock_root'),ref('stock.menu_action_location_form'),ref('stock.menu_action_location_tree'),ref('stock.menu_picking_waiting'),ref('stock.menu_action_picking_tree3'),ref('stock.menu_action_picking_tree5'),ref('stock.menu_action_picking_form'),ref('stock.menu_action_picking_tree7'),ref('stock.menu_action_picking_tree8'),ref('stock.menu_action_picking_tree9'),ref('procurement.menu_mrp_procurement_action3'),ref('procurement.menu_mrp_procurement_new'),ref('mrp.next_id_77'),ref('mrp.menu_report_workcenter_load'),ref('mrp.menu_report_in_out_picking'),ref('base.menu_sales'),ref('sale.menu_action_shop_form'),ref('sale.menu_sale_order'),ref('sale.menu_action_order_tree'),ref('sale.menu_action_order_tree_all'),ref('sale.menu_action_order_tree2'),ref('sale.menu_action_order_tree3'),ref('sale.menu_action_order_tree7'),ref('sale.menu_action_order_tree8'),ref('sale.menu_action_order_line_tree1'),ref('delivery.menu_action_delivery_carrier_form'),ref('delivery.menu_action_delivery_grid_form'),ref('point_of_sale.menu_point_root')])]" name="menu_access"/>
 			<field eval="[(6,0,[ref('ir_rule_group_bankstatementcompany0'),ref('ir_rule_group_bankstatementlinecompany0'),ref('point_of_sale.ir_rule_group_point0'),ref('point_of_sale.ir_rule_group_poslinecompany0'),ref('point_of_sale.ir_rule_group_posreporting0')])]" name="rule_groups"/>
 			<field eval="&quot;&quot;&quot;POS_user&quot;&quot;&quot;" name="name"/>
 		</record>
diff --git a/addons/mrp_procurement/__init__.py b/addons/procurement/__init__.py
index 6cb8ad4027b..3420ef1f75e 100644
--- a/addons/mrp_procurement/__init__.py
+++ b/addons/procurement/__init__.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-import mrp_procurement
+import procurement
 import wizard
 import schedulers
 import company
\ No newline at end of file
diff --git a/addons/mrp_procurement/__openerp__.py b/addons/procurement/__openerp__.py
index 82c611c6c78..74847354b5e 100644
--- a/addons/mrp_procurement/__openerp__.py
+++ b/addons/procurement/__openerp__.py
@@ -33,14 +33,14 @@
     'init_xml': [],
     'update_xml': [
         'security/ir.model.access.csv',
-        'security/mrp_procurement_security.xml',
-        'mrp_procurement_data.xml',
+        'security/procurement_security.xml',
+        'procurement_data.xml',
         'wizard/make_procurement_view.xml',
         'wizard/mrp_procurement_view.xml',
         'wizard/orderpoint_procurement_view.xml',
-        'mrp_procurement_view.xml',
+        'procurement_view.xml',
         'wizard/schedulers_all_view.xml',
-        'mrp_procurement_workflow.xml',
+        'procurement_workflow.xml',
         'process/procurement_process.xml',
         "company_view.xml",
     ],
diff --git a/addons/mrp_procurement/company.py b/addons/procurement/company.py
index ce39ca9a684..ce39ca9a684 100644
--- a/addons/mrp_procurement/company.py
+++ b/addons/procurement/company.py
diff --git a/addons/mrp_procurement/company_view.xml b/addons/procurement/company_view.xml
index 543e36fe02f..543e36fe02f 100644
--- a/addons/mrp_procurement/company_view.xml
+++ b/addons/procurement/company_view.xml
diff --git a/addons/mrp_procurement/process/procurement_process.xml b/addons/procurement/process/procurement_process.xml
index 21f953c6a6f..b537eeed865 100644
--- a/addons/mrp_procurement/process/procurement_process.xml
+++ b/addons/procurement/process/procurement_process.xml
@@ -8,7 +8,7 @@
 
         <record id="process_process_procurementprocess0" model="process.process">
             <field eval="&quot;&quot;&quot;Procurement&quot;&quot;&quot;" name="name"/>
-            <field name="model_id" ref="mrp_procurement.model_mrp_procurement"/>
+            <field name="model_id" ref="procurement.model_mrp_procurement"/>
             <field eval="1" name="active"/>
         </record>
 
diff --git a/addons/mrp_procurement/mrp_procurement.py b/addons/procurement/procurement.py
index ceaefb4c4db..ceaefb4c4db 100644
--- a/addons/mrp_procurement/mrp_procurement.py
+++ b/addons/procurement/procurement.py
diff --git a/addons/mrp_procurement/mrp_procurement_data.xml b/addons/procurement/procurement_data.xml
index 256472bd2fd..256472bd2fd 100644
--- a/addons/mrp_procurement/mrp_procurement_data.xml
+++ b/addons/procurement/procurement_data.xml
diff --git a/addons/mrp_procurement/mrp_procurement_view.xml b/addons/procurement/procurement_view.xml
index 1defa214754..1defa214754 100644
--- a/addons/mrp_procurement/mrp_procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
diff --git a/addons/mrp_procurement/mrp_procurement_workflow.xml b/addons/procurement/procurement_workflow.xml
index 599d11cfe01..599d11cfe01 100644
--- a/addons/mrp_procurement/mrp_procurement_workflow.xml
+++ b/addons/procurement/procurement_workflow.xml
diff --git a/addons/mrp_procurement/schedulers.py b/addons/procurement/schedulers.py
index 6ebc0f61fad..6ebc0f61fad 100644
--- a/addons/mrp_procurement/schedulers.py
+++ b/addons/procurement/schedulers.py
diff --git a/addons/mrp_procurement/scripts/scheduler.py b/addons/procurement/scripts/scheduler.py
index d95e8246c70..d95e8246c70 100644
--- a/addons/mrp_procurement/scripts/scheduler.py
+++ b/addons/procurement/scripts/scheduler.py
diff --git a/addons/mrp_procurement/security/ir.model.access.csv b/addons/procurement/security/ir.model.access.csv
index ce022a730b0..ce022a730b0 100644
--- a/addons/mrp_procurement/security/ir.model.access.csv
+++ b/addons/procurement/security/ir.model.access.csv
diff --git a/addons/mrp_procurement/security/mrp_procurement_security.xml b/addons/procurement/security/procurement_security.xml
index a0f2ef431bf..a0f2ef431bf 100644
--- a/addons/mrp_procurement/security/mrp_procurement_security.xml
+++ b/addons/procurement/security/procurement_security.xml
diff --git a/addons/mrp_procurement/wizard/__init__.py b/addons/procurement/wizard/__init__.py
index ae70ffbf941..ae70ffbf941 100644
--- a/addons/mrp_procurement/wizard/__init__.py
+++ b/addons/procurement/wizard/__init__.py
diff --git a/addons/mrp_procurement/wizard/make_procurement_product.py b/addons/procurement/wizard/make_procurement_product.py
index 96f00b89eb4..fa447e5abe2 100644
--- a/addons/mrp_procurement/wizard/make_procurement_product.py
+++ b/addons/procurement/wizard/make_procurement_product.py
@@ -83,8 +83,8 @@ class make_procurement(osv.osv_memory):
             wf_service.trg_validate(uid, 'mrp.procurement', procure_id, 'button_confirm', cr)
         
         
-        id2 = data_obj._get_id(cr, uid, 'mrp_procurement', 'mrp_procurement_tree_view')
-        id3 = data_obj._get_id(cr, uid, 'mrp_procurement', 'mrp_procurement_form_view')
+        id2 = data_obj._get_id(cr, uid, 'procurement', 'mrp_procurement_tree_view')
+        id3 = data_obj._get_id(cr, uid, 'procurement', 'mrp_procurement_form_view')
         
         if id2:
             id2 = data_obj.browse(cr, uid, id2, context=context).res_id
diff --git a/addons/mrp_procurement/wizard/make_procurement_view.xml b/addons/procurement/wizard/make_procurement_view.xml
index 2e9b44edb63..2e9b44edb63 100644
--- a/addons/mrp_procurement/wizard/make_procurement_view.xml
+++ b/addons/procurement/wizard/make_procurement_view.xml
diff --git a/addons/mrp_procurement/wizard/mrp_procurement.py b/addons/procurement/wizard/mrp_procurement.py
index 1c3f3dd5c8a..1c3f3dd5c8a 100644
--- a/addons/mrp_procurement/wizard/mrp_procurement.py
+++ b/addons/procurement/wizard/mrp_procurement.py
diff --git a/addons/mrp_procurement/wizard/mrp_procurement_view.xml b/addons/procurement/wizard/mrp_procurement_view.xml
index 817f7011e0c..817f7011e0c 100644
--- a/addons/mrp_procurement/wizard/mrp_procurement_view.xml
+++ b/addons/procurement/wizard/mrp_procurement_view.xml
diff --git a/addons/mrp_procurement/wizard/orderpoint_procurement.py b/addons/procurement/wizard/orderpoint_procurement.py
index 56302660939..56302660939 100644
--- a/addons/mrp_procurement/wizard/orderpoint_procurement.py
+++ b/addons/procurement/wizard/orderpoint_procurement.py
diff --git a/addons/mrp_procurement/wizard/orderpoint_procurement_view.xml b/addons/procurement/wizard/orderpoint_procurement_view.xml
index c17bedae84f..c17bedae84f 100644
--- a/addons/mrp_procurement/wizard/orderpoint_procurement_view.xml
+++ b/addons/procurement/wizard/orderpoint_procurement_view.xml
diff --git a/addons/mrp_procurement/wizard/schedulers_all.py b/addons/procurement/wizard/schedulers_all.py
index ad67b1330d0..80694d178f5 100644
--- a/addons/mrp_procurement/wizard/schedulers_all.py
+++ b/addons/procurement/wizard/schedulers_all.py
@@ -23,7 +23,7 @@ import threading
 
 from osv import osv, fields
 
-class procurement_compute(osv.osv_memory):
+class procurement_compute_all(osv.osv_memory):
     _name = 'mrp.procurement.compute.all'
     _description = 'Compute all schedulers'
     
@@ -61,7 +61,7 @@ class procurement_compute(osv.osv_memory):
         threaded_calculation.start()
         return {}
     
-procurement_compute()
+procurement_compute_all()
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp_procurement/wizard/schedulers_all_view.xml b/addons/procurement/wizard/schedulers_all_view.xml
index 33861287278..33861287278 100644
--- a/addons/mrp_procurement/wizard/schedulers_all_view.xml
+++ b/addons/procurement/wizard/schedulers_all_view.xml
diff --git a/addons/project_mrp/__openerp__.py b/addons/project_mrp/__openerp__.py
index 342ff9e3d91..a51a95c5d16 100644
--- a/addons/project_mrp/__openerp__.py
+++ b/addons/project_mrp/__openerp__.py
@@ -47,7 +47,7 @@ automatically created via sale orders.
 """,
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
-    'depends': ['project', 'mrp_procurement', 'sale', 'mrp_jit'],
+    'depends': ['project', 'procurement', 'sale', 'mrp_jit'],
     'init_xml': [],
     'update_xml': ['project_mrp_workflow.xml', 
                    #'process/project_mrp_process.xml',
diff --git a/addons/project_mrp/project_mrp_workflow.xml b/addons/project_mrp/project_mrp_workflow.xml
index 43217d69f83..cd242e7f699 100644
--- a/addons/project_mrp/project_mrp_workflow.xml
+++ b/addons/project_mrp/project_mrp_workflow.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <openerp>
 <data>
-    <record model="workflow.transition" id="mrp_procurement.trans_produce_service_make_done">
-        <field name="act_from" ref="mrp_procurement.act_produce_service"/>
-        <field name="act_to" ref="mrp_procurement.act_make_done"/>
+    <record model="workflow.transition" id="procurement.trans_produce_service_make_done">
+        <field name="act_from" ref="procurement.act_produce_service"/>
+        <field name="act_to" ref="procurement.act_make_done"/>
         <field name="signal">subflow.done</field>
     </record>
 </data>
diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py
index 46d7c3296b9..5b3830fbcb5 100644
--- a/addons/purchase/__openerp__.py
+++ b/addons/purchase/__openerp__.py
@@ -31,7 +31,7 @@
     """,
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
-    'depends': ['base', 'account', 'stock', 'process', 'mrp_procurement'],
+    'depends': ['base', 'account', 'stock', 'process', 'procurement'],
     'init_xml': [],
     'update_xml': [
                    
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 8aa643d1c43..8495ef46e1d 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -331,7 +331,7 @@
         <record id="view_procurement_form_inherit" model="ir.ui.view">
         	<field name="name">mrp.procurement.form.inherit</field>
         	<field name="model">mrp.procurement</field>
-        	<field name="inherit_id" ref="mrp_procurement.mrp_procurement_form_view"/>
+        	<field name="inherit_id" ref="procurement.mrp_procurement_form_view"/>
         	<field name="type">form</field>
         	<field name="arch" type="xml">
         		<xpath expr="/form/notebook/page/field[@name='close_move']" position="before">
diff --git a/addons/purchase/purchase_workflow.xml b/addons/purchase/purchase_workflow.xml
index d7684be1875..d14530e5f48 100644
--- a/addons/purchase/purchase_workflow.xml
+++ b/addons/purchase/purchase_workflow.xml
@@ -180,7 +180,7 @@
 	
 	<!-- Procurement -->
 		<record id="act_buy" model="workflow.activity">
-            <field name="wkf_id" ref="mrp_procurement.wkf_procurement"/>
+            <field name="wkf_id" ref="procurement.wkf_procurement"/>
             <field name="name">buy</field>
             <field name="kind">subflow</field>
             <field name="subflow_id" search="[('osv','=','purchase.order')]"/>
@@ -188,20 +188,20 @@
         </record>
         
         <record id="trans_confirm_mto_buy" model="workflow.transition">
-            <field name="act_from" ref="mrp_procurement.act_confirm_mto"/>
+            <field name="act_from" ref="procurement.act_confirm_mto"/>
             <field name="act_to" ref="act_buy"/>
             <field name="condition">check_buy()</field>
         </record>
         
         <record id="trans_buy_make_done" model="workflow.transition">
             <field name="act_from" ref="act_buy"/>
-            <field name="act_to" ref="mrp_procurement.act_make_done"/>
+            <field name="act_to" ref="procurement.act_make_done"/>
             <field name="signal">subflow.delivery_done</field>
         </record>
         
         <record id="trans_buy_cancel" model="workflow.transition">
             <field name="act_from" ref="act_buy"/>
-            <field name="act_to" ref="mrp_procurement.act_cancel"/>
+            <field name="act_to" ref="procurement.act_cancel"/>
             <field name="signal">subflow.cancel</field>
         </record>
 
diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index d43278381f5..2f265b3d6f7 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -42,7 +42,7 @@
     """,
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
-    'depends': ['product', 'stock', 'mrp_procurement', 'process'],
+    'depends': ['product', 'stock', 'procurement', 'process'],
     'init_xml': [],
     'update_xml': [
         'wizard/sale_make_invoice_advance.xml',
diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml
index 58e4be14d84..5b71c050704 100644
--- a/addons/sale/process/sale_process.xml
+++ b/addons/sale/process/sale_process.xml
@@ -35,7 +35,7 @@
             <field eval="&quot;&quot;&quot;Sale Order Requisition&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Drives procurement orders for every sale order line.&quot;&quot;&quot;" name="note"/>
             <field name="subflow_id" ref="process_process_salesprocess0"/>
-            <field name="process_id" ref="mrp_procurement.process_process_procurementprocess0"/>
+            <field name="process_id" ref="procurement.process_process_procurementprocess0"/>
             <field eval="&quot;&quot;&quot;object.state in ('draft', 'waiting_date', 'manual', 'progress', 'shipping_except', 'invoice_except', 'done', 'cancel')&quot;&quot;&quot;" name="model_states"/>
             <field eval="1" name="flow_start"/>
         </record>
@@ -63,8 +63,8 @@
         </record>
 
         <record id="process_node_saleprocurement0" 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 name="menu_id" ref="procurement.menu_mrp_procurement_action"/>
+            <field name="model_id" ref="procurement.model_mrp_procurement"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Procurement Order&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;One Procurement order for each sale order line and for each of the components.&quot;&quot;&quot;" name="note"/>
@@ -202,7 +202,7 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Procurement of sold material&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;For every sale order line, a procurement order is created to supply the sold product.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="mrp_procurement.process_node_procureproducts0"/>
+            <field model="process.node" name="target_node_id" ref="procurement.process_node_procureproducts0"/>
             <field model="process.node" name="source_node_id" ref="process_node_saleorderprocurement0"/>
         </record>
 
diff --git a/addons/sale/security/ir.model.access.csv b/addons/sale/security/ir.model.access.csv
index 7af8c1e74a7..726cd679212 100644
--- a/addons/sale/security/ir.model.access.csv
+++ b/addons/sale/security/ir.model.access.csv
@@ -11,7 +11,7 @@
 "access_account_analytic_account_salesman","account_analytic_account salesman","analytic.model_account_analytic_account","group_sale_user",1,1,1,1
 "access_stock_picking_salesman","stock_picking salesman","stock.model_stock_picking","group_sale_user",1,1,1,1
 "access_stock_move_salesman","stock_move salesman","stock.model_stock_move","group_sale_user",1,1,1,0
-"access_mrp_procurement_salesman","mrp.procurement salesman","mrp_procurement.model_mrp_procurement","group_sale_user",1,1,1,1
+"access_mrp_procurement_salesman","mrp.procurement salesman","procurement.model_mrp_procurement","group_sale_user",1,1,1,1
 "access_sale_order_stock_worker","sale.order stock worker","model_sale_order","stock.group_stock_user",1,1,0,0
 "access_sale_order_line_stock_worker","sale.order.line stock worker","model_sale_order_line","stock.group_stock_user",1,1,0,0
 "access_sale_order_manager","sale.order.manager","model_sale_order","group_sale_manager",1,1,1,1