diff --git a/addons/.pydevproject b/addons/.pydevproject
new file mode 100644
index 00000000000..78259a9c3db
--- /dev/null
+++ b/addons/.pydevproject
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?eclipse-pydev version="1.0"?>
+
+<pydev_project>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.4</pydev_property>
+</pydev_project>
diff --git a/addons/account/__terp__.py b/addons/account/__terp__.py
index bed1cc2a0b6..01d9f9e499f 100644
--- a/addons/account/__terp__.py
+++ b/addons/account/__terp__.py
@@ -66,7 +66,7 @@
         "project/project_report.xml",
         "product_view.xml",
         "account_assert_test.xml",
-        "process/invoice_process.xml"
+        "process/invoice_process.xml",
         "process/statement_process.xml"
     ],
     "translations" : {
diff --git a/addons/account/process/invoice_process.xml b/addons/account/process/invoice_process.xml
index 7e8e3ef7c7a..e38d3d8b288 100644
--- a/addons/account/process/invoice_process.xml
+++ b/addons/account/process/invoice_process.xml
@@ -16,28 +16,6 @@
 			Process	Node
 		-->
 	
-		<record id="process_node_order0" 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;subflow&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;Order&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;After confirming order, Create the invoice.&quot;&quot;&quot;" name="note"/>
-			<field name="process_id" ref="process_process_invoiceworkflow0"/>
-			<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_purchaseorder0" 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;Purchase Order&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;After confirming purchase order, it is approved by supplier.&quot;&quot;&quot;" name="note"/>
-			<field name="process_id" ref="process_process_invoiceworkflow0"/>
-			<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_analytic0" model="process.node">
 			<field name="menu_id" ref="account.account_analytic_def_account"/>
 			<field name="model_id" ref="account.model_account_analytic_account"/>
@@ -129,24 +107,6 @@
 			Process	Transition
 		-->
 	
-		<record id="process_transition_saleinvoice0" model="process.transition">
-			<field eval="[(6,0,[])]" name="role_ids"/>
-			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Sale Invoice&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;Confirm sale order and Create invoice.&quot;&quot;&quot;" name="note"/>
-			<field model="process.node" name="target_node_id" search="[('name','=','Draft Invoices')]"/>
-			<field model="process.node" name="source_node_id" search="[('name','=','Order')]"/>
-		</record>
-	
-		<record id="process_transition_purchaseinvoice0" model="process.transition">
-			<field eval="[(6,0,[])]" name="role_ids"/>
-			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Purchase Invoice&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;After Purchase order , Create invoice.&quot;&quot;&quot;" name="note"/>
-			<field model="process.node" name="target_node_id" search="[('name','=','Draft Invoices')]"/>
-			<field model="process.node" name="source_node_id" search="[('name','=','Purchase Order')]"/>
-		</record>
-	
 		<record id="process_transition_analyticinvoice0" model="process.transition">
 			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
diff --git a/addons/hr_timesheet/process/hr_timesheet_process.xml b/addons/hr_timesheet/process/hr_timesheet_process.xml
index 9af5f1453a3..157ffc09deb 100644
--- a/addons/hr_timesheet/process/hr_timesheet_process.xml
+++ b/addons/hr_timesheet/process/hr_timesheet_process.xml
@@ -12,124 +12,5 @@
 			<field eval="&quot;&quot;&quot;Timesheet Workflow&quot;&quot;&quot;" name="name"/>
 		</record>
 		
-		<!--		
-			Process Node
-		-->
-	
-		<record id="process_node_phonecall0" model="process.node">
-			<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;state&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;Phone call&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;Whatever time u spent for phone call&quot;&quot;&quot;" name="note"/>
-			<field name="process_id" ref="process_process_timesheetworkflow0"/>
-			<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_taskwork0" model="process.node">
-			<field name="menu_id" ref="project.menu_action_view_task6"/>
-			<field name="model_id" ref="project.model_project_task_work"/>
-			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;Task Work&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;Work on task&quot;&quot;&quot;" name="note"/>
-			<field name="process_id" ref="process_process_timesheetworkflow0"/>
-			<field eval="&quot;&quot;&quot;object.state=='open'&quot;&quot;&quot;" name="model_states"/>
-			<field eval="1" name="flow_start"/>
-		</record>
-	
-		<record id="process_node_timesheetline0" model="process.node">
-			<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;state&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;Timesheet Line&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;Encode your timesheet line&quot;&quot;&quot;" name="note"/>
-			<field name="process_id" ref="process_process_timesheetworkflow0"/>
-			<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_analyticcost0" model="process.node">
-			<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;state&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;Analytic cost&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;Analytic cost is created&quot;&quot;&quot;" name="note"/>
-			<field name="process_id" ref="process_process_timesheetworkflow0"/>
-			<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_review0" model="process.node">
-			<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;state&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;Review&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;Review end of day check day is complete&quot;&quot;&quot;" name="note"/>
-			<field name="process_id" ref="process_process_timesheetworkflow0"/>
-			<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_timesheetconfirming0" model="process.node">
-			<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 sheet confirm at the end of the period&quot;&quot;&quot;" name="note"/>
-			<field name="process_id" ref="process_process_timesheetworkflow0"/>
-			<field eval="&quot;&quot;&quot;object.state=='confirm'&quot;&quot;&quot;" name="model_states"/>
-			<field eval="0" name="flow_start"/>
-		</record>
-	
-		<!--		
-			Process Transition
-		-->
-	
-		<record id="process_transition_phonecallencoding0" model="process.transition">
-			<field eval="[(6,0,[])]" name="role_ids"/>
-			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Phone call encoding&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;Encode how much time u spent on phone call&quot;&quot;&quot;" name="note"/>
-			<field model="process.node" name="target_node_id" search="[('name','=','Timesheet Line')]"/>
-			<field model="process.node" name="source_node_id" search="[('name','=','Phone call')]"/>
-		</record>
-	
-		<record id="process_transition_taskencoding0" model="process.transition">
-			<field eval="[(6,0,[])]" name="role_ids"/>
-			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Task encoding&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;Encode how much time u spent on your task&quot;&quot;&quot;" name="note"/>
-			<field model="process.node" name="target_node_id" search="[('name','=','Timesheet Line')]"/>
-			<field model="process.node" name="source_node_id" search="[('name','=','Task Work')]"/>
-		</record>
-	
-		<record id="process_transition_createanalyticcose0" model="process.transition">
-			<field eval="[(6,0,[])]" name="role_ids"/>
-			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Create Analytic cose&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;Creates your analytic cose accoording to quantity&quot;&quot;&quot;" name="note"/>
-			<field model="process.node" name="target_node_id" search="[('name','=','Analytic cost')]"/>
-			<field model="process.node" name="source_node_id" search="[('name','=','Timesheet Line')]"/>
-		</record>
-	
-		<record id="process_transition_reviewofwork0" model="process.transition">
-			<field eval="[(6,0,[])]" name="role_ids"/>
-			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Review of work&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;Review of your work at the end of the day&quot;&quot;&quot;" name="note"/>
-			<field model="process.node" name="target_node_id" search="[('name','=','Review')]"/>
-			<field model="process.node" name="source_node_id" search="[('name','=','Timesheet Line')]"/>
-		</record>
-	
-		<record id="process_transition_confirmtimesheetsheet0" model="process.transition">
-			<field eval="[(6,0,[])]" name="role_ids"/>
-			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Confirm timesheet sheet&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;Confirm timesheet at the end of the period&quot;&quot;&quot;" name="note"/>
-			<field model="process.node" name="target_node_id" search="[('name','=','Timesheet Confirming')]"/>
-			<field model="process.node" name="source_node_id" search="[('name','=','Review')]"/>
-		</record>
-
 	</data>
 </openerp>
\ No newline at end of file
diff --git a/addons/hr_timesheet_project/__terp__.py b/addons/hr_timesheet_project/__terp__.py
index bc2db6c0d8c..06922784d56 100644
--- a/addons/hr_timesheet_project/__terp__.py
+++ b/addons/hr_timesheet_project/__terp__.py
@@ -33,8 +33,8 @@
     "category" : "Generic Modules/Human Resources",
     "description": """Auto-complete timesheet based on tasks made on the project management module.""",
     "website" : "http://tinyerp.com/module_hr.html",
-    "depends" : ["project", "hr_timesheet"],
-    "update_xml" : ["hr_timesheet_project_view.xml"],
+    "depends" : ["project", "hr_timesheet_sheet"],
+    "update_xml" : ["hr_timesheet_project_view.xml", "process/hr_timesheet_project_process.xml"],
     "active": False,
     "installable": True
 }
