diff options
| author | Mayur Maheshwari (OpenERP) <mma@tinyerp.com> | 2012-06-21 16:42:44 +0530 |
|---|---|---|
| committer | Mayur Maheshwari (OpenERP) <mma@tinyerp.com> | 2012-06-21 16:42:44 +0530 |
| commit | 64d7a8ae41db20a5bb8f41bae5c9ea1cab01fe0a (patch) | |
| tree | b00da6a48cb2c3e90a00b1131d1145a1745fbd7d /addons/project_long_term/wizard | |
| parent | 61a3238d978ab40e661974dc2b75fbda700f7c70 (diff) | |
| parent | d17d4384058155649e6013d162f0182131d03dc4 (diff) | |
[MERGE]: Merge with lp:openobject-addons
bzr revid: mma@tinyerp.com-20120621111244-sddylu3jxapx73cv
Diffstat (limited to 'addons/project_long_term/wizard')
3 files changed, 3 insertions, 5 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 2e494166464..3ceac7e9a9e 100644 --- a/addons/project_long_term/wizard/project_compute_tasks_view.xml +++ b/addons/project_long_term/wizard/project_compute_tasks_view.xml @@ -7,10 +7,9 @@ <field name="model">project.compute.tasks</field> <field name="type">form</field> <field name="arch" type="xml"> - <form string="Schedule Tasks"> + <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"/> |