pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] account_asset: Improved code.

Browse Source 
bzr revid: uco@tinyerp.com-20110523131732-3wk11pedk0i1tdrz
This commit is contained in:
Ujjvala Collins (OpenERP)
2011-05-23 18:47:32 +05:30
parent 73efba9f15
commit 1ed4231b8e
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account_asset/account_asset.py
+7 -6
View File
@@ -107,12 +107,13 @@ class account_asset_asset(osv.osv):
amount = residual_amount
else:
if asset.method == 'linear':
amount = asset.purchase_value / asset.method_delay
if asset.prorata and i == 1:
days = float(total_days) - float(depreciation_date.strftime('%j'))
first_amount = amount = (asset.purchase_value / asset.method_delay)/total_days * days
elif asset.prorata and i == undone_dotation_number:
amount = (asset.purchase_value / asset.method_delay) - first_amount
amount = asset.purchase_value / undone_dotation_number
if asset.prorata:
if i == 1:
days = float(total_days) - float(depreciation_date.strftime('%j'))
amount = (asset.purchase_value / asset.method_delay) / total_days * days
elif i == undone_dotation_number:
amount = (asset.purchase_value / asset.method_delay) / total_days * (total_days - days)
else:
amount = residual_amount * asset.method_progress_factor
residual_amount -= amount