[MERGE] Merged with main addons.

bzr revid: tde@openerp.com-20120601135532-dz42z4bfnp83kh6s
This commit is contained in:
Thibault Delavallée
2012-06-01 15:55:32 +02:00
28 changed files with 3 additions and 219 deletions
@@ -150,19 +150,7 @@
<field name="user_id"/>
<field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}"/>
<field name="stage_id" widget="selection" readonly="1"/>
<button name="stage_previous" string="Previous" type="object"
icon="gtk-go-back" help="Change to Previous Stage"
attrs="{'invisible': [('stage_id','=', False)]}"/>
<button name="stage_next" string="Next" type="object"
icon="gtk-go-forward" help="Change to Next Stage"
attrs="{'invisible': [('stage_id','=', False)]}"/>
<field name="state" groups="base.group_no_one"/>
<button name="case_open" string="Open" type="object"
icon="gtk-go-forward" states="draft,pending"/>
<button name="case_close" string="Done" type="object"
icon="gtk-close" states="draft,open,pending"/>
<button name="case_cancel" string="Cancel" type="object"
icon="gtk-cancel" states="draft,open,pending"/>
<field name="categ_id" invisible="1"/>
<field name="task_id" invisible="1"/>
</tree>
@@ -318,19 +306,7 @@
<field name="version_id"/>
<field name="user_id"/>
<field name="stage_id" widget="selection" readonly="1"/>
<button name="stage_previous" string="Previous" type="object"
icon="gtk-go-back" help="Change to Previous Stage"
attrs="{'invisible': [('stage_id','=', False)]}"/>
<button name="stage_next" string="Next" type="object"
icon="gtk-go-forward" help="Change to Next Stage"
attrs="{'invisible': [('stage_id','=', False)]}"/>
<field name="state" groups="base.group_no_one"/>
<button name="case_open" string="Open" type="object"
states="draft,pending" icon="gtk-go-forward"/>
<button name="case_close" string="Done" type="object"
states="draft,open,pending" icon="gtk-close"/>
<button name="case_cancel" string="Cancel" type="object"
states="draft,open,pending" icon="gtk-cancel"/>
</tree>
</field>
</record>