diff options
| author | Turkesh Patel (Open ERP) <tpa@tinyerp.com> | 2012-08-23 15:51:02 +0530 |
|---|---|---|
| committer | Turkesh Patel (Open ERP) <tpa@tinyerp.com> | 2012-08-23 15:51:02 +0530 |
| commit | cbacbf07be8d43d2781380f86ecfc8a964bb0109 (patch) | |
| tree | c5db3d0d35fbc69684061b8d8807c631ce132776 /addons/project_long_term/wizard | |
| parent | 1fcea0f2567f0360aa1c0a9baf34f90c4987337b (diff) | |
| parent | 79224ea6722e0f2644239b582d86346f32021c0a (diff) | |
[MRG] merge with lp:openobject-addons.
bzr revid: tpa@tinyerp.com-20120823102102-piznx3iyugzu640x
Diffstat (limited to 'addons/project_long_term/wizard')
3 files changed, 20 insertions, 27 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 b6afc26276b..c9fcf5aca70 100644 --- a/addons/project_long_term/wizard/project_compute_phases_view.xml +++ b/addons/project_long_term/wizard/project_compute_phases_view.xml @@ -5,21 +5,17 @@ <record id="view_project_compute_phases_select" model="ir.ui.view"> <field name="name">Schedule Phases</field> <field name="model">project.compute.phases</field> - <field name="type">form</field> <field name="arch" type="xml"> - <form string="Schedule Phases"> - <group colspan="4" col="4"> - <separator colspan="4" string="Schedule Phases" /> - <field name="target_project" colspan="4"/> - <field name="project_id" colspan="4" attrs="{'invisible':[('target_project','=','all')], 'required':[('target_project','!=','all')]}"/> - <separator colspan="4"/> - <group colspan="2" col="2"> - </group> - <group colspan="2" col="2"> <!-- Improve me --> - <button icon="gtk-cancel" special="cancel" string="_Cancel"/> - <button icon="gtk-ok" name="check_selection" string="C_ompute" type="object"/> - </group> - </group> + <form string="Schedule Phases" version="7.0"> + <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 bf27e7e7286..8b807806cde 100644 --- a/addons/project_long_term/wizard/project_compute_tasks_view.xml +++ b/addons/project_long_term/wizard/project_compute_tasks_view.xml @@ -5,19 +5,16 @@ <record id="view_project_compute_tasks" model="ir.ui.view"> <field name="name">Schedule Tasks</field> <field name="model">project.compute.tasks</field> - <field name="type">form</field> <field name="arch" type="xml"> - <form string="Schedule Tasks"> - <group colspan="4"> - <field name="project_id" colspan="4"/> - <separator colspan="4"/> - <group colspan="2" col="2"> - </group> - <group colspan="2" col="2"> - <button icon="gtk-cancel" special="cancel" string="_Cancel"/> - <button icon="gtk-ok" name="compute_date" string="C_ompute" type="object"/> - </group> - </group> + <form string="Schedule Tasks" version="7.0"> + <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> |