Merge lp:~hbrunn/ocb-addons/7.0_1023047 into lp:ocb-addons

[Holger Brunn (Therp)]

Automatically derived from https://code.launchpad.net/~therp-nl/openobject-addons/7.0_1023047 for https://code.launchpad.net/~openerp/openobject-addons/7.0.

[Stefan Rijnhart (Opener) (stefan-opener)]

We run this fix in production for 6.1

review: Approve

=== modified file 'project_timesheet/project_timesheet.py'
--- project_timesheet/project_timesheet.py	2012-12-18 22:50:15 +0000
+++ project_timesheet/project_timesheet.py	2013-03-20 14:03:33 +0000
@@ -200,7 +200,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)
+            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)