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

Proposed by Stefan Rijnhart (Opener) on 2014-05-02
Status: Merged
Approved by: Holger Brunn (Therp) on 2014-05-05
Approved revision: 6842
Merged at revision: 6843
Proposed branch: lp:~therp-nl/ocb-addons/6.1-lp1315367-task_work_timesheet_lines_False
Merge into: lp:ocb-addons/6.1
Diff against target: 29 lines (+3/-3)
1 file modified
project_timesheet/project_timesheet.py (+3/-3)
To merge this branch: bzr merge lp:~therp-nl/ocb-addons/6.1-lp1315367-task_work_timesheet_lines_False
Reviewer Review Type Date Requested Status
Holger Brunn (Therp) code review Approve on 2014-05-05
Pedro Manuel Baeza code review Approve on 2014-05-03
Raphaël Valyi - http://www.akretion.com 2014-05-02 Approve on 2014-05-02
Review via email: mp+218060@code.launchpad.net
To post a comment you must log in.

LGTM

review: Approve
Pedro Manuel Baeza (pedro.baeza) wrote :

LGTM (that parenthesis order...)

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 2013-09-10 15:12:35 +0000
3+++ project_timesheet/project_timesheet.py 2014-05-02 12:36:24 +0000
4@@ -85,7 +85,7 @@
5 if not context.get('no_analytic_entry',False):
6 obj_task = task_obj.browse(cr, uid, vals['task_id'])
7 result = self.get_user_related_details(cr, uid, vals.get('user_id', uid))
8- vals_line['name'] = '%s: %s' % (tools.ustr(obj_task.name), tools.ustr(vals['name']) or '/')
9+ vals_line['name'] = '%s: %s' % (tools.ustr(obj_task.name), tools.ustr(vals['name'] or '/'))
10 vals_line['user_id'] = vals['user_id']
11 vals_line['product_id'] = result['product_id']
12 vals_line['date'] = vals['date'][:10]
13@@ -139,7 +139,7 @@
14 continue
15 vals_line = {}
16 if 'name' in vals:
17- vals_line['name'] = '%s: %s' % (tools.ustr(task.task_id.name), tools.ustr(vals['name']) or '/')
18+ vals_line['name'] = '%s: %s' % (tools.ustr(task.task_id.name), tools.ustr(vals['name'] or '/'))
19 if 'user_id' in vals:
20 vals_line['user_id'] = vals['user_id']
21
22@@ -219,7 +219,7 @@
23 if vals.get('project_id',False):
24 vals_line['account_id'] = acc_id
25 if vals.get('name',False):
26- vals_line['name'] = '%s: %s' % (tools.ustr(vals['name']), tools.ustr(task_work.name) or '/')
27+ vals_line['name'] = '%s: %s' % (tools.ustr(vals['name']), tools.ustr(task_work.name or '/'))
28 hr_anlytic_timesheet.write(cr, uid, [line_id], vals_line, {})
29 return super(task,self).write(cr, uid, ids, vals, context)
30

Subscribers

People subscribed via source and target branches