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

[ADD] account_asset: Added remaining fields of two groups. 

bzr revid: uco@tinyerp.com-20110517124452-b9vbcdc6le9umavk
This commit is contained in:
Ujjvala Collins (OpenERP) 2011-05-17 18:14:52 +05:30
parent 1b7975285a
commit 262b898671
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
addons/account_asset/account_asset.py
View File

@ -39,10 +39,19 @@ class account_asset_category(osv.osv):
'company_id': fields.many2one('res.company', 'Company', required=True),
'method': fields.selection([('linear','Linear'),('progressif','Progressive')], 'Computation method', required=True),
'method_delay': fields.integer('During (interval)'),
'method_period': fields.integer('Depre. all (period)'),
'method_progress_factor': fields.float('Progressif Factor'),
'method_time': fields.selection([('delay','Delay'),('end','Ending Period')], 'Time Method', required=True),
'prorata':fields.boolean('Prorata Temporis', help='Indicates that the accounting entries for this asset have to be done from the purchase date instead of the first January'),
}
_defaults = {
'company_id': lambda self, cr, uid, context: self.pool.get('res.company')._company_default_get(cr, uid, 'account.asset.category', context=context),
'method': lambda obj, cr, uid, context: 'linear',
'method_delay': lambda obj, cr, uid, context: 5,
'method_time': lambda obj, cr, uid, context: 'delay',
'method_period': lambda obj, cr, uid, context: 12,
'method_progress_factor': lambda obj, cr, uid, context: 0.3,
}
account_asset_category()
@ -204,7 +213,13 @@ class account_asset_asset(osv.osv):
res = {'value':{}}
if category_id:
category_obj = self.pool.get('account.asset.category').browse(cr, uid, category_id, context=context)
res['value'] = {'method': category_obj.method, 'method_delay': category_obj.method_delay}
res['value'] = {'method': category_obj.method,
'method_delay': category_obj.method_delay,
'method_time': category_obj.method_time,
'method_period': category_obj.method_period,
'method_progress_factor': category_obj.method_progress_factor,
'prorata': category_obj.prorata,
}
return res
def _compute_period(self, cr, uid, property, context={}):

6
addons/account_asset/account_asset_view.xml
View File

@ -15,7 +15,13 @@
<field name="account_asset_id"/>
<field name="account_depreciation_id"/>
<field name="account_expense_depreciation_id"/>
<separator string="Depreciation duration" colspan="4"/>
<field name="method"/>
<field name="method_progress_factor" attrs="{'invisible':[('method','=','linear')]}"/>
<newline/>
<field name="method_time"/>
<field name="method_period" attrs="{'invisible':[('method_time','=','end')]}"/>
<field name="prorata" colspan="1"/>
<field name="method_delay"/>
<group col="4" colspan="4" groups="analytic.group_analytic_accounting">
<separator string="Analytic information" colspan="4" />