diff --git a/addons/.project b/addons/.project
new file mode 100644
index 00000000000..ada2ccca54d
--- /dev/null
+++ b/addons/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>addons-pso-process</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.python.pydev.PyDevBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.python.pydev.pythonNature</nature>
+	</natures>
+</projectDescription>
diff --git a/addons/.pydevproject b/addons/.pydevproject
new file mode 100644
index 00000000000..78259a9c3db
--- /dev/null
+++ b/addons/.pydevproject
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?eclipse-pydev version="1.0"?>
+
+<pydev_project>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.4</pydev_property>
+</pydev_project>
diff --git a/addons/mrp/__terp__.py b/addons/mrp/__terp__.py
index 5ea266c3a0d..b8cb6a2d3da 100644
--- a/addons/mrp/__terp__.py
+++ b/addons/mrp/__terp__.py
@@ -64,6 +64,8 @@
         "mrp_wizard.xml", 
         "mrp_report.xml",
         "company_view.xml",
+        "process/stockable_product_process.xml",
+        "process/service_product_process.xml",
         "process/procurement_process.xml",
     ],
     "active": False,
diff --git a/addons/mrp/process/procurement_process.xml b/addons/mrp/process/procurement_process.xml
index 39e599c27e2..a1c2429f917 100755
--- a/addons/mrp/process/procurement_process.xml
+++ b/addons/mrp/process/procurement_process.xml
@@ -18,7 +18,7 @@
 		<record id="process_node_productionorder0" model="process.node">
 			<field name="menu_id" ref="mrp.menu_mrp_production_action"/>
 			<field name="model_id" ref="mrp.model_mrp_production"/>
-			<field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
+			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
 			<field eval="&quot;&quot;&quot;Procurement for raw materials.&quot;&quot;&quot;" name="note"/>
 			<field eval="&quot;&quot;&quot;Production Order&quot;&quot;&quot;" name="name"/>
 			<field name="process_id" ref="process_process_procurementworkflow0"/>
@@ -50,9 +50,10 @@
 		<record id="process_node_stockproduct0" model="process.node">
 			<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;subflow&quot;&quot;&quot;" name="kind"/>
 			<field eval="&quot;&quot;&quot;For stockable and 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_stockableproductworkflow0"/>
 			<field name="process_id" ref="process_process_procurementworkflow0"/>
 			<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"/>
@@ -61,93 +62,15 @@
 		<record id="process_node_serviceproduct0" model="process.node">
 			<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;subflow&quot;&quot;&quot;" name="kind"/>
 			<field eval="&quot;&quot;&quot;If Product type is service&quot;&quot;&quot;" name="note"/>
 			<field eval="&quot;&quot;&quot;Service Product&quot;&quot;&quot;" name="name"/>
+			<field name="subflow_id" ref="process_process_serviceproductworkflow0"/>
 			<field name="process_id" ref="process_process_procurementworkflow0"/>
 			<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_mts0" model="process.node">
