diff --git a/addons/account/process/customer_invoice_process.xml b/addons/account/process/customer_invoice_process.xml
index 581ca083ac9..c3fedd1826e 100755
--- a/addons/account/process/customer_invoice_process.xml
+++ b/addons/account/process/customer_invoice_process.xml
@@ -18,11 +18,10 @@
         <record id="process_node_analytic0" model="process.node">
             <field name="menu_id" ref="account.account_analytic_def_account"/>
             <field name="model_id" ref="account.model_account_analytic_account"/>
-            <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;Analytic&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Analytic costs to reinvoice purchases, timesheets, ...&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_invoiceworkflow0"/>
-            <field name="subflow_id" ref="process_process_invoiceworkflow0"/>
             <field eval="&quot;&quot;&quot;object.state in ('draft', 'open', 'pending', 'close')&quot;&quot;&quot;" name="model_states"/>
             <field eval="1" name="flow_start"/>
         </record>
diff --git a/addons/account/process/supplier_invoice_process.xml b/addons/account/process/supplier_invoice_process.xml
index be4892c0da9..613aaaa4005 100755
--- a/addons/account/process/supplier_invoice_process.xml
+++ b/addons/account/process/supplier_invoice_process.xml
@@ -15,6 +15,17 @@
             Process Node
         -->
         
+        <record id="process_node_analyticcost0" model="process.node">
+            <field name="menu_id" ref="account.account_analytic_def_account"/>
+            <field name="model_id" ref="account.model_account_analytic_account"/>
+            <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
+            <field eval="&quot;&quot;&quot;Analytic&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Analytic costs to reinvoice purchases, timesheets, ...&quot;&quot;&quot;" name="note"/>
+            <field name="process_id" ref="process_process_supplierinvoiceworkflow0"/>
+            <field eval="&quot;&quot;&quot;object.state in ('draft', 'open', 'pending', 'close')&quot;&quot;&quot;" name="model_states"/>
+            <field eval="1" name="flow_start"/>
+        </record>
+        
         <record id="process_node_supplierdraftinvoices0" model="process.node">
             <field name="menu_id" ref="account.menu_invoice_draft"/>
             <field name="model_id" ref="account.model_account_invoice"/>
@@ -45,7 +56,7 @@
             <field eval="&quot;&quot;&quot;Statement encoding produces payment entries&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_supplierinvoiceworkflow0"/>
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
-            <field eval="1" name="flow_start"/>
+            <field eval="0" name="flow_start"/>
         </record>
         
         <record id="process_node_supplieraccountingentries0" model="process.node">
@@ -95,6 +106,15 @@
             Process Transition
         -->
         
+		<record id="process_transition_supplieranalyticcost0" model="process.transition">
+            <field eval="[(6,0,[])]" name="role_ids"/>
+            <field eval="[(6,0,[])]" name="transition_ids"/>
+            <field eval="&quot;&quot;&quot;Analytic Invoice&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;From analytic accounts, Create invoice.&quot;&quot;&quot;" name="note"/>
+            <field model="process.node" name="target_node_id" ref="process_node_supplierdraftinvoices0"/>
+            <field model="process.node" name="source_node_id" ref="process_node_analyticcost0"/>
+        </record>
+        
         <record id="process_transition_suppliercustomerinvoice0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
diff --git a/addons/hr/process/hr_process.xml b/addons/hr/process/hr_process.xml
index c1d85525b79..42c9fd022ab 100755
--- a/addons/hr/process/hr_process.xml
+++ b/addons/hr/process/hr_process.xml
@@ -15,15 +15,6 @@
 			Process Node
 		-->
 	
-		<record id="process_node_jobshiring0" model="process.node">
-			<field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;Jobs hiring&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;Process to search, interview and evaluate new candidates&quot;&quot;&quot;" name="note"/>
-			<field name="process_id" ref="process_process_employeecontractworkflow0"/>
-			<field eval="&quot;&quot;&quot;object.state in ('draft', 'open', 'pending', 'done', 'cancel')&quot;&quot;&quot;" name="model_states"/>
-			<field eval="1" name="flow_start"/>
-		</record>
-	
 		<record id="process_node_employee0" model="process.node">
 			<field name="menu_id" ref="hr.menu_open_view_employee_list"/>
 			<field name="model_id" ref="hr.model_hr_employee"/>
@@ -67,15 +58,6 @@
 			<field model="process.node" name="source_node_id" ref="process_node_employee0"/>
 		</record>
 		
