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

Proposed by Stefan Rijnhart (Opener) on 2014-05-02
Status: Needs review
Proposed branch: lp:~therp-nl/openobject-addons/7.0-lp1315367-task_work_timesheet_lines_False
Merge into: lp:openobject-addons/7.0
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/openobject-addons/7.0-lp1315367-task_work_timesheet_lines_False
Reviewer Review Type Date Requested Status
Pedro Manuel Baeza (community) code review Approve on 2014-05-05
OpenERP Core Team 2014-05-02 Pending
Review via email: mp+218058@code.launchpad.net
To post a comment you must log in.
Pedro Manuel Baeza (pedro.baeza) wrote :

This parenthesis reorder prevents indeed 'False' word.

Regards.

review: Approve (code review)

Unmerged revisions

10030. By Stefan Rijnhart (Opener) on 2014-05-02

[FIX] lp:1315367, prevent python term 'False' to show up in timesheet lines generated from task work

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 2013-06-07 11:38:29 +0000
3+++ project_timesheet/project_timesheet.py 2014-05-02 12:35:18 +0000
4@@ -251,7 +251,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