From 3be9d940f7f6c65e50545c07cdc26d414513dbfd Mon Sep 17 00:00:00 2001 From: Gery Debongnie Date: Wed, 7 May 2014 15:45:44 +0200 Subject: [PATCH] [FIX] code cleanup (addon account_asset) simplify the method _entry_count by using search_count and by removing try/except/pass bzr revid: ged@openerp.com-20140507134544-oi3y8hwf16nituki --- addons/account_asset/account_asset.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py index ebeb0cb8e25..0ba7182d0d4 100644 --- a/addons/account_asset/account_asset.py +++ b/addons/account_asset/account_asset.py @@ -238,13 +238,11 @@ class account_asset_asset(osv.osv): val['value_residual'] = purchase_value - salvage_value return {'value': val} def _entry_count(self, cr, uid, ids, field_name, arg, context=None): - res = dict(map(lambda x: (x,0), ids)) - try: - for entry in self.browse(cr, uid, ids, context=context): - res[entry.id] = len(entry.account_move_line_ids) - except: - pass - return res + MoveLine = self.pool('account.move.line') + return { + asset_id: MoveLine.search_count(cr, uid, [('asset_id', '=', asset_id)], context=context) + for asset_id in ids + } _columns = { 'account_move_line_ids': fields.one2many('account.move.line', 'asset_id', 'Entries', readonly=True, states={'draft':[('readonly',False)]}), 'entry_count': fields.function(_entry_count, string='# Asset Entries', type='integer'),