diff options
| author | Harry (Open ERP) <hmo@tinyerp.com> | 2010-03-29 13:39:47 +0530 |
|---|---|---|
| committer | Harry (Open ERP) <hmo@tinyerp.com> | 2010-03-29 13:39:47 +0530 |
| commit | f03a4fe933d9472d0b0d22bc29bbfcf2076d3a18 (patch) | |
| tree | 884c945ac83afd494c32b403d118f96ceabb81d9 /addons/project_long_term | |
| parent | 836e67c9fa22c6f193dd21c8653932bc071122a8 (diff) | |
| parent | 8756f1f7c4064da5011cf03ff0499085912ab382 (diff) | |
[MERGE] merge with trunk-addons
bzr revid: hmo@tinyerp.com-20100329080947-lojccpq7zwynyg6v
Diffstat (limited to 'addons/project_long_term')
| -rw-r--r-- | addons/project_long_term/wizard/compute_phases_date.py | 4 | ||||
| -rw-r--r-- | addons/project_long_term/wizard/compute_tasks_date.py | 7 | ||||
| -rw-r--r-- | addons/project_long_term/wizard/schedule_tasks.py | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/addons/project_long_term/wizard/compute_phases_date.py b/addons/project_long_term/wizard/compute_phases_date.py index 48409bd46c5..61f3bb42251 100644 --- a/addons/project_long_term/wizard/compute_phases_date.py +++ b/addons/project_long_term/wizard/compute_phases_date.py @@ -165,8 +165,8 @@ class wizard_compute_phases(wizard.interface): 'init': { 'actions': [], 'result': {'type': 'form', 'arch': compute_form, 'fields': compute_fields, 'state':[ - ('end', 'Cancel'), - ('compute', 'Compute') + ('end', 'Cancel', 'gtk-cancel'), + ('compute', 'Compute', 'gtk-ok', True) ]}, }, diff --git a/addons/project_long_term/wizard/compute_tasks_date.py b/addons/project_long_term/wizard/compute_tasks_date.py index f327328305e..77e7bbd6512 100644 --- a/addons/project_long_term/wizard/compute_tasks_date.py +++ b/addons/project_long_term/wizard/compute_tasks_date.py @@ -76,7 +76,8 @@ class wizard_compute_tasks(wizard.interface): 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[0], resource.get('calendar_id')[0]) + if resource.get('calendar_id', False): + leaves = wkcal.compute_leaves(cr, uid, calendar_id , resource_id[0], resource['calendar_id'] and resource['calendar_id'][0] or False) time_efficiency = resource.get('time_efficiency') resources.append(classobj((user.name.encode('utf8')), (Resource,), {'__doc__': user.name, '__name__': user.name, @@ -147,8 +148,8 @@ class wizard_compute_tasks(wizard.interface): 'init': { 'actions': [], 'result': {'type': 'form', 'arch': compute_form, 'fields': compute_fields, 'state': [ - ('end', 'Cancel'), - ('compute', 'Compute') + ('end', 'Cancel', 'gtk-cancel'), + ('compute', 'Compute', 'gtk-ok', True) ]}, }, 'compute': { diff --git a/addons/project_long_term/wizard/schedule_tasks.py b/addons/project_long_term/wizard/schedule_tasks.py index 592f5a1dc5d..4a170859032 100644 --- a/addons/project_long_term/wizard/schedule_tasks.py +++ b/addons/project_long_term/wizard/schedule_tasks.py @@ -139,7 +139,7 @@ class wizard_schedule_task(wizard.interface): states = { 'init': { 'actions': [_compute_date], - 'result': {'type':'form','arch':success_msg,'fields':{}, 'state':[('end', 'Ok')]}, + 'result': {'type':'form','arch':success_msg,'fields':{}, 'state':[('end', 'Ok', 'gtk-ok', True)]}, } } wizard_schedule_task('phase.schedule.tasks') |