From 258b58675ce0036bbf4c1d5f7abfc5aae398cb5f Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Wed, 3 Jul 2013 15:52:27 +0200 Subject: [PATCH] [fix] use justgage library from sale_crm bzr revid: mat@openerp.com-20130703135227-m409fmvh5t1ne3o6 --- addons/gamification/__openerp__.py | 3 ++- addons/gamification/goal_view.xml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/gamification/__openerp__.py b/addons/gamification/__openerp__.py index aaa4565cf43..444299b9ffb 100644 --- a/addons/gamification/__openerp__.py +++ b/addons/gamification/__openerp__.py @@ -56,7 +56,8 @@ Both goals and badges are flexibles and can be adapted to a large range of modul 'css': ['static/src/css/gamification.css'], 'js': [ 'static/src/js/gamification.js', - 'static/lib/justgage/justgage.js', + # conficting with justgage from sale_crm + # 'static/lib/justgage/justgage.js', ], 'qweb': ['static/src/xml/gamification.xml'], } diff --git a/addons/gamification/goal_view.xml b/addons/gamification/goal_view.xml index d1da5f027d1..9e1e692359f 100644 --- a/addons/gamification/goal_view.xml +++ b/addons/gamification/goal_view.xml @@ -163,7 +163,7 @@ - +