-		<record id="process_transition_employeejob0" model="process.transition">
-			<field eval="[(6,0,[])]" name="role_ids"/>
-			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Employee Job&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;After confirming job, he will be a employee&quot;&quot;&quot;" name="note"/>
-			<field model="process.node" name="target_node_id" ref="process_node_employee0"/>
-			<field model="process.node" name="source_node_id" ref="process_node_jobshiring0"/>
-		</record>
-	
 		<record id="process_transition_contactofemployee0" model="process.transition">
 			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
diff --git a/addons/hr_timesheet_project/process/hr_timesheet_project_process.xml b/addons/hr_timesheet_project/process/hr_timesheet_project_process.xml
index 53dbc32e056..390e572c52b 100755
--- a/addons/hr_timesheet_project/process/hr_timesheet_project_process.xml
+++ b/addons/hr_timesheet_project/process/hr_timesheet_project_process.xml
@@ -66,7 +66,7 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Task timesheet&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Moves task entry into the timesheet line&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_timesheettask0"/>
+            <field model="process.node" name="target_node_id" ref="hr_timesheet_sheet.process_node_timesheet0"/>
             <field model="process.node" name="source_node_id" ref="process_node_workontask0"/>
         </record>
         
diff --git a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml
index f7fdf41a5cd..a664be5e1ee 100755
--- a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml
+++ b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml
@@ -129,9 +129,10 @@
         <record id="process_node_invoiceonwork0" model="process.node">
             <field name="menu_id" ref="account.menu_finance_invoice"/>
             <field name="model_id" ref="account.model_account_invoice"/>
-            <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;Invoice on Work&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Invoice based on timesheet&quot;&quot;&quot;" name="note"/>
+            <field name="subflow_id" ref="account.process_process_invoiceworkflow0"/>
             <field name="process_id" ref="process_process_hrtimesheetworkflow0"/>
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
@@ -149,7 +150,7 @@
             <field name="role_id" ref="res_roles_hr0"/>
         </record>
     
-        <record id="process_transition_attendance0" model="process.transition">
+        <record id="process_transition_attendancetimesheet0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Attendance&quot;&quot;&quot;" name="name"/>
@@ -158,7 +159,7 @@
             <field model="process.node" name="source_node_id" ref="process_node_attendance0"/>
         </record>
     
-        <record id="process_transition_timesheet0" model="process.transition">
+        <record id="process_transition_timesheetdraft0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Timesheet&quot;&quot;&quot;" name="name"/>
diff --git a/addons/mrp/process/procurement_process.xml b/addons/mrp/process/procurement_process.xml
index 4818f33d5da..39e599c27e2 100755
--- a/addons/mrp/process/procurement_process.xml
+++ b/addons/mrp/process/procurement_process.xml
@@ -29,7 +29,7 @@
 		<record id="process_node_minimumstockrule0" model="process.node">
 			<field name="menu_id" ref="mrp.menu_action_orderpoint_form"/>
 			<field name="model_id" ref="mrp.model_stock_warehouse_orderpoint"/>
-			<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 is created if the product quantity is lower than the minimum limit.&quot;&quot;&quot;" name="note"/>
 			<field eval="&quot;&quot;&quot;Minimum Stock Rule&quot;&quot;&quot;" name="name"/>
 			<field name="process_id" ref="process_process_procurementworkflow0"/>
@@ -47,7 +47,7 @@
 			<field eval="0" name="flow_start"/>
 		</record>
 	
-		<record id="process_node_stockableproduct0" model="process.node">
+		<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"/>
@@ -69,7 +69,7 @@
 			<field eval="0" name="flow_start"/>
 		</record>
 	
-		<record id="process_node_maketostock0" model="process.node">
+		<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"/>
@@ -79,8 +79,8 @@
 			<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_stockablestock0" model="process.node">
+		
+		<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"/>
@@ -91,18 +91,18 @@
 			<field eval="0" name="flow_start"/>
 		</record>
 	
-		<record id="process_node_stockableorder0" model="process.node">
+		<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;Stockable Order&quot;&quot;&quot;" name="name"/>
+			<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_maketostock1" model="process.node">
+		<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"/>
@@ -113,7 +113,7 @@
 			<field eval="0" name="flow_start"/>
 		</record>
 	
-		<record id="process_node_requestforquotation1" model="process.node">
+		<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"/>
@@ -125,10 +125,10 @@
 			<field eval="0" name="flow_start"/>
 		</record>
 	