-			<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 system waits for requested products in stock.&quot;&quot;&quot;" name="note"/>
-			<field eval="&quot;&quot;&quot;Make to Stock&quot;&quot;&quot;" name="name"/>
-			<field name="process_id" ref="process_process_procurementworkflow0"/>
-			<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_stock0" model="process.node">
-			<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;Wait for available products for reservation&quot;&quot;&quot;" name="note"/>
-			<field eval="&quot;&quot;&quot;Stockable Stock&quot;&quot;&quot;" name="name"/>
-			<field name="process_id" ref="process_process_procurementworkflow0"/>
-			<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_serviceonorder0" model="process.node">
-			<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;If procurement is make to order&quot;&quot;&quot;" name="note"/>
-			<field eval="&quot;&quot;&quot;Service on Order&quot;&quot;&quot;" name="name"/>
-			<field name="process_id" ref="process_process_procurementworkflow0"/>
-			<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_servicemts0" model="process.node">
-			<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;If Procurement is make to stock&quot;&quot;&quot;" name="note"/>
-			<field eval="&quot;&quot;&quot;Make to stock&quot;&quot;&quot;" name="name"/>
-			<field name="process_id" ref="process_process_procurementworkflow0"/>
-			<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_rfq0" model="process.node">
-			<field name="menu_id" ref="purchase.menu_purchase_order_draft"/>
-			<field name="model_id" ref="purchase.model_purchase_order"/>
-			<field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;A Request for Quotation is created and sent to the supplier.&quot;&quot;&quot;" name="note"/>
-			<field eval="&quot;&quot;&quot;Request For Quotation&quot;&quot;&quot;" name="name"/>
-			<field name="subflow_id" ref="purchase.process_process_purchaseworkflow0"/>
-			<field name="process_id" ref="process_process_procurementworkflow0"/>
-			<field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
-			<field eval="0" name="flow_start"/>
-		</record>
-	
-		<record id="process_node_production0" model="process.node">
-			<field name="menu_id" ref="mrp.menu_mrp_production_action"/>
-			<field name="model_id" ref="mrp.model_mrp_production"/>
-			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;Production orders are created for the product manufacturing.&quot;&quot;&quot;" name="note"/>
-			<field eval="&quot;&quot;&quot;Production Order&quot;&quot;&quot;" name="name"/>
-			<field name="process_id" ref="process_process_procurementworkflow0"/>
-			<field eval="&quot;&quot;&quot;object.state=='confirmed'&quot;&quot;&quot;" name="model_states"/>
-			<field eval="0" name="flow_start"/>
-		</record>
-	
-		<record id="process_node_orderrfq0" model="process.node">
-			<field name="menu_id" ref="purchase.menu_purchase_form_action"/>
-			<field name="model_id" ref="purchase.model_purchase_order"/>
-			<field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;A purchase order is created for a sub-contracting demand.&quot;&quot;&quot;" name="note"/>
-			<field eval="&quot;&quot;&quot;Request For Quotation&quot;&quot;&quot;" name="name"/>
-			<field name="subflow_id" ref="purchase.process_process_purchaseworkflow0"/>
-			<field name="process_id" ref="process_process_procurementworkflow0"/>
-			<field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
-			<field eval="0" name="flow_start"/>
-		</record>
-		
 		<record id="process_node_purchaseprocure0" model="process.node">
             <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
             <field name="model_id" ref="mrp.model_mrp_procurement"/>
@@ -229,69 +152,6 @@
 			<field model="process.node" name="source_node_id" ref="process_node_procureproducts0"/>
 		</record>
 	
