diff --git a/addons/account/__terp__.py b/addons/account/__terp__.py
index 704eb79ab65..13288c6262f 100644
--- a/addons/account/__terp__.py
+++ b/addons/account/__terp__.py
@@ -61,9 +61,9 @@
         "project/project_report.xml",
         "product_view.xml",
         "account_assert_test.xml",
+        "process/statement_process.xml",
         "process/customer_invoice_process.xml",
         "process/supplier_invoice_process.xml",
-        "process/statement_process.xml",
     ],
     "translations" : {
         "fr": "i18n/french_fr.csv"
diff --git a/addons/account/process/customer_invoice_process.xml b/addons/account/process/customer_invoice_process.xml
index c3fedd1826e..7af469d142f 100755
--- a/addons/account/process/customer_invoice_process.xml
+++ b/addons/account/process/customer_invoice_process.xml
@@ -8,6 +8,7 @@
         
         <record id="process_process_invoiceworkflow0" model="process.process">
             <field eval="1" name="active"/>
+             <field name="model_id" ref="account.model_account_invoice"/>
             <field eval="&quot;&quot;&quot;Customer Invoice Workflow&quot;&quot;&quot;" name="name"/>
         </record>
         
@@ -61,13 +62,14 @@
         <record id="process_node_bankstatement0" model="process.node">
             <field name="menu_id" ref="account.menu_bank_statement_tree"/>
             <field name="model_id" ref="account.model_account_bank_statement"/>
-            <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;Bank Statement&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Statement encoding produces payment entries&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_invoiceworkflow0"/>
+            <field name="subflow_id" ref="process_process_statementworkflow0"/>
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
             <field eval="1" name="flow_start"/>
-        </record>
+  		</record>
     
         <record id="process_node_paymententries0" model="process.node">
             <field name="menu_id" ref="account.menu_action_move_line_form"/>
@@ -101,6 +103,19 @@
             <field eval="&quot;&quot;&quot;object.state=='paid'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
         </record>
+        
+        <record id="process_node_accountingstatemententries0" model="process.node">
+            <field name="menu_id" ref="account.menu_action_move_line_search"/>
+            <field name="model_id" ref="account.model_account_move_line"/>
+            <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
+            <field eval="&quot;&quot;&quot;Accounting Statement&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Accounting entries at statement's confirmation&quot;&quot;&quot;" name="note"/>
+            <field name="subflow_id" ref="account.process_process_invoiceworkflow0"/>
+            <field name="process_id" ref="process_process_statementworkflow0"/>
+            <field eval="&quot;&quot;&quot;object.state in ('draft', 'valid')&quot;&quot;&quot;" name="model_states"/>
+            <field eval="0" name="flow_start"/>
+        </record>
+        
 
         <!--    
             Process Transition
@@ -113,6 +128,15 @@
         <record id="account.t5" model="workflow.transition">
             <field name="role_id" ref="res_roles_invoice0"/>
         </record>
+        
+        <record id="process_transition_confirmstatementfromdraft0" model="process.transition">
+            <field eval="[(6,0,[])]" name="role_ids"/>
+            <field eval="[(6,0,[])]" name="transition_ids"/>
+            <field eval="&quot;&quot;&quot;Confirm statement from draft&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Confirm statement with/without reconciliation from draft statement&quot;&quot;&quot;" name="note"/>
+            <field model="process.node" name="target_node_id" ref="process_node_accountingstatemententries0"/>
+            <field model="process.node" name="source_node_id" ref="account.process_node_draftstatement0"/>
+        </record>
     
         <record id="process_transition_analyticinvoice0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
diff --git a/addons/account/process/statement_process.xml b/addons/account/process/statement_process.xml
index d0105f76e03..e68aa5d15e2 100755
--- a/addons/account/process/statement_process.xml
+++ b/addons/account/process/statement_process.xml
@@ -8,6 +8,7 @@
     
         <record id="process_process_statementworkflow0" model="process.process">
             <field eval="1" name="active"/>
+            <field name="model_id" ref="account.model_account_bank_statement"/>
             <field eval="&quot;&quot;&quot;Statement workflow&quot;&quot;&quot;" name="name"/>
         </record>
         
@@ -59,18 +60,6 @@
             <field eval="0" name="flow_start"/>
         </record>
 
-        <record id="process_node_accountingstatemententries0" model="process.node">
-            <field name="menu_id" ref="account.menu_action_move_line_search"/>
-            <field name="model_id" ref="account.model_account_move_line"/>
-            <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Accounting Statement&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Accounting entries at statement's confirmation&quot;&quot;&quot;" name="note"/>
-            <field name="subflow_id" ref="process_process_invoiceworkflow0"/>
-            <field name="process_id" ref="process_process_statementworkflow0"/>
-            <field eval="&quot;&quot;&quot;object.state in ('draft', 'valid')&quot;&quot;&quot;" name="model_states"/>
-            <field eval="0" name="flow_start"/>
-        </record>
-
     <!--
         Process Transition
     -->
@@ -102,36 +91,5 @@
             <field model="process.node" name="source_node_id" ref="process_node_importinvoice0"/>
         </record>
     
-        <record id="process_transition_confirmstatementfromdraft0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
-            <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Confirm statement from draft&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Confirm statement with/without reconciliation from draft statement&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_accountingstatemententries0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_draftstatement0"/>
-        </record>
-    
-        <record id="process_transition_statemententries0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
-            <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Statement Entries&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;From statement, create entries&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_paymententries0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_bankstatement0"/>
-        </record>
-        
-        
-		<!--
-		Process Action
-		-->
-    	
-    	
-    	<record id="process_transition_action_draftconfirmstatement0" model="process.transition.action">
-            <field eval="&quot;&quot;&quot;button_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_confirmstatementfromdraft0"/>
-        </record>
-    
     </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/account/process/supplier_invoice_process.xml b/addons/account/process/supplier_invoice_process.xml
index 613aaaa4005..d20548f7eef 100755
--- a/addons/account/process/supplier_invoice_process.xml
+++ b/addons/account/process/supplier_invoice_process.xml
@@ -8,6 +8,7 @@
         
         <record id="process_process_supplierinvoiceworkflow0" model="process.process">
             <field eval="1" name="active"/>
+            <field name="model_id" ref="account.model_account_invoice"/>
             <field eval="&quot;&quot;&quot;Supplier Invoice Workflow&quot;&quot;&quot;" name="name"/>
         </record>
         
@@ -51,10 +52,11 @@
         <record id="process_node_supplierbankstatement0" model="process.node">
             <field name="menu_id" ref="account.menu_bank_statement_tree"/>
             <field name="model_id" ref="account.model_account_bank_statement"/>
-            <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;Bank Statement&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Statement encoding produces payment entries&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_supplierinvoiceworkflow0"/>
+            <field name="subflow_id" ref="process_process_statementworkflow0"/>
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
         </record>
diff --git a/addons/base_contact/process/base_contact_process.xml b/addons/base_contact/process/base_contact_process.xml
index 8f653a90e2f..182eb70ca0e 100755
--- a/addons/base_contact/process/base_contact_process.xml
+++ b/addons/base_contact/process/base_contact_process.xml
@@ -9,6 +9,7 @@
 		<record id="process_process_basecontactworkflow0" model="process.process">
 			<field eval="&quot;&quot;&quot;base_contact workflow&quot;&quot;&quot;" name="name"/>
 			<field eval="1" name="active"/>
+			<field name="model_id" ref="base_contact.model_res_partner_contact"/>
 		</record>
 		
 	<!--
diff --git a/addons/crm_configuration/process/crm_configuration_process.xml b/addons/crm_configuration/process/crm_configuration_process.xml
index 1cb82e4f67e..89ca44ecf54 100755
--- a/addons/crm_configuration/process/crm_configuration_process.xml
+++ b/addons/crm_configuration/process/crm_configuration_process.xml
@@ -8,6 +8,7 @@
 		
         <record id="process_process_contractworkflow0" model="process.process">
 			<field eval="1" name="active"/>
+			<field name="model_id" ref="crm.model_crm_case"/>
 			<field eval="&quot;&quot;&quot;Contract Workflow&quot;&quot;&quot;" name="name"/>
 		</record>
 		
@@ -17,7 +18,7 @@
 		
 		<record id="process_node_leads0" model="process.node">
 			<field name="model_id" ref="crm.model_crm_case"/>
-			<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;Leads&quot;&quot;&quot;" name="name"/>
 			<field eval="&quot;&quot;&quot;Very first contact with new prospect&quot;&quot;&quot;" name="note"/>
 			<field name="process_id" ref="process_process_contractworkflow0"/>
@@ -37,7 +38,7 @@
 	
 		<record id="process_node_opportunities0" model="process.node">
 			<field name="model_id" ref="crm.model_crm_case"/>
-			<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;Opportunities&quot;&quot;&quot;" name="name"/>
 			<field eval="&quot;&quot;&quot;When a real project/opportunity is detected&quot;&quot;&quot;" name="note"/>
 			<field name="process_id" ref="process_process_contractworkflow0"/>
diff --git a/addons/hr/process/hr_process.xml b/addons/hr/process/hr_process.xml
index 42c9fd022ab..d1fb9b951aa 100755
--- a/addons/hr/process/hr_process.xml
+++ b/addons/hr/process/hr_process.xml
@@ -8,6 +8,7 @@
     
 		<record id="process_process_employeecontractworkflow0" model="process.process">
 			<field eval="1" name="active"/>
+			<field name="model_id" ref="hr.model_hr_employee"/>
 			<field eval="&quot;&quot;&quot;Employee Contract Workflow&quot;&quot;&quot;" name="name"/>
 		</record>
 		
diff --git a/addons/hr_expense/process/hr_expense_process.xml b/addons/hr_expense/process/hr_expense_process.xml
index f333fdf5715..dfc9c04774b 100755
--- a/addons/hr_expense/process/hr_expense_process.xml
+++ b/addons/hr_expense/process/hr_expense_process.xml
@@ -8,6 +8,7 @@
     
 		<record id="process_process_expenseworkflow0" model="process.process">
 			<field eval="1" name="active"/>
+			<field name="model_id" ref="model_hr_expense_expense"/>
 			<field eval="&quot;&quot;&quot;Expense Workflow&quot;&quot;&quot;" name="name"/>
 		</record>
 		
diff --git a/addons/hr_holidays/process/hr_holidays_process.xml b/addons/hr_holidays/process/hr_holidays_process.xml
index e78b140b6a7..91a236932d2 100755
--- a/addons/hr_holidays/process/hr_holidays_process.xml
+++ b/addons/hr_holidays/process/hr_holidays_process.xml
@@ -8,6 +8,7 @@
 	
 		<record id="process_process_holidaysworkflow0" model="process.process">
 			<field eval="&quot;&quot;&quot;Holidays Workflow&quot;&quot;&quot;" name="name"/>
+			<field name="model_id" ref="hr_holidays.model_hr_holidays"/>
 			<field eval="1" name="active"/>
 		</record>
 		
diff --git a/addons/hr_timesheet/process/hr_timesheet_process.xml b/addons/hr_timesheet/process/hr_timesheet_process.xml
index 64c325d5cd5..aee609b5120 100755
--- a/addons/hr_timesheet/process/hr_timesheet_process.xml
+++ b/addons/hr_timesheet/process/hr_timesheet_process.xml
@@ -8,6 +8,7 @@
         
         <record id="process_process_timesheetworkflow0" model="process.process">
             <field eval="1" name="active"/>
+            <field name="model_id" ref="hr_timesheet.model_hr_analytic_timesheet"/>
             <field eval="&quot;&quot;&quot;Timesheet Workflow&quot;&quot;&quot;" name="name"/>
         </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 a664be5e1ee..c29de87a601 100755
--- a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml
+++ b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml
@@ -8,6 +8,7 @@
         
         <record id="process_process_hrtimesheetworkflow0" model="process.process">
             <field eval="1" name="active"/>
+            <field name="model_id" ref="hr_timesheet_sheet.model_hr_timesheet_sheet_sheet"/>
             <field eval="&quot;&quot;&quot;Hr Timesheet Workflow&quot;&quot;&quot;" name="name"/>
         </record>
         
diff --git a/addons/membership/process/membership_process.xml b/addons/membership/process/membership_process.xml
index 3ebe7c6cf6c..bd8d7b7414d 100755
--- a/addons/membership/process/membership_process.xml
+++ b/addons/membership/process/membership_process.xml
@@ -8,6 +8,7 @@
 	
 		<record id="process_process_membershipworkflow0" model="process.process">
 			<field eval="&quot;&quot;&quot;Membership workflow&quot;&quot;&quot;" name="name"/>
+			<field name="model_id" ref="base.model_res_partner"/>
 			<field eval="1" name="active"/>
 		</record>
 		
diff --git a/addons/mrp/process/procurement_process.xml b/addons/mrp/process/procurement_process.xml
index a1c2429f917..79d33a8e98d 100755
--- a/addons/mrp/process/procurement_process.xml
+++ b/addons/mrp/process/procurement_process.xml
@@ -8,13 +8,38 @@
 	
 		<record id="process_process_procurementworkflow0" model="process.process">
 			<field eval="&quot;&quot;&quot;Procurement Workflow&quot;&quot;&quot;" name="name"/>
+			<field name="model_id" ref="mrp.model_mrp_procurement"/>
 			<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;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="process_id" ref="mrp.process_process_stockableproductworkflow0"/>
+			<field name="subflow_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="1" name="flow_start"/>
+		</record>
+		
+		<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;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="process_id" ref="mrp.process_process_serviceproductworkflow0"/>
+			<field name="subflow_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="1" name="flow_start"/>
+		</record>
+		
 		<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"/>
@@ -115,6 +140,42 @@
 		<!--
 			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="mrp.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="mrp.process_node_servicemts0"/>
+			<field model="process.node" name="source_node_id" ref="process_node_serviceproduct1"/>
+		</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="mrp.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="mrp.process_node_stock0"/>
+			<field model="process.node" name="source_node_id" ref="process_node_stockproduct1"/>
+		</record>
 
 		<record id="process_transition_productionprocureproducts0" model="process.transition">
 			<field eval="[(6,0,[])]" name="role_ids"/>
diff --git a/addons/mrp/process/service_product_process.xml b/addons/mrp/process/service_product_process.xml
index abaa418331e..e7aacaaf044 100644
--- a/addons/mrp/process/service_product_process.xml
+++ b/addons/mrp/process/service_product_process.xml
@@ -8,6 +8,7 @@
 	
 		<record id="process_process_serviceproductworkflow0" model="process.process">
 			<field eval="&quot;&quot;&quot;Service Product Workflow&quot;&quot;&quot;" name="name"/>
+			<field name="model_id" ref="mrp.model_mrp_procurement"/>
 			<field eval="1" name="active"/>
 		</record>
 		
@@ -15,17 +16,6 @@
 			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"/>
@@ -41,7 +31,7 @@
 			<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;Do nothing&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"/>
@@ -64,24 +54,6 @@
 			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"/>
diff --git a/addons/mrp/process/stockable_product_process.xml b/addons/mrp/process/stockable_product_process.xml
index 9c885d51942..92da99f635e 100644
--- a/addons/mrp/process/stockable_product_process.xml
+++ b/addons/mrp/process/stockable_product_process.xml
@@ -8,6 +8,7 @@
 	
 		<record id="process_process_stockableproductworkflow0" model="process.process">
 			<field eval="&quot;&quot;&quot;Stockable Product Workflow&quot;&quot;&quot;" name="name"/>
+			<field name="model_id" ref="mrp.model_mrp_procurement"/>
 			<field eval="1" name="active"/>
 		</record>
 		
@@ -15,17 +16,6 @@
 			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"/>
@@ -75,24 +65,6 @@
 			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"/>
diff --git a/addons/mrp_operations/__terp__.py b/addons/mrp_operations/__terp__.py
index 9132b252552..f523fc11487 100755
--- a/addons/mrp_operations/__terp__.py
+++ b/addons/mrp_operations/__terp__.py
@@ -55,7 +55,8 @@
     "demo_xml" : ["mrp_operation_data.xml"],
     "update_xml" : [
         "security/ir.model.access.csv",
-        "mrp_operations_workflow.xml","mrp_operations_view.xml","mrp_operations_report.xml"
+        "mrp_operations_workflow.xml","mrp_operations_view.xml","mrp_operations_report.xml",
+        "process/mrp_operation_process.xml"
     ],
     "active": False,
     "installable": True
diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py
index 72316aca8bd..0de73bad7e5 100755
--- a/addons/mrp_operations/mrp_operations.py
+++ b/addons/mrp_operations/mrp_operations.py
@@ -47,14 +47,14 @@ class mrp_production_workcenter_line(osv.osv):
        'date_planned': fields.related('production_id', 'date_planned', type='datetime', string='Date Planned'),
        'date_start': fields.datetime('Start Date'),
        'date_finnished': fields.datetime('End Date'),
-       'delay': fields.float('Delay',size=128,help="This is delay between operation start and stop in this workcenter",readonly=True),
+       'delay': fields.char('Delay',size=128,help="This is delay between operation start and stop in this workcenter",readonly=True),
        'product':fields.related('production_id','product_id',type='many2one',relation='product.product',string='Product'),
        'qty':fields.related('production_id','product_qty',type='float',string='Qty'),
        'uom':fields.related('production_id','product_uom',type='many2one',relation='product.uom',string='UOM'),
     }
     _defaults = {
         'state': lambda *a: 'draft',
-        'delay': lambda *a: 0.0
+        'delay': lambda *a: '0 Days 0 hrs  and 0 mins'
     }
 
     def modify_production_order_state(self,cr,uid,ids,action):
