diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index f3b62f0fd27..48a39a1bcfd 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -892,7 +892,7 @@ class account_invoice(osv.osv):
             self.write(cr, uid, [inv.id], {'move_id': move_id,'period_id':period_id, 'move_name':new_move_name})
             self.pool.get('account.move').post(cr, uid, [move_id])
         self._log_event(cr, uid, ids)
-        
+
         return True
 
     def line_get_convert(self, cr, uid, x, part, date, context=None):
@@ -925,11 +925,11 @@ class account_invoice(osv.osv):
             reference = obj_inv.reference
             if not number:
                 tmp_context = {
-                    'fiscalyear_id': inv.period_id.fiscalyear_id.id
+                    'fiscalyear_id': obj_inv.period_id.fiscalyear_id.id
                 }
-                if inv.journal_id.invoice_sequence_id:
-                    sequence_id = inv.journal_id.invoice_sequence_id.id
-                    number = self.pool.get('ir.sequence').get_id(cr, uid, 
+                if obj_inv.journal_id.invoice_sequence_id:
+                    sequence_id = obj_inv.journal_id.invoice_sequence_id.id
+                    number = self.pool.get('ir.sequence').get_id(cr, uid,
                                                                  sequence_id,
                                                                  'id',
                                                                  context=tmp_context)
diff --git a/addons/project_scrum/project_scrum_demo.xml b/addons/project_scrum/project_scrum_demo.xml
index a4fad8eb307..d162a396abe 100644
--- a/addons/project_scrum/project_scrum_demo.xml
+++ b/addons/project_scrum/project_scrum_demo.xml
@@ -247,16 +247,7 @@ Demo :Bugfix - memory leak
 			<field eval="5.0" name="hours"/>
 			<field eval="time.strftime('%Y-%m-%d')" name="date"/>
 		</record>
-
-		<record id="project_task_work_scrum_task2" model="project.task.work">
-			<field name="user_id" ref="base.user_root"/>
-			<field name="name">Create a script for migration and testing</field>
-			<field name="task_id" ref="scrum_task_6"/>
-			<field name="company_id" ref="base.main_company"/>
-			<field eval="5.0" name="hours"/>
-			<field eval="time.strftime('%Y-%m-%d')" name="date"/>
-		</record>
-	<record id="project_task_work_scrum_task1" model="project.task.work">
+        <record id="project_task_work_scrum_task3" model="project.task.work">
 			<field name="user_id" ref="base.user_root"/>
 			<field name="name">Add on top or bottom and shortcuts</field>
 			<field name="task_id" ref="scrum_task_17"/>