From 75e8fd083923abf7185a94ae35d2abadca378f94 Mon Sep 17 00:00:00 2001 From: "Ujjvala Collins (OpenERP)" Date: Wed, 6 Jul 2011 10:58:02 +0530 Subject: [PATCH 1/2] [IMP] account_asset: Improved tooltip for Time method field. bzr revid: uco@tinyerp.com-20110706052802-bc2xxu6i200xg2va --- addons/account_asset/account_asset.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py index 1f3eca5f20c..f7ea25fb1ed 100644 --- a/addons/account_asset/account_asset.py +++ b/addons/account_asset/account_asset.py @@ -221,7 +221,9 @@ class account_asset_asset(osv.osv): 'method_end': fields.date('Ending Date', readonly=True, states={'draft':[('readonly',False)]}), 'method_progress_factor': fields.float('Progressif Factor', readonly=True, states={'draft':[('readonly',False)]}), 'value_residual': fields.function(_amount_residual, method=True, digits_compute=dp.get_precision('Account'), string='Residual Value'), - 'method_time': fields.selection([('delay','Delay'),('end','Ending Period')], 'Time Method', required=True, readonly=True, states={'draft':[('readonly',False)]}, help="Delay: Allow users to enter number of periods to generate depreciation lines \n Ending Period: Calculates depreciation lines on the basis of Ending Period Date and Number of Depreciation"), + 'method_time': fields.selection([('delay','Delay'),('end','Ending Period')], 'Time Method', required=True, readonly=True, states={'draft':[('readonly',False)]}, + help="Delay: Calculates depreciation lines based on fixed number of intervals\n" \ + "Ending Period: Calculates depreciation lines based on Ending Date and Period Length"), 'prorata':fields.boolean('Prorata Temporis', readonly=True, states={'draft':[('readonly',False)]}, 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, states={'draft':[('readonly',False)]}), From f5931de1fb3c842f21448a5bae2900dd3c3e06c9 Mon Sep 17 00:00:00 2001 From: "Ujjvala Collins (OpenERP)" Date: Wed, 6 Jul 2011 11:32:04 +0530 Subject: [PATCH 2/2] [FIX] account_asset: Corrected indentation. bzr revid: uco@tinyerp.com-20110706060204-jiv40hh5q4yjhhe7 --- addons/account_asset/account_asset.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py index f7ea25fb1ed..485cef33a35 100644 --- a/addons/account_asset/account_asset.py +++ b/addons/account_asset/account_asset.py @@ -222,8 +222,8 @@ class account_asset_asset(osv.osv): 'method_progress_factor': fields.float('Progressif Factor', readonly=True, states={'draft':[('readonly',False)]}), 'value_residual': fields.function(_amount_residual, method=True, digits_compute=dp.get_precision('Account'), string='Residual Value'), 'method_time': fields.selection([('delay','Delay'),('end','Ending Period')], 'Time Method', required=True, readonly=True, states={'draft':[('readonly',False)]}, - help="Delay: Calculates depreciation lines based on fixed number of intervals\n" \ - "Ending Period: Calculates depreciation lines based on Ending Date and Period Length"), + help="Delay: Calculates depreciation lines based on fixed number of intervals\n" \ + "Ending Period: Calculates depreciation lines based on Ending Date and Period Length"), 'prorata':fields.boolean('Prorata Temporis', readonly=True, states={'draft':[('readonly',False)]}, 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, states={'draft':[('readonly',False)]}),