diff --git a/addons/hr_timesheet_project/process/hr_timesheet_project_process.xml b/addons/hr_timesheet_project/process/hr_timesheet_project_process.xml
new file mode 100644
index 00000000000..5c96a0c8239
--- /dev/null
+++ b/addons/hr_timesheet_project/process/hr_timesheet_project_process.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" ?>
+<openerp>
+	<data>
+	
+		<!-- 
+			Process Node
+		-->		
+		
+		<record id="process_node_timesheettask0" model="process.node">
+			<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;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"/>
+			<field eval="0" name="flow_start"/>
+		</record>
+		
+		<record id="process_node_workontask0" 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;state&quot;&quot;&quot;" name="kind"/>
+			<field eval="&quot;&quot;&quot;Work on Task&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Defines the work summary of task&quot;&quot;&quot;" name="note"/>
+			<field name="process_id" ref="hr_timesheet_sheet.process_process_hrtimesheetworkflow0"/>
+			<field eval="&quot;&quot;&quot;object.state in ('open', pending', 'done', 'cancelled')&quot;&quot;&quot;" name="model_states"/>
+			<field eval="1" name="flow_start"/>
+		</record>
+		
+		<record id="process_node_taskwork0" model="process.node">
+			<field name="menu_id" ref="project.menu_action_view_task6"/>
+			<field name="model_id" ref="project.model_project_task_work"/>
+			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
+			<field eval="&quot;&quot;&quot;Task Work&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;Work on task&quot;&quot;&quot;" name="note"/>
+			<field name="process_id" ref="hr_timesheet.process_process_timesheetworkflow0"/>
+			<field eval="&quot;&quot;&quot;object.state=='open'&quot;&quot;&quot;" name="model_states"/>
+			<field eval="1" name="flow_start"/>
+		</record>
+		
+		<!-- 
+			Process Transition
+		-->
+		
+		<record id="process_transition_filltimesheet0" model="process.transition">
+			<field eval="[(6,0,[])]" name="role_ids"/>
+			<field eval="[(6,0,[])]" name="transition_ids"/>
+			<field eval="&quot;&quot;&quot;Fill Timesheet&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;Task summary is comes into the timesheet line&quot;&quot;&quot;" name="note"/>
+			<field model="process.node" name="target_node_id" search="[('name','=','Timesheet_task')]"/>
+			<field model="process.node" name="source_node_id" search="[('name','=','Open task')]" ref="project.process_node_opentask0"/>
+		</record>
+		
+		<record id="process_transition_taskencoding0" model="process.transition">
+			<field eval="[(6,0,[])]" name="role_ids"/>
+			<field eval="[(6,0,[])]" name="transition_ids"/>
+			<field eval="&quot;&quot;&quot;Task encoding&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;Encode how much time u spent on your task&quot;&quot;&quot;" name="note"/>
+			<field model="process.node" name="target_node_id" search="[('name','=','Timesheet Line')]" ref="hr_timesheet_sheet.process_node_timesheetline0"/>
+			<field model="process.node" name="source_node_id" search="[('name','=','Task Work')]" ref="project.process_node_taskwork0"/>
+		</record>
+		
+		<record id="process_transition_tasktimesheet0" model="process.transition">
+			<field eval="[(6,0,[])]" name="role_ids"/>
+			<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" search="[('name','=','Timesheet')]"/>
+			<field model="process.node" name="source_node_id" search="[('name','=','Work on Task')]"/>
+		</record>
+		
+	</data>
+</openerp>
+	
\ No newline at end of file
diff --git a/addons/hr_timesheet_sheet/__terp__.py b/addons/hr_timesheet_sheet/__terp__.py
index 19419f71dd1..f09a7d63978 100644
--- a/addons/hr_timesheet_sheet/__terp__.py
+++ b/addons/hr_timesheet_sheet/__terp__.py
@@ -58,7 +58,7 @@ The validation can be configured in te company:
         "security/ir.model.access.csv",
         "hr_timesheet_sheet_view.xml",
         "hr_timesheet_workflow.xml",
