diff options
| author | ron@tinyerp.com <> | 2010-10-13 16:37:19 +0530 |
|---|---|---|
| committer | ron@tinyerp.com <> | 2010-10-13 16:37:19 +0530 |
| commit | 1ae5e3800101fee2827cfe34d4804c67dbdea550 (patch) | |
| tree | a79a55bdb910a106417c5ab463dd2e4718f4030c /addons/project_long_term/project_long_term_view.xml | |
| parent | 802541e5c78daac2cfc2a1273780193306ba5522 (diff) | |
| parent | 896ebda0aed93c01cb381e20404139211c1cb571 (diff) | |
[MERGE] Merged with lp:~trunk-dev-addons2
bzr revid: ron@tinyerp.com-20101013110719-rk9mb03k7mfsk8fq
Diffstat (limited to 'addons/project_long_term/project_long_term_view.xml')
| -rw-r--r-- | addons/project_long_term/project_long_term_view.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index bb8e05770ed..e83085c3afa 100644 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -122,7 +122,7 @@ <field name="product_uom" nolabel="1" domain="[('category_id.name', '=', 'Working Time')]"/> <field name="date_end"/> </group> - </group> + </group> <notebook colspan="4"> <page string="Resource Allocation"> <field colspan="4" name="resource_ids" nolabel="1"> @@ -142,11 +142,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"> @@ -307,8 +307,8 @@ # Project # ------------------------------------------------------ - <record id="view_phase_project_form1" model="ir.ui.view"> - <field name="name">phase.project.form1</field> + <record id="project.view_project_resource_form1" model="ir.ui.view"> + <field name="name">Project Resource Calendar View</field> <field name="model">project.project</field> <field name="type">form</field> <field name="inherit_id" ref="project.edit_project"/> |