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

[IMP] account_asset: Implement salvage value functionality. 

bzr revid: uco@tinyerp.com-20110526101847-j9lednhp07iaww9s
This commit is contained in:
Ujjvala Collins (OpenERP) 2011-05-26 15:48:47 +05:30
parent 2bc8a08ed5
commit 6d51b19759
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/account_asset/account_asset.py
View File

@ -94,7 +94,7 @@ class account_asset_asset(osv.osv):
depreciation_lin_obj.unlink(cr, uid, old_depreciation_line_ids, context=context)
undone_dotation_number = asset.method_delay - len(asset.account_move_line_ids)
residual_amount = asset.value_residual
residual_amount = asset.value_residual - asset.salvage_value
depreciation_date = datetime.strptime(self._get_last_depreciation_date(cr, uid, [asset.id], context)[asset.id], '%Y-%m-%d')
day = depreciation_date.day
month = depreciation_date.month
@ -104,7 +104,7 @@ class account_asset_asset(osv.osv):
amount = residual_amount
else:
if asset.method == 'linear':
amount = asset.purchase_value / undone_dotation_number
amount = (asset.purchase_value - asset.salvage_value) / undone_dotation_number
else:
amount = residual_amount * asset.method_progress_factor
residual_amount -= amount
@ -172,6 +172,7 @@ class account_asset_asset(osv.osv):
'prorata':fields.boolean('Prorata Temporis', Readonly="True", help='Indicates that the accounting entries for this asset have to be done from the purchase date instead of the first January'),
'history_ids': fields.one2many('account.asset.history', 'asset_id', 'History', readonly=True),
'depreciation_line_ids': fields.one2many('account.asset.depreciation.line', 'asset_id', 'Depreciation Lines', readonly=True,),
'salvage_value': fields.float('Salvage Value', digits=(16,2), required=True, help="It is the amount you plan to have that you can't depreciate."),
}
_defaults = {
'code': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'account.asset.code'),

3
addons/account_asset/account_asset_view.xml
View File

@ -53,9 +53,10 @@
<field name="category_id" select="1"/>
<field name="code" select="1"/>
<field name="purchase_value" select="1"/>
<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="value_residual"/>
</group>
<notebook colspan="4">
<page string="Depreciation">