-        "process/hr_timesheet_sheet_process.xml"
+        "process/hr_timesheet_sheet_process.xml",
     ],
     "active": False,
     "installable": True
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 8ba8e0392d9..2e59204aa30 100644
--- a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml
+++ b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml
@@ -15,18 +15,63 @@
 		<!-- 
 			Process Node
 		-->
-			
-		<record id="process_node_workontask0" model="process.node">
-			<field name="menu_id" ref="project.menu_action_view_task"/>
-			<field name="model_id" ref="project.model_project_task"/>
+		
+		<record id="process_node_analyticcost0" model="process.node">
+			<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;state&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;Work on Task&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Defines the work summary of task&quot;&quot;&quot;" name="note"/>
-			<field name="process_id" ref="process_process_hrtimesheetworkflow0"/>
-			<field eval="&quot;&quot;&quot;object.state in ('open', pending', 'done', 'cancelled')&quot;&quot;&quot;" name="model_states"/>
+			<field eval="&quot;&quot;&quot;Analytic cost&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;Analytic cost is created&quot;&quot;&quot;" name="note"/>
+			<field name="process_id" ref="hr_timesheet.process_process_timesheetworkflow0"/>
+			<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_review0" model="process.node">
+			<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;state&quot;&quot;&quot;" name="kind"/>
+			<field eval="&quot;&quot;&quot;Review&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;Review end of day check day is complete&quot;&quot;&quot;" name="note"/>
+			<field name="process_id" ref="hr_timesheet.process_process_timesheetworkflow0"/>
+			<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_timesheetconfirming0" model="process.node">
+			<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 sheet confirm at the end of the period&quot;&quot;&quot;" name="note"/>
+			<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"/>
+		</record>
+		
+		<record id="process_node_timesheetline0" model="process.node">
+			<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;state&quot;&quot;&quot;" name="kind"/>
+			<field eval="&quot;&quot;&quot;Timesheet Line&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;Encode your timesheet line&quot;&quot;&quot;" name="note"/>
+			<field name="process_id" ref="hr_timesheet.process_process_timesheetworkflow0"/>
+			<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_phonecall0" model="process.node">
+			<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;state&quot;&quot;&quot;" name="kind"/>
+			<field eval="&quot;&quot;&quot;Phone call&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;Whatever time u spent for phone call&quot;&quot;&quot;" name="note"/>
+			<field name="process_id" ref="hr_timesheet.process_process_timesheetworkflow0"/>
+			<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_attendance0" model="process.node">
 			<field name="menu_id" ref="hr_attendance.menu_si_so"/>
 			<field name="model_id" ref="hr.model_hr_employee"/>
@@ -96,15 +141,6 @@
 			Process Transition
 		-->
 	
-		<record id="process_transition_tasktimesheet0" model="process.transition">
-			<field eval="[(6,0,[])]" name="role_ids"/>
-			<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" search="[('name','=','Timesheet')]"/>
-			<field model="process.node" name="source_node_id" search="[('name','=','Work on Task')]"/>
-		</record>
-	
 		<record id="process_transition_attendance0" model="process.transition">
 			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
@@ -149,6 +185,42 @@
 			<field model="process.node" name="target_node_id" search="[('name','=','Invoice on Work')]"/>
 			<field model="process.node" name="source_node_id" search="[('name','=','Confirmed Timesheet')]"/>
 		</record>
-
+		
+		<record id="process_transition_phonecallencoding0" model="process.transition">
+			<field eval="[(6,0,[])]" name="role_ids"/>
+			<field eval="[(6,0,[])]" name="transition_ids"/>
+			<field eval="&quot;&quot;&quot;Phone call encoding&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;Encode how much time u spent on phone call&quot;&quot;&quot;" name="note"/>
+			<field model="process.node" name="target_node_id" search="[('name','=','Timesheet Line')]" ref="process_node_timesheetline0"/>
+			<field model="process.node" name="source_node_id" search="[('name','=','Phone call')]"/>
+		</record>
+		
+		<record id="process_transition_createanalyticcose0" model="process.transition">
+			<field eval="[(6,0,[])]" name="role_ids"/>
+			<field eval="[(6,0,[])]" name="transition_ids"/>
+			<field eval="&quot;&quot;&quot;Create Analytic cose&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;Creates your analytic cose accoording to quantity&quot;&quot;&quot;" name="note"/>
+			<field model="process.node" name="target_node_id" search="[('name','=','Analytic cost')]"/>
+			<field model="process.node" name="source_node_id" search="[('name','=','Timesheet Line')]"/>
+		</record>
+	
+		<record id="process_transition_reviewofwork0" model="process.transition">
+			<field eval="[(6,0,[])]" name="role_ids"/>
+			<field eval="[(6,0,[])]" name="transition_ids"/>
+			<field eval="&quot;&quot;&quot;Review of work&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;Review of your work at the end of the day&quot;&quot;&quot;" name="note"/>
+			<field model="process.node" name="target_node_id" search="[('name','=','Review')]"/>
+			<field model="process.node" name="source_node_id" search="[('name','=','Timesheet Line')]"/>
+		</record>
+	
+		<record id="process_transition_confirmtimesheetsheet0" model="process.transition">
+			<field eval="[(6,0,[])]" name="role_ids"/>
+			<field eval="[(6,0,[])]" name="transition_ids"/>
+			<field eval="&quot;&quot;&quot;Confirm timesheet sheet&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;Confirm timesheet at the end of the period&quot;&quot;&quot;" name="note"/>
+			<field model="process.node" name="target_node_id" search="[('name','=','Timesheet Confirming')]"/>
+			<field model="process.node" name="source_node_id" search="[('name','=','Review')]"/>
+		</record>
+		
 	</data>
 </openerp>