-		<record id="process_transition_stockmts0" model="process.transition">
-			<field eval="[(6,0,[])]" name="role_ids"/>
-			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Stockable Make to Stock&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;If Product type is Stockable and procure method is make to stock&quot;&quot;&quot;" name="note"/>
-			<field model="process.node" name="target_node_id" ref="process_node_mts0"/>
-			<field model="process.node" name="source_node_id" ref="process_node_stockproduct0"/>
-		</record>
-	
-		<record id="process_transition_stockproduct0" model="process.transition">
-			<field eval="[(6,0,[])]" name="role_ids"/>
-			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Stockable Product Stock&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;Product type is Stockable and procure method is make to stock&quot;&quot;&quot;" name="note"/>
-			<field model="process.node" name="target_node_id" ref="process_node_stock0"/>
-			<field model="process.node" name="source_node_id" ref="process_node_stockproduct0"/>
-		</record>
-	
-		<record id="process_transition_servicemto0" model="process.transition">
-			<field eval="[(6,0,[])]" name="role_ids"/>
-			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Serivce Stockable Order&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;If product type is service and procure method is Make to order&quot;&quot;&quot;" name="note"/>
-			<field model="process.node" name="target_node_id" ref="process_node_serviceonorder0"/>
-			<field model="process.node" name="source_node_id" ref="process_node_serviceproduct0"/>
-		</record>
-	
-		<record id="process_transition_servicemts0" model="process.transition">
-			<field eval="[(6,0,[])]" name="role_ids"/>
-			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Service Make to Stock&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;If Product type is service and procure method is Make to stock&quot;&quot;&quot;" name="note"/>
-			<field model="process.node" name="target_node_id" ref="process_node_servicemts0"/>
-			<field model="process.node" name="source_node_id" ref="process_node_serviceproduct0"/>
-		</record>
-	
-		<record id="process_transition_stockrfq0" model="process.transition">
-			<field eval="[(6,0,[])]" name="role_ids"/>
-			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Stockable Request&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;If Product type is Stockable and procure method is make to stock&quot;&quot;&quot;" name="note"/>
-			<field model="process.node" name="target_node_id" ref="process_node_rfq0"/>
-			<field model="process.node" name="source_node_id" ref="process_node_stock0"/>
-		</record>
-	
-		<record id="process_transition_stockproduction0" model="process.transition">
-			<field eval="[(6,0,[])]" name="role_ids"/>
-			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Stockable Production Order&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;If Procure method is Make to order and supply method is produce&quot;&quot;&quot;" name="note"/>
-			<field model="process.node" name="target_node_id" ref="process_node_production0"/>
-			<field model="process.node" name="source_node_id" ref="process_node_stock0"/>
-		</record>
-	
-		<record id="process_transition_servicerfq0" model="process.transition">
-			<field eval="[(6,0,[])]" name="role_ids"/>
-			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Stockable Order Request&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;If Procure method is Make to order and supply method is buy&quot;&quot;&quot;" name="note"/>
-			<field model="process.node" name="target_node_id" ref="process_node_orderrfq0"/>
-			<field model="process.node" name="source_node_id" ref="process_node_serviceonorder0"/>
-		</record>
-		
 		<record id="process_transition_purchaseprocure0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
