[MERGE] Merged with main addons.
bzr revid: tde@openerp.com-20120601135532-dz42z4bfnp83kh6s
This commit is contained in:
@@ -19,14 +19,6 @@
|
||||
<field name="progress" widget="progressbar"/>
|
||||
<field name="stage_id" invisible="context.get('set_visible',False)"/>
|
||||
<field name="state" invisible="context.get('set_visible',False)" groups="base.group_no_one"/>
|
||||
<button name="do_open" string="Start Task" type="object"
|
||||
states="draft,pending" icon="gtk-go-forward" invisible="context.get('set_visible',False)"/>
|
||||
<button name="action_close" string="Done" type="object"
|
||||
states="draft,open,pending" icon="gtk-apply" invisible="context.get('set_visible',False)"/>
|
||||
<button name="do_cancel" string="Cancel" type="object"
|
||||
states="open,draft,pending" icon="gtk-cancel" invisible="context.get('set_visible',False)"/>
|
||||
<button name="%(action_project_task_delegate)d" string="Delegate" type="action"
|
||||
states="pending,open,draft" icon="gtk-sort-descending"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
@@ -46,12 +38,6 @@
|
||||
<field name="progress" widget="progressbar"/>
|
||||
<field name="stage_id" invisible="context.get('set_visible',False)"/>
|
||||
<field name="state" invisible="context.get('set_visible',False)" groups="base.group_no_one"/>
|
||||
<button name="do_open" string="Start Task" type="object"
|
||||
states="draft,pending" icon="gtk-go-forward" invisible="context.get('set_visible',False)"/>
|
||||
<button name="action_close" string="Done" type="object"
|
||||
states="draft,open,pending" icon="gtk-apply" invisible="context.get('set_visible',False)"/>
|
||||
<button name="do_cancel" string="Cancel" type="object"
|
||||
states="open,draft,pending" icon="gtk-cancel" invisible="context.get('set_visible',False)"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
@@ -517,17 +517,7 @@
|
||||
<field name="effective_hours" widget="float_time" sum="Spent Hours" invisible="1"/>
|
||||
<field name="remaining_hours" widget="float_time" sum="Remaining Hours" on_change="onchange_remaining(remaining_hours,planned_hours)" invisible="context.get('set_visible',False)" groups="project.group_time_work_estimation_tasks"/>
|
||||
<field name="date_deadline" invisible="context.get('deadline_visible',True)"/>
|
||||
<button name="do_open" string="Start Task" type="object"
|
||||
states="draft,pending" icon="gtk-go-forward"/>
|
||||
<button name="action_close" string="Done" type="object"
|
||||
states="draft,open,pending" icon="gtk-apply"/>
|
||||
<button name="%(action_project_task_delegate)d" string="Delegate" type="action"
|
||||
states="pending,open,draft" icon="terp-personal"/>
|
||||
<field name="stage_id" invisible="context.get('set_visible',False)"/>
|
||||
<button name="stage_previous" string="Previous Stage" type="object"
|
||||
states="open,pending" icon="gtk-go-back" attrs="{'invisible': [('stage_id','=', False)]}"/>
|
||||
<button name="stage_next" string="Next Stage" type="object"
|
||||
states="open,pending" icon="gtk-go-forward" attrs="{'invisible': [('stage_id','=', False)]}"/>
|
||||
<field name="state" invisible="context.get('set_visible',False)" groups="base.group_no_one"/>
|
||||
<field name="date_start" invisible="1" groups="base.group_no_one"/>
|
||||
<field name="date_end" invisible="1" groups="base.group_no_one"/>
|
||||
|
||||
Reference in New Issue
Block a user