\ No newline at end of file
diff --git a/addons/mrp/__terp__.py b/addons/mrp/__terp__.py
index ea672858ebc..3f4b301fe11 100644
--- a/addons/mrp/__terp__.py
+++ b/addons/mrp/__terp__.py
@@ -70,7 +70,7 @@
         "mrp_wizard.xml", 
         "mrp_report.xml",
         "company_view.xml",
-        "process/procurement_process.xml"
+        "process/procurement_process.xml",
     ],
     "active": False,
     "installable": True
diff --git a/addons/mrp/process/procurement_process.xml b/addons/mrp/process/procurement_process.xml
index 73e12053143..f0eae8dd157 100644
--- a/addons/mrp/process/procurement_process.xml
+++ b/addons/mrp/process/procurement_process.xml
@@ -15,6 +15,37 @@
 		<!--
 			Process	Node
 		-->	
+		
+		<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;state&quot;&quot;&quot;" name="kind"/>
+			<field eval="&quot;&quot;&quot;Minimum stock rule&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;Create minimum stock rules&quot;&quot;&quot;" name="note"/>
+			<field name="process_id" ref="product.process_process_productworkflow0"/>
+			<field eval="0" name="flow_start"/>
+		</record>
+		
+		<record id="process_node_billofmaterial0" model="process.node">
+			<field name="menu_id" ref="mrp.menu_mrp_bom_form_action"/>
+			<field name="model_id" ref="mrp.model_mrp_bom"/>
+			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
+			<field eval="&quot;&quot;&quot;Bill of Material&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;Defines Bill of materials&quot;&quot;&quot;" name="note"/>
+			<field name="process_id" ref="product.process_process_productworkflow0"/>
+			<field eval="0" name="flow_start"/>
+		</record>
+		
+		<record id="process_node_procurements0" 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="process_id" ref="purchase.process_process_purchaseworkflow0"/>
+			<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"/>
@@ -27,17 +58,6 @@
 			<field eval="1" name="flow_start"/>
 		</record>
 	
-		<record id="process_node_saleorderprocurement0" 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;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="process_id" ref="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"/>
-		</record>
-	
 		<record id="process_node_procureproducts0" model="process.node">
 			<field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
 			<field name="model_id" ref="mrp.model_mrp_procurement"/>
@@ -93,17 +113,6 @@
 			<field eval="0" name="flow_start"/>
 		</record>
 	
-		<record id="process_node_procuretask0" 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;Procure task&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;If Procure method is produce&quot;&quot;&quot;" name="note"/>
-			<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_stockableproduct0" model="process.node">
 			<field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
 			<field name="model_id" ref="mrp.model_mrp_procurement"/>
@@ -172,15 +181,6 @@
 			<field model="process.node" name="source_node_id" search="[('name','=','Production order')]"/>
 		</record>
 	
-		<record id="process_transition_saleprocurement0" model="process.transition">
-			<field eval="[(6,0,[])]" name="role_ids"/>
-			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Sale Procurement&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;In sale order , procuerement for each line and it comes into the procurement order&quot;&quot;&quot;" name="note"/>
-			<field model="process.node" name="target_node_id" search="[('name','=','Procure Products')]"/>
-			<field model="process.node" name="source_node_id" search="[('name','=','Sale Order Procurement')]"/>
-		</record>
-	
 		<record id="process_transition_procurementservice0" model="process.transition">
 			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
@@ -217,15 +217,6 @@
 			<field model="process.node" name="source_node_id" search="[('name','=','Make to order')]"/>
 		</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" search="[('name','=','Procure task')]"/>
-			<field model="process.node" name="source_node_id" search="[('name','=','Make to order')]"/>
-		</record>
-	
 		<record id="process_transition_procurementstockable0" model="process.transition">
 			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
@@ -270,6 +261,42 @@
 			<field model="process.node" name="target_node_id" search="[('name','=','Stockable production')]"/>
 			<field model="process.node" name="source_node_id" search="[('name','=','Stockable make to order')]"/>
 		</record>
