Merge lp:~hbrunn/openobject-addons/6.1_project_timesheet_workaround_1023047 into lp:openobject-addons/6.1

[Holger Brunn (Therp)]

workaround for #1023047

Unmerged revisions

7126. By Holger Brunn (Therp) on 2013-01-08

[FIX] workaround for lp:1023047

=== modified file 'project_timesheet/project_timesheet.py'
--- project_timesheet/project_timesheet.py	2012-01-31 13:36:57 +0000
+++ project_timesheet/project_timesheet.py	2013-01-08 10:21:27 +0000
@@ -165,7 +165,9 @@
                 if amount_unit and 'amount' in amount_unit.get('value',{}):
                     vals_line['amount'] = amount_unit['value']['amount']
 
-            self.pool.get('hr.analytic.timesheet').write(cr, uid, [line_id.id], vals_line, context=context)
+            #workaround for lp:1023047
+            if vals_line:
+                self.pool.get('hr.analytic.timesheet').write(cr, uid, [line_id.id], vals_line, context=context)
             
         return super(project_work,self).write(cr, uid, ids, vals, context)