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

[FIX] account_asset: Fixed problem of change in params when computing depreciation lines. 

bzr revid: uco@tinyerp.com-20110608133553-f9039h3zjvmj6do3
This commit is contained in:
Ujjvala Collins (OpenERP) 2011-06-08 19:05:53 +05:30
parent 900a19dbac
commit a0154cca06
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
addons/account_asset/account_asset.py
View File

@ -105,6 +105,9 @@ class account_asset_asset(osv.osv):
def compute_depreciation_board(self, cr, uid,ids, context=None):
depreciation_lin_obj = self.pool.get('account.asset.depreciation.line')
for asset in self.browse(cr, uid, ids, context=context):
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)
# For all cases: amount to depreciate is (Purchase Value - Salvage Value)
amount_to_depr = residual_amount = asset.purchase_value - asset.salvage_value
depreciation_date = datetime.strptime(self._get_last_depreciation_date(cr, uid, [asset.id], context)[asset.id], '%Y-%m-%d')
@ -134,6 +137,8 @@ class account_asset_asset(osv.osv):
else:
amount = residual_amount * asset.method_progress_factor
residual_amount -= amount
if i <= len(asset.account_move_line_ids):
continue
vals = {
'amount': amount,
'asset_id': asset.id,
@ -143,11 +148,7 @@ class account_asset_asset(osv.osv):
'depreciated_value': amount_to_depr - residual_amount,
'depreciation_date': depreciation_date.strftime('%Y-%m-%d'),
}
dep_id = [dep.id for dep in asset.depreciation_line_ids if not dep.move_check and dep.sequence == vals['sequence']]
if asset.depreciation_line_ids:
depreciation_lin_obj.write(cr, uid, dep_id, vals, context=context)
else:
depreciation_lin_obj.create(cr, uid, vals, context=context)
depreciation_lin_obj.create(cr, uid, vals, context=context)
# Considering Depr. Period as months
depreciation_date = (datetime(year, month, day) + relativedelta(months=+asset.method_period))
day = depreciation_date.day

2
addons/account_asset/account_asset_view.xml
View File

@ -91,7 +91,7 @@
<field name="method_time"/>
<field name="method_period"/>
<field name="method_delay" attrs="{'invisible': [('method_time','=','end')]}"/>
<field name="prorata" colspan="1"/>
<field name="prorata" colspan="1" attrs="{'invisible': ['|',('method_time','=','end'),('method','!=','linear')]}"/>
<field name="method_end" attrs="{'required': [('method_time','=','end')], 'invisible':[('method_time','=','delay')]}"/>
<newline/>
</page>