-
+		
+		<record id="process_transition_procurementtopurchase0" model="process.transition">
+			<field eval="[(6,0,[])]" name="role_ids"/>
+			<field eval="[(6,0,[])]" name="transition_ids"/>
+			<field eval="&quot;&quot;&quot;procurement to purchase&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;After procurementing order , it comes into the Draft Purchase Order&quot;&quot;&quot;" name="note"/>
+			<field model="process.node" name="target_node_id" search="[('name','=','Draft Purchase Order')]" ref="purchase.process_node_draftpurchaseorder0"/>
+			<field model="process.node" name="source_node_id" search="[('name','=','Procurements')]"/>
+		</record>
+		
+		<record id="process_transition_producttostockrules0" model="process.transition">
+			<field eval="[(6,0,[])]" name="role_ids"/>
+			<field eval="[(6,0,[])]" name="transition_ids"/>
+			<field eval="&quot;&quot;&quot;Product to stock rules&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;you can see the minimum stock rules from product&quot;&quot;&quot;" name="note"/>
+			<field model="process.node" name="target_node_id" search="[('name','=','Minimum stock rule')]"/>
+			<field model="process.node" name="source_node_id" search="[('name','=','Product')]" ref="product.process_node_product0"/>
+		</record>
+		
+		<record id="process_transition_bom0" model="process.transition">
+			<field eval="[(6,0,[])]" name="role_ids"/>
+			<field eval="[(6,0,[])]" name="transition_ids"/>
+			<field eval="&quot;&quot;&quot;BOM&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;You can see its bill of material which are used to make product&quot;&quot;&quot;" name="note"/>
+			<field model="process.node" name="target_node_id" search="[('name','=','Bill of Material')]"/>
+			<field model="process.node" name="source_node_id" search="[('name','=','Product')]" ref="product.process_node_product0"/>
+		</record>
+		
+		<record id="process_transition_bomtook0" model="process.transition">
+			<field eval="[(6,0,[])]" name="role_ids"/>
+			<field eval="[(6,0,[])]" name="transition_ids"/>
+			<field eval="&quot;&quot;&quot;Bom to Ok&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;Set status of Bill of material to ok&quot;&quot;&quot;" name="note"/>
+			<field model="process.node" name="target_node_id" search="[('name','=','Status ok')]" ref="product.process_node_statusok0"/>
+			<field model="process.node" name="source_node_id" search="[('name','=','Bill of Material')]"/>
+		</record>
+		
 	</data>
 </openerp>
\ No newline at end of file
diff --git a/addons/process/__terp__.py b/addons/process/__terp__.py
index 80008ca6181..ca48fada8a6 100644
--- a/addons/process/__terp__.py
+++ b/addons/process/__terp__.py
@@ -8,14 +8,13 @@
     "description": """
 This module allows you to manage your process for the end-users.
     """,
-    "depends" : ["base", "sale"],
+    "depends" : ["base"],
     "init_xml" : [],
-    "demo_xml" : ['process_demo.xml'],
+    "demo_xml" : [],
     "update_xml" : [
         "security/ir.model.access.csv",
         'process_view.xml',
-        '../sale/process/sale_process.xml'
-    ],
+      ],
     "active": False,
     "installable": True
 }
diff --git a/addons/product/__terp__.py b/addons/product/__terp__.py
index c9e52f9b7e5..0328b8d03e9 100644
--- a/addons/product/__terp__.py
+++ b/addons/product/__terp__.py
@@ -58,7 +58,8 @@
         "product_data.xml","product_report.xml",
         "product_view.xml", "pricelist_view.xml",
         "partner_view.xml", "product_wizard.xml",
-        "process/product_process.xml"],
+        "process/product_process.xml"
+        ],
     "active": False,
     "installable": True
 }
diff --git a/addons/product/process/product_process.xml b/addons/product/process/product_process.xml
index 73d28808133..987f86331ae 100644
--- a/addons/product/process/product_process.xml
+++ b/addons/product/process/product_process.xml
@@ -27,26 +27,6 @@
 			<field eval="1" name="flow_start"/>
 		</record>
 	
-		<record id="process_node_minimumstockrule0" model="process.node">
-			<field name="menu_id" ref="mrp.menu_action_orderpoint_form"/>
-			<field name="model_id" ref="mrp.model_stock_warehouse_orderpoint"/>
-			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;Minimum stock rule&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;Create minimum stock rules&quot;&quot;&quot;" name="note"/>
-			<field name="process_id" ref="process_process_productworkflow0"/>
-			<field eval="0" name="flow_start"/>
-		</record>
-	
-		<record id="process_node_billofmaterial0" model="process.node">
-			<field name="menu_id" ref="mrp.menu_mrp_bom_form_action"/>
-			<field name="model_id" ref="mrp.model_mrp_bom"/>
-			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;Bill of Material&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;Defines Bill of materials&quot;&quot;&quot;" name="note"/>
-			<field name="process_id" ref="process_process_productworkflow0"/>
-			<field eval="0" name="flow_start"/>
-		</record>
-	
 		<record id="process_node_supplier0" model="process.node">
 			<field name="menu_id" ref="product.menu_products"/>
 			<field name="model_id" ref="product.model_product_product"/>
@@ -83,24 +63,6 @@
 		Process Transition	
 	-->
 	
-		<record id="process_transition_producttostockrules0" model="process.transition">
-			<field eval="[(6,0,[])]" name="role_ids"/>
-			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Product to stock rules&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;you can see the minimum stock rules from product&quot;&quot;&quot;" name="note"/>
-			<field model="process.node" name="target_node_id" search="[('name','=','Minimum stock rule')]"/>
-			<field model="process.node" name="source_node_id" search="[('name','=','Product')]"/>
-		</record>
-	
-		<record id="process_transition_bom0" model="process.transition">
-			<field eval="[(6,0,[])]" name="role_ids"/>
-			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;BOM&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;You can see its bill of material which are used to make product&quot;&quot;&quot;" name="note"/>
-			<field model="process.node" name="target_node_id" search="[('name','=','Bill of Material')]"/>
-			<field model="process.node" name="source_node_id" search="[('name','=','Product')]"/>
-		</record>
-	
 		<record id="process_transition_supplierofproduct0" model="process.transition">
 			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
@@ -110,15 +72,6 @@
 			<field model="process.node" name="source_node_id" search="[('name','=','Product')]"/>
 		</record>
 	
-		<record id="process_transition_bomtook0" model="process.transition">
-			<field eval="[(6,0,[])]" name="role_ids"/>
-			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Bom to Ok&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;Set status of Bill of material to ok&quot;&quot;&quot;" name="note"/>
-			<field model="process.node" name="target_node_id" search="[('name','=','Status ok')]"/>
-			<field model="process.node" name="source_node_id" search="[('name','=','Bill of Material')]"/>
-		</record>
-	
 		<record id="process_transition_suppliertook0" model="process.transition">
 			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
