[MERGE]:lp:~openerp-dev/openobject-addons/trunk-form-add-topbar-apa-asset-mma

bzr revid: apa@tinyerp.com-20120504083815-h5vb0ic0c7bs387g
This commit is contained in:
Amit Patel (OpenERP) 2012-05-04 14:08:15 +05:30
commit b9126a30d9
1 changed files with 12 additions and 10 deletions

View File

@ -78,8 +78,17 @@
<field name="model">account.asset.asset</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Asset">
<group col="6" colspan="4">
<form layout="manual">
<div class="oe_form_topbar">
<button name="validate" states="draft" string="Confirm Asset" type="object" icon="terp-camera_test"/>
<button name="set_to_close" states="open" string="Set to Close" type="object" icon="gtk-close"/>
<button name="set_to_draft" states="open" string="Set to Draft" type="object" icon="gtk-convert"/>
<div class="oe_right">
<field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open"/>
</div>
</div>
<sheet string="Asset" layout="auto">
<group col="6" colspan="4" class="oe_form_header">
<field name="name"/>
<field name="category_id" on_change="onchange_category_id(category_id)"/>
<field name="code"/>
@ -111,14 +120,6 @@
<field name="method_progress_factor" attrs="{'invisible':[('method','=','linear')], 'required':[('method','=','degressive')]}"/>
<field name="prorata" attrs="{'invisible': [('method_time','=','end')]}"/>
</group>
<newline/>
<separator string="" colspan="4"/>
<field name="state" readonly="1" colspan="2"/>
<group colspan="2" col="4">
<button name="validate" states="draft" string="Confirm Asset" type="object" icon="terp-camera_test"/>
<button name="set_to_draft" states="open" string="Set to Draft" type="object" icon="gtk-convert"/>
<button name="set_to_close" states="open" string="Set to Close" type="object" icon="gtk-close"/>
</group>
</page>
<page string="Depreciation Board">
<field name="depreciation_line_ids" colspan="4" nolabel="1" mode="tree,graph">
@ -148,6 +149,7 @@
<field name="note" nolabel="1"/>
</page>
</notebook>
</sheet>
</form>
</field>
</record>