diff options
| author | Antony Lesuisse <al@openerp.com> | 2012-07-25 22:58:40 +0200 |
|---|---|---|
| committer | Antony Lesuisse <al@openerp.com> | 2012-07-25 22:58:40 +0200 |
| commit | ecd5ca73c8b87e44905f6083f1b2bf280f87b3f9 (patch) | |
| tree | 6ef34889dd89deda604e62e2df1e2badf03a265c /addons/project_long_term/wizard | |
| parent | 4b073c0a888b38eb6d79e0c8c78b2cd5096b3b3b (diff) | |
| parent | 649fa8798e349916e8088136b73d0193eac95da7 (diff) | |
[MERGE] trunk
bzr revid: al@openerp.com-20120725205840-8d86kc0zr0uwb6j2
Diffstat (limited to 'addons/project_long_term/wizard')
3 files changed, 12 insertions, 10 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..0d5c81984ba 100644 --- a/addons/project_long_term/wizard/project_compute_phases_view.xml +++ b/addons/project_long_term/wizard/project_compute_phases_view.xml @@ -8,14 +8,15 @@ <field name="type">form</field> <field name="arch" type="xml"> <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> + <footer> + <button name="check_selection" string="C_ompute" type="object" class="oe_highlight"/> + or + <button string="Cancel" class="oe_link" special="cancel" /> + </footer> </form> </field> </record> 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..8eb9db762dd 100644 --- a/addons/project_long_term/wizard/project_compute_tasks_view.xml +++ b/addons/project_long_term/wizard/project_compute_tasks_view.xml @@ -8,13 +8,14 @@ <field name="type">form</field> <field name="arch" type="xml"> <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"/> </group> + <footer> + <button name="compute_date" string="C_ompute" type="object" class="oe_highlight"/> + or + <button string="Cancel" class="oe_link" special="cancel" /> + </footer> </form> </field> </record> |