diff --git a/addons/project/process/task_process.xml b/addons/project/process/task_process.xml
index 9f5da3b2de0..4fef858fa8e 100644
--- a/addons/project/process/task_process.xml
+++ b/addons/project/process/task_process.xml
@@ -16,17 +16,6 @@
 		Process Node
 	-->
 	
-		<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 name="process_id" ref="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_taskbydelegate0" model="process.node">
 			<field name="menu_id" ref="project.menu_action_view_task"/>
 			<field name="model_id" ref="project.model_project_task"/>
@@ -38,17 +27,6 @@
 			<field eval="1" name="flow_start"/>
 		</record>
 	
-		<record id="process_node_productbacklog0" model="process.node">
-			<field name="menu_id" ref="scrum.menu_action_product_backlog_form"/>
-			<field name="model_id" ref="scrum.model_scrum_product_backlog"/>
-			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;Product backlog&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;Create task from backlogs&quot;&quot;&quot;" name="note"/>
-			<field name="process_id" ref="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_drafttask0" model="process.node">
 			<field name="menu_id" ref="project.menu_action_view_task"/>
 			<field name="model_id" ref="project.model_project_task"/>
@@ -94,31 +72,10 @@
 			<field eval="0" name="flow_start"/>
 		</record>
 	
-		<record id="process_node_timesheettask0" model="process.node">
-			<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;Complete Your Timesheet.&quot;&quot;&quot;" name="note"/>
-			<field name="process_id" ref="process_process_tasksworkflow0"/>
-			<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_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"/>
-			<field model="process.node" name="target_node_id" search="[('name','=','Draft task')]"/>
-			<field model="process.node" name="source_node_id" search="[('name','=','Sale_Order_Task')]"/>
-		</record>
-	
 		<record id="process_transition_delegate0" model="process.transition">
 			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
@@ -128,15 +85,6 @@
 			<field model="process.node" name="source_node_id" search="[('name','=','Task by delegate')]"/>
 		</record>
 	
-		<record id="process_transition_backlogtask0" model="process.transition">
-			<field eval="[(6,0,[])]" name="role_ids"/>
-			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Backlog Task&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;From backlog create task.&quot;&quot;&quot;" name="note"/>
-			<field model="process.node" name="target_node_id" search="[('name','=','Draft task')]"/>
-			<field model="process.node" name="source_node_id" search="[('name','=','Product backlog')]"/>
-		</record>
-	
 		<record id="process_transition_draftopentask0" model="process.transition">
 			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
@@ -163,15 +111,6 @@
 			<field model="process.node" name="target_node_id" search="[('name','=','Trigger Invoice')]"/>
 			<field model="process.node" name="source_node_id" search="[('name','=','Done task')]"/>
 		</record>
-	
-		<record id="process_transition_filltimesheet0" model="process.transition">
-			<field eval="[(6,0,[])]" name="role_ids"/>
-			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Fill Timesheet&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;Task summary is comes into the timesheet line&quot;&quot;&quot;" name="note"/>
-			<field model="process.node" name="target_node_id" search="[('name','=','Timesheet_task')]"/>
-			<field model="process.node" name="source_node_id" search="[('name','=','Open task')]"/>
-		</record>
-
+		
 	</data>
 </openerp>
\ No newline at end of file
diff --git a/addons/project_mrp/__terp__.py b/addons/project_mrp/__terp__.py
index 208b879cef7..e83b5e832db 100644
--- a/addons/project_mrp/__terp__.py
+++ b/addons/project_mrp/__terp__.py
@@ -5,7 +5,7 @@
     "author" : "Tiny",
     "website" : "http://tinyerp.com/module_project.html",
     "category" : "Generic Modules/Projects & Services",
-    "depends" : ["project", 'mrp'],
+    "depends" : ["project", 'mrp', "sale"],
     "description": """
 This module is used to automatically create tasks base on different
 procurements: sales order, manufacturing order, ...
@@ -15,7 +15,9 @@ order on services products.
 """,
     "init_xml" : [],
     "demo_xml" : [],
-    "update_xml": ["project_workflow.xml"],
+    "update_xml": ["project_workflow.xml",
+                   "process/project_mrp_process.xml"
+                   ],
     "active": False,
     "installable": True
 }
diff --git a/addons/project_mrp/process/project_mrp_process.xml b/addons/project_mrp/process/project_mrp_process.xml
new file mode 100644
index 00000000000..c8bd1738314
--- /dev/null
+++ b/addons/project_mrp/process/project_mrp_process.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" ?>
+<openerp>
+	<data>
+	
+	<!--	
+		Process Node
+	-->
+	
+		<record id="process_node_tasks0" 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;state&quot;&quot;&quot;" name="kind"/>
+			<field eval="&quot;&quot;&quot;Tasks&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 name="process_id" ref="sale.process_process_salesworkflow0"/>
+			<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_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 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">
+			<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;Procure task&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;If Procure method is produce&quot;&quot;&quot;" name="note"/>
+			<field name="process_id" ref="mrp.process_process_procurementworkflow0"/>
+			<field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
+			<field eval="0" name="flow_start"/>
+		</record>
+		
+	<!--	
+		Process Condition
+	-->
+		
+		<record id="process_condition_conditiontask0" model="process.condition">
+			<field name="model_id" ref="product.model_product_template"/>
+			<field name="node_id" ref="process_node_tasks0"/>
+			<field eval="&quot;&quot;&quot;object.type=='service'&quot;&quot;&quot;" name="model_states"/>
+			<field eval="&quot;&quot;&quot;condition_task&quot;&quot;&quot;" name="name"/>
+		</record>
+		
+	<!--	
+		Process Transition
+	-->
+	
+		<record id="process_transition_task0" model="process.transition">
+			<field eval="[(6,0,[])]" name="transition_ids"/>
+			<field eval="&quot;&quot;&quot;Task&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;When you select any product's type as a 'service' after confiming sale order, it will create a task of product.&quot;&quot;&quot;" name="note"/>
+			<field model="process.node" name="target_node_id" search="[('name','=','Tasks')]"/>
+			<field model="process.node" name="source_node_id" search="[('name','=','Sale Order')]" ref="sale.process_node_saleorder0"/>
+		</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"/>
+			<field model="process.node" name="target_node_id" search="[('name','=','Draft task')]"/>
+			<field model="process.node" name="source_node_id" search="[('name','=','Sale_Order_Task')]"/>
+		</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" search="[('name','=','Procure task')]"/>
+			<field model="process.node" name="source_node_id" search="[('name','=','Make to order')]" ref="mrp.process_node_maketoorder0"/>
+		</record>
+		
+	</data>
+</openerp>
diff --git a/addons/purchase/__terp__.py b/addons/purchase/__terp__.py
index ec218e520c5..0c24b8df2f4 100644
--- a/addons/purchase/__terp__.py
+++ b/addons/purchase/__terp__.py
@@ -47,7 +47,7 @@
         "purchase_report.xml", 
         "purchase_wizard.xml",
         "stock_view.xml",
