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

[Merge] After posting also Compute button works fine 

bzr revid: bde@tiny2-desktop-20110524114350-n9hnhlo2sppezmyj
This commit is contained in:
bde 2011-05-24 17:13:50 +05:30
parent a2ffcb5888
commit 81e8742041
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/account_asset/account_asset.py
View File

@ -92,7 +92,6 @@ class account_asset_asset(osv.osv):
old_depreciation_line_ids = depreciation_lin_obj.search(cr, uid, [('asset_id', '=', asset.id), ('move_id', '=', False)])
if old_depreciation_line_ids:
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
depreciation_date = datetime.strptime(self._get_last_depreciation_date(cr, uid, [asset.id], context)[asset.id], '%Y-%m-%d')
@ -104,7 +103,7 @@ class account_asset_asset(osv.osv):
amount = residual_amount
else:
if asset.method == 'linear':
amount = asset.purchase_value / undone_dotation_number
amount = asset.value_residual / undone_dotation_number
else:
amount = residual_amount * asset.method_progress_factor
residual_amount -= amount
@ -357,6 +356,7 @@ class account_asset_depreciation_line(osv.osv):
'amount_currency': company_currency <> current_currency and sign * line.amount or 0.0,
'analytic_account_id': line.asset_id.category_id.account_analytic_id.id,
'date': depreciation_date,
'asset_id': line.asset_id.id
})
self.write(cr, uid, line.id, {'move_id': move_id}, context=context)
return True