Merge lp:~therp-nl/ocb-addons/7.0-lp1315367-task_work_timesheet_lines_False into lp:ocb-addons

Proposed by Stefan Rijnhart (Opener) on 2014-05-02
Status: Merged
Merged at revision: 10209
Proposed branch: lp:~therp-nl/ocb-addons/7.0-lp1315367-task_work_timesheet_lines_False
Merge into: lp:ocb-addons
Diff against target: 11 lines (+1/-1)
1 file modified
project_timesheet/project_timesheet.py (+1/-1)
To merge this branch: bzr merge lp:~therp-nl/ocb-addons/7.0-lp1315367-task_work_timesheet_lines_False
Reviewer Review Type Date Requested Status
Stéphane Bidoul (Acsone) (community) code review Approve on 2014-06-06
Omar (Pexego) code review Approve on 2014-06-06
Pedro Manuel Baeza code review Approve on 2014-05-05
Holger Brunn (Therp) code review 2014-05-02 Approve on 2014-05-05
Review via email: mp+218059@code.launchpad.net
To post a comment you must log in.
review: Approve (code review)
Pedro Manuel Baeza (pedro.baeza) wrote :

LGTM.

Regards.

review: Approve (code review)
Omar (Pexego) (omar7r) wrote :

LGTM

review: Approve (code review)
review: Approve (code review)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'project_timesheet/project_timesheet.py'
2--- project_timesheet/project_timesheet.py 2014-03-10 08:54:20 +0000
3+++ project_timesheet/project_timesheet.py 2014-05-02 12:34:39 +0000
4@@ -253,7 +253,7 @@
5 if vals.get('project_id',False):
6 vals_line['account_id'] = acc_id
7 if vals.get('name',False):
8- vals_line['name'] = '%s: %s' % (tools.ustr(vals['name']), tools.ustr(task_work.name) or '/')
9+ vals_line['name'] = '%s: %s' % (tools.ustr(vals['name']), tools.ustr(task_work.name or '/'))
10 hr_anlytic_timesheet.write(cr, uid, [line_id], vals_line, {})
11 return super(task,self).write(cr, uid, ids, vals, context)
12