-        "partner_view.xml"
+        "partner_view.xml",
         "process/purchase_process.xml"
     ],
     "active": False,
diff --git a/addons/purchase/process/purchase_process.xml b/addons/purchase/process/purchase_process.xml
index 05a1857cbe3..ce69d273c01 100644
--- a/addons/purchase/process/purchase_process.xml
+++ b/addons/purchase/process/purchase_process.xml
@@ -16,14 +16,14 @@
 			Process Node
 		-->
 	
-		<record id="process_node_procurements0" model="process.node">
-			<field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
-			<field name="model_id" ref="mrp.model_mrp_procurement"/>
+		<record id="process_node_purchaseorder0" 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;Procurements&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;Procurement Orders&quot;&quot;&quot;" name="note"/>
-			<field name="process_id" ref="process_process_purchaseworkflow0"/>
-			<field eval="&quot;&quot;&quot;object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting') &quot;&quot;&quot;" name="model_states"/>
+			<field eval="&quot;&quot;&quot;Purchase Order&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;After confirming purchase order, it is approved by supplier.&quot;&quot;&quot;" name="note"/>
+			<field name="process_id" ref="account.process_process_invoiceworkflow0"/>
+			<field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
 			<field eval="1" name="flow_start"/>
 		</record>
 	
@@ -96,15 +96,6 @@
 		<!--		
 			Process Transition
 		-->
-		
-		<record id="process_transition_procurementtopurchase0" model="process.transition">
-			<field eval="[(6,0,[])]" name="role_ids"/>
-			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;procurement to purchase&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;After procurementing order , it comes into the Draft Purchase Order&quot;&quot;&quot;" name="note"/>
-			<field model="process.node" name="target_node_id" search="[('name','=','Draft Purchase Order')]"/>
-			<field model="process.node" name="source_node_id" search="[('name','=','Procurements')]"/>
-		</record>
 	
 		<record id="process_transition_confirmingpurchaseorder0" model="process.transition">
 			<field eval="[(6,0,[])]" name="role_ids"/>
@@ -150,6 +141,15 @@
 			<field model="process.node" name="target_node_id" search="[('name','=','Invoice after packing')]"/>
 			<field model="process.node" name="source_node_id" search="[('name','=','Packing list')]"/>
 		</record>
+		
+		<record id="process_transition_purchaseinvoice0" model="process.transition">
+			<field eval="[(6,0,[])]" name="role_ids"/>
+			<field eval="[(6,0,[])]" name="transition_ids"/>
+			<field eval="&quot;&quot;&quot;Purchase Invoice&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;After Purchase order , Create invoice.&quot;&quot;&quot;" name="note"/>
+			<field model="process.node" name="target_node_id" search="[('name','=','Draft Invoices')]" ref="account.process_node_draftinvoices0"/>
+			<field model="process.node" name="source_node_id" search="[('name','=','Purchase Order')]"/>
+		</record>
 
 	</data>
 </openerp>
\ No newline at end of file
diff --git a/addons/sale/__terp__.py b/addons/sale/__terp__.py
index 6dbd080b853..fd9e2440794 100644
--- a/addons/sale/__terp__.py
+++ b/addons/sale/__terp__.py
@@ -62,7 +62,7 @@
         "sale_report.xml",
         "sale_wizard.xml",
         "stock_view.xml",
-        "process/sale_process.xml"
+        "process/sale_process.xml",
     ],
     "active": False,
     "installable": True
diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml
index 6865fa8a57b..217172d46e2 100644
--- a/addons/sale/process/sale_process.xml
+++ b/addons/sale/process/sale_process.xml
@@ -1,11 +1,42 @@
 <?xml version="1.0" ?>
 <openerp>
 	<data>
+	
+		<!--		
+			Process
+		-->
+	
 		<record id="process_process_salesworkflow0" model="process.process">
 			<field eval="1" name="active"/>
 			<field eval="&quot;&quot;&quot;Sales flow for services companies.&quot;&quot;&quot;" name="note"/>
 			<field eval="&quot;&quot;&quot;Sales Workflow&quot;&quot;&quot;" name="name"/>
 		</record>
+		
+		<!--		
+			Process Node
+		-->
+		
+		<record id="process_node_order0" 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;subflow&quot;&quot;&quot;" name="kind"/>
+			<field eval="&quot;&quot;&quot;Order&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;After confirming order, Create the invoice.&quot;&quot;&quot;" name="note"/>
+			<field name="process_id" ref="account.process_process_invoiceworkflow0"/>
+			<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_saleorderprocurement0" 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;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="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"/>
+		</record>
 	
 		<record id="process_node_quotation0" model="process.node">
 			<field name="menu_id" ref="sale.menu_action_order_tree10"/>
