From 0f3aa047a82820218a5283b5705f0f06b65b2541 Mon Sep 17 00:00:00 2001 From: bde Date: Tue, 17 May 2011 12:11:17 +0530 Subject: [PATCH 1/5] Onchange on asset account => fill the depreciation account bzr revid: bde@tiny2-desktop-20110517064117-zz46iisjceas9hrd --- addons/account_asset/account_asset.py | 10 ++++++++++ addons/account_asset/account_asset_view.xml | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py index 4220fe0df1e..1e6b8118cf2 100644 --- a/addons/account_asset/account_asset.py +++ b/addons/account_asset/account_asset.py @@ -43,6 +43,16 @@ class account_asset_category(osv.osv): 'company_id': lambda self, cr, uid, context: self.pool.get('res.company')._company_default_get(cr, uid, 'account.asset.category', context=context), } + def onchange_account_depreciation_id(self, cr, uid, ids, account_asset_id, context=None): + if context is None: + context = {} + account_depreciation_id = self.pool.get('account.account').browse(cr, uid, account_asset_id, + context=context).id + return {'value': { + 'account_depreciation_id': account_depreciation_id, + } + } + account_asset_category() #class one2many_mod_asset(fields.one2many): diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml index f75b0dc4cf6..2ae55c69611 100644 --- a/addons/account_asset/account_asset_view.xml +++ b/addons/account_asset/account_asset_view.xml @@ -12,7 +12,7 @@ - + From adce9420f858269853f83ecc3575bae5018f9c2f Mon Sep 17 00:00:00 2001 From: bde Date: Tue, 17 May 2011 18:45:18 +0530 Subject: [PATCH 2/5] Improved OnChange Method bzr revid: bde@tiny2-desktop-20110517131518-44788w3et6470w6t --- addons/account_asset/account_asset.py | 14 +++++--------- addons/account_asset/account_asset_view.xml | 2 +- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py index 1e6b8118cf2..de889cbf0e1 100644 --- a/addons/account_asset/account_asset.py +++ b/addons/account_asset/account_asset.py @@ -43,15 +43,11 @@ class account_asset_category(osv.osv): 'company_id': lambda self, cr, uid, context: self.pool.get('res.company')._company_default_get(cr, uid, 'account.asset.category', context=context), } - def onchange_account_depreciation_id(self, cr, uid, ids, account_asset_id, context=None): - if context is None: - context = {} - account_depreciation_id = self.pool.get('account.account').browse(cr, uid, account_asset_id, - context=context).id - return {'value': { - 'account_depreciation_id': account_depreciation_id, - } - } + def onchange_account_asset(self, cr, uid, ids, account_asset_id, context=None): + res = {'value':{}} + if account_asset: + res['value'] = {'account_depreciation_id': account_asset_id} + return res account_asset_category() diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml index 2ae55c69611..9eceb1cb339 100644 --- a/addons/account_asset/account_asset_view.xml +++ b/addons/account_asset/account_asset_view.xml @@ -12,7 +12,7 @@ - + From ef9baa9e4426665becb5126bc2fe6a19ada95da7 Mon Sep 17 00:00:00 2001 From: bde Date: Wed, 18 May 2011 19:02:24 +0530 Subject: [PATCH 3/5] Improved State field bzr revid: bde@tiny2-desktop-20110518133224-qfmli32e1381mi2c --- addons/account_asset/account_asset.py | 4 +++- addons/account_asset/account_asset_view.xml | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py index de889cbf0e1..71e9e647e55 100644 --- a/addons/account_asset/account_asset.py +++ b/addons/account_asset/account_asset.py @@ -94,7 +94,9 @@ class account_asset_asset(osv.osv): def compute_depreciation_board(self, cr, uid,ids, context=None): depreciation_lin_obj = self.pool.get('account.asset.depreciation.line') + for asset in self.browse(cr, uid, ids, context=context): + old_depreciation_line_ids = depreciation_lin_obj.search(cr, uid, [('asset_id', '=', asset.id), ('move_id', '=', False)]) if old_depreciation_line_ids: depreciation_lin_obj.unlink(cr, uid, old_depreciation_line_ids, context=context) @@ -173,7 +175,7 @@ class account_asset_asset(osv.osv): 'parent_id': fields.many2one('account.asset.asset', 'Parent Asset'), 'child_ids': fields.one2many('account.asset.asset', 'parent_id', 'Children Assets'), 'purchase_date': fields.date('Purchase Date', required=True), - 'state': fields.selection([('view','View'),('draft','Draft'),('normal','Normal'),('close','Close')], 'state', required=True), + 'state': fields.selection([('view','View'),('draft','Draft'),('normal','Normal'),('close','Close')], 'State', required=True), 'active': fields.boolean('Active', select=2), 'partner_id': fields.many2one('res.partner', 'Partner'), diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml index 9eceb1cb339..e3575f1aef9 100644 --- a/addons/account_asset/account_asset_view.xml +++ b/addons/account_asset/account_asset_view.xml @@ -97,6 +97,7 @@