diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py index 8cfb4f2afff..061f5d88318 100644 --- a/addons/account_asset/account_asset.py +++ b/addons/account_asset/account_asset.py @@ -38,11 +38,11 @@ class account_asset_category(osv.osv): 'account_expense_depreciation_id': fields.many2one('account.account', 'Depr. Expense Account', required=True), 'journal_id': fields.many2one('account.journal', 'Journal', required=True), 'company_id': fields.many2one('res.company', 'Company', required=True), - 'method': fields.selection([('linear','Linear'),('progressif','Progressive')], 'Computation method', required=True), - 'method_delay': fields.integer('Number of Depreciation'), + 'method': fields.selection([('linear','Linear'),('progressif','Progressive')], 'Computation Method', required=True, readonly=True, states={'draft':[('readonly',False)]}), + 'method_delay': fields.integer('During (interval)', readonly=True, states={'draft':[('readonly',False)]}), 'method_period': fields.integer('Period Length'), 'method_progress_factor': fields.float('Progressif Factor'), - 'method_time': fields.selection([('delay','Delay'),('end','Ending Period')], 'Time Method', required=True), + 'method_time': fields.selection([('delay','Delay'),('end','Ending Period')], 'Time Method', required=True, readonly=True, states={'draft':[('readonly',False)]}), 'prorata':fields.boolean('Prorata Temporis', help='Indicates that the accounting entries for this asset have to be done from the purchase date instead of the first January'), 'open_asset': fields.boolean('Skip Draft State', help="Check this if you want to automatically confirm the assets of this category when created by invoice."), } @@ -174,13 +174,14 @@ class account_asset_asset(osv.osv): 'active': fields.boolean('Active', select=2), 'partner_id': fields.many2one('res.partner', 'Partner'), - 'method': fields.selection([('linear','Linear'),('progressif','Progressive')], 'Computation method', required=True, readonly=True, states={'draft':[('readonly',False)]}), - 'method_delay': fields.integer('During (interval)', readonly=True, states={'draft':[('readonly',False)]}), + 'method': fields.selection([('linear','Linear'),('progressif','Progressive')], 'Computation method', required=True, readonly=True, states={'draft':[('readonly',False)]}, help="Linear: Calculated on basis of Gross Value/During (interval) \ + \nProgressive: Calculated on basis of Gross Value * Progressif Factor"), + 'method_delay': fields.integer('During (interval)', readonly=True, states={'draft':[('readonly',False)]}, help="Calculates Depreciation within specified interval"), 'method_period': fields.integer('Depre. all (period)', readonly=True, states={'draft':[('readonly',False)]}), 'method_end': fields.date('Ending date'), '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)]}), + '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 every 12 months"), 'prorata':fields.boolean('Prorata Temporis', Readonly="True", 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,), diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml index dd9e1682c1c..2963c0f2c61 100644 --- a/addons/account_asset/account_asset_view.xml +++ b/addons/account_asset/account_asset_view.xml @@ -76,7 +76,6 @@ -