diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index cef4f8f742a..26a7728ddcb 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -248,10 +248,6 @@ class hr_timesheet_sheet(osv.osv):
 		'date_to' : _default_date_to,
 		'state': lambda *a: 'new',
 	}
-	def create(self, cr, uid, vals, *args, **kwargs):
-		if 'state' in vals and vals['state'] == 'new':
-			vals['state']='draft'
-		return super(hr_timesheet_sheet, self).create(cr, uid, vals, *args, **kwargs)
 
 	def _sheet_date(self, cr, uid, ids):
 		for sheet in self.browse(cr, uid, ids):
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_workflow.xml b/addons/hr_timesheet_sheet/hr_timesheet_workflow.xml
index 61be36025dc..bf9d557e112 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_workflow.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_workflow.xml
@@ -16,12 +16,18 @@
 			<field name="on_create">True</field>
 		</record>
 
+		<record model="workflow.activity" id="act_new">
+			<field name="wkf_id" ref="wkf_timesheet" />
+			<field name="name">new</field>
+			<field name="kind">function</field>
+			<field name="action">write({'state':'new'})</field>
+			<field name="flow_start">True</field>
+		</record>
 		<record model="workflow.activity" id="act_draft">
 			<field name="wkf_id" ref="wkf_timesheet" />
 			<field name="name">draft</field>
 			<field name="kind">function</field>
 			<field name="action">write({'state':'draft'})</field>
-			<field name="flow_start">True</field>
 		</record>
 		<record model="workflow.activity" id="act_confirm">
 			<field name="wkf_id" ref="wkf_timesheet" />
@@ -34,8 +40,13 @@
 			<field name="name">done</field>
 			<field name="kind">function</field>
 			<field name="action">write({'state':'done'})</field>
+			<field name="flow_stop">True</field>
 		</record>
 
+		<record model="workflow.transition" id="t0">
+			<field name="act_from" ref="act_new"/>
+			<field name="act_to" ref="act_draft"/>
+		</record>
 		<record model="workflow.transition" id="t1">
 			<field name="act_from" ref="act_draft" />
 			<field name="act_to" ref="act_confirm" />