From ef9baa9e4426665becb5126bc2fe6a19ada95da7 Mon Sep 17 00:00:00 2001 From: bde Date: Wed, 18 May 2011 19:02:24 +0530 Subject: [PATCH] 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 @@