-		<record id="process_node_productionorder1" model="process.node">
+		<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;subflow&quot;&quot;&quot;" name="kind"/>
+			<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"/>
@@ -136,7 +136,7 @@
 			<field eval="0" name="flow_start"/>
 		</record>
 	
-		<record id="process_node_requestforquotation2" model="process.node">
+		<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"/>
@@ -216,7 +216,7 @@
 			<field eval="[(6,0,[])]" name="transition_ids"/>
 			<field eval="&quot;&quot;&quot;Procure Stockable Product&quot;&quot;&quot;" name="name"/>
 			<field eval="&quot;&quot;&quot;if Product type is Stockable in procurement order&quot;&quot;&quot;" name="note"/>
-			<field model="process.node" name="target_node_id" ref="process_node_stockableproduct0"/>
+			<field model="process.node" name="target_node_id" ref="process_node_stockproduct0"/>
 			<field model="process.node" name="source_node_id" ref="process_node_procureproducts0"/>
 		</record>
 	
@@ -229,67 +229,67 @@
 			<field model="process.node" name="source_node_id" ref="process_node_procureproducts0"/>
 		</record>
 	
-		<record id="process_transition_stockablemaketostock0" model="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_maketostock0"/>
-			<field model="process.node" name="source_node_id" ref="process_node_stockableproduct0"/>
+			<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_stockableproductstock0" model="process.transition">
+		<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_stockablestock0"/>
-			<field model="process.node" name="source_node_id" ref="process_node_stockableproduct0"/>
+			<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_serivcestockableorder0" model="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_stockableorder0"/>
+			<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_servicemaketostock0" model="process.transition">
+		<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_maketostock1"/>
+			<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_stockablerequest0" model="process.transition">
+		<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_requestforquotation1"/>
-			<field model="process.node" name="source_node_id" ref="process_node_stockablestock0"/>
+			<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_stockableproductionorder0" model="process.transition">
+		<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_productionorder1"/>
-			<field model="process.node" name="source_node_id" ref="process_node_stockablestock0"/>
+			<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_stockableorderrequest0" model="process.transition">
+		<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_requestforquotation2"/>
-			<field model="process.node" name="source_node_id" ref="process_node_stockableorder0"/>
+			<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">
diff --git a/addons/project/process/task_process.xml b/addons/project/process/task_process.xml
index 675437c8d81..8dfc3a340d3 100755
--- a/addons/project/process/task_process.xml
+++ b/addons/project/process/task_process.xml
@@ -65,7 +65,7 @@
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Trigger Invoice&quot;&quot;&quot;" name="name"/>
             <field name="subflow_id" ref="account.process_process_invoiceworkflow0"/>
-            <field eval="&quot;&quot;&quot;Trigger invoices from sale order lines (sale subflow)&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Trigger invoices from sale order lines&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_tasksworkflow0"/>
             <field eval="&quot;&quot;&quot;object.state=='paid'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
diff --git a/addons/project_mrp/process/project_mrp_process.xml b/addons/project_mrp/process/project_mrp_process.xml
index d187d5f3f37..21c641dd8e4 100755
--- a/addons/project_mrp/process/project_mrp_process.xml
+++ b/addons/project_mrp/process/project_mrp_process.xml
@@ -21,15 +21,16 @@
         <record id="process_node_saleordertask0" model="process.node">
             <field name="menu_id" ref="sale.menu_sale_order"/>
             <field name="model_id" ref="sale.model_sale_order"/>
-            <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;Sale Order Task&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;In case you sell services on sale order (task subflow)&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;In case you sell services on sale order&quot;&quot;&quot;" name="note"/>
+            <field name="subflow_id" ref="sale.process_process_salesworkflow0"/>
             <field name="process_id" ref="project.process_process_tasksworkflow0"/>
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
             <field eval="1" name="flow_start"/>
         </record>
     
-        <record id="process_node_procuretask0" model="process.node">
+        <record id="process_node_mrptask0" model="process.node">
             <field name="menu_id" ref="project.menu_action_view_task"/>
             <field name="model_id" ref="project.model_project_task"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
@@ -54,7 +55,6 @@
         </record>
     
         <record id="process_transition_createtask0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Create Task&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Product type is service, then its creates the task.&quot;&quot;&quot;" name="note"/>
@@ -63,39 +63,37 @@
         </record>
         
         <record id="process_transition_ordertask0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Order Task&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_procuretask0"/>
