diff options
| author | Kuldeep Joshi (OpenERP) <kjo@tinyerp.com> | 2012-06-12 17:17:20 +0530 |
|---|---|---|
| committer | Kuldeep Joshi (OpenERP) <kjo@tinyerp.com> | 2012-06-12 17:17:20 +0530 |
| commit | 97653d0bb727350e8bf85fdcdfe91dbf1ac2bd38 (patch) | |
| tree | 781730944853905c7f1d52b1c542ba71b9d34faa /addons/project_long_term/wizard | |
| parent | c95b6d26abc54d3d597cb577410033afba971363 (diff) | |
| parent | fcca76b487575e82f00ab8ff9d8f021f3fa3187d (diff) | |
[MERGE] merge with main addons
bzr revid: kjo@tinyerp.com-20120612114720-ehebwl8uw9w56azk
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> |