diff --git a/addons/mrp_operations/process/mrp_operation_process.xml b/addons/mrp_operations/process/mrp_operation_process.xml
new file mode 100644
index 00000000000..013a629d3a7
--- /dev/null
+++ b/addons/mrp_operations/process/mrp_operation_process.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" ?>
+<openerp>
+	<data>
+	
+		<!--
+			Process
+		-->
+	
+		<record id="process_process_mrpoperationworkflow0" model="process.process">
+			<field eval="&quot;&quot;&quot;Mrp Operation Workflow&quot;&quot;&quot;" name="name"/>
+			<field name="model_id" ref="mrp.model_mrp_production_workcenter_line"/>
+			<field eval="1" name="active"/>
+		</record>
+		
+		<!--
+			Process Node
+		-->
+		
+		<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;state&quot;&quot;&quot;" name="kind"/>
+			<field eval="&quot;&quot;&quot;Production order for any products&quot;&quot;&quot;" name="note"/>
+			<field eval="&quot;&quot;&quot;Production Order&quot;&quot;&quot;" name="name"/>
+			<field name="process_id" ref="process_process_mrpoperationworkflow0"/>
+			<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_workorder0" model="process.node">
+			<field name="menu_id" ref="menu_mrp_production_operation_action"/>
+			<field name="model_id" ref="mrp.model_mrp_production_workcenter_line"/>
+			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
+			<field eval="&quot;&quot;&quot;Production Work Center&quot;&quot;&quot;" name="note"/>
+			<field eval="&quot;&quot;&quot;Work Center&quot;&quot;&quot;" name="name"/>
+			<field name="process_id" ref="process_process_mrpoperationworkflow0"/>
+			<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_startoperation0" model="process.node">
+			<field name="menu_id" ref="menu_mrp_production_operation_action"/>
+			<field name="model_id" ref="mrp.model_mrp_production_workcenter_line"/>
+			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
+			<field eval="&quot;&quot;&quot;Operation is started&quot;&quot;&quot;" name="note"/>
+			<field eval="&quot;&quot;&quot;Start Operation&quot;&quot;&quot;" name="name"/>
+			<field name="process_id" ref="process_process_mrpoperationworkflow0"/>
+			<field eval="&quot;&quot;&quot;object.state=='startworking'&quot;&quot;&quot;" name="model_states"/>
+			<field eval="0" name="flow_start"/>
+		</record>
+		
+		<record id="process_node_doneoperation0" model="process.node">
+			<field name="menu_id" ref="menu_mrp_production_operation_action"/>
+			<field name="model_id" ref="mrp.model_mrp_production_workcenter_line"/>
+			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
+			<field eval="&quot;&quot;&quot;Operation is done&quot;&quot;&quot;" name="note"/>
+			<field eval="&quot;&quot;&quot;Done Operation&quot;&quot;&quot;" name="name"/>
+			<field name="process_id" ref="process_process_mrpoperationworkflow0"/>
+			<field eval="&quot;&quot;&quot;object.state=='done'&quot;&quot;&quot;" name="model_states"/>
+			<field eval="0" name="flow_start"/>
+		</record>
+		
+		<record id="process_node_canceloperation0" model="process.node">
+			<field name="menu_id" ref="menu_mrp_production_operation_action"/>
+			<field name="model_id" ref="mrp.model_mrp_production_workcenter_line"/>
+			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
+			<field eval="&quot;&quot;&quot;Operation is cancelled&quot;&quot;&quot;" name="note"/>
+			<field eval="&quot;&quot;&quot;Cancel Operation&quot;&quot;&quot;" name="name"/>
+			<field name="process_id" ref="process_process_mrpoperationworkflow0"/>
+			<field eval="&quot;&quot;&quot;object.state=='cancel'&quot;&quot;&quot;" name="model_states"/>
+			<field eval="0" name="flow_start"/>
+		</record>
+		
+		<!--
+			Process Transition
+		-->
+		
+		<record id="process_transition_productionstart0" model="process.transition">
+			<field eval="[(6,0,[])]" name="role_ids"/>
+			<field eval="[(6,0,[])]" name="transition_ids"/>
+			<field eval="&quot;&quot;&quot;Production start Operation&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;From production order, create the workorder&quot;&quot;&quot;" name="note"/>
+			<field model="process.node" name="target_node_id" ref="process_node_startoperation0"/>
+			<field model="process.node" name="source_node_id" ref="process_node_productionorder0"/>
+		</record>
+		
+		<record id="process_transition_workstartoperation0" model="process.transition">
+			<field eval="[(6,0,[])]" name="role_ids"/>
+			<field eval="[(6,0,[])]" name="transition_ids"/>
+			<field eval="&quot;&quot;&quot;Work start Operation&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;From work order, define the cycles and hour for creating product&quot;&quot;&quot;" name="note"/>
+			<field model="process.node" name="target_node_id" ref="process_node_startoperation0"/>
+			<field model="process.node" name="source_node_id" ref="process_node_workorder0"/>
+		</record>
+		
+		<record id="process_transition_startdoneoperation0" model="process.transition">
+			<field eval="[(6,0,[])]" name="role_ids"/>
+			<field eval="[(6,0,[])]" name="transition_ids"/>
+			<field eval="&quot;&quot;&quot;Start Done Operation&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;Operation is done&quot;&quot;&quot;" name="note"/>
+			<field model="process.node" name="target_node_id" ref="process_node_doneoperation0"/>
+			<field model="process.node" name="source_node_id" ref="process_node_startoperation0"/>
+		</record>
+		
+		<record id="process_transition_startcanceloperation0" model="process.transition">
+			<field eval="[(6,0,[])]" name="role_ids"/>
+			<field eval="[(6,0,[])]" name="transition_ids"/>
+			<field eval="&quot;&quot;&quot;Start Cancel Operation&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;Operation is cancelled&quot;&quot;&quot;" name="note"/>
+			<field model="process.node" name="target_node_id" ref="process_node_canceloperation0"/>
+			<field model="process.node" name="source_node_id" ref="process_node_startoperation0"/>
+		</record>
+		
+	</data>
+</openerp>
+	
\ No newline at end of file
diff --git a/addons/process/process.py b/addons/process/process.py
index 94bbd6daaa1..ab4bf724da0 100644
--- a/addons/process/process.py
+++ b/addons/process/process.py
@@ -71,7 +71,6 @@ class process_process(osv.osv):
             res = pool.get('process.process').browse(cr, uid, res, context)
             for process in res:
                 result.append((process.id, process.name))
