diff options
| author | Amit Patel (OpenERP) <apa@tinyerp.com> | 2012-06-12 12:05:39 +0530 |
|---|---|---|
| committer | Amit Patel (OpenERP) <apa@tinyerp.com> | 2012-06-12 12:05:39 +0530 |
| commit | deec2bda0da0a28d86d08b0d0a5a999b353882a2 (patch) | |
| tree | 005d3488ab79c3f5663bcfd27d50befa3bfd74fb /addons/project_long_term/wizard | |
| parent | a3ebc147841f78d03d5616f3c7da10c01725bc04 (diff) | |
| parent | b8716390702b098c395fd452b9152481157c8b6d (diff) | |
[MERGE]:resolved conflicts and merged with trunk
bzr revid: apa@tinyerp.com-20120612063539-japenzf86hh59541
Diffstat (limited to 'addons/project_long_term/wizard')
| -rw-r--r-- | addons/project_long_term/wizard/project_compute_phases_view.xml | 22 | ||||
| -rw-r--r-- | addons/project_long_term/wizard/project_compute_tasks_view.xml | 19 |
2 files changed, 17 insertions, 24 deletions
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..bf2c51e41e6 100644 --- a/addons/project_long_term/wizard/project_compute_phases_view.xml +++ b/addons/project_long_term/wizard/project_compute_phases_view.xml @@ -7,19 +7,15 @@ <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"> + <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"> + <field name="target_project"/> + <field name="project_id" attrs="{'invisible':[('target_project','=','all')], 'required':[('target_project','!=','all')]}"/> + </group> </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..ac30a3aa6d9 100644 --- a/addons/project_long_term/wizard/project_compute_tasks_view.xml +++ b/addons/project_long_term/wizard/project_compute_tasks_view.xml @@ -7,17 +7,14 @@ <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"> + <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> </form> </field> </record> |