From 1ed4231b8ecee9a04caefa71a863131df2aae207 Mon Sep 17 00:00:00 2001 From: "Ujjvala Collins (OpenERP)" Date: Mon, 23 May 2011 18:47:32 +0530 Subject: [PATCH] [IMP] account_asset: Improved code. bzr revid: uco@tinyerp.com-20110523131732-3wk11pedk0i1tdrz --- addons/account_asset/account_asset.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py index 8fdce1ede9d..24ee24624c1 100644 --- a/addons/account_asset/account_asset.py +++ b/addons/account_asset/account_asset.py @@ -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