@@ -62,24 +93,6 @@
 			<field eval="0" name="flow_start"/>
 		</record>
 
-		<record id="process_node_tasks0" 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;state&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;Tasks&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 name="process_id" ref="process_process_salesworkflow0"/>
-			<field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
-			<field eval="0" name="flow_start"/>
-		</record>
-
-		<record id="process_condition_conditiontask0" model="process.condition">
-			<field name="model_id" ref="product.model_product_template"/>
-			<field name="node_id" ref="process_node_tasks0"/>
-			<field eval="&quot;&quot;&quot;object.type=='service'&quot;&quot;&quot;" name="model_states"/>
-			<field eval="&quot;&quot;&quot;condition_task&quot;&quot;&quot;" name="name"/>
-		</record>
-
 		<record id="process_node_invoiceafterdelivery0" model="process.node">
 			<field name="menu_id" ref="account.menu_invoice_draft"/>
 			<field name="model_id" ref="account.model_account_invoice"/>
@@ -90,6 +103,10 @@
 			<field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
 			<field eval="0" name="flow_start"/>
 		</record>
+		
+		<!--		
+			Process Condition
+		-->
 
 		<record id="process_condition_conditionafterdelivery0" model="process.condition">
 			<field name="model_id" ref="sale.model_sale_order"/>
@@ -97,6 +114,10 @@
 			<field eval="&quot;&quot;&quot;object.order_policy=='postpaid'&quot;&quot;&quot;" name="model_states"/>
 			<field eval="&quot;&quot;&quot;condition_after_delivery&quot;&quot;&quot;" name="name"/>
 		</record>
+		
+		<!--		
+			Process Transition
+		-->
 	
 		<record id="process_transition_confirmquotation0" model="process.transition">
 			<field eval="[(6,0,[])]" name="transition_ids"/>
@@ -211,12 +232,22 @@
 			<field model="process.node" name="source_node_id" search="[('name','=','Delivery Order')]"/>
 		</record>
 	
-		<record id="process_transition_task0" model="process.transition">
+		<record id="process_transition_saleprocurement0" model="process.transition">
+			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Task&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;When you select any product's type as a 'service' after confiming sale order, it will create a task of product.&quot;&quot;&quot;" name="note"/>
-			<field model="process.node" name="target_node_id" search="[('name','=','Tasks')]"/>
-			<field model="process.node" name="source_node_id" search="[('name','=','Sale Order')]"/>
+			<field eval="&quot;&quot;&quot;Sale Procurement&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;In sale order , procuerement for each line and it comes into the procurement order&quot;&quot;&quot;" name="note"/>
+			<field model="process.node" name="target_node_id" search="[('name','=','Procure Products')]" ref="mrp.process_node_procureproducts0"/>
+			<field model="process.node" name="source_node_id" search="[('name','=','Sale Order Procurement')]"/>
+		</record>
+		
+		<record id="process_transition_saleinvoice0" model="process.transition">
+			<field eval="[(6,0,[])]" name="role_ids"/>
+			<field eval="[(6,0,[])]" name="transition_ids"/>
+			<field eval="&quot;&quot;&quot;Sale Invoice&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;Confirm sale order and Create invoice.&quot;&quot;&quot;" name="note"/>
+			<field model="process.node" name="target_node_id" search="[('name','=','Draft Invoices')]" ref="account.process_node_draftinvoices0"/>
+			<field model="process.node" name="source_node_id" search="[('name','=','Order')]"/>
 		</record>
 	
 		<record id="res_roles_salesman0" model="res.roles">
diff --git a/addons/scrum/__terp__.py b/addons/scrum/__terp__.py
index 7be9cb422be..dfb466307c0 100644
--- a/addons/scrum/__terp__.py
+++ b/addons/scrum/__terp__.py
@@ -30,7 +30,7 @@
     "name" : "Scrum, Agile Development Method",
     "version": "1.0",
     "author" : "Tiny",
-    "depends" : ["project"],
+    "depends" : ["project", "process"],
     "category" : "Enterprise Specific Modules/Information Technology",
     "init_xml" : [],
     "description": """
@@ -61,6 +61,7 @@
         "scrum_view.xml",
         "scrum_report.xml",
         "scrum_wizard.xml",
+        "process/scrum_process.xml",
     ],
     "active": False,
     "installable": True
diff --git a/addons/scrum/process/scrum_process.xml b/addons/scrum/process/scrum_process.xml
new file mode 100644
index 00000000000..9fbaec3964b
--- /dev/null
+++ b/addons/scrum/process/scrum_process.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" ?>
+<openerp>
+	<data>
+	
+		<!--		
+			Process Node
+		-->
+	
+		<record id="process_node_productbacklog0" model="process.node">
+			<field name="menu_id" ref="scrum.menu_action_product_backlog_form"/>
+			<field name="model_id" ref="scrum.model_scrum_product_backlog"/>
+			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
+			<field eval="&quot;&quot;&quot;Product backlog&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;Create task from backlogs&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"/>
+			<field eval="1" name="flow_start"/>
+		</record>
+		
+		<!--		
+			Process Transition
+		-->
+		
+		<record id="process_transition_backlogtask0" model="process.transition">
+			<field eval="[(6,0,[])]" name="role_ids"/>
+			<field eval="[(6,0,[])]" name="transition_ids"/>
+			<field eval="&quot;&quot;&quot;Backlog Task&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;From backlog create task.&quot;&quot;&quot;" name="note"/>
+			<field model="process.node" name="target_node_id" search="[('name','=','Draft task')]" ref="project.process_node_drafttask0"/>
+			<field model="process.node" name="source_node_id" search="[('name','=','Product backlog')]"/>
+		</record>
+	
+	</data>
+</openerp>
\ No newline at end of file