From 1b7975285a8b6c4a296d71b34ed9186db15f18e6 Mon Sep 17 00:00:00 2001 From: "Ujjvala Collins (OpenERP)" Date: Tue, 17 May 2011 16:07:53 +0530 Subject: [PATCH 1/3] [ADD] account_asset: Added fields on asset category which will reflect into the same fields of asset. bzr revid: uco@tinyerp.com-20110517103753-kh2v1z9pupi8s1dh --- addons/account_asset/account_asset.py | 10 +++++++++- addons/account_asset/account_asset_view.xml | 4 +++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py index 4220fe0df1e..96c5cc39aa9 100644 --- a/addons/account_asset/account_asset.py +++ b/addons/account_asset/account_asset.py @@ -37,6 +37,8 @@ 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('During (interval)'), } _defaults = { @@ -198,7 +200,13 @@ class account_asset_asset(osv.osv): 'company_id': lambda self, cr, uid, context: self.pool.get('res.company')._company_default_get(cr, uid, 'account.asset.asset',context=context), } - + def onchange_category_id(self, cr, uid, ids, category_id, context=None): + res = {'value':{}} + if category_id: + category_obj = self.pool.get('account.asset.category').browse(cr, uid, category_id, context=context) + res['value'] = {'method': category_obj.method, 'method_delay': category_obj.method_delay} + return res + def _compute_period(self, cr, uid, property, context={}): if (len(property.entry_asset_ids or [])/2)>=property.method_delay: return False diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml index f75b0dc4cf6..cc5232b12c7 100644 --- a/addons/account_asset/account_asset_view.xml +++ b/addons/account_asset/account_asset_view.xml @@ -15,6 +15,8 @@ + + @@ -50,7 +52,7 @@
- + From 262b898671b566aba8b6dbe40874a238c525c9e3 Mon Sep 17 00:00:00 2001 From: "Ujjvala Collins (OpenERP)" Date: Tue, 17 May 2011 18:14:52 +0530 Subject: [PATCH 2/3] [ADD] account_asset: Added remaining fields of two groups. bzr revid: uco@tinyerp.com-20110517124452-b9vbcdc6le9umavk --- addons/account_asset/account_asset.py | 17 ++++++++++++++++- addons/account_asset/account_asset_view.xml | 6 ++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py index 96c5cc39aa9..5681168ad73 100644 --- a/addons/account_asset/account_asset.py +++ b/addons/account_asset/account_asset.py @@ -39,10 +39,19 @@ class account_asset_category(osv.osv): 'company_id': fields.many2one('res.company', 'Company', required=True), 'method': fields.selection([('linear','Linear'),('progressif','Progressive')], 'Computation method', required=True), 'method_delay': fields.integer('During (interval)'), + 'method_period': fields.integer('Depre. all (period)'), + 'method_progress_factor': fields.float('Progressif Factor'), + 'method_time': fields.selection([('delay','Delay'),('end','Ending Period')], 'Time Method', required=True), + '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'), } _defaults = { 'company_id': lambda self, cr, uid, context: self.pool.get('res.company')._company_default_get(cr, uid, 'account.asset.category', context=context), + 'method': lambda obj, cr, uid, context: 'linear', + 'method_delay': lambda obj, cr, uid, context: 5, + 'method_time': lambda obj, cr, uid, context: 'delay', + 'method_period': lambda obj, cr, uid, context: 12, + 'method_progress_factor': lambda obj, cr, uid, context: 0.3, } account_asset_category() @@ -204,7 +213,13 @@ class account_asset_asset(osv.osv): res = {'value':{}} if category_id: category_obj = self.pool.get('account.asset.category').browse(cr, uid, category_id, context=context) - res['value'] = {'method': category_obj.method, 'method_delay': category_obj.method_delay} + res['value'] = {'method': category_obj.method, + 'method_delay': category_obj.method_delay, + 'method_time': category_obj.method_time, + 'method_period': category_obj.method_period, + 'method_progress_factor': category_obj.method_progress_factor, + 'prorata': category_obj.prorata, + } return res def _compute_period(self, cr, uid, property, context={}): diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml index cc5232b12c7..8f867567f43 100644 --- a/addons/account_asset/account_asset_view.xml +++ b/addons/account_asset/account_asset_view.xml @@ -15,7 +15,13 @@ + + + + + + From 26b3ffdf1d510f5b266a743fadcf7b23285a6248 Mon Sep 17 00:00:00 2001 From: "Ujjvala Collins (OpenERP)" Date: Tue, 17 May 2011 18:48:03 +0530 Subject: [PATCH 3/3] [IMP] account_asset: Improved default values. Improved view. bzr revid: uco@tinyerp.com-20110517131803-vuakdgz6p8kkfk03 --- addons/account_asset/account_asset.py | 18 +++++++++-------- addons/account_asset/account_asset_view.xml | 22 +++++++++++++-------- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py index 5681168ad73..314304b2cdd 100644 --- a/addons/account_asset/account_asset.py +++ b/addons/account_asset/account_asset.py @@ -47,11 +47,11 @@ class account_asset_category(osv.osv): _defaults = { 'company_id': lambda self, cr, uid, context: self.pool.get('res.company')._company_default_get(cr, uid, 'account.asset.category', context=context), - 'method': lambda obj, cr, uid, context: 'linear', - 'method_delay': lambda obj, cr, uid, context: 5, - 'method_time': lambda obj, cr, uid, context: 'delay', - 'method_period': lambda obj, cr, uid, context: 12, - 'method_progress_factor': lambda obj, cr, uid, context: 0.3, + 'method': 'linear', + 'method_delay': 5, + 'method_time': 'delay', + 'method_period': 12, + 'method_progress_factor': 0.3, } account_asset_category() @@ -211,15 +211,17 @@ class account_asset_asset(osv.osv): def onchange_category_id(self, cr, uid, ids, category_id, context=None): res = {'value':{}} + asset_categ_obj = self.pool.get('account.asset.category') if category_id: - category_obj = self.pool.get('account.asset.category').browse(cr, uid, category_id, context=context) - res['value'] = {'method': category_obj.method, + category_obj = asset_categ_obj.browse(cr, uid, category_id, context=context) + res['value'] = { + 'method': category_obj.method, 'method_delay': category_obj.method_delay, 'method_time': category_obj.method_time, 'method_period': category_obj.method_period, 'method_progress_factor': category_obj.method_progress_factor, 'prorata': category_obj.prorata, - } + } return res def _compute_period(self, cr, uid, property, context={}): diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml index 8f867567f43..08d501abaa9 100644 --- a/addons/account_asset/account_asset_view.xml +++ b/addons/account_asset/account_asset_view.xml @@ -15,14 +15,20 @@ - - - - - - - - + + + + + + + + + + + + + +