-            <field model="process.node" name="source_node_id" ref="mrp.process_node_stockableorder0"/>
-            <field eval="[(6,0,[ref('mrp.trans_draft_confirm')])]" name="transition_ids"/>
+            <field model="process.node" name="target_node_id" ref="process_node_mrptask0"/>
+            <field model="process.node" name="source_node_id" ref="mrp.process_node_serviceonorder0"/>
         </record>
         
         <!--    
         	Process Action
     	-->
         
-        <record id="process_transition_action_orderconfirmtask0" model="process.transition.action">
-            <field eval="&quot;&quot;&quot;action_confirm&quot;&quot;&quot;" name="action"/>
-            <field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
-            <field eval="&quot;&quot;&quot;Confirm&quot;&quot;&quot;" name="name"/>
-            <field name="transition_id" ref="process_transition_ordertask0"/>
-        </record>
-        
-        <record id="process_transition_action_ordercanceltask0" model="process.transition.action">
-            <field eval="&quot;&quot;&quot;action_cancel&quot;&quot;&quot;" name="action"/>
-            <field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
-            <field eval="&quot;&quot;&quot;Cancel&quot;&quot;&quot;" name="name"/>
-            <field name="transition_id" ref="process_transition_ordertask0"/>
-        </record>
-        
-        <record id="process_transition_action_taskrunprocurement0" model="process.transition.action">
-            <field eval="&quot;&quot;&quot;write({'state':'exception'})&quot;&quot;&quot;" name="action"/>
-            <field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
-            <field eval="&quot;&quot;&quot;Run Procurement&quot;&quot;&quot;" name="name"/>
-            <field name="transition_id" ref="process_transition_ordertask0"/>
-        </record>
+<!--        <record id="process_transition_action_orderconfirmtask0" model="process.transition.action">-->
+<!--            <field eval="&quot;&quot;&quot;action_confirm&quot;&quot;&quot;" name="action"/>-->
+<!--            <field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>-->
+<!--            <field eval="&quot;&quot;&quot;Confirm&quot;&quot;&quot;" name="name"/>-->
+<!--            <field name="transition_id" ref="process_transition_ordertask0"/>-->
+<!--        </record>-->
+<!--        -->
+<!--        <record id="process_transition_action_ordercanceltask0" model="process.transition.action">-->
+<!--            <field eval="&quot;&quot;&quot;action_cancel&quot;&quot;&quot;" name="action"/>-->
+<!--            <field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>-->
+<!--            <field eval="&quot;&quot;&quot;Cancel&quot;&quot;&quot;" name="name"/>-->
+<!--            <field name="transition_id" ref="process_transition_ordertask0"/>-->
+<!--        </record>-->
+<!--        -->
+<!--        <record id="process_transition_action_taskrunprocurement0" model="process.transition.action">-->
+<!--            <field eval="&quot;&quot;&quot;write({'state':'exception'})&quot;&quot;&quot;" name="action"/>-->
+<!--            <field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>-->
+<!--            <field eval="&quot;&quot;&quot;Run Procurement&quot;&quot;&quot;" name="name"/>-->
+<!--            <field name="transition_id" ref="process_transition_ordertask0"/>-->
+<!--        </record>-->
         
     </data>
 </openerp>
diff --git a/addons/purchase/process/purchase_process.xml b/addons/purchase/process/purchase_process.xml
index 3dfbbf4cb83..38a2fce7460 100755
--- a/addons/purchase/process/purchase_process.xml
+++ b/addons/purchase/process/purchase_process.xml
@@ -18,10 +18,9 @@
         <record id="process_node_packinginvoice0" model="process.node">
             <field name="menu_id" ref="stock.menu_picking_waiting"/>
             <field name="model_id" ref="stock.model_stock_picking"/>
-            <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;Out Packing&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Invoice based on deliveries&quot;&quot;&quot;" name="note"/>
-            <field name="subflow_id" ref="process_process_purchaseworkflow0"/>
             <field name="process_id" ref="account.process_process_invoiceworkflow0"/>
             <field eval="&quot;&quot;&quot;object.state in ('assigned', 'confirmed')&quot;&quot;&quot;" name="model_states"/>
             <field eval="1" name="flow_start"/>
@@ -43,7 +42,7 @@
             <field name="menu_id" ref="purchase.menu_purchase_order_draft"/>
             <field name="model_id" ref="purchase.model_purchase_order"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Request for Quotation&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;RFQ&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Request for quotation is proposed by the system.&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_purchaseworkflow0"/>
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
@@ -53,8 +52,8 @@
         <record id="process_node_draftpurchaseorder1" 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;Request for Quotation&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