diff --git a/addons/mrp/process/service_product_process.xml b/addons/mrp/process/service_product_process.xml
new file mode 100644
index 00000000000..abaa418331e
--- /dev/null
+++ b/addons/mrp/process/service_product_process.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" ?>
+<openerp>
+	<data>
+	
+		<!--
+			Process
+		-->
+	
+		<record id="process_process_serviceproductworkflow0" model="process.process">
+			<field eval="&quot;&quot;&quot;Service Product Workflow&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="active"/>
+		</record>
+		
+		<!--
+			Process Node
+		-->
+		
+		<record id="process_node_serviceproduct1" model="process.node">
+			<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;If Product type is service&quot;&quot;&quot;" name="note"/>
+			<field eval="&quot;&quot;&quot;Service Product&quot;&quot;&quot;" name="name"/>
+			<field name="process_id" ref="process_process_serviceproductworkflow0"/>
+			<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>
+		
+		<record id="process_node_serviceonorder0" model="process.node">
+			<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;If procurement is make to order&quot;&quot;&quot;" name="note"/>
+			<field eval="&quot;&quot;&quot;Service on Order&quot;&quot;&quot;" name="name"/>
+			<field name="process_id" ref="process_process_serviceproductworkflow0"/>
+			<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_servicemts0" model="process.node">
+			<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;If Procurement is make to stock&quot;&quot;&quot;" name="note"/>
+			<field eval="&quot;&quot;&quot;Make to stock&quot;&quot;&quot;" name="name"/>
+			<field name="process_id" ref="process_process_serviceproductworkflow0"/>
+			<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_orderrfq0" model="process.node">
+			<field name="menu_id" ref="purchase.menu_purchase_form_action"/>
+			<field name="model_id" ref="purchase.model_purchase_order"/>
+			<field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
+			<field eval="&quot;&quot;&quot;A purchase order is created for a sub-contracting demand.&quot;&quot;&quot;" name="note"/>
+			<field eval="&quot;&quot;&quot;RFQ&quot;&quot;&quot;" name="name"/>
+			<field name="subflow_id" ref="purchase.process_process_purchaseworkflow0"/>
+			<field name="process_id" ref="process_process_serviceproductworkflow0"/>
+			<field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
+			<field eval="0" name="flow_start"/>
+		</record>
+		
+		<!--
+			Process Transition
+		-->
+		
+		<record id="process_transition_servicemto0" model="process.transition">
+			<field eval="[(6,0,[])]" name="role_ids"/>
+			<field eval="[(6,0,[])]" name="transition_ids"/>
+			<field eval="&quot;&quot;&quot;Serivce Stockable Order&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;If product type is service and procure method is Make to order&quot;&quot;&quot;" name="note"/>
+			<field model="process.node" name="target_node_id" ref="process_node_serviceonorder0"/>
+			<field model="process.node" name="source_node_id" ref="process_node_serviceproduct1"/>
+		</record>
+	
+		<record id="process_transition_servicemts0" model="process.transition">
+			<field eval="[(6,0,[])]" name="role_ids"/>
+			<field eval="[(6,0,[])]" name="transition_ids"/>
+			<field eval="&quot;&quot;&quot;Service Make to Stock&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;If Product type is service and procure method is Make to stock&quot;&quot;&quot;" name="note"/>
+			<field model="process.node" name="target_node_id" ref="process_node_servicemts0"/>
+			<field model="process.node" name="source_node_id" ref="process_node_serviceproduct1"/>
+		</record>
+		
+		<record id="process_transition_servicerfq0" model="process.transition">
+			<field eval="[(6,0,[])]" name="role_ids"/>
+			<field eval="[(6,0,[])]" name="transition_ids"/>
+			<field eval="&quot;&quot;&quot;Stockable Order Request&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;If Procure method is Make to order and supply method is buy&quot;&quot;&quot;" name="note"/>
+			<field model="process.node" name="target_node_id" ref="process_node_orderrfq0"/>
+			<field model="process.node" name="source_node_id" ref="process_node_serviceonorder0"/>
+		</record>
+		
+	</data>
+</openerp>
\ No newline at end of file
diff --git a/addons/mrp/process/stockable_product_process.xml b/addons/mrp/process/stockable_product_process.xml
new file mode 100644
index 00000000000..9c885d51942
--- /dev/null
+++ b/addons/mrp/process/stockable_product_process.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" ?>
+<openerp>
+	<data>
+	
+		<!--
+			Process
+		-->
+	
+		<record id="process_process_stockableproductworkflow0" model="process.process">
+			<field eval="&quot;&quot;&quot;Stockable Product Workflow&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="active"/>
+		</record>
+		
+		<!--
+			Process Node
+		-->
+		
+		<record id="process_node_stockproduct1" model="process.node">
+			<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;For stockable and consumable&quot;&quot;&quot;" name="note"/>
+			<field eval="&quot;&quot;&quot;Stockable Product&quot;&quot;&quot;" name="name"/>
+			<field name="process_id" ref="process_process_stockableproductworkflow0"/>
+			<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>
+		
+		<record id="process_node_mts0" model="process.node">
+			<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 system waits for requested products in stock.&quot;&quot;&quot;" name="note"/>
+			<field eval="&quot;&quot;&quot;Make to Stock&quot;&quot;&quot;" name="name"/>
+			<field name="process_id" ref="process_process_stockableproductworkflow0"/>
+			<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_stock0" model="process.node">
+			<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;Wait for available products for reservation&quot;&quot;&quot;" name="note"/>
+			<field eval="&quot;&quot;&quot;Stockable Stock&quot;&quot;&quot;" name="name"/>
+			<field name="process_id" ref="process_process_stockableproductworkflow0"/>
+			<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_rfq0" model="process.node">
+			<field name="menu_id" ref="purchase.menu_purchase_order_draft"/>
+			<field name="model_id" ref="purchase.model_purchase_order"/>
+			<field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
+			<field eval="&quot;&quot;&quot;A Request for Quotation is created and sent to the supplier.&quot;&quot;&quot;" name="note"/>
+			<field eval="&quot;&quot;&quot;RFQ&quot;&quot;&quot;" name="name"/>
+			<field name="subflow_id" ref="purchase.process_process_purchaseworkflow0"/>
+			<field name="process_id" ref="process_process_stockableproductworkflow0"/>
+			<field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
+			<field eval="0" name="flow_start"/>
+		</record>
+	
+		<record id="process_node_production0" model="process.node">
+			<field name="menu_id" ref="mrp.menu_mrp_production_action"/>
+			<field name="model_id" ref="mrp.model_mrp_production"/>
+			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
+			<field eval="&quot;&quot;&quot;Production orders are created for the product manufacturing.&quot;&quot;&quot;" name="note"/>
+			<field eval="&quot;&quot;&quot;Production Order&quot;&quot;&quot;" name="name"/>
+			<field name="process_id" ref="process_process_stockableproductworkflow0"/>
+			<field eval="&quot;&quot;&quot;object.state=='confirmed'&quot;&quot;&quot;" name="model_states"/>
+			<field eval="0" name="flow_start"/>
+		</record>
+		
+		<!--
+			Process Transition
+		-->
+		
+		<record id="process_transition_stockmts0" model="process.transition">
+			<field eval="[(6,0,[])]" name="role_ids"/>
+			<field eval="[(6,0,[])]" name="transition_ids"/>
+			<field eval="&quot;&quot;&quot;Stockable Make to Stock&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;If Product type is Stockable and procure method is make to stock&quot;&quot;&quot;" name="note"/>
+			<field model="process.node" name="target_node_id" ref="process_node_mts0"/>
+			<field model="process.node" name="source_node_id" ref="process_node_stockproduct1"/>
+		</record>
+	
+		<record id="process_transition_stockproduct0" model="process.transition">
+			<field eval="[(6,0,[])]" name="role_ids"/>
+			<field eval="[(6,0,[])]" name="transition_ids"/>
+			<field eval="&quot;&quot;&quot;Stockable Product Stock&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;Product type is Stockable and procure method is make to stock&quot;&quot;&quot;" name="note"/>
+			<field model="process.node" name="target_node_id" ref="process_node_stock0"/>
+			<field model="process.node" name="source_node_id" ref="process_node_stockproduct1"/>
+		</record>
+		
+		<record id="process_transition_stockrfq0" model="process.transition">
+			<field eval="[(6,0,[])]" name="role_ids"/>
+			<field eval="[(6,0,[])]" name="transition_ids"/>
+			<field eval="&quot;&quot;&quot;Stockable Request&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;If Product type is Stockable and procure method is make to stock&quot;&quot;&quot;" name="note"/>
+			<field model="process.node" name="target_node_id" ref="process_node_rfq0"/>
+			<field model="process.node" name="source_node_id" ref="process_node_stock0"/>
+		</record>
+	
+		<record id="process_transition_stockproduction0" model="process.transition">
+			<field eval="[(6,0,[])]" name="role_ids"/>
+			<field eval="[(6,0,[])]" name="transition_ids"/>
+			<field eval="&quot;&quot;&quot;Stockable Production Order&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;If Procure method is Make to order and supply method is produce&quot;&quot;&quot;" name="note"/>
+			<field model="process.node" name="target_node_id" ref="process_node_production0"/>
+			<field model="process.node" name="source_node_id" ref="process_node_stock0"/>
+		</record>
+	
+	</data>
+</openerp>
\ No newline at end of file
diff --git a/addons/project_mrp/process/project_mrp_process.xml b/addons/project_mrp/process/project_mrp_process.xml
index 21c641dd8e4..7082deef237 100755
--- a/addons/project_mrp/process/project_mrp_process.xml
+++ b/addons/project_mrp/process/project_mrp_process.xml
@@ -36,7 +36,7 @@
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Task&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;A task is created to provide the service.&quot;&quot;&quot;" name="note"/>
-            <field name="process_id" ref="mrp.process_process_procurementworkflow0"/>
+            <field name="process_id" ref="mrp.process_process_serviceproductworkflow0"/>
             <field name="subflow_id" ref="project.process_process_tasksworkflow0"/>
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>