[IMP] Improved Usability of Account Asset
bzr revid: bde@tiny2-desktop-20110627102554-p0kk7websm7qxv4r
This commit is contained in:
bde
parent
267fc98723
commit
cec2748751
|
|
@ -189,11 +189,11 @@ class account_asset_asset(osv.osv):
|
|||
|
||||
'name': fields.char('Asset', size=64, required=True, select=1),
|
||||
'code': fields.char('Reference ', size=16, select=1),
|
||||
'purchase_value': fields.float('Gross value ', required=True, size=16, select=1),
|
||||
'purchase_value': fields.float('Gross Value ', required=True, size=16, select=1),
|
||||
'currency_id': fields.many2one('res.currency','Currency',required=True,size=5,select=1),
|
||||
'company_id': fields.many2one('res.company', 'Company', required=True),
|
||||
'note': fields.text('Note'),
|
||||
'category_id': fields.many2one('account.asset.category', 'Asset category',required=True, change_default=True),
|
||||
'category_id': fields.many2one('account.asset.category', 'Asset Category',required=True, change_default=True),
|
||||
'localisation': fields.char('Localisation', size=32, select=2),
|
||||
'parent_id': fields.many2one('account.asset.asset', 'Parent Asset'),
|
||||
'child_ids': fields.one2many('account.asset.asset', 'parent_id', 'Children Assets'),
|
||||
|
|
@ -205,7 +205,7 @@ class account_asset_asset(osv.osv):
|
|||
\nProgressive: Calculated on basis of Gross Value * Progressif Factor"),
|
||||
'method_delay': fields.integer('Number of Depreciation', readonly=True, states={'draft':[('readonly',False)]}, help="Calculates Depreciation within specified interval"),
|
||||
'method_period': fields.integer('Period Length', readonly=True, states={'draft':[('readonly',False)]}, help="State here the time during 2 depreciations, in months"),
|
||||
'method_end': fields.date('Ending date', readonly=True, states={'draft':[('readonly',False)]}),
|
||||
'method_end': fields.date('Ending Date', readonly=True, states={'draft':[('readonly',False)]}),
|
||||
'method_progress_factor': fields.float('Progressif Factor', readonly=True, states={'draft':[('readonly',False)]}),
|
||||
'value_residual': fields.function(_amount_residual, method=True, digits_compute=dp.get_precision('Account'), string='Residual Value'),
|
||||
'method_time': fields.selection([('delay','Delay'),('end','Ending Period')], 'Time Method', required=True, readonly=True, states={'draft':[('readonly',False)]}, help="Delay: Allow users to enter number of periods to generate depreciation lines \n Ending Period: Calculates depreciation lines on the basis of Ending Period Date and Number of Depreciation"),
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
<field name="method_time"/>
|
||||
<field name="method_delay" attrs="{'invisible':[('method_time','=','end')]}"/>
|
||||
<field name="method_period"/>
|
||||
<field name="method_end" attrs="{'required': [('method_time','=','end')], 'invisible':[('method_time','=','delay')]}"/>
|
||||
<field name="method_end" attrs="{'required': [('method_time','=','end')], 'invisible':[('method_time','=','delay')]}"/>
|
||||
</group>
|
||||
<group colspan="2" col="2">
|
||||
<separator string="Depreciation Method" colspan="2" />
|
||||
|
|
@ -78,17 +78,17 @@
|
|||
<field name="purchase_date"/>
|
||||
<group colspan="2" col="2">
|
||||
<separator string="Depreciation Dates" colspan="2" />
|
||||
<button
|
||||
name="%(wizard_asset_modify)d"
|
||||
states="open"
|
||||
string="Change duration"
|
||||
type="action"
|
||||
<button
|
||||
name="%(wizard_asset_modify)d"
|
||||
states="open"
|
||||
string="Change duration"
|
||||
type="action"
|
||||
colspan="2"/>
|
||||
<newline/>
|
||||
<field name="method_time" on_change="onchange_method_time(method_time)"/>
|
||||
<field name="method_delay" attrs="{'invisible':[('method_time','=','end')]}"/>
|
||||
<field name="method_period"/>
|
||||
<field name="method_end" attrs="{'required': [('method_time','=','end')], 'invisible':[('method_time','=','delay')]}"/>
|
||||
<field name="method_end" attrs="{'required': [('method_time','=','end')], 'invisible':[('method_time','=','delay')]}"/>
|
||||
</group>
|
||||
<group colspan="2" col="2">
|
||||
<separator string="Depreciation Method" colspan="2" />
|
||||
|
|
@ -176,7 +176,7 @@
|
|||
<field name="arch" type="xml">
|
||||
<tree string="Assets">
|
||||
<field name="name"/>
|
||||
<field name="category_id"/>
|
||||
<field name="category_id"/>
|
||||
<field name="purchase_date"/>
|
||||
<field name="partner_id"/>
|
||||
<field name="purchase_value"/>
|
||||
|
|
@ -188,7 +188,7 @@
|
|||
</field>
|
||||
</record>
|
||||
|
||||
<record id="view_analytic_entries_report_search" model="ir.ui.view">
|
||||
<record id="view_account_asset_search" model="ir.ui.view">
|
||||
<field name="name">account.asset.asset.search</field>
|
||||
<field name="model">account.asset.asset</field>
|
||||
<field name="type">search</field>
|
||||
|
|
@ -197,11 +197,12 @@
|
|||
<group col="10" colspan="12">
|
||||
<filter icon="terp-document-new" string="Draft" domain="[('state','=', 'draft')]" help="Assets in Draft State"/>
|
||||
<filter icon="terp-camera_test" string="Running" domain="[('state','=', 'open')]" help="Assets in Running State"/>
|
||||
<separator orientation="vertical"/>
|
||||
<field name="name"/>
|
||||
<field name="category_id"/>
|
||||
<field name="purchase_date"/>
|
||||
<field name="partner_id"/>
|
||||
</group>
|
||||
<field name="name"/>
|
||||
<field name="category_id"/>
|
||||
<field name="purchase_date"/>
|
||||
<field name="partner_id"/>
|
||||
</search>
|
||||
</field>
|
||||
</record>
|
||||
|
|
@ -223,6 +224,8 @@
|
|||
<field name="name">Assets</field>
|
||||
<field name="res_model">account.asset.asset</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_id" ref="view_account_asset_asset_tree"/>
|
||||
<field name="search_view_id" ref="view_account_asset_search"/>
|
||||
</record>
|
||||
|
||||
<menuitem
|
||||
|
|
|
|||
Loading…
Reference in New Issue