odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] project_long_term: Corrected Resource not found error. Corrected error when switching the views on project phases. 

bzr revid: uco@tinyerp.com-20110321130645-ey1i0ra2qpkzlfwu
This commit is contained in:
Ujjvala Collins (OpenERP) 2011-03-21 18:36:45 +05:30
parent 550f4be14e
commit 8429d1fe58
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/project_long_term/wizard/project_compute_phases.py
View File

@ -69,7 +69,7 @@ class project_compute_phases(osv.osv_memory):
id = mod_obj.read(cr, uid, [result], ['res_id'])[0]['res_id']
result = act_obj.read(cr, uid, [id], context=context)[0]
result['target'] = 'current'
result['context'] = {"search_default_project_id":data['project_id'], "default_project_id":data['project_id'], "search_default_responsible_id":uid, "search_default_current": 1}
result['context'] = {"search_default_project_id":data['project_id'][0], "default_project_id":data['project_id'][0], "search_default_responsible_id":uid, "search_default_current": 1}
return result
project_compute_phases()

23
addons/resource/resource.py
View File

@ -258,18 +258,17 @@ class resource_resource(osv.osv):
leaves = []
resource_eff = 1.0
if resource_ids:
resource_id = resource_ids[0]
resource = self.browse(cr, uid, resource_id, context=context)
resource_eff = resource.time_efficiency
resource_cal = resource.calendar_id.id
if resource_cal:
leaves = self.compute_vacation(cr, uid, calendar_id, resource.id, resource_cal, context=context)
temp = {
'name' : resource.name,
'vacation': tuple(leaves),
'efficiency': resource_eff,
}
resource_objs[resource_id] = temp
for resource in self.browse(cr, uid, resource_ids, context=context):
resource_eff = resource.time_efficiency
resource_cal = resource.calendar_id.id
if resource_cal:
leaves = self.compute_vacation(cr, uid, calendar_id, resource.id, resource_cal, context=context)
temp = {
'name' : resource.name,
'vacation': tuple(leaves),
'efficiency': resource_eff,
}
resource_objs[resource.id] = temp
# resource_objs.append(classobj(str(user.name), (Resource,),{
# '__doc__': user.name,
# '__name__': user.name,