openerp-community-reviewer team mailing list archive

["Stefan Rijnhart \(Therp\)" <stefan@xxxxxxxx>]

Stefan Rijnhart (Therp) has proposed merging lp:~therp-nl/ocb-addons/7.0-lp1315367-task_work_timesheet_lines_False into lp:ocb-addons.

Requested reviews:
  OpenERP Community Backports (ocb)
Related bugs:
  Bug #1315367 in OpenERP Community Backports (Addons): "[6.1] Project task work creates timesheet entry containing 'False' instead of empty label"
  https://bugs.launchpad.net/ocb-addons/+bug/1315367

For more details, see:
https://code.launchpad.net/~therp-nl/ocb-addons/7.0-lp1315367-task_work_timesheet_lines_False/+merge/218059
-- 
https://code.launchpad.net/~therp-nl/ocb-addons/7.0-lp1315367-task_work_timesheet_lines_False/+merge/218059
Your team OpenERP Community Backports is requested to review the proposed merge of lp:~therp-nl/ocb-addons/7.0-lp1315367-task_work_timesheet_lines_False into lp:ocb-addons.

=== 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:24:10 +0000
@@ -253,7 +253,7 @@
                         if vals.get('project_id',False):
                             vals_line['account_id'] = acc_id
                         if vals.get('name',False):
-                            vals_line['name'] = '%s: %s' % (tools.ustr(vals['name']), tools.ustr(task_work.name) or '/')
+                            vals_line['name'] = '%s: %s' % (tools.ustr(vals['name']), tools.ustr(task_work.name or '/'))
                         hr_anlytic_timesheet.write(cr, uid, [line_id], vals_line, {})
         return super(task,self).write(cr, uid, ids, vals, context)