diff options
| author | jas <jas@tinyerp.com> | 2010-10-13 15:18:41 +0530 |
|---|---|---|
| committer | jas <jas@tinyerp.com> | 2010-10-13 15:18:41 +0530 |
| commit | 0ec23b5a256c7f2f59c1253859cf4daedbd8e45c (patch) | |
| tree | c0604245857b116fdb137b509b89877f825ac8c4 /addons/project_long_term/project_long_term_view.xml | |
| parent | 2648dff04dd9d5a0ebababc0af9cc5e156cfc27b (diff) | |
| parent | db43747c75a0ef22c3a383456071c52d41bc17eb (diff) | |
[MERGE] : merged with trunk-dev-addons2
bzr revid: jas@tinyerp.com-20101013094841-6xfjrw6xcc5sdoxd
Diffstat (limited to 'addons/project_long_term/project_long_term_view.xml')
| -rw-r--r-- | addons/project_long_term/project_long_term_view.xml | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index 3412ba7ca08..f2e4c6efd68 100644 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -110,22 +110,23 @@ <field name="type">form</field> <field name="arch" type="xml"> <form string="Project Phase"> - <group colspan="6" col="6"> - <group colspan="2" col="2"> + <group colspan="8" col="7"> + <group colspan="8"> <field name="name" select="1"/> - <field name="date_start"/> + <field name="total_hours"/> + <field name="project_id" on_change="onchange_project(project_id)" colspan="2"/> + <field name="responsible_id" colspan="2"/> </group> - <group colspan="2" col="4"> - <field name="project_id" on_change="onchange_project(project_id)" colspan="4"/> - <newline/> - <field name="duration" colspan="1" on_change="onchange_days(project_id)" /> + <newline/> + <group colspan="2"> + <field name="date_start"/> + <field name="date_end"/> + </group> + <group colspan="2"> + <field name="duration" on_change="onchange_days(project_id)"/> <field name="product_uom" nolabel="1" domain="[('category_id.name', '=', 'Working Time')]"/> - </group> - <group colspan="2" col="2"> - <field name="responsible_id"/> - <field name="date_end"/> </group> - </group> + </group> <notebook colspan="4"> <page string="Resource Allocation"> <field colspan="4" name="resource_ids" nolabel="1"> @@ -145,11 +146,11 @@ <separator string="" colspan="4"/> <group col="12" colspan="4"> <field name="state" select="1"/> + <button string="Cancel" name="set_cancel" states="draft,open,pending" icon="gtk-cancel"/> <button string="Draft" name="set_draft" states="open" icon="gtk-indent"/> <button string="Pending" name="set_pending" states="open" icon="gtk-media-pause"/> <button string="Done" name="set_done" states="pending,open" icon="terp-dialog-close"/> <button string="Start Phase" name="set_open" states="pending,draft" icon="gtk-execute"/> - <button string="Cancel" name="set_cancel" states="draft,open,pending" icon="gtk-cancel"/> </group> </page> <page string="Task Detail"> |