diff --git a/addons/project_long_term/wizard/compute_phases_date.py b/addons/project_long_term/wizard/compute_phases_date.py index 96e6ce5f2d4..48409bd46c5 100644 --- a/addons/project_long_term/wizard/compute_phases_date.py +++ b/addons/project_long_term/wizard/compute_phases_date.py @@ -65,7 +65,7 @@ class wizard_compute_phases(wizard.interface): resource = resource_obj.browse(cr, uid, resource_id, context=context)[0] time_efficiency = resource.time_efficiency leaves = wkcal.compute_leaves(cr, uid, calendar_id , resource.id, resource.calendar_id.id) - phase_resource_obj = classobj(str(phase.responsible_id.name), (Resource,), + phase_resource_obj = classobj((phase.responsible_id.name.encode('utf8')), (Resource,), {'__doc__': phase.responsible_id.name, '__name__': phase.responsible_id.name, 'vacation': tuple(leaves), diff --git a/addons/project_long_term/wizard/compute_tasks_date.py b/addons/project_long_term/wizard/compute_tasks_date.py index dbe4739e199..f327328305e 100644 --- a/addons/project_long_term/wizard/compute_tasks_date.py +++ b/addons/project_long_term/wizard/compute_tasks_date.py @@ -72,13 +72,13 @@ class wizard_compute_tasks(wizard.interface): for user in project.members: leaves = [] time_efficiency = 1.0 - resource_id = resource_obj.search(cr, uid, [('user_id', '=', user.id)]) + resource_id = resource_obj.search(cr, uid, [('user_id', '=', user.id)], context=context) if resource_id: # resource = resource_obj.browse(cr, uid, resource_id, context=context)[0] resource = resource_obj.read(cr, uid, resource_id, ['calendar_id','time_efficiency'], context=context)[0] - leaves = wkcal.compute_leaves(cr, uid, calendar_id , resource_id, resource.get('calendar_id')[0]) + leaves = wkcal.compute_leaves(cr, uid, calendar_id , resource_id[0], resource.get('calendar_id')[0]) time_efficiency = resource.get('time_efficiency') - resources.append(classobj(str(user.name), (Resource,), {'__doc__': user.name, + resources.append(classobj((user.name.encode('utf8')), (Resource,), {'__doc__': user.name, '__name__': user.name, 'vacation': tuple(leaves), 'efficiency': time_efficiency diff --git a/addons/project_long_term/wizard/schedule_tasks.py b/addons/project_long_term/wizard/schedule_tasks.py index 16a40155fa8..592f5a1dc5d 100644 --- a/addons/project_long_term/wizard/schedule_tasks.py +++ b/addons/project_long_term/wizard/schedule_tasks.py @@ -49,7 +49,7 @@ class wizard_schedule_task(wizard.interface): if resource_cal: cal_id = phase.project_id.resource_calendar_id and phase.project_id.resource_calendar_id.id or False leaves = wkcal.compute_leaves(cr, uid, cal_id, res.id, resource_cal, context=context) - resource_objs.append(classobj(str(res.user_id.name), (Resource,), + resource_objs.append(classobj(res.user_id.name.encode('utf8'), (Resource,), {'__doc__': res.user_id.name, '__name__': res.user_id.name, 'vacation': tuple(leaves),