diff options
| author | ARA (OpenERP) <ara@tinyerp.com> | 2011-01-11 11:02:19 +0530 |
|---|---|---|
| committer | ARA (OpenERP) <ara@tinyerp.com> | 2011-01-11 11:02:19 +0530 |
| commit | a142d7ace095dac0a17bc6f12955187c4cf6e3e4 (patch) | |
| tree | cf87c65dbadbbfc318355932818db65ba8922b7c /addons/project_long_term/project_long_term_view.xml | |
| parent | 1058ae9c8b3cf4b189fb30d72415dd88a1d8801c (diff) | |
| parent | d13830c1e7546da7e80e68a83ee7ef868c127f6c (diff) | |
[MERGE] merge from dev3
bzr revid: ara@tinyerp.com-20110111053219-20xwe4xhh8l50nki
Diffstat (limited to 'addons/project_long_term/project_long_term_view.xml')
| -rwxr-xr-x | addons/project_long_term/project_long_term_view.xml | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index ff4cfd8575b..b720da13654 100755 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -116,10 +116,10 @@ <field name="responsible_id"/> </group> <group colspan="6" col="6"> - <field name="date_start"/> + <field name="date_start" readonly="1"/> <field name="duration"/> <field name="product_uom" nolabel="1" domain="[('category_id.name', '=', 'Working Time')]"/> - <field name="date_end"/> + <field name="date_end" readonly="1"/> </group> </group> <notebook colspan="4"> @@ -127,14 +127,14 @@ <field colspan="4" name="resource_ids" nolabel="1"> <tree editable="bottom" string="Project Resource Allocation"> <field name="resource_id" context="{'project_id':parent.project_id}"/> - <field name="date_start" readonly="1"/> - <field name="date_end" readonly="1"/> + <field name="date_start"/> + <field name="date_end"/> <field name="useability" string="Availability"/> </tree> <form string="Project Resource Allocation"> <field name="resource_id" context="{'project_id':parent.project_id}"/> - <field name="date_start" readonly="1"/> - <field name="date_end" readonly="1"/> + <field name="date_start" /> + <field name="date_end"/> <field name="useability" string="Availability"/> </form> </field> @@ -228,6 +228,7 @@ <field name="date_end"/> <field name="duration"/> <field name="state"/> + <button name="%(action_project_schedule_tasks)d" string="Schedule Tasks" type="action" icon="gtk-jump-to"/> </tree> </field> </record> @@ -266,7 +267,7 @@ <field name="arch" type="xml"> <search string="Project Phases"> <group colspan="4" col="20"> - <filter string="Current" domain="[('state','in',('open','draft'))]" name="current" help="Draft and In Progress Phases" icon="terp-check"/> + <filter string="Current" domain="[('state','in',('open','draft'))]" name="current" help="Draft and In Progress Phases" icon="terp-check"/> <filter string="In Progress" name="Progress" domain="[('state','=','open')]" help="In Progress Phases" icon="terp-camera_test"/> <filter string="Pending" domain="[('state','=','pending')]" help="Pending Phases" icon="terp-gtk-media-pause"/> <separator orientation="vertical"/> @@ -322,7 +323,7 @@ <field name="type">form</field> <field name="inherit_id" ref="project.edit_project"/> <field name="arch" type="xml"> - <field name="priority" position="before"> + <field name="effective_hours" position="after"> <field name="resource_calendar_id"/> </field> @@ -396,21 +397,21 @@ name="Phases" res_model="project.phase" src_model="project.project" - domain="[('project_id', '=', active_id)]" + domain="[('project_id', '=', active_id)]" view_mode="tree,form" view_type="form" - /> + /> - <act_window - context="{'search_default_user_id': [user_id]}" + <act_window + context="{'search_default_user_id': [user_id]}" id="act_project_resource" name="Resources" res_model="resource.resource" src_model="project.project" - domain="[('user_id', '=',user_id)]" + domain="[('user_id', '=',user_id)]" view_mode="tree,form" view_type="form" - /> + /> # ------------------------------------------------------ # Menu Items |