From 553e85f369a1383a91e9e10f4237434d1d523a27 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Wed, 18 Dec 2013 13:14:59 +0100 Subject: [PATCH] [FIX] gamification: move manifest order and remove useless browse bzr revid: mat@openerp.com-20131218121459-zlfumwysdx9qm7d9 --- addons/gamification/models/badge.py | 12 ++++++------ addons/hr_gamification/__openerp__.py | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/addons/gamification/models/badge.py b/addons/gamification/models/badge.py index ad3767cbbc4..099176dc88f 100644 --- a/addons/gamification/models/badge.py +++ b/addons/gamification/models/badge.py @@ -78,12 +78,12 @@ class gamification_badge(osv.Model): result = dict.fromkeys(ids, False) badge_user_obj = self.pool.get('gamification.badge.user') first_month_day = date.today().replace(day=1).strftime(DF) - for obj in self.browse(cr, uid, ids, context=context): - result[obj.id] = { - 'stat_my': badge_user_obj.search(cr, uid, [('badge_id', '=', obj.id), ('user_id', '=', uid)], context=context, count=True), - 'stat_this_month': badge_user_obj.search(cr, uid, [('badge_id', '=', obj.id), ('create_date', '>=', first_month_day)], context=context, count=True), - 'stat_my_this_month': badge_user_obj.search(cr, uid, [('badge_id', '=', obj.id), ('user_id', '=', uid), ('create_date', '>=', first_month_day)], context=context, count=True), - 'stat_my_monthly_sending': badge_user_obj.search(cr, uid, [('badge_id', '=', obj.id), ('create_uid', '=', uid), ('create_date', '>=', first_month_day)], context=context, count=True) + for bid in ids: + result[id] = { + 'stat_my': badge_user_obj.search(cr, uid, [('badge_id', '=', bid), ('user_id', '=', uid)], context=context, count=True), + 'stat_this_month': badge_user_obj.search(cr, uid, [('badge_id', '=', bid), ('create_date', '>=', first_month_day)], context=context, count=True), + 'stat_my_this_month': badge_user_obj.search(cr, uid, [('badge_id', '=', bid), ('user_id', '=', uid), ('create_date', '>=', first_month_day)], context=context, count=True), + 'stat_my_monthly_sending': badge_user_obj.search(cr, uid, [('badge_id', '=', bid), ('create_uid', '=', uid), ('create_date', '>=', first_month_day)], context=context, count=True) } return result diff --git a/addons/hr_gamification/__openerp__.py b/addons/hr_gamification/__openerp__.py index 2d29ccbc60a..c75a4454437 100644 --- a/addons/hr_gamification/__openerp__.py +++ b/addons/hr_gamification/__openerp__.py @@ -33,8 +33,8 @@ Badge received are displayed on the user profile. 'data': [ 'security/ir.model.access.csv', 'security/gamification_security.xml', - 'views/gamification.xml', 'wizard/grant_badge.xml', + 'views/gamification.xml', ], 'js': ['static/src/js/gamification.js'], }