Merge lp:~openerp-dev/openobject-addons/7.0-opw-597447-fka into lp:openobject-addons/7.0

[Foram Katharotiya (OpenERP)]

Hello,

I have fixed the bug of worklog entry in task.

Steps to reproduce:

- Go to Project -> Tasks
- Register any hours in the worklog in a open task, example in 2013-04-13.
- Go to Human Resources -> My timesheet
- Register a timesheet between 2013-04-15 to 2013-04-21.
- Send to approval.Approval it.
- Go to Project -> Tasks
- Register any new hours in the working log in the same open task with other user with no timesheet, in 2013-04-30.
- Error, You cannot modify hours in a confirmed timesheet

Thanks,
FKA

Unmerged revisions

9417. By Foram Katharotiya (OpenERP) on 2013-09-17

[MERGE] with 7.0

9416. By Foram Katharotiya (OpenERP) on 2013-09-06

[FIX] can not register worklog with other user with no timesheet when the any one timesheet is confirmed

=== modified file 'project_timesheet/project_timesheet.py'
--- project_timesheet/project_timesheet.py	2013-06-07 11:38:29 +0000
+++ project_timesheet/project_timesheet.py	2013-09-17 05:05:57 +0000
@@ -200,7 +200,8 @@
                 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)