diff --git a/addons/account/process/customer_invoice_process.xml b/addons/account/process/customer_invoice_process.xml
index be50089cc9d..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>
@@ -60,7 +59,7 @@
         </record>
     
         <record id="process_node_bankstatement0" model="process.node">
-            <field name="menu_id" ref="account.menu_bank_statement_tree2"/>
+            <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;Bank Statement&quot;&quot;&quot;" name="name"/>
diff --git a/addons/account/process/statement_process.xml b/addons/account/process/statement_process.xml
index 9fa1bf6becb..d0105f76e03 100755
--- a/addons/account/process/statement_process.xml
+++ b/addons/account/process/statement_process.xml
@@ -16,7 +16,7 @@
     -->
     
         <record id="process_node_electronicfile0" model="process.node">
-            <field name="menu_id" ref="account.menu_bank_statement_tree2"/>
+            <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;Electronic File&quot;&quot;&quot;" name="name"/>
@@ -27,7 +27,7 @@
         </record>
         
         <record id="process_node_manually0" model="process.node">
-            <field name="menu_id" ref="account.menu_bank_statement_tree2"/>
+            <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;Manually&quot;&quot;&quot;" name="name"/>
@@ -38,7 +38,7 @@
         </record>
     
         <record id="process_node_importinvoice0" model="process.node">
-            <field name="menu_id" ref="account.menu_bank_statement_tree2"/>
+            <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;Import invoice&quot;&quot;&quot;" name="name"/>
@@ -49,7 +49,7 @@
         </record>
     
         <record id="process_node_draftstatement0" model="process.node">
-            <field name="menu_id" ref="account.menu_bank_statement_tree2"/>
+            <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;Draft statement&quot;&quot;&quot;" name="name"/>
@@ -65,6 +65,7 @@
             <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"/>
diff --git a/addons/account/process/supplier_invoice_process.xml b/addons/account/process/supplier_invoice_process.xml
index ef335146fa9..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"/>
@@ -38,14 +49,14 @@
         </record>
         
         <record id="process_node_supplierbankstatement0" model="process.node">
-            <field name="menu_id" ref="account.menu_bank_statement_tree2"/>
+            <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;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 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/base_module_publish/wizard/module_zip.py b/addons/base_module_publish/wizard/module_zip.py
index c3d04ceb5c4..569423e7c87 100644
--- a/addons/base_module_publish/wizard/module_zip.py
+++ b/addons/base_module_publish/wizard/module_zip.py
@@ -42,7 +42,7 @@ def _zippy(archive, fromurl, path, src=True):
         else:
             exclude = ['py','pyo','pyc']
         if (path.split('.')[-1] not in exclude) or (os.path.basename(path)=='__terp__.py'):
-            archive.write(os.path.join(fromurl, path).encode(), path.encode())
+            archive.write(os.path.join(fromurl, path).encode('utf8'), path.encode('utf8'))
     return True
 
 def createzip(cr, uid, moduleid, context, b64enc=True, src=True):
@@ -60,7 +60,7 @@ def createzip(cr, uid, moduleid, context, b64enc=True, src=True):
     if os.path.isdir(os.path.join(ad, name)):
         archname = StringIO.StringIO('wb')
         archive = PyZipFile(archname, "w", ZIP_DEFLATED)
-        archive.writepy(os.path.join(ad, name).encode())
+        archive.writepy(os.path.join(ad, name).encode('utf8'))
         _zippy(archive, ad, name, src=src)
         archive.close()
         val =archname.getvalue()