-
             return result
 
         # else search process nodes
@@ -85,7 +84,7 @@ class process_process(osv.osv):
         return result
 
     def graph_get(self, cr, uid, id, res_model, res_id, scale, context):
-        
+
         pool = pooler.get_pool(cr.dbname)
         
         process = pool.get('process.process').browse(cr, uid, [id])[0]
diff --git a/addons/product/process/product_process.xml b/addons/product/process/product_process.xml
index 4ff800ad0cc..c3564e09b1d 100755
--- a/addons/product/process/product_process.xml
+++ b/addons/product/process/product_process.xml
@@ -8,6 +8,7 @@
         
         <record id="process_process_productworkflow0" model="process.process">
             <field eval="1" name="active"/>
+            <field name="model_id" ref="product.model_product_product"/>
             <field eval="&quot;&quot;&quot;Product Workflow&quot;&quot;&quot;" name="name"/>
         </record>
         
diff --git a/addons/project/process/task_process.xml b/addons/project/process/task_process.xml
index 8dfc3a340d3..f713baad82e 100755
--- a/addons/project/process/task_process.xml
+++ b/addons/project/process/task_process.xml
@@ -8,6 +8,7 @@
     
         <record id="process_process_tasksworkflow0" model="process.process">
             <field eval="1" name="active"/>
