odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] account_asset: history tree view changes + removal of select=1 statements in views 

bzr revid: qdp-launchpad@openerp.com-20110711113827-shx1zyqmbd34rslv
This commit is contained in:
Quentin (OpenERP) 2011-07-11 13:38:27 +02:00
parent 11144bf20e
commit 65009b9f0b
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/account_asset/account_asset.py
View File

@ -407,7 +407,7 @@ class account_asset_history(osv.osv):
'date': fields.date('Date', required=True),
'asset_id': fields.many2one('account.asset.asset', 'Asset', required=True),
'method_time': fields.selection([('number','Number of Depreciations'),('end','Ending Date')], 'Time Method', required=True,
help="Choose the method to use to compute the dates and number of depreciation lines.\n"\
help="The method to use to compute the dates and number of depreciation lines.\n"\
"Number of Depreciations: Fix the number of depreciation lines and the time between 2 depreciations.\n" \
"Ending Date: Choose the time between 2 depreciations and the date the depreciations won't go beyond."),
'method_number': fields.integer('Number of Depreciations'),

29
addons/account_asset/account_asset_view.xml
View File

@ -12,7 +12,7 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Asset category">
<field name="name" select="1"/>
<field name="name"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
<separator string="Accounting information" colspan="4" />
<field name="journal_id"/>
@ -83,14 +83,14 @@
<field name="arch" type="xml">
<form string="Asset">
<group col="6" colspan="4">
<field name="name" select="1"/>
<field name="category_id" select="1" on_change="onchange_category_id(category_id)"/>
<field name="code" select="1"/>
<field name="purchase_value" select="1"/>
<field name="name"/>
<field name="category_id" on_change="onchange_category_id(category_id)"/>
<field name="code"/>
<field name="purchase_value"/>
<field name="salvage_value"/>
<field name="value_residual"/>
<field name="currency_id" select="1"/>
<field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
<field name="currency_id"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group>
<notebook colspan="4">
<page string="General">
@ -230,9 +230,9 @@
<field name="arch" type="xml">
<form string="Asset history">
<group col="6" colspan="4">
<field name="name" select="1"/>
<field name="date" select="1"/>
<field name="user_id" select="1"/>
<field name="name"/>
<field name="date"/>
<field name="user_id"/>
</group>
<group col="2" colspan="2">
<separator string="Depreciation Dates" colspan="2" />
@ -253,10 +253,11 @@
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Asset history">
<field name="date" select="1"/>
<field name="name" select="1"/>
<field name="user_id" select="1"/>
<field name="method_number" select="2"/>
<field name="date"/>
<field name="name"/>
<field name="user_id"/>
<field name="method_time"/>
<field name="method_number"/>
<field name="method_period"/>
<field name="method_end"/>
</tree>