diff --git a/addons/base_module_publish/wizard/wizard_module_export.py b/addons/base_module_publish/wizard/wizard_module_export.py
index 0c8bf2f0266..64195741759 100644
--- a/addons/base_module_publish/wizard/wizard_module_export.py
+++ b/addons/base_module_publish/wizard/wizard_module_export.py
@@ -52,7 +52,7 @@ finish_fields = {
 
 class move_module_wizard(wizard.interface):
     def createzip(self, cr, uid, data, context):
-        return module_zip.createzip(cr, uid, data['id'], context, src=data['form']['include_src'])
+       return module_zip.createzip(cr, uid, data['id'], context, src=data['form']['include_src'])
 
     states = {
         'init': {
diff --git a/addons/board_crm_configuration/board_crm_view.xml b/addons/board_crm_configuration/board_crm_view.xml
index 6672e13b2b1..2508f15e1ef 100644
--- a/addons/board_crm_configuration/board_crm_view.xml
+++ b/addons/board_crm_configuration/board_crm_view.xml
@@ -22,7 +22,7 @@
 			<field name="view_type">form</field>
 			<field name="view_mode">tree,form</field>
 			<field name="view_id" ref="crm_configuration.crm_case_tree_view_leads"/>
-			<field name="domain">[('section_id', '=', 'Leads'),('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]</field>
+			<field name="domain">[('section_id.name', '=', 'Leads'),('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]</field>
 		</record>
 
 		<record model="ir.actions.act_window" id="act_my_meetings">
@@ -30,7 +30,7 @@
 			<field name="view_type">form</field>
 			<field name="view_mode">tree,form</field>
 			<field name="view_id" ref="crm_configuration.crm_case_tree_view_meet"/>
-			<field name="domain">[('section_id', '=', 'Meetings'),('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]</field>
+			<field name="domain">[('section_id.name', '=', 'Meetings'),('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]</field>
 		</record>
 			
 		<act_window name="My Cases"
@@ -45,7 +45,7 @@
 			<field name="view_type">form</field>
 			<field name="view_mode">graph,tree,form</field>
 			<field name="view_id" ref="view_crm_lead_stage_graph1"/>
-			<field name="domain">[('section_id', '=', 'Leads'),('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]</field>
+			<field name="domain">[('section_id.name', '=', 'Leads'),('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]</field>
 		</record>
 					
 		<record model="ir.actions.act_window" id="act_sales_pipeline">
@@ -53,7 +53,7 @@
 			<field name="view_type">form</field>
 			<field name="view_mode">graph,tree,form</field>
 			<field name="view_id" ref="view_crm_case_user_graph1"/>
-			<field name="domain">[('section_id', '=', 'Opportunities'),('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]</field>
+			<field name="domain">[('section_id.name', '=', 'Opportunities'),('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]</field>
 		</record>	
 		
 		<record model="ir.actions.act_window" id="act_jobs_requests">
@@ -61,7 +61,7 @@
 			<field name="view_type">form</field>
 			<field name="view_mode">graph,tree,form</field>
 			<field name="view_id" ref="view_crm_case_user_graph1"/>
-			<field name="domain">[('section_id','=','Jobs'),('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]</field>
+			<field name="domain">[('section_id.name','=','Jobs'),('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]</field>
 		</record>
 					
 		<record model="ir.ui.view" id="board_crm_form">
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 7ba7c6d0337..b1451e7b90a 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -181,6 +181,7 @@ class crm_case_section(osv.osv):
                     'object': True
                 })
         return True
+    
     def name_get(self, cr, uid, ids, context={}):
         if not len(ids):
             return []
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 c07d8deffcf..390e572c52b 100755
--- a/addons/hr_timesheet_project/process/hr_timesheet_project_process.xml
+++ b/addons/hr_timesheet_project/process/hr_timesheet_project_process.xml
@@ -10,7 +10,7 @@
             <field name="menu_id" ref="hr_timesheet.menu_act_hr_timesheet_line_evry1_today_form"/>
             <field name="model_id" ref="hr.model_hr_timesheet"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Timesheet_task&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Timesheet task&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Complete Your Timesheet.&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="project.process_process_tasksworkflow0"/>
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
@@ -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/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index 78aec8304bf..6965274dca1 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -635,7 +635,7 @@ class hr_timesheet_sheet_sheet_account(osv.osv):
         'sheet_id': fields.many2one('hr_timesheet_sheet.sheet', 'Sheet', readonly=True),
         'total': fields.float('Total Time', digits=(16,2), readonly=True),
         'invoice_rate': fields.many2one('hr_timesheet_invoice.factor', 'Invoice rate', readonly=True),
-    }
+        }
 
     def init(self, cr):
         cr.execute("""create or replace view hr_timesheet_sheet_sheet_account as (
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 1f467a1c2e2..a664be5e1ee 100755
--- a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml
+++ b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml
@@ -41,8 +41,9 @@
             <field name="menu_id" ref="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current"/>
             <field name="model_id" ref="hr_timesheet_sheet.model_hr_timesheet_sheet_sheet"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Timesheet Confirming&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Timesheet&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Timesheet sheet confirm at the end of the period&quot;&quot;&quot;" name="note"/>
+            <field name="subflow_id" ref="process_process_hrtimesheetworkflow0"/>
             <field name="process_id" ref="hr_timesheet.process_process_timesheetworkflow0"/>
             <field eval="&quot;&quot;&quot;object.state=='confirm'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
@@ -72,7 +73,6 @@
     
             
         <record id="process_node_attendance0" model="process.node">
-            <field name="menu_id" ref="hr_attendance.menu_si_so"/>
             <field name="model_id" ref="hr.model_hr_employee"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Attendance&quot;&quot;&quot;" name="name"/>
@@ -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/__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 9724c5c28f1..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"/>
@@ -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,12 +47,13 @@
 			<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"/>
+			<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,99 +62,22 @@
 		<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_maketostock0" 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_stockablestock0" 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_stockableorder0" 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 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">
-			<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_requestforquotation1" 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_productionorder1" 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;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_requestforquotation2" 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"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Procurements&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Procurement orders&quot;&quot;&quot;" name="note"/>
+            <field name="subflow_id" ref="process_process_procurementworkflow0"/>
             <field name="process_id" ref="purchase.process_process_purchaseworkflow0"/>
             <field eval="1" name="flow_start"/>
         </record>
@@ -171,7 +95,7 @@
         <record id="process_node_routing0" model="process.node">
             <field name="menu_id" ref="mrp.menu_mrp_routing_action"/>
             <field name="model_id" ref="mrp.model_mrp_routing"/>
-            <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;Routing&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Define a routing to describe the manufacturing steps.&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="product.process_process_productworkflow0"/>
@@ -215,7 +139,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>
 	
@@ -228,69 +152,6 @@
 			<field model="process.node" name="source_node_id" ref="process_node_procureproducts0"/>
 		</record>
 	
-		<record id="process_transition_stockablemaketostock0" 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"/>
-		</record>
-	
-		<record id="process_transition_stockableproductstock0" 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"/>
-		</record>
-	
-		<record id="process_transition_serivcestockableorder0" 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="source_node_id" ref="process_node_serviceproduct0"/>
-		</record>
-	
-		<record id="process_transition_servicemaketostock0" 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="source_node_id" ref="process_node_serviceproduct0"/>
-		</record>
-	
-		<record id="process_transition_stockablerequest0" 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"/>
-		</record>
-	
-		<record id="process_transition_stockableproductionorder0" 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"/>
-		</record>
-	
-		<record id="process_transition_stockableorderrequest0" 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"/>
-		</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/product/__terp__.py b/addons/product/__terp__.py
index bbc4d667b75..1742af513ba 100644
--- a/addons/product/__terp__.py
+++ b/addons/product/__terp__.py
@@ -48,7 +48,8 @@
     "update_xml" : [
         "security/product_security.xml",
         "security/ir.model.access.csv",
-        "product_data.xml","product_report.xml",
+        "product_data.xml",
+        "product_report.xml",
         "product_view.xml", "pricelist_view.xml",
         "partner_view.xml", "product_wizard.xml",
         "process/product_process.xml"
diff --git a/addons/product/report/product_label.xsl b/addons/product/report/product_label.xsl
index f76cea07e94..81d317c0fb7 100644
--- a/addons/product/report/product_label.xsl
+++ b/addons/product/report/product_label.xsl
@@ -70,7 +70,6 @@
 				</td>
 			</tr><tr>
 				<td>
-					<barCode><xsl:value-of select="ean13"/></barCode>
 				</td><td>
 					<para style="nospace"><xsl:value-of select="product"/></para><xsl:text>, </xsl:text>
 					<para style="nospace"><xsl:value-of select="variant"/></para>
diff --git a/addons/project/process/task_process.xml b/addons/project/process/task_process.xml
index 945db0e3498..8dfc3a340d3 100755
--- a/addons/project/process/task_process.xml
+++ b/addons/project/process/task_process.xml
@@ -64,8 +64,8 @@
             <field name="model_id" ref="account.model_account_invoice"/>
             <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" search="[('name','=','sale.order.basic')]"/>
-            <field eval="&quot;&quot;&quot;Trigger invoices from sale order lines (sale subflow)&quot;&quot;&quot;" name="note"/>
+            <field name="subflow_id" ref="account.process_process_invoiceworkflow0"/>
+            <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 d4d44f374e3..7082deef237 100755
--- a/addons/project_mrp/process/project_mrp_process.xml
+++ b/addons/project_mrp/process/project_mrp_process.xml
@@ -21,21 +21,22 @@
         <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;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;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&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"/>
             <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"/>
@@ -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 dae58ba269a..38a2fce7460 100755
--- a/addons/purchase/process/purchase_process.xml
+++ b/addons/purchase/process/purchase_process.xml
@@ -14,6 +14,17 @@
         <!--        
             Process Node
         -->
+        
+        <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;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="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"/>
+        </record>
     
         <record id="process_node_purchaseorder0" model="process.node">
             <field name="menu_id" ref="purchase.menu_purchase_form_action"/>
@@ -31,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"/>
@@ -41,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"/>
@@ -78,7 +89,7 @@
             <field eval="&quot;&quot;&quot;Draft Invoice&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Pre-generated supplier invoice to control based on order&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_purchaseworkflow0"/>
-            <field name="subflow_id" ref="account.process_process_invoiceworkflow0"/>
+            <field name="subflow_id" ref="account.process_process_supplierinvoiceworkflow0"/>
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
         </record>
@@ -101,11 +112,23 @@
             <field eval="&quot;&quot;&quot;Draft Invoice&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Supplier Invoice pre-generated on receptions for control&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_purchaseworkflow0"/>
-            <field name="subflow_id" ref="account.process_process_invoiceworkflow0"/>
+            <field name="subflow_id" ref="account.process_process_supplierinvoiceworkflow0"/>
             <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_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     
         -->
@@ -139,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"/>
@@ -205,6 +237,15 @@
             <field model="process.node" name="source_node_id" ref="process_node_purchaseorder0"/>
         </record>
         
+        <record id="process_transition_packinginvoice0" model="process.transition">
+            <field eval="[(6,0,[])]" name="role_ids"/>
+            <field eval="[(6,0,[])]" name="transition_ids"/>
+            <field eval="&quot;&quot;&quot;Packing Invoice&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;From Packing list, Create invoice.&quot;&quot;&quot;" name="note"/>
+            <field model="process.node" name="target_node_id" ref="account.process_node_draftinvoices0"/>
+            <field model="process.node" name="source_node_id" ref="process_node_packinginvoice0"/>
+        </record>
+        
         <!--        
             Process Action
         -->
diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml
index d371081d2c3..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"/>
@@ -66,6 +67,7 @@
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Procurement&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;One procurement for each product.&quot;&quot;&quot;" name="note"/>
+            <field name="subflow_id" ref="mrp.process_process_procurementworkflow0"/>
             <field name="process_id" ref="process_process_salesworkflow0"/>
             <field eval="&quot;&quot;&quot;object.state=='confirmed'&quot;&quot;&quot;" name="model_states"/>
             <field eval="1" name="flow_start"/>
diff --git a/addons/sale_crm/process/sale_crm_process.xml b/addons/sale_crm/process/sale_crm_process.xml
index 6ea2f7e3ede..861d21672ac 100755
--- a/addons/sale_crm/process/sale_crm_process.xml
+++ b/addons/sale_crm/process/sale_crm_process.xml
@@ -22,6 +22,7 @@
 			<field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
 			<field eval="&quot;&quot;&quot;CRM Opportunity&quot;&quot;&quot;" name="name"/>
 			<field eval="&quot;&quot;&quot;The CRM Opportunity can lead to a quotation.&quot;&quot;&quot;" name="note"/>
+			<field name="subflow_id" ref="crm_configuration.process_process_contractworkflow0"/>
 			<field name="process_id" ref="sale.process_process_salesworkflow0"/>
 			<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"/>
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 8dce029be20..00000000000
--- a/addons/stock/process/stock_process.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" ?>
-<openerp>
-    <data>	
-				
-		<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;Out Packing&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Invoice based on deliveries&quot;&quot;&quot;" name="note"/>
-            <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"/>
-        </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 Recept&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>
-        
-        <record id="process_transition_packinginvoice0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
-            <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Packing Invoice&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;From Packing list, Create invoice.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="account.process_node_draftinvoices0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_packinginvoice0"/>
-        </record>
-       
-	</data>
-</openerp>
-    
\ No newline at end of file