+            <field name="model_id" ref="project.model_project_task"/>
             <field eval="&quot;&quot;&quot;Tasks workflow&quot;&quot;&quot;" name="name"/>
         </record>
         
diff --git a/addons/purchase/process/purchase_process.xml b/addons/purchase/process/purchase_process.xml
index 38a2fce7460..8893d0b9df8 100755
--- a/addons/purchase/process/purchase_process.xml
+++ b/addons/purchase/process/purchase_process.xml
@@ -8,6 +8,7 @@
         
         <record id="process_process_purchaseworkflow0" model="process.process">
             <field eval="1" name="active"/>
+            <field name="model_id" ref="purchase.model_purchase_order"/>
             <field eval="&quot;&quot;&quot;Purchase Workflow&quot;&quot;&quot;" name="name"/>
         </record>
         
diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml
index 46e13d1d6d2..5c98b95dd48 100755
--- a/addons/sale/process/sale_process.xml
+++ b/addons/sale/process/sale_process.xml
@@ -8,6 +8,7 @@
     
         <record id="process_process_salesworkflow0" model="process.process">
             <field eval="1" name="active"/>
+            <field name="model_id" ref="sale.model_sale_order"/>
             <field eval="&quot;&quot;&quot;Sales Workflow&quot;&quot;&quot;" name="name"/>
         </record>