diff options
| author | Antonin Bourguignon <abo@openerp.com> | 2012-06-19 16:37:52 +0200 |
|---|---|---|
| committer | Antonin Bourguignon <abo@openerp.com> | 2012-06-19 16:37:52 +0200 |
| commit | da0fcfc19fa512e1e1eb2bdaa78a2507abc82a7a (patch) | |
| tree | 61b33a46e4cd33ccf0cf4b50987cf68a3efb30ff /addons/project_long_term/wizard | |
| parent | 3ebcb195d0ba17f0348dd3f23083b4358738ae3a (diff) | |
| parent | c9c27a2432dca8a23656659b07dbe77382307500 (diff) | |
[MERGE] latest trunk
bzr revid: abo@openerp.com-20120619143752-29v97mmr7xcttj9o
Diffstat (limited to 'addons/project_long_term/wizard')
3 files changed, 2 insertions, 4 deletions
diff --git a/addons/project_long_term/wizard/project_compute_phases.py b/addons/project_long_term/wizard/project_compute_phases.py index 4a66cecf9cd..85ab158e0b2 100644 --- a/addons/project_long_term/wizard/project_compute_phases.py +++ b/addons/project_long_term/wizard/project_compute_phases.py @@ -28,7 +28,7 @@ class project_compute_phases(osv.osv_memory): 'target_project': fields.selection([ ('all', 'Compute All My Projects'), ('one', 'Compute a Single Project'), - ], 'Schedule', required=True), + ], 'Action', required=True), 'project_id': fields.many2one('project.project', 'Project') } _defaults = { diff --git a/addons/project_long_term/wizard/project_compute_phases_view.xml b/addons/project_long_term/wizard/project_compute_phases_view.xml index bf2c51e41e6..37c7256cb7c 100644 --- a/addons/project_long_term/wizard/project_compute_phases_view.xml +++ b/addons/project_long_term/wizard/project_compute_phases_view.xml @@ -10,9 +10,8 @@ <form string="Schedule Phases" version="7.0"> <header> <button icon="gtk-ok" name="check_selection" string="C_ompute" type="object"/> - <button icon="gtk-cancel" special="cancel" string="_Cancel"/> </header> - <group string="Schedule Phases"> + <group> <field name="target_project"/> <field name="project_id" attrs="{'invisible':[('target_project','=','all')], 'required':[('target_project','!=','all')]}"/> </group> diff --git a/addons/project_long_term/wizard/project_compute_tasks_view.xml b/addons/project_long_term/wizard/project_compute_tasks_view.xml index ac30a3aa6d9..3ceac7e9a9e 100644 --- a/addons/project_long_term/wizard/project_compute_tasks_view.xml +++ b/addons/project_long_term/wizard/project_compute_tasks_view.xml @@ -10,7 +10,6 @@ <form string="Schedule Tasks" version="7.0"> <header> <button icon="gtk-ok" name="compute_date" string="C_ompute" type="object"/> - <button icon="gtk-cancel" special="cancel" string="_Cancel"/> </header> <group> <field name="project_id"/> |