+            <field eval="&quot;&quot;&quot;RFQ&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Encoded manually by the user.&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_purchaseworkflow0"/>
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
@@ -118,6 +117,18 @@
             <field eval="0" name="flow_start"/>
         </record>
         
+        <record id="process_node_productrecept0" model="process.node">
+            <field name="menu_id" ref="stock.menu_picking_waiting"/>
+            <field name="model_id" ref="stock.model_stock_picking"/>
+            <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
+            <field eval="&quot;&quot;&quot;Product Receipt&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Control invoices on receptions&quot;&quot;&quot;" name="note"/>
+            <field name="subflow_id" ref="process_process_purchaseworkflow0"/>
+            <field name="process_id" ref="account.process_process_supplierinvoiceworkflow0"/>
+            <field eval="&quot;&quot;&quot;object.state in ('draft', 'open', 'pending', 'close')&quot;&quot;&quot;" name="model_states"/>
+            <field eval="1" name="flow_start"/>
+        </record>
+        
         <!--        
             Process Condition     
         -->
@@ -151,6 +162,15 @@
         <record id="purchase.trans_router_invoice" model="workflow.transition">
             <field name="role_id" ref="res_roles_purchase0"/>
         </record>
+        
+        <record id="process_transition_productrecept0" model="process.transition">
+            <field eval="[(6,0,[])]" name="role_ids"/>
+            <field eval="[(6,0,[])]" name="transition_ids"/>
+            <field eval="&quot;&quot;&quot;Product recept invoice&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Create invoice from product recept&quot;&quot;&quot;" name="note"/>
+            <field model="process.node" name="target_node_id" ref="account.process_node_supplierdraftinvoices0"/>
+            <field model="process.node" name="source_node_id" ref="process_node_productrecept0"/>
+        </record>
     	
         <record id="process_transition_confirmingpurchaseorder0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml
index 553c46bade6..46e13d1d6d2 100755
--- a/addons/sale/process/sale_process.xml
+++ b/addons/sale/process/sale_process.xml
@@ -33,6 +33,7 @@
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Sale Order Procurement&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Procurement for each line&quot;&quot;&quot;" name="note"/>
+            <field name="subflow_id" ref="process_process_salesworkflow0"/>
             <field name="process_id" ref="mrp.process_process_procurementworkflow0"/>
             <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"/>
@@ -42,7 +43,7 @@
             <field name="menu_id" ref="sale.menu_action_order_tree10"/>
             <field name="model_id" ref="sale.model_sale_order"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Ok&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Quotation&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Quotation (A sale order in draft state)&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_salesworkflow0"/>
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
@@ -53,8 +54,8 @@
             <field name="menu_id" ref="sale.menu_action_order_tree9"/>
             <field name="model_id" ref="sale.model_sale_order"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Ok&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Ok&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Sale Order&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Manages the delivery and invoicing progress&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_salesworkflow0"/>
             <field eval="&quot;&quot;&quot;object.state=='manual'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
diff --git a/addons/stock/__terp__.py b/addons/stock/__terp__.py
index dc09385b09f..1d012329503 100644
--- a/addons/stock/__terp__.py
+++ b/addons/stock/__terp__.py
@@ -42,7 +42,6 @@
         "report_stock_view.xml",
         "security/stock_security.xml",
         "security/ir.model.access.csv",
-        "process/stock_process.xml"
     ],
     "active": False,
     "installable": True
diff --git a/addons/stock/process/stock_process.xml b/addons/stock/process/stock_process.xml
deleted file mode 100755
index aade7ce555a..00000000000
--- a/addons/stock/process/stock_process.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" ?>
-<openerp>
-    <data>	
-
-        <record id="process_node_productrecept0" model="process.node">
-            <field name="menu_id" ref="stock.menu_picking_waiting"/>
-            <field name="model_id" ref="stock.model_stock_picking"/>
-            <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Product Receipt&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Control invoices on receptions&quot;&quot;&quot;" name="note"/>
-            <field name="process_id" ref="account.process_process_supplierinvoiceworkflow0"/>
-            <field eval="&quot;&quot;&quot;object.state in ('draft', 'open', 'pending', 'close')&quot;&quot;&quot;" name="model_states"/>
-            <field eval="1" name="flow_start"/>
-        </record>
-        
-        <record id="process_transition_productrecept0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
-            <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Product recept invoice&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Create invoice from product recept&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="account.process_node_supplierdraftinvoices0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_productrecept0"/>
-        </record>
-        
-	</data>
-</openerp>
-    
\ No newline at end of file