OpenERP Community Backports (Addons)

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

  1. 7.0-lp1315367-task_work_timesheet_lines_False
  2. Merge into 7.0
Proposed by Stefan Rijnhart (Opener)
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
Omar (Pexego) code review Approve
Pedro Manuel Baeza code review Approve
Holger Brunn (Therp) code review Approve
Review via email: mp+218059@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Holger Brunn (Therp) (hbrunn) :
review: Approve (code review)
Revision history for this message
Pedro Manuel Baeza (pedro.baeza) wrote :

LGTM.

Regards.

review: Approve (code review)
Revision history for this message
Omar (Pexego) (omar7r) wrote :

LGTM

review: Approve (code review)
Revision history for this message
Stéphane Bidoul (Acsone) (sbi) :
review: Approve (code review)

Preview Diff

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