From bb8e24d9519ea4b131bed0a173ca65301bf196c1 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 18 Apr 2014 14:41:12 +0200
Subject: [PATCH 01/19] [FIX] website_forum: set badges and challenges in
 noupdate

bzr revid: mat@openerp.com-20140418124112-m97idrklxq8y3e3f
---
 addons/website_forum/data/badges_answer.xml        | 2 +-
 addons/website_forum/data/badges_moderation.xml    | 2 +-
 addons/website_forum/data/badges_participation.xml | 2 +-
 addons/website_forum/data/badges_question.xml      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/website_forum/data/badges_answer.xml b/addons/website_forum/data/badges_answer.xml
index 4e92600663d..d4e9ead5f89 100644
--- a/addons/website_forum/data/badges_answer.xml
+++ b/addons/website_forum/data/badges_answer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
+    <data noupdate="1">
 
         <!-- QUALITY (VOTES) -->
         <!-- Teacher: at least 3 upvotes -->
diff --git a/addons/website_forum/data/badges_moderation.xml b/addons/website_forum/data/badges_moderation.xml
index d99508bba51..2ebb0f23cd1 100644
--- a/addons/website_forum/data/badges_moderation.xml
+++ b/addons/website_forum/data/badges_moderation.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
+    <data noupdate="1">
 
         <!-- Cleanup: answer or question edition -->
         <!-- Not rollback feature in forum -->
diff --git a/addons/website_forum/data/badges_participation.xml b/addons/website_forum/data/badges_participation.xml
index cf1f79185e1..8c922f09b33 100644
--- a/addons/website_forum/data/badges_participation.xml
+++ b/addons/website_forum/data/badges_participation.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
+    <data noupdate="1">
 
         <!-- Biography: complet your profile -->
         <record id="badge_p_1" model="gamification.badge">
diff --git a/addons/website_forum/data/badges_question.xml b/addons/website_forum/data/badges_question.xml
index ab05d8bcf7a..f0d403a3455 100644
--- a/addons/website_forum/data/badges_question.xml
+++ b/addons/website_forum/data/badges_question.xml
@@ -1,6 +1,6 @@
 <!-- <?xml version="1.0" encoding="utf-8"?> -->
 <openerp>
-    <data>
+    <data noupdate="1">
 
         <!-- POPULARITY (VIEWS) -->
         <!-- Popular: 150 views -->

From 202ee0208bca8731dcd8918d0c87aabbb9d526b8 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 18 Apr 2014 14:42:20 +0200
Subject: [PATCH 02/19] [IMP] gamification: add use_ids fields if technical
 features

bzr revid: mat@openerp.com-20140418124220-fvsgvvgunmeq3opj
---
 addons/gamification/views/challenge.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/gamification/views/challenge.xml b/addons/gamification/views/challenge.xml
index 75dcd4a7959..87dea680222 100644
--- a/addons/gamification/views/challenge.xml
+++ b/addons/gamification/views/challenge.xml
@@ -48,6 +48,7 @@
                             <label for="user_domain" class="oe_edit_only" string="Assign Challenge To"/>
                             <div>
                                 <field name="user_domain" widget="char_domain" options="{'model': 'res.users'}" />
+                                <field name="user_ids" groups="base.group_no_one" widget="many2many_tags" />
                             </div>
                         </div>
 

From a6103a08be1a9eed23700e82bf6c2c0f563139bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 18 Apr 2014 15:29:05 +0200
Subject: [PATCH 03/19] [IMP] [FIX] website_forum: better karma management for
 votes and answers. Also some fixes in answer tagging and edition closing.

bzr revid: tde@openerp.com-20140418132905-ja2rqcc2edqzu3jv
---
 addons/website_forum/controllers/main.py      | 27 ++++---
 addons/website_forum/models/forum.py          | 78 ++++++++++++++++---
 addons/website_forum/models/res_users.py      |  2 -
 .../static/src/js/website_forum.js            |  7 +-
 addons/website_forum/views/website_forum.xml  | 10 +--
 5 files changed, 93 insertions(+), 31 deletions(-)

diff --git a/addons/website_forum/controllers/main.py b/addons/website_forum/controllers/main.py
index 354aa52c8b3..4d91b361497 100644
--- a/addons/website_forum/controllers/main.py
+++ b/addons/website_forum/controllers/main.py
@@ -208,7 +208,7 @@ class WebsiteForum(http.Controller):
 
         values = self._prepare_forum_values(**post)
         values.update({
-            'post': question,
+            'question': question,
             'forum': forum,
             'reasons': reasons,
         })
@@ -283,15 +283,19 @@ class WebsiteForum(http.Controller):
     @http.route('/forum/<model("forum.forum"):forum>/post/<model("forum.post"):post>/toggle_correct', type='json', auth="public", website=True)
     def post_toggle_correct(self, forum, post, **kwargs):
         cr, uid, context = request.cr, request.uid, request.context
+        if post.parent_id is False:
+            return request.redirect('/')
         if not request.session.uid:
             return {'error': 'anonymous_user'}
-        # if user have not access to accept answer then reise warning
-        if post.parent_id is False or post.parent_id.create_uid.id != uid:
+        user = request.registry['res.users'].browse(request.cr, SUPERUSER_ID, request.uid, context=request.context)
+        if post.parent_id.create_uid.id != uid:
             return {'error': 'own_post'}
+        if post.create_uid.id == user.id and user.karma < request.registry['forum.forum']._karma_answer_accept_own:
+            return {'error': 'not_enough_karma', 'karma': 20}
 
         # set all answers to False, only one can be accepted
         request.registry['forum.post'].write(cr, uid, [c.id for c in post.parent_id.child_ids], {'is_correct': False}, context=context)
-        request.registry['forum.post'].write(cr, uid, [post.id, post.parent_id.id], {'is_correct': not post.is_correct}, context=context)
+        request.registry['forum.post'].write(cr, uid, [post.id], {'is_correct': not post.is_correct}, context=context)
         return not post.is_correct
 
     @http.route('/forum/<model("forum.forum"):forum>/post/<model("forum.post"):post>/delete', type='http', auth="user", multilang=True, website=True)
@@ -341,15 +345,15 @@ class WebsiteForum(http.Controller):
 
     @http.route('/forum/<model("forum.forum"):forum>/post/<model("forum.post"):post>/upvote', type='json', auth="public", multilang=True, website=True)
     def post_upvote(self, forum, post, **kwargs):
-        # check for karma and not self vote
         if not request.session.uid:
             return {'error': 'anonymous_user'}
         if request.uid == post.create_uid.id:
             return {'error': 'own_post'}
         user = request.registry['res.users'].browse(request.cr, SUPERUSER_ID, request.uid, context=request.context)
-        if user.karma <= 5:
-            return {'error': 'not_enough_karma', 'karma': 1}
-        return request.registry['forum.post'].vote(request.cr, request.uid, [post.id], upvote=True, context=request.context)
+        if user.karma < request.registry['forum.forum']._karma_upvote:
+            return {'error': 'not_enough_karma', 'karma': request.registry['forum.forum']._karma_upvote}
+        upvote = True if not post.user_vote > 0 else False
+        return request.registry['forum.post'].vote(request.cr, request.uid, [post.id], upvote=upvote, context=request.context)
 
     @http.route('/forum/<model("forum.forum"):forum>/post/<model("forum.post"):post>/downvote', type='json', auth="public", multilang=True, website=True)
     def post_downvote(self, forum, post, **kwargs):
@@ -358,9 +362,10 @@ class WebsiteForum(http.Controller):
         if request.uid == post.create_uid.id:
             return {'error': 'own_post'}
         user = request.registry['res.users'].browse(request.cr, SUPERUSER_ID, request.uid, context=request.context)
-        if user.karma <= 50:
-            return {'error': 'not_enough_karma', 'karma': 50}
-        return request.registry['forum.post'].vote(request.cr, request.uid, [post.id], upvote=False, context=request.context)
+        if user.karma < request.registry['forum.forum']._karma_downvote:
+            return {'error': 'not_enough_karma', 'karma': request.registry['forum.forum']._karma_downvote}
+        upvote = True if post.user_vote < 0 else False
+        return request.registry['forum.post'].vote(request.cr, request.uid, [post.id], upvote=upvote, context=request.context)
 
     # User
     # --------------------------------------------------
diff --git a/addons/website_forum/models/forum.py b/addons/website_forum/models/forum.py
index 031ae4b33e1..88755e64940 100644
--- a/addons/website_forum/models/forum.py
+++ b/addons/website_forum/models/forum.py
@@ -9,9 +9,32 @@ from openerp.tools.translate import _
 
 
 class Forum(osv.Model):
+    """TDE TODO: set karma values for actions dynamic for a given forum"""
     _name = 'forum.forum'
     _description = 'Forums'
     _inherit = ['website.seo.metadata']
+    # karma values
+    _karma_upvote = 5  # done
+    _karma_downvote = 50  # done
+    _karma_answer_accept_own = 20  # done
+    _karma_answer_own_question_immediately = 50
+    _karma_editor_link_files = 30  # done
+    _karma_editor_clickable_link = 50
+    _karma_modo_retag = 75
+    _karma_modo_close_own = 100
+    _karma_modo_edit_all = 300
+    _karma_modo_unlink_comment = 400
+    _karma_modo_close_all = 900
+    _karma_modo_unlink_all = 1000
+    # karma generation
+    _karma_gen_quest_new = 2  # done
+    _karma_gen_upvote_quest = 5  # done
+    _karma_gen_downvote_quest = -2  # done
+    _karma_gen_upvote_ans = 10  # done
+    _karma_gen_downvote_ans = -2  # done
+    _karma_gen_ans_accept = 2  # done
+    _karma_gen_ans_accepted = 15  # done
+    _karma_gen_ans_flagged = -100
 
     _columns = {
         'name': fields.char('Name', required=True, translate=True),
@@ -97,6 +120,13 @@ class Post(osv.Model):
             res[post.id] = any(answer.create_uid.id == uid for answer in post.child_ids)
         return res
 
+    def _get_has_validated_answer(self, cr, uid, ids, field_name, arg, context=None):
+        res = dict.fromkeys(ids, False)
+        ans_ids = self.search(cr, uid, [('parent_id', 'in', ids), ('is_correct', '=', True)], context=context)
+        for answer in self.browse(cr, uid, ans_ids, context=context):
+            res[answer.parent_id.id] = True
+        return res
+
     def _is_self_reply(self, cr, uid, ids, field_name, arg, context=None):
         res = dict.fromkeys(ids, False)
         for post in self.browse(cr, uid, ids, context=context):
@@ -143,7 +173,8 @@ class Post(osv.Model):
             }),
         # hierarchy
         'parent_id': fields.many2one('forum.post', 'Question', ondelete='cascade'),
-        'self_reply': fields.function(_is_self_reply, 'Reply to own question', type='boolean',
+        'self_reply': fields.function(
+            _is_self_reply, 'Reply to own question', type='boolean',
             store={
                 'forum.post': (lambda self, cr, uid, ids, c={}: ids, ['parent_id', 'create_uid'], 10),
             }),
@@ -156,6 +187,12 @@ class Post(osv.Model):
         'uid_has_answered': fields.function(
             _get_uid_answered, string='Has Answered', type='boolean',
         ),
+        'has_validated_answer': fields.function(
+            _get_has_validated_answer, string='Has a Validated Answered', type='boolean',
+            store={
+                'forum.post': (_get_post_from_hierarchy, ['parent_id', 'child_ids', 'is_correct'], 10),
+            }
+        ),
         # closing
         'closed_reason_id': fields.many2one('forum.post.reason', 'Reason'),
         'closed_uid': fields.many2one('res.users', 'Closed by', select=1),
@@ -183,10 +220,18 @@ class Post(osv.Model):
             self.message_post(cr, uid, parent.id, subject=_('Re: %s') % parent.name, body=body, subtype='website_forum.mt_answer_new', context=context)
         else:
             self.message_post(cr, uid, post_id, subject=vals.get('name', ''), body=_('New Question Created'), subtype='website_forum.mt_question_new', context=context)
-            self.pool['res.users'].add_karma(cr, SUPERUSER_ID, [uid], 2, context=context)
+            self.pool['res.users'].add_karma(cr, SUPERUSER_ID, [uid], self.pool['forum.forum']._karma_gen_quest_new, context=context)
         return post_id
 
     def write(self, cr, uid, ids, vals, context=None):
+        Forum = self.pool['forum.forum']
+        # update karma when accepting/rejecting answers
+        if 'is_correct' in vals:
+            mult = 1 if vals['is_correct'] else -1
+            for post in self.browse(cr, uid, ids, context=context):
+                if vals['is_correct'] != post.is_correct:
+                    self.pool['res.users'].add_karma(cr, SUPERUSER_ID, [post.create_uid.id], Forum._karma_gen_ans_accepted * mult, context=context)
+                    self.pool['res.users'].add_karma(cr, SUPERUSER_ID, [uid], Forum._karma_gen_ans_accept * mult, context=context)
         res = super(Post, self).write(cr, uid, ids, vals, context=context)
         # if post content modify, notify followers
         if 'content' in vals or 'name' in vals:
@@ -198,11 +243,6 @@ class Post(osv.Model):
                     body, subtype = _('Question Edited'), 'website_forum.mt_question_edit'
                     obj_id = post.id
                 self.message_post(cr, uid, obj_id, body=_(body), subtype=subtype, context=context)
-        # update karma of related user when any answer accepted
-        if 'correct' in vals:
-            for post in self.browse(cr, uid, ids, context=context):
-                karma_value = 15 if vals.get('correct') else -15
-                self.pool['res.users'].add_karma(cr, SUPERUSER_ID, [post.create_uid.id], {'karma': karma_value}, context=context)
         return res
 
     def vote(self, cr, uid, ids, upvote=True, context=None):
@@ -251,16 +291,30 @@ class Vote(osv.Model):
 
     def create(self, cr, uid, vals, context=None):
         vote_id = super(Vote, self).create(cr, uid, vals, context=context)
-        karma_value = int(vals.get('vote', '1')) * 10
-        post = self.pool['forum.post'].browse(cr, uid, vals.get('post_id'), context=context)
-        self.pool['res.users'].add_karma(cr, SUPERUSER_ID, post.create_uid.id, karma_value, context=context)
+        if vals.get('vote', '1') == '1':
+            karma = self.pool['forum.forum']._karma_upvote
+        elif vals.get('vote', '1') == '-1':
+            karma = self.pool['forum.forum']._karma_downvote
+        post = self.pool['forum.post'].browse(cr, uid, vals['post_id'], context=context)
+        self.pool['res.users'].add_karma(cr, SUPERUSER_ID, [post.create_uid.id], karma, context=context)
         return vote_id
 
     def write(self, cr, uid, ids, values, context=None):
+        def _get_karma_value(old_vote, new_vote, up_karma, down_karma):
+            _karma_upd = {
+                '-1': {'-1': 0, '0': -1 * down_karma, '1': -1 * down_karma + up_karma},
+                '0': {'-1': 1 * down_karma, '0': 0, '1': up_karma},
+                '1': {'-1': -1 * up_karma + down_karma, '0': -1 * up_karma, '1': 0}
+            }
+            return _karma_upd[old_vote][new_vote]
         if 'vote' in values:
+            Forum = self.pool['forum.forum']
             for vote in self.browse(cr, uid, ids, context=context):
-                karma_value = (int(values.get('vote')) - int(vote.vote)) * 10
-                self.pool['res.users'].add_karma(cr, SUPERUSER_ID, vote.post_id.create_uid.id, karma_value, context=context)
+                if vote.post_id.parent_id:
+                    karma_value = _get_karma_value(vote.vote, values['vote'], Forum._karma_gen_upvote_ans, Forum._karma_gen_downvote_ans)
+                else:
+                    karma_value = _get_karma_value(vote.vote, values['vote'], Forum._karma_gen_upvote_quest, Forum._karma_gen_downvote_quest)
+                self.pool['res.users'].add_karma(cr, SUPERUSER_ID, [vote.post_id.create_uid.id], karma_value, context=context)
         res = super(Vote, self).write(cr, uid, ids, values, context=context)
         return res
 
diff --git a/addons/website_forum/models/res_users.py b/addons/website_forum/models/res_users.py
index 58d43a58191..f3632f379c3 100644
--- a/addons/website_forum/models/res_users.py
+++ b/addons/website_forum/models/res_users.py
@@ -32,8 +32,6 @@ class Users(osv.Model):
     }
 
     def add_karma(self, cr, uid, ids, karma, context=None):
-        if isinstance(ids, (int, long)):
-            ids = [ids]
         for user in self.browse(cr, uid, ids, context=context):
             self.write(cr, uid, [user.id], {'karma': user.karma + karma}, context=context)
         return True
diff --git a/addons/website_forum/static/src/js/website_forum.js b/addons/website_forum/static/src/js/website_forum.js
index 2c428740776..3eda8a2b4ca 100644
--- a/addons/website_forum/static/src/js/website_forum.js
+++ b/addons/website_forum/static/src/js/website_forum.js
@@ -57,7 +57,12 @@ $(document).ready(function () {
                 } else if (data['error'] == 'own_post'){
                     var $warning = $('<div class="alert alert-danger alert-dismissable" id="correct_answer_alert" style="position:absolute; margin-top: -30px; margin-left: 90px;">'+
                         '<button type="button" class="close notification_close" data-dismiss="alert" aria-hidden="true">&times;</button>'+
-                        'Sorry, the user who asked this question can only accept the answer as correct.'+
+                        'Sorry, only the user who asked this question can accept the answer as correct.'+
+                        '</div>');
+                } else if (data['error'] == 'not_enough_karma') {
+                    var $warning = $('<div class="alert alert-danger alert-dismissable" id="vote_alert" style="position:absolute; margin-top: -30px; margin-left: 90px;">'+
+                        '<button type="button" class="close notification_close" data-dismiss="alert" aria-hidden="true">&times;</button>'+
+                        'Sorry, at least ' + data['karma'] + ' karma is required to accept your own answers'+
                         '</div>');
                 }
                 correct_answer_alert = $link.parent().find("#correct_answer_alert");
diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index 2d1787a48ab..9dc6d8fd0b1 100644
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -138,7 +138,7 @@
         <div class="pull-left text-center">
             <div t-attf-class="box #{question.child_count and 'oe_green' or 'oe_grey'}">
                 <span t-esc="question.child_count"/>
-                <span t-if="question.is_correct" class="fa fa-2x fa-check-circle"/>
+                <span t-if="question.has_validated_answer" class="fa fa-2x fa-check-circle"/>
                 <div t-if="question.child_count&gt;1">Answers</div>
                 <div t-if="question.child_count&lt;=1">Answer</div>
             </div>
@@ -336,16 +336,16 @@
 <template id="close_question">
     <t t-call="website_forum.header">
         <h3 class=""><b>Close question</b></h3><br/>
-        <form t-attf-action="/forum/#{ slug(forum) }/question/#{slug(question)}/close" method="post" role="form">
-            <input name="post_id" t-att-value="post.id" type="hidden"/>
+        <form t-attf-action="/forum/#{slug(forum)}/question/#{slug(question)}/close" method="post" role="form">
+            <input name="post_id" t-att-value="question.id" type="hidden"/>
             <span class="pull-left">Close the question:</span>
-            <a t-attf-href="/forum/#{ slug(forum) }/question/#{ slug(post) }" t-field="post.name"/>
+            <a t-attf-href="/forum/#{ slug(forum) }/question/#{ slug(question) }" t-field="question.name"/>
             <div class="mt16">
                 <label class="col-md-2 control-label mb16" for="reason">Reasons:</label>
                 <div class="col-md-9 mb16">
                     <select class="form-control" name="reason">
                         <t t-foreach="reasons or []" t-as="reason">
-                            <option t-att-value="reason.id" t-att-selected="reason.id == post.closed_reason_id.id"><t t-esc="reason.name"/></option>
+                            <option t-att-value="reason.id" t-att-selected="reason.id == question.closed_reason_id.id"><t t-esc="reason.name"/></option>
                         </t>
                     </select>
                 </div>

From b153fcd35e50313947e26b546cadc61011ebd0f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 18 Apr 2014 15:57:24 +0200
Subject: [PATCH 04/19] [IMP] [FIX] website_forum: better control of actions
 based on karma; those actions are calculated in the controller, based on
 forum.forum values instead of values hardcoded in the view.

bzr revid: tde@openerp.com-20140418135724-k64yey6hhrki0b6h
---
 addons/website_forum/controllers/main.py     | 11 ++++++++++-
 addons/website_forum/models/forum.py         | 18 ++++++++++++------
 addons/website_forum/views/website_forum.xml | 14 +++++++-------
 3 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/addons/website_forum/controllers/main.py b/addons/website_forum/controllers/main.py
index 4d91b361497..a56ece43305 100644
--- a/addons/website_forum/controllers/main.py
+++ b/addons/website_forum/controllers/main.py
@@ -32,12 +32,21 @@ class WebsiteForum(http.Controller):
         return msg
 
     def _prepare_forum_values(self, forum=None, **kwargs):
+        Forum = request.registry['forum.forum']
         user = request.registry['res.users'].browse(request.cr, request.uid, request.uid, context=request.context)
         public_uid = request.registry['website'].get_public_user(request.cr, request.uid, request.context)
         values = {'user': user, 'is_public_user': user.id == public_uid,
                   'notifications': self._get_notifications(),
                   'header': kwargs.get('header', dict()),
-                  'searches': kwargs.get('searches', dict())}
+                  'searches': kwargs.get('searches', dict()),
+                  'can_edit_own': True,
+                  'can_edit_all': user.karma > Forum._karma_modo_edit_all,
+                  'can_close_own': user.karma > Forum._karma_modo_close_own,
+                  'can_close_all': user.karma > Forum._karma_modo_close_all,
+                  'can_unlink_own': user.karma > Forum._karma_modo_unlink_own,
+                  'can_unlink_all': user.karma > Forum._karma_modo_unlink_all,
+                  'can_unlink_comment': user.karma > Forum._karma_modo_unlink_comment,
+                  }
         if forum:
             values['forum'] = forum
         elif kwargs.get('forum_id'):
diff --git a/addons/website_forum/models/forum.py b/addons/website_forum/models/forum.py
index 88755e64940..662ec10d094 100644
--- a/addons/website_forum/models/forum.py
+++ b/addons/website_forum/models/forum.py
@@ -17,15 +17,21 @@ class Forum(osv.Model):
     _karma_upvote = 5  # done
     _karma_downvote = 50  # done
     _karma_answer_accept_own = 20  # done
-    _karma_answer_own_question_immediately = 50
+    _karma_answer_accept_own_now = 50
+    _karma_answer_accept_all = 500
     _karma_editor_link_files = 30  # done
     _karma_editor_clickable_link = 50
+    _karma_comment = 1
     _karma_modo_retag = 75
-    _karma_modo_close_own = 100
-    _karma_modo_edit_all = 300
-    _karma_modo_unlink_comment = 400
-    _karma_modo_close_all = 900
-    _karma_modo_unlink_all = 1000
+    _karma_modo_flag = 100
+    _karma_modo_flag_see_all = 300
+    _karma_modo_unlink_comment = 750
+    _karma_modo_edit_own = 1  # done
+    _karma_modo_edit_all = 300  # done
+    _karma_modo_close_own = 100  # done
+    _karma_modo_close_all = 900  # done
+    _karma_modo_unlink_own = 500  # done
+    _karma_modo_unlink_all = 1000  # done
     # karma generation
     _karma_gen_quest_new = 2  # done
     _karma_gen_upvote_quest = 5  # done
diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index 9dc6d8fd0b1..5f82e3b12f8 100644
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -430,19 +430,19 @@
                                     comment
                                 </a>
                             </li>
-                            <li t-if="question.state != 'close' and (user.id == question.create_uid.id or user.karma&gt;=100)">
+                            <li t-if="question.state != 'close' and ((user.id == question.create_uid.id and can_close_own) or can_close_all)">
                                 <a class="text-muted fa fa-times" t-attf-href="/forum/#{ slug(forum) }/question/#{slug(question)}/ask_for_close">close</a>
                             </li>
-                            <li t-if="question.state == 'close' and user.karma&gt;=500">
+                            <li t-if="question.state == 'close' and ((user.id == question.create_uid.id and can_close_own) or can_close_all)">
                                 <a class="text-muted fa fa-undo" t-attf-href="/forum/#{ slug(forum) }/question/#{slug(question)/reopen">reopen</a>
                             </li>
-                            <li t-if="user.id == question.create_uid.id or user.karma&gt;=300">
+                            <li t-if="(user.id == question.create_uid.id and can_edit_own) or can_edit_all">
                                 <a class="text-muted fa fa-edit" t-attf-href="/forum/#{ slug(forum) }/post/#{slug(question)}/edit">edit</a>
                             </li>
-                            <li t-if="question.active and user.id == question.create_uid.id or user.karma&gt;=1000">
+                            <li t-if="question.active and ((user.id == question.create_uid.id and can_unlink_own) or can_unlink_all)">
                                 <a class="text-muted fa fa-trash-o" t-attf-href="/forum/#{ slug(forum) }/question/#{slug(question)}/delete">delete</a>
                             </li>
-                            <li t-if="uid == question.create_uid.id and not question.active">
+                            <li t-if="not question.active and ((user.id == question.create_uid.id and can_unlink_own) or can_unlink_all)">
                                 <a class="text-muted fa fa-trash-o" t-attf-href="/forum/#{ slug(forum) }/question/#{slug(question)}/undelete">undelete</a>
                             </li>
                             <li><a class="text-muted fa fa-share" t-attf-href="/forum/#{slug(forum)}/question/#{slug(question)}">share</a></li>
@@ -496,10 +496,10 @@
                                       t-attf-data-target="#comment#{ answer._name.replace('.','') + '-' + str(answer.id) }">comment
                                 </a>
                             </li>
-                            <li t-if="user.id == answer.create_uid.id or user.karma&gt;=300">
+                            <li t-if="(user.id == answer.create_uid.id and can_edit_own) or can_edit_all">
                                 <a class="text-muted fa fa-edit" t-attf-href="/forum/#{slug(forum)}/post/#{slug(answer)}/edit">edit</a>
                             </li>
-                            <li t-if="user.id == answer.create_uid.id or user.karma&gt;=1000">
+                            <li t-if="(user.id == answer.create_uid.id and can_unlink_own) or can_unlink_all">
                                 <a class="text-muted fa fa-trash-o" t-attf-href="/forum/#{slug(forum)}/post/#{slug(answer)}/delete">delete</a>
                             </li>
                             <li t-if="user.id == answer.create_uid.id">

From 1b006190d9aee078a367cbae5c92907a4a0bb3c1 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 18 Apr 2014 16:07:41 +0200
Subject: [PATCH 05/19] [REF] gamification

bzr revid: mat@openerp.com-20140418140741-djesyaxahxytnl1n
---
 addons/gamification/models/challenge.py | 66 ++++++++++++++-----------
 1 file changed, 38 insertions(+), 28 deletions(-)

diff --git a/addons/gamification/models/challenge.py b/addons/gamification/models/challenge.py
index 081127d6bf0..c3c06c3d63d 100644
--- a/addons/gamification/models/challenge.py
+++ b/addons/gamification/models/challenge.py
@@ -117,12 +117,6 @@ class gamification_challenge(osv.Model):
         except ValueError:
             return False
 
-    def _get_challenger_users(self, cr, uid, domain, context=None):
-        ref = functools.partial(self.pool['ir.model.data'].xmlid_to_res_id, cr, uid)
-        user_domain = eval(domain, {'ref': ref})
-        return self.pool['res.users'].search(cr, uid, user_domain, context=context)
-
-
     _order = 'end_date, start_date, name, id'
     _columns = {
         'name': fields.char('Challenge Name', required=True, translate=True),
@@ -239,14 +233,11 @@ class gamification_challenge(osv.Model):
     def write(self, cr, uid, ids, vals, context=None):
         if isinstance(ids, (int,long)):
             ids = [ids]
+        
+        write_res = super(gamification_challenge, self).write(cr, uid, ids, vals, context=context)
 
         if vals.get('state') == 'inprogress':
-            for challenge in self.browse(cr, uid, ids, context=context):
-                user_ids = self._get_challenger_users(cr, uid, challenge.user_domain, context=context)
-                write_op = [(4, user_id) for user_id in user_ids]
-                self.write(cr, uid, [challenge.id], {'user_ids': write_op}, context=context)            
-                self.message_subscribe_users(cr, uid, [challenge.id], user_ids, context=context)
-
+            self._recompute_challenge_users(cr, uid, ids, context=context):
             self.generate_goals_from_challenge(cr, uid, ids, context=context)
 
         elif vals.get('state') == 'done':
@@ -256,9 +247,6 @@ class gamification_challenge(osv.Model):
             # resetting progress
             if self.pool.get('gamification.goal').search(cr, uid, [('challenge_id', 'in', ids), ('state', '=', 'inprogress')], context=context):
                 raise osv.except_osv("Error", "You can not reset a challenge with unfinished goals.")
-        
-        write_res = super(gamification_challenge, self).write(cr, uid, ids, vals, context=context)
-
 
         return write_res
 
@@ -314,18 +302,10 @@ class gamification_challenge(osv.Model):
         # update every running goal already generated linked to selected challenges
         goal_obj.update(cr, uid, goal_ids, context=context)
 
+        self._recompute_challenge_users(cr, uid, ids, context=context):
+        self.generate_goals_from_challenge(cr, uid, ids, context=context)
+
         for challenge in self.browse(cr, uid, ids, context=context):
-            # in case of new users matching the domain
-            old_user_ids = [user.id for user in challenge.user_ids]
-            new_user_ids = self._get_challenger_users(cr, uid, challenge.user_domain, context=context)
-            to_remove_ids = list(set(old_user_ids) - set(new_user_ids))
-            to_add_ids = list(set(new_user_ids) - set(old_user_ids))
-
-            write_op = [(3, user_id) for user_id in to_remove_ids]
-            write_op += [(4, user_id) for user_id in to_add_ids]
-            self.write(cr, uid, [challenge.id], {'user_ids': write_op}, context=context)            
-
-            self.generate_goals_from_challenge(cr, uid, [challenge.id], context=context)
 
             # goals closed but still opened at the last report date
             closed_goals_to_report = goal_obj.search(cr, uid, [
@@ -345,11 +325,37 @@ class gamification_challenge(osv.Model):
         return True
 
     def quick_update(self, cr, uid, challenge_id, context=None):
-        """Update all the goals of a challenge, no generation of new goals"""
+        """Update all the goals of a specific challenge, no generation of new goals"""
         goal_ids = self.pool.get('gamification.goal').search(cr, uid, [('challenge_id', '=', challenge_id)], context=context)
         self.pool.get('gamification.goal').update(cr, uid, goal_ids, context=context)
         return True
 
+    def _get_challenger_users(self, cr, uid, domain, context=None):
+        ref = functools.partial(self.pool['ir.model.data'].xmlid_to_res_id, cr, uid)
+        user_domain = eval(domain, {'ref': ref})
+        return self.pool['res.users'].search(cr, uid, user_domain, context=context)
+
+    def _recompute_challenge_users(self, cr, uid, challenge_ids, context=None):
+        """Recompute the domain to add new users and remove the one no longer matching the domain"""
+        for challenge in self.browse(cr, uid, challenge_ids, context=context):
+            if challenge.user_domain:
+
+                old_user_ids = [user.id for user in challenge.user_ids]
+                new_user_ids = self._get_challenger_users(cr, uid, challenge.user_domain, context=context)
+                to_remove_ids = list(set(old_user_ids) - set(new_user_ids))
+                to_add_ids = list(set(new_user_ids) - set(old_user_ids))
+
+                write_op = [(3, user_id) for user_id in to_remove_ids]
+                write_op += [(4, user_id) for user_id in to_add_ids]
+                self.write(cr, uid, [challenge.id], {'user_ids': write_op}, context=context)
+
+                if to_remove_ids:
+                    self.message_unsubscribe_users(cr, uid, [challenge.id], to_remove_ids, context=None)
+                if to_add_ids:
+                    self.message_subscribe_users(cr, uid, [challenge.id], new_user_ids, context=context)
+
+        return True
+
 
     def action_check(self, cr, uid, ids, context=None):
         """Check a challenge
@@ -370,6 +376,10 @@ class gamification_challenge(osv.Model):
     ##### Automatic actions #####
 
     def generate_goals_from_challenge(self, cr, uid, ids, context=None):
+        _logger.warning("Deprecated, use private method _generate_goals_from_challenge(...) instead.")
+        return self._generate_goals_from_challenge(cr, uid, )
+
+    def _generate_goals_from_challenge(self, cr, uid, ids, context=None):
         """Generate the goals for each line and user.
 
         If goals already exist for this line and user, the line is skipped. This
@@ -388,7 +398,7 @@ class gamification_challenge(osv.Model):
                 end_date = challenge.end_date
 
             for line in challenge.line_ids:
-                # FIXME: allow to restrict to a subset of users
+                # TODO: allow to restrict to a subset of users
                 for user in challenge.user_ids:
 
                     domain = [('line_id', '=', line.id), ('user_id', '=', user.id)]

From aa8bdfc7405763f918dea4b10e3d93b4ff38ff0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 18 Apr 2014 16:47:22 +0200
Subject: [PATCH 06/19] =?UTF-8?q?[IMP]=20website=5Fforum:=20controllers=20?=
 =?UTF-8?q?now=20check=20the=20karma=20in=20addition=20to=20the=20view?=
 =?UTF-8?q?=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

bzr revid: tde@openerp.com-20140418144722-k2g2gespb3dwpio4
---
 addons/website_forum/controllers/main.py | 50 ++++++++++++++++++++----
 addons/website_forum/models/res_users.py |  2 +-
 2 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/addons/website_forum/controllers/main.py b/addons/website_forum/controllers/main.py
index a56ece43305..639d69ae82e 100644
--- a/addons/website_forum/controllers/main.py
+++ b/addons/website_forum/controllers/main.py
@@ -54,6 +54,15 @@ class WebsiteForum(http.Controller):
         values.update(kwargs)
         return values
 
+    def _has_enough_karma(self, karma_name, uid=None):
+        Forum = request.registry['forum.forum']
+        karma = hasattr(Forum, karma_name) and getattr(Forum, karma_name) or 0
+        user = request.registry['res.users'].browse(request.cr, SUPERUSER_ID, uid or request.uid, context=request.context)
+        print karma_name, karma, user.karma
+        if user.karma < karma:
+            return False, {'error': 'not_enough_karma', 'karma': karma}
+        return True, {}
+
     # Forum
     # --------------------------------------------------
 
@@ -210,6 +219,10 @@ class WebsiteForum(http.Controller):
 
     @http.route('/forum/<model("forum.forum"):forum>/question/<model("forum.post"):question>/ask_for_close', type='http', auth="user", multilang=True, website=True)
     def question_ask_for_close(self, forum, question, **post):
+        check_res = self._has_enough_karma(question.create_uid.id == request.uid and '_karma_modo_close_own' or '_karma_modo_close_all')
+        if not check_res[0]:
+            return werkzeug.utils.redirect("/forum/%s" % slug(forum))
+
         cr, uid, context = request.cr, request.uid, request.context
         Reason = request.registry['forum.post.reason']
         reason_ids = Reason.search(cr, uid, [], context=context)
@@ -233,6 +246,10 @@ class WebsiteForum(http.Controller):
 
     @http.route('/forum/<model("forum.forum"):forum>/question/<model("forum.post"):question>/close', type='http', auth="user", multilang=True, methods=['POST'], website=True)
     def question_close(self, forum, question, **post):
+        check_res = self._has_enough_karma(question.create_uid.id == request.uid and '_karma_modo_close_own' or '_karma_modo_close_all')
+        if not check_res[0]:
+            return werkzeug.utils.redirect("/forum/%s" % slug(forum))
+
         request.registry['forum.post'].write(request.cr, request.uid, [question.id], {
             'state': 'close',
             'closed_uid': request.uid,
@@ -243,17 +260,28 @@ class WebsiteForum(http.Controller):
 
     @http.route('/forum/<model("forum.forum"):forum>/question/<model("forum.post"):question>/reopen', type='http', auth="user", multilang=True, website=True)
     def question_reopen(self, forum, question, **kwarg):
+        check_res = self._has_enough_karma(question.create_uid.id == request.uid and '_karma_modo_close_own' or '_karma_modo_close_all')
+        if not check_res[0]:
+            return werkzeug.utils.redirect("/forum/%s" % slug(forum))
+
         request.registry['forum.post'].write(request.cr, request.uid, [question.id], {'state': 'active'}, context=request.context)
         return werkzeug.utils.redirect("/forum/%s/question/%s" % (slug(forum), slug(question)))
 
     @http.route('/forum/<model("forum.forum"):forum>/question/<model("forum.post"):question>/delete', type='http', auth="user", multilang=True, website=True)
     def question_delete(self, forum, question, **kwarg):
-        #instead of unlink record just change 'active' to false so user can undelete it.
+        check_res = self._has_enough_karma(question.create_uid.id == request.uid and '_karma_modo_unlink_own' or '_karma_modo_unlink_all')
+        if not check_res[0]:
+            return werkzeug.utils.redirect("/forum/%s" % slug(forum))
+
         request.registry['forum.post'].write(request.cr, request.uid, [question.id], {'active': False}, context=request.context)
         return werkzeug.utils.redirect("/forum/%s/question/%s" % (slug(forum), slug(question)))
 
     @http.route('/forum/<model("forum.forum"):forum>/question/<model("forum.post"):question>/undelete', type='http', auth="user", multilang=True, website=True)
     def question_undelete(self, forum, question, **kwarg):
+        check_res = self._has_enough_karma(question.create_uid.id == request.uid and '_karma_modo_unlink_own' or '_karma_modo_unlink_all')
+        if not check_res[0]:
+            return werkzeug.utils.redirect("/forum/%s" % slug(forum))
+
         request.registry['forum.post'].write(request.cr, request.uid, [question.id], {'active': True}, context=request.context)
         return werkzeug.utils.redirect("/forum/%s/question/%s" % (slug(forum), slug(question)))
 
@@ -309,6 +337,10 @@ class WebsiteForum(http.Controller):
 
     @http.route('/forum/<model("forum.forum"):forum>/post/<model("forum.post"):post>/delete', type='http', auth="user", multilang=True, website=True)
     def post_delete(self, forum, post, **kwargs):
+        check_res = self._has_enough_karma(post.create_uid.id == request.uid and '_karma_modo_unlink_own' or '_karma_modo_unlink_all')
+        if not check_res[0]:
+            return werkzeug.utils.redirect("/forum/%s" % slug(forum))
+
         question = post.parent_id
         request.registry['forum.post'].unlink(request.cr, request.uid, [post.id], context=request.context)
         if question:
@@ -317,6 +349,10 @@ class WebsiteForum(http.Controller):
 
     @http.route('/forum/<model("forum.forum"):forum>/post/<model("forum.post"):post>/edit', type='http', auth="user", website=True, multilang=True)
     def post_edit(self, forum, post, **kwargs):
+        check_res = self._has_enough_karma(post.create_uid.id == request.uid and '_karma_modo_edit_own' or '_karma_modo_edit_all')
+        if not check_res[0]:
+            return werkzeug.utils.redirect("/forum/%s" % slug(forum))
+
         tags = ""
         for tag_name in post.tag_ids:
             tags += tag_name.name + ","
@@ -358,9 +394,9 @@ class WebsiteForum(http.Controller):
             return {'error': 'anonymous_user'}
         if request.uid == post.create_uid.id:
             return {'error': 'own_post'}
-        user = request.registry['res.users'].browse(request.cr, SUPERUSER_ID, request.uid, context=request.context)
-        if user.karma < request.registry['forum.forum']._karma_upvote:
-            return {'error': 'not_enough_karma', 'karma': request.registry['forum.forum']._karma_upvote}
+        check_res = self._has_enough_karma('_karma_upvote')
+        if not check_res[0]:
+            return check_res[1]
         upvote = True if not post.user_vote > 0 else False
         return request.registry['forum.post'].vote(request.cr, request.uid, [post.id], upvote=upvote, context=request.context)
 
@@ -370,9 +406,9 @@ class WebsiteForum(http.Controller):
             return {'error': 'anonymous_user'}
         if request.uid == post.create_uid.id:
             return {'error': 'own_post'}
-        user = request.registry['res.users'].browse(request.cr, SUPERUSER_ID, request.uid, context=request.context)
-        if user.karma < request.registry['forum.forum']._karma_downvote:
-            return {'error': 'not_enough_karma', 'karma': request.registry['forum.forum']._karma_downvote}
+        check_res = self._has_enough_karma('_karma_downvote')
+        if not check_res[0]:
+            return check_res[1]
         upvote = True if post.user_vote < 0 else False
         return request.registry['forum.post'].vote(request.cr, request.uid, [post.id], upvote=upvote, context=request.context)
 
diff --git a/addons/website_forum/models/res_users.py b/addons/website_forum/models/res_users.py
index f3632f379c3..a9f2dfe0e93 100644
--- a/addons/website_forum/models/res_users.py
+++ b/addons/website_forum/models/res_users.py
@@ -42,4 +42,4 @@ class Users(osv.Model):
                 excluded_categories.append('forum')
         else:
             excluded_categories = ['forum']
-        return super(Users, self).get_serialised_gamification_summary(cr, uid, excluded_categories=excluded_categories, context=context)
\ No newline at end of file
+        return super(Users, self).get_serialised_gamification_summary(cr, uid, excluded_categories=excluded_categories, context=context)

From 35a3f7fbd0efef70e9c8e691ea11678f9e6c72fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 18 Apr 2014 16:48:54 +0200
Subject: [PATCH 07/19] [CLEAN] website_forum: removed a forgotten print
 statement

bzr revid: tde@openerp.com-20140418144854-cxl30gibxw43r5th
---
 addons/website_forum/controllers/main.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/website_forum/controllers/main.py b/addons/website_forum/controllers/main.py
index 639d69ae82e..e75f0a521ae 100644
--- a/addons/website_forum/controllers/main.py
+++ b/addons/website_forum/controllers/main.py
@@ -58,7 +58,6 @@ class WebsiteForum(http.Controller):
         Forum = request.registry['forum.forum']
         karma = hasattr(Forum, karma_name) and getattr(Forum, karma_name) or 0
         user = request.registry['res.users'].browse(request.cr, SUPERUSER_ID, uid or request.uid, context=request.context)
-        print karma_name, karma, user.karma
         if user.karma < karma:
             return False, {'error': 'not_enough_karma', 'karma': karma}
         return True, {}

From a6bcf53bd3dfe4ecb5949bd04c3d16520d874ce2 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 18 Apr 2014 17:06:18 +0200
Subject: [PATCH 08/19] [IMP] gamification: performance improvement in
 generation method

bzr revid: mat@openerp.com-20140418150618-9g179rleuru44xrt
---
 addons/gamification/models/challenge.py | 74 +++++++++++++------------
 addons/gamification/models/res_users.py |  1 -
 2 files changed, 38 insertions(+), 37 deletions(-)

diff --git a/addons/gamification/models/challenge.py b/addons/gamification/models/challenge.py
index c3c06c3d63d..beeb859a03b 100644
--- a/addons/gamification/models/challenge.py
+++ b/addons/gamification/models/challenge.py
@@ -237,7 +237,7 @@ class gamification_challenge(osv.Model):
         write_res = super(gamification_challenge, self).write(cr, uid, ids, vals, context=context)
 
         if vals.get('state') == 'inprogress':
-            self._recompute_challenge_users(cr, uid, ids, context=context):
+            self._recompute_challenge_users(cr, uid, ids, context=context)
             self.generate_goals_from_challenge(cr, uid, ids, context=context)
 
         elif vals.get('state') == 'done':
@@ -302,7 +302,7 @@ class gamification_challenge(osv.Model):
         # update every running goal already generated linked to selected challenges
         goal_obj.update(cr, uid, goal_ids, context=context)
 
-        self._recompute_challenge_users(cr, uid, ids, context=context):
+        self._recompute_challenge_users(cr, uid, ids, context=context)
         self.generate_goals_from_challenge(cr, uid, ids, context=context)
 
         for challenge in self.browse(cr, uid, ids, context=context):
@@ -377,7 +377,7 @@ class gamification_challenge(osv.Model):
 
     def generate_goals_from_challenge(self, cr, uid, ids, context=None):
         _logger.warning("Deprecated, use private method _generate_goals_from_challenge(...) instead.")
-        return self._generate_goals_from_challenge(cr, uid, )
+        return self._generate_goals_from_challenge(cr, uid, ids, context=context)
 
     def _generate_goals_from_challenge(self, cr, uid, ids, context=None):
         """Generate the goals for each line and user.
@@ -398,44 +398,46 @@ class gamification_challenge(osv.Model):
                 end_date = challenge.end_date
 
             for line in challenge.line_ids:
-                # TODO: allow to restrict to a subset of users
-                for user in challenge.user_ids:
 
-                    domain = [('line_id', '=', line.id), ('user_id', '=', user.id)]
-                    if start_date:
-                        domain.append(('start_date', '=', start_date))
+                # there is potentially a lot of users
+                # detect the ones with no goal linked to this line
+                date_clause = ""
+                query_params = [line.id]
+                if start_date:
+                    date_clause += "AND g.start_date = %s"
+                    query_params.append(start_date)
+                if end_date:
+                    date_clause += "AND g.end_date = %s"
+                    query_params.append(end_date)
+            
+                query = """SELECT u.id AS user_id
+                             FROM res_users u
+                        LEFT JOIN gamification_goal g
+                               ON (u.id = g.user_id)
+                            WHERE line_id = %s
+                              {date_clause}
+                        """.format(date_clause=date_clause)
+                cr.execute(query, query_params)
+                user_with_goal_ids = cr.dictfetchall()
+                user_without_goal_ids = list(set([user.id for user in challenge.user_ids]) - set([user['user_id'] for user in user_with_goal_ids]))
 
-                    # goal already existing for this line ?
-                    if len(goal_obj.search(cr, uid, domain, context=context)) > 0:
+                values = {
+                    'definition_id': line.definition_id.id,
+                    'line_id': line.id,
+                    'target_goal': line.target_goal,
+                    'state': 'inprogress',
+                }
 
-                        # resume canceled goals
-                        domain.append(('state', '=', 'canceled'))
-                        canceled_goal_ids = goal_obj.search(cr, uid, domain, context=context)
-                        if canceled_goal_ids:
-                            goal_obj.write(cr, uid, canceled_goal_ids, {'state': 'inprogress'}, context=context)
-                            to_update.extend(canceled_goal_ids)
+                if start_date:
+                    values['start_date'] = start_date
+                if end_date:
+                    values['end_date'] = end_date
 
-                        # skip to next user
-                        continue
+                if challenge.remind_update_delay:
+                    values['remind_update_delay'] = challenge.remind_update_delay
 
-                    values = {
-                        'definition_id': line.definition_id.id,
-                        'line_id': line.id,
-                        'user_id': user.id,
-                        'target_goal': line.target_goal,
-                        'state': 'inprogress',
-                    }
-
-                    if start_date:
-                        values['start_date'] = start_date
-                    if end_date:
-                        values['end_date'] = end_date
-
-                    if challenge.remind_update_delay:
-                        values['remind_update_delay'] = challenge.remind_update_delay
-
-                    new_goal_id = goal_obj.create(cr, uid, values, context=context)
-                    to_update.append(new_goal_id)
+                for user_id in user_without_goal_ids:
+                    values.update({'user_id': user_id})
 
             goal_obj.update(cr, uid, to_update, context=context)
 
diff --git a/addons/gamification/models/res_users.py b/addons/gamification/models/res_users.py
index 330311ba05e..67020520467 100644
--- a/addons/gamification/models/res_users.py
+++ b/addons/gamification/models/res_users.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-from openerp import SUPERUSER_ID
 from openerp.osv import osv
 from challenge import MAX_VISIBILITY_RANKING
 

From 018624ea43cf003e1639c1d91b4f81558bb6fe55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 18 Apr 2014 17:16:08 +0200
Subject: [PATCH 09/19] [IMP] website_forum: better error messages about karma

bzr revid: tde@openerp.com-20140418151608-0pb3ui97aksb9en1
---
 addons/website_forum/static/src/js/website_forum.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/website_forum/static/src/js/website_forum.js b/addons/website_forum/static/src/js/website_forum.js
index 3eda8a2b4ca..eed4947aab9 100644
--- a/addons/website_forum/static/src/js/website_forum.js
+++ b/addons/website_forum/static/src/js/website_forum.js
@@ -18,9 +18,9 @@ $(document).ready(function () {
                             '</div>');
                     }
                     else if (data['error'] == 'not_enough_karma') {
-                        var $warning = $('<div class="alert alert-danger alert-dismissable" id="vote_alert" style="position:absolute; margin-top: -30px; margin-left: 90px;">'+
+                        var $warning = $('<div class="alert alert-danger alert-dismissable" id="vote_alert" style="max-width: 500px; position:absolute; margin-top: -30px; margin-left: 90px;">'+
                             '<button type="button" class="close notification_close" data-dismiss="alert" aria-hidden="true">&times;</button>'+
-                            'Sorry, at least ' + data['karma'] + ' karma is required to vote'+
+                            'Sorry, at least ' + data['karma'] + ' karma is required to vote. You can gain karma by answering questions and receiving votes.'+
                             '</div>');
                     }
                     vote_alert = $link.parent().find("#vote_alert");
@@ -60,9 +60,9 @@ $(document).ready(function () {
                         'Sorry, only the user who asked this question can accept the answer as correct.'+
                         '</div>');
                 } else if (data['error'] == 'not_enough_karma') {
-                    var $warning = $('<div class="alert alert-danger alert-dismissable" id="vote_alert" style="position:absolute; margin-top: -30px; margin-left: 90px;">'+
+                    var $warning = $('<div class="alert alert-danger alert-dismissable" id="vote_alert" style="max-width: 500px; position:absolute; margin-top: -30px; margin-left: 90px;">'+
                         '<button type="button" class="close notification_close" data-dismiss="alert" aria-hidden="true">&times;</button>'+
-                        'Sorry, at least ' + data['karma'] + ' karma is required to accept your own answers'+
+                        'Sorry, at least ' + data['karma'] + ' karma is required to accept your own answers. You can gain karma by answering questions and receiving votes.'+
                         '</div>');
                 }
                 correct_answer_alert = $link.parent().find("#correct_answer_alert");

From bf6cd98083ffa00a3ab89e05162aa41a5a253697 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 18 Apr 2014 17:32:17 +0200
Subject: [PATCH 10/19] [FIX] message author link, now working

bzr revid: tde@openerp.com-20140418153217-qdbslziaiz832xvz
---
 addons/website_forum/controllers/main.py     | 10 ++++++++++
 addons/website_forum/views/website_forum.xml |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/addons/website_forum/controllers/main.py b/addons/website_forum/controllers/main.py
index e75f0a521ae..aad4e3e4234 100644
--- a/addons/website_forum/controllers/main.py
+++ b/addons/website_forum/controllers/main.py
@@ -436,6 +436,16 @@ class WebsiteForum(http.Controller):
 
         return request.website.render("website_forum.users", values)
 
+    @http.route(['/forum/<model("forum.forum"):forum>/partner/<int:partner_id>'], type='http', auth="public", website=True, multilang=True)
+    def open_partner(self, forum, partner_id=0, **post):
+        cr, uid, context = request.cr, request.uid, request.context
+        pids = request.registry['res.partner'].search(cr, SUPERUSER_ID, [('id', '=', partner_id)], context=context)
+        if pids:
+            partner = request.registry['res.partner'].browse(cr, SUPERUSER_ID, pids[0], context=context)
+            if partner.user_ids:
+                return werkzeug.utils.redirect("/forum/%s/user/%d" % (slug(forum), partner.user_ids[0].id))
+        return werkzeug.utils.redirect("/forum/%s" % slug(forum))
+
     @http.route(['/forum/<model("forum.forum"):forum>/user/<int:user_id>'], type='http', auth="public", website=True, multilang=True)
     def open_user(self, forum, user_id=0, **post):
         cr, uid, context = request.cr, request.uid, request.context
diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index 5f82e3b12f8..fd21c2cd1f0 100644
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -543,7 +543,7 @@
                         t-attf-href="/forum/#{slug(forum)}/post/#{slug(object)}/comment/#{slug(message)}/delete" 
                         class="close comment_delete">&amp;times;</button>
                     <span t-field="message.body"/>
-                    <a t-attf-href="/forum/#{slug(forum)}/user/#{message.id}"
+                    <a t-attf-href="/forum/#{slug(forum)}/partner/#{message.author_id.id}"
                         t-field="message.author_id" t-field-options='{"widget": "contact", "country_image": true, "fields": ["name", "country_id"]}'
                         style="display: inline-block;"/>
                     on <span t-field="message.date" t-field-options='{"format":"short"}'/>

From 130f572d81fa05ade9e9dd98565ebc6c5f9c8335 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 18 Apr 2014 18:10:53 +0200
Subject: [PATCH 11/19] [IMP] gamification: use evaluated version of the
 domain. Needs server fix to avoid sending evaluated data.

bzr revid: mat@openerp.com-20140418161053-lc970koh96wfe200
---
 addons/gamification/data/goal_base.xml          |  4 ++--
 addons/gamification/models/challenge.py         | 10 ++++++++--
 addons/gamification_sale_crm/sale_crm_goals.xml |  4 ++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/addons/gamification/data/goal_base.xml b/addons/gamification/data/goal_base.xml
index 0437dee031c..c12763025f6 100644
--- a/addons/gamification/data/goal_base.xml
+++ b/addons/gamification/data/goal_base.xml
@@ -164,7 +164,7 @@
             <field name="period">once</field>
             <field name="visibility_mode">personal</field>
             <field name="report_message_frequency">never</field>
-            <field name="user_domain">[('groups_id', 'in', ref('base.group_user'))]</field>
+            <field name="user_domain" eval="[('groups_id', '=', ref('base.group_user'))]" />
             <field name="state">inprogress</field>
             <field name="category">other</field>
         </record>
@@ -174,7 +174,7 @@
             <field name="period">once</field>
             <field name="visibility_mode">personal</field>
             <field name="report_message_frequency">never</field>
-            <field name="user_domain">[('groups_id', 'in', ref('base.user_root'))]</field>
+            <field name="user_domain" eval="[('groups_id', '=', ref('base.group_erp_manager'))]" />
             <field name="state">inprogress</field>
             <field name="category">other</field>
         </record>
diff --git a/addons/gamification/models/challenge.py b/addons/gamification/models/challenge.py
index beeb859a03b..ea698ca77fa 100644
--- a/addons/gamification/models/challenge.py
+++ b/addons/gamification/models/challenge.py
@@ -212,7 +212,6 @@ class gamification_challenge(osv.Model):
     def create(self, cr, uid, vals, context=None):
         """Overwrite the create method to add the user of groups"""
 
-        # add users when change the group auto-subscription
         if vals.get('user_domain'):
             user_ids = self._get_challenger_users(cr, uid, vals.get('user_domain'), context=context)
 
@@ -233,7 +232,14 @@ class gamification_challenge(osv.Model):
     def write(self, cr, uid, ids, vals, context=None):
         if isinstance(ids, (int,long)):
             ids = [ids]
-        
+
+        if vals.get('user_domain'):
+            user_ids = self._get_challenger_users(cr, uid, vals.get('user_domain'), context=context)
+
+            if not vals.get('user_ids'):
+                vals['user_ids'] = []
+            vals['user_ids'] += [(4, user_id) for user_id in user_ids]
+
         write_res = super(gamification_challenge, self).write(cr, uid, ids, vals, context=context)
 
         if vals.get('state') == 'inprogress':
diff --git a/addons/gamification_sale_crm/sale_crm_goals.xml b/addons/gamification_sale_crm/sale_crm_goals.xml
index fbc1c952bb8..13bf49767dc 100644
--- a/addons/gamification_sale_crm/sale_crm_goals.xml
+++ b/addons/gamification_sale_crm/sale_crm_goals.xml
@@ -130,7 +130,7 @@
             <field name="name">Monthly Sales Targets</field>
             <field name="period">monthly</field>
             <field name="visibility_mode">ranking</field>
-            <field name="user_domain">[('groups_id', 'in', ref('base.group_sale_salesman'))]</field>
+            <field name="user_domain" eval="[('groups_id', 'in', ref('base.group_sale_salesman'))]" />
             <field name="report_message_frequency">weekly</field>
         </record>
 
@@ -138,7 +138,7 @@
             <field name="name">Lead Acquisition</field>
             <field name="period">monthly</field>
             <field name="visibility_mode">ranking</field>
-            <field name="user_domain">[('groups_id', 'in', ref('base.group_sale_salesman'))]</field>
+            <field name="user_domain" eval="[('groups_id', 'in', ref('base.group_sale_salesman'))]" />"
             <field name="report_message_frequency">weekly</field>
         </record>
 

From 4725d6f532adf0ed7e62e47d535e673ec9388f83 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 18 Apr 2014 18:34:40 +0200
Subject: [PATCH 12/19] [REF] gamification: remove unused ref local variable

bzr revid: mat@openerp.com-20140418163440-7y1k3sliuk9bgco8
---
 addons/gamification/models/challenge.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/gamification/models/challenge.py b/addons/gamification/models/challenge.py
index ea698ca77fa..c7896b61851 100644
--- a/addons/gamification/models/challenge.py
+++ b/addons/gamification/models/challenge.py
@@ -337,8 +337,7 @@ class gamification_challenge(osv.Model):
         return True
 
     def _get_challenger_users(self, cr, uid, domain, context=None):
-        ref = functools.partial(self.pool['ir.model.data'].xmlid_to_res_id, cr, uid)
-        user_domain = eval(domain, {'ref': ref})
+        user_domain = eval(domain)
         return self.pool['res.users'].search(cr, uid, user_domain, context=context)
 
     def _recompute_challenge_users(self, cr, uid, challenge_ids, context=None):

From b24252d5e967dfac4818163c849d924274ba0e75 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 18 Apr 2014 18:38:37 +0200
Subject: [PATCH 13/19] [IMP] gamification: force domain to be in unicode

bzr revid: mat@openerp.com-20140418163837-32nldgj5u04q9kyu
---
 addons/gamification/models/challenge.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/gamification/models/challenge.py b/addons/gamification/models/challenge.py
index c7896b61851..bc49c434a13 100644
--- a/addons/gamification/models/challenge.py
+++ b/addons/gamification/models/challenge.py
@@ -21,14 +21,13 @@
 
 from openerp import SUPERUSER_ID
 from openerp.osv import fields, osv
-from openerp.tools import DEFAULT_SERVER_DATE_FORMAT as DF
+from openerp.tools import ustr, DEFAULT_SERVER_DATE_FORMAT as DF
 from openerp.tools.safe_eval import safe_eval as eval
 from openerp.tools.translate import _
 
 from datetime import date, datetime, timedelta
 import calendar
 import logging
-import functools
 _logger = logging.getLogger(__name__)
 
 # display top 3 in ranking, could be db variable
@@ -337,7 +336,7 @@ class gamification_challenge(osv.Model):
         return True
 
     def _get_challenger_users(self, cr, uid, domain, context=None):
-        user_domain = eval(domain)
+        user_domain = eval(ustr(domain))
         return self.pool['res.users'].search(cr, uid, user_domain, context=context)
 
     def _recompute_challenge_users(self, cr, uid, challenge_ids, context=None):

From 6022f890cb500137f170df6277c4cfc0bd7b831d Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 22 Apr 2014 09:52:47 +0200
Subject: [PATCH 14/19] [FIX] gamification: convert calls to private method and
 don't forget to create missing goals

bzr revid: mat@openerp.com-20140422075247-5rddurvr6ymt80mo
---
 addons/gamification/models/challenge.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/addons/gamification/models/challenge.py b/addons/gamification/models/challenge.py
index bc49c434a13..1658c4eab08 100644
--- a/addons/gamification/models/challenge.py
+++ b/addons/gamification/models/challenge.py
@@ -243,7 +243,7 @@ class gamification_challenge(osv.Model):
 
         if vals.get('state') == 'inprogress':
             self._recompute_challenge_users(cr, uid, ids, context=context)
-            self.generate_goals_from_challenge(cr, uid, ids, context=context)
+            self._generate_goals_from_challenge(cr, uid, ids, context=context)
 
         elif vals.get('state') == 'done':
             self.check_challenge_reward(cr, uid, ids, force=True, context=context)
@@ -308,7 +308,7 @@ class gamification_challenge(osv.Model):
         goal_obj.update(cr, uid, goal_ids, context=context)
 
         self._recompute_challenge_users(cr, uid, ids, context=context)
-        self.generate_goals_from_challenge(cr, uid, ids, context=context)
+        self._generate_goals_from_challenge(cr, uid, ids, context=context)
 
         for challenge in self.browse(cr, uid, ids, context=context):
 
@@ -421,6 +421,7 @@ class gamification_challenge(osv.Model):
                             WHERE line_id = %s
                               {date_clause}
                         """.format(date_clause=date_clause)
+
                 cr.execute(query, query_params)
                 user_with_goal_ids = cr.dictfetchall()
                 user_without_goal_ids = list(set([user.id for user in challenge.user_ids]) - set([user['user_id'] for user in user_with_goal_ids]))
@@ -442,6 +443,8 @@ class gamification_challenge(osv.Model):
 
                 for user_id in user_without_goal_ids:
                     values.update({'user_id': user_id})
+                    goal_id = goal_obj.create(cr, uid, values, context=context)
+                    to_update.append(goal_id)
 
             goal_obj.update(cr, uid, to_update, context=context)
 
@@ -654,7 +657,7 @@ class gamification_challenge(osv.Model):
         message = "%s has joined the challenge" % user.name
         self.message_post(cr, SUPERUSER_ID, challenge_ids, body=message, context=context)
         self.write(cr, SUPERUSER_ID, challenge_ids, {'invited_user_ids': [(3, user_id)], 'user_ids': [(4, user_id)]}, context=context)
-        return self.generate_goals_from_challenge(cr, SUPERUSER_ID, challenge_ids, context=context)
+        return self._generate_goals_from_challenge(cr, SUPERUSER_ID, challenge_ids, context=context)
 
     # TODO in trunk, remove unused parameter user_id
     def discard_challenge(self, cr, uid, challenge_ids, context=None, user_id=None):

From f756fa671e8b0397314b57e00120e00361eda59a Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 22 Apr 2014 11:09:37 +0200
Subject: [PATCH 15/19] [FIX] gamification: remove wrong double quote in xml
 website_forum: restrict granting rights on forum badges

bzr revid: mat@openerp.com-20140422090937-l2mxc828hof9u8pi
---
 addons/gamification_sale_crm/sale_crm_goals.xml    |  2 +-
 addons/website_forum/data/badges_answer.xml        |  7 +++++++
 addons/website_forum/data/badges_moderation.xml    |  5 +++++
 addons/website_forum/data/badges_participation.xml |  5 +++++
 addons/website_forum/data/badges_question.xml      | 11 +++++++++++
 5 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/addons/gamification_sale_crm/sale_crm_goals.xml b/addons/gamification_sale_crm/sale_crm_goals.xml
index 13bf49767dc..ffb3a24318a 100644
--- a/addons/gamification_sale_crm/sale_crm_goals.xml
+++ b/addons/gamification_sale_crm/sale_crm_goals.xml
@@ -138,7 +138,7 @@
             <field name="name">Lead Acquisition</field>
             <field name="period">monthly</field>
             <field name="visibility_mode">ranking</field>
-            <field name="user_domain" eval="[('groups_id', 'in', ref('base.group_sale_salesman'))]" />"
+            <field name="user_domain" eval="[('groups_id', 'in', ref('base.group_sale_salesman'))]" />
             <field name="report_message_frequency">weekly</field>
         </record>
 
diff --git a/addons/website_forum/data/badges_answer.xml b/addons/website_forum/data/badges_answer.xml
index d4e9ead5f89..97f184d59f0 100644
--- a/addons/website_forum/data/badges_answer.xml
+++ b/addons/website_forum/data/badges_answer.xml
@@ -8,6 +8,7 @@
             <field name="name">Teacher</field>
             <field name="description">Received at least 3 upvote for an answer for the first time</field>
             <field name="level">bronze</field>
+            <field name="rule_auth">nobody</field>
         </record>
         <record model="gamification.goal.definition" id="definition_teacher">
             <field name="name">Teacher</field>
@@ -42,6 +43,7 @@
             <field name="name">Nice Answer</field>
             <field name="description">Answer voted up 4 times</field>
             <field name="level">bronze</field>
+            <field name="rule_auth">nobody</field>
         </record>
         <record model="gamification.goal.definition" id="definition_nice_answer">
             <field name="name">Nice Answer (4)</field>
@@ -76,6 +78,7 @@
             <field name="name">Good Answer</field>
             <field name="description">Answer voted up 6 times</field>
             <field name="level">silver</field>
+            <field name="rule_auth">nobody</field>
         </record>
         <record model="gamification.goal.definition" id="definition_good_answer">
             <field name="name">Good Answer (6)</field>
@@ -110,6 +113,7 @@
             <field name="name">Great Answer</field>
             <field name="description">Answer voted up 15 times</field>
             <field name="level">gold</field>
+            <field name="rule_auth">nobody</field>
         </record>
         <record model="gamification.goal.definition" id="definition_great_answer">
             <field name="name">Great Answer (15)</field>
@@ -146,6 +150,7 @@
             <field name="name">Enlightened</field>
             <field name="description">Answer was accepted with 3 or more votes</field>
             <field name="level">silver</field>
+            <field name="rule_auth">nobody</field>
         </record>
         <record model="gamification.goal.definition" id="definition_enlightened">
             <field name="name">Enlightened</field>
@@ -180,6 +185,7 @@
             <field name="name">Guru</field>
             <field name="description">Answer accepted with 15 or more votes</field>
             <field name="level">silver</field>
+            <field name="rule_auth">nobody</field>
         </record>
         <record model="gamification.goal.definition" id="definition_guru">
             <field name="name">Guru (15)</field>
@@ -256,6 +262,7 @@ for post in Post.browse(cr, uid, user_posts, context=context):
             <field name="name">Self-Learner</field>
             <field name="description">Answered own question with at least 4 up votes</field>
             <field name="level">gold</field>
+            <field name="rule_auth">nobody</field>
         </record>
         <record model="gamification.goal.definition" id="definition_self_learner">
             <field name="name">Self-Learner</field>
diff --git a/addons/website_forum/data/badges_moderation.xml b/addons/website_forum/data/badges_moderation.xml
index 2ebb0f23cd1..41f3eb7fe41 100644
--- a/addons/website_forum/data/badges_moderation.xml
+++ b/addons/website_forum/data/badges_moderation.xml
@@ -15,6 +15,7 @@
             <field name="name">Critic</field>
             <field name="description">First downvote</field>
             <field name="level">bronze</field>
+            <field name="rule_auth">nobody</field>
         </record>
         <record model="gamification.goal.definition" id="definition_critic">
             <field name="name">Critic</field>
@@ -50,6 +51,7 @@
             <field name="name">Disciplined</field>
             <field name="description">Deleted own post with 3 or more upvotes</field>
             <field name="level">bronze</field>
+            <field name="rule_auth">nobody</field>
         </record>
         <record model="gamification.goal.definition" id="definition_disciplined">
             <field name="name">Disciplined</field>
@@ -85,6 +87,7 @@
             <field name="name">Editor</field>
             <field name="description">First edit</field>
             <field name="level">gold</field>
+            <field name="rule_auth">nobody</field>
         </record>
         <record model="gamification.goal.definition" id="definition_editor">
             <field name="name">Editor</field>
@@ -223,6 +226,7 @@ result = int(len(data) >= 15)</field>
             <field name="name">Supporter</field>
             <field name="description">First upvote</field>
             <field name="level">gold</field>
+            <field name="rule_auth">nobody</field>
         </record>
         <record model="gamification.goal.definition" id="definition_supporter">
             <field name="name">Supporter</field>
@@ -258,6 +262,7 @@ result = int(len(data) >= 15)</field>
             <field name="name">Peer Pressure</field>
             <field name="description">Deleted own post with 3 or more downvotes</field>
             <field name="level">gold</field>
+            <field name="rule_auth">nobody</field>
         </record>
         <record model="gamification.goal.definition" id="definition_peer_pressure">
             <field name="name">Peer Pressure</field>
diff --git a/addons/website_forum/data/badges_participation.xml b/addons/website_forum/data/badges_participation.xml
index 8c922f09b33..05c2540d77d 100644
--- a/addons/website_forum/data/badges_participation.xml
+++ b/addons/website_forum/data/badges_participation.xml
@@ -7,6 +7,7 @@
             <field name="name">Autobiographer</field>
             <field name="description">Completed own biography</field>
             <field name="level">bronze</field>
+            <field name="rule_auth">nobody</field>
         </record>
         <record model="gamification.goal.definition" id="definition_configure_profile">
             <field name="name">Completed own biography</field>
@@ -46,6 +47,7 @@
             <field name="name">Commentator</field>
             <field name="description">Posted 10 comments</field>
             <field name="level">bronze</field>
+            <field name="rule_auth">nobody</field>
         </record>
         <record model="gamification.goal.definition" id="definition_commentator">
             <field name="name">Commentator</field>
@@ -81,6 +83,7 @@
             <field name="name">Pundit</field>
             <field name="description">Left comments with score of 10 or more</field>
             <field name="level">silver</field>
+            <field name="rule_auth">nobody</field>
         </record>
         <record model="gamification.goal.definition" id="definition_pundit">
             <field name="name">Pundit</field>
@@ -115,6 +118,7 @@
             <field name="name">Chief Commentator</field>
             <field name="description">Posted 100 comments</field>
             <field name="level">silver</field>
+            <field name="rule_auth">nobody</field>
         </record>
         <record model="gamification.challenge" id="challenge_chief_commentator">
             <field name="name">Chief Commentator</field>
@@ -177,6 +181,7 @@ result = get_counter(cr, uid, context=context)
             <field name="name">Taxonomist</field>
             <field name="description">Created a tag used by 15 questions</field>
             <field name="level">silver</field>
+            <field name="rule_auth">nobody</field>
         </record>
         <record model="gamification.goal.definition" id="definition_taxonomist">
             <field name="name">Taxonomist</field>
diff --git a/addons/website_forum/data/badges_question.xml b/addons/website_forum/data/badges_question.xml
index f0d403a3455..ff2d63c034d 100644
--- a/addons/website_forum/data/badges_question.xml
+++ b/addons/website_forum/data/badges_question.xml
@@ -8,6 +8,7 @@
             <field name="name">Popular Question</field>
             <field name="description">Asked a question with at least 150 views</field>
             <field name="level">bronze</field>
+            <field name="rule_auth">nobody</field>
         </record>
         <record model="gamification.goal.definition" id="definition_popular_question">
             <field name="name">Popular Question (150)</field>
@@ -43,6 +44,7 @@
             <field name="name">Notable Question</field>
             <field name="description">Asked a question with at least 250 views</field>
             <field name="level">silver</field>
+            <field name="rule_auth">nobody</field>
         </record>
         <record model="gamification.goal.definition" id="definition_notable_question">
             <field name="name">Popular Question (250)</field>
@@ -77,6 +79,7 @@
             <field name="name">Famous Question</field>
             <field name="description">Asked a question with at least 500 views</field>
             <field name="level">gold</field>
+            <field name="rule_auth">nobody</field>
         </record>
         <record model="gamification.goal.definition" id="definition_famous_question">
             <field name="name">Popular Question (500)</field>
@@ -113,6 +116,7 @@
             <field name="name">Credible Question</field>
             <field name="description">Question set as favorite by 1 user</field>
             <field name="level">bronze</field>
+            <field name="rule_auth">nobody</field>
         </record>
         <record model="gamification.goal.definition" id="definition_favorite_question_1">
             <field name="name">Favourite Question (1)</field>
@@ -147,6 +151,7 @@
             <field name="name">Favorite Question</field>
             <field name="description">Question set as favorite by 5 users</field>
             <field name="level">silver</field>
+            <field name="rule_auth">nobody</field>
         </record>
         <record model="gamification.goal.definition" id="definition_favorite_question_5">
             <field name="name">Favourite Question (5)</field>
@@ -181,6 +186,7 @@
             <field name="name">Stellar Question</field>
             <field name="description">Question set as favorite by 25 users</field>
             <field name="level">bronze</field>
+            <field name="rule_auth">nobody</field>
         </record>
         <record model="gamification.goal.definition" id="definition_stellar_question_25">
             <field name="name">Favourite Question (25)</field>
@@ -217,6 +223,7 @@
             <field name="name">Student</field>
             <field name="description">Asked first question with at least one up vote</field>
             <field name="level">gold</field>
+            <field name="rule_auth">nobody</field>
         </record>
         <record model="gamification.goal.definition" id="definition_student">
             <field name="name">Upvoted question (1)</field>
@@ -251,6 +258,7 @@
             <field name="name">Nice Quesiotn</field>
             <field name="description">Question voted up 4 times</field>
             <field name="level">bronze</field>
+            <field name="rule_auth">nobody</field>
         </record>
         <record model="gamification.goal.definition" id="definition_nice_question">
             <field name="name">Upvoted question (4)</field>
@@ -285,6 +293,7 @@
             <field name="name">Good Question</field>
             <field name="description">Question voted up 6 times</field>
             <field name="level">silver</field>
+            <field name="rule_auth">nobody</field>
         </record>
         <record model="gamification.goal.definition" id="definition_good_question">
             <field name="name">Upvoted question (6)</field>
@@ -319,6 +328,7 @@
             <field name="name">Great Question</field>
             <field name="description">Question voted up 15 times</field>
             <field name="level">gold</field>
+            <field name="rule_auth">nobody</field>
         </record>
         <record model="gamification.goal.definition" id="definition_great_question">
             <field name="name">Upvoted question (15)</field>
@@ -354,6 +364,7 @@
             <field name="name">Scholar</field>
             <field name="description">Asked a question and accepted an answer</field>
             <field name="level">gold</field>
+            <field name="rule_auth">nobody</field>
         </record>
         <record model="gamification.goal.definition" id="definition_scholar">
             <field name="name">Scholar</field>

From ada7facefe12ff87238fa8c036fc14b80d4bc635 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Tue, 22 Apr 2014 14:06:48 +0200
Subject: [PATCH 16/19] [FIX] when runing in prefork mode, empty connection
 pool *after* the registry preloading

bzr revid: chs@openerp.com-20140422120648-2np8izn19z97e4iy
---
 openerp/service/server.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/openerp/service/server.py b/openerp/service/server.py
index 9dde14c0edb..72e130edf8b 100644
--- a/openerp/service/server.py
+++ b/openerp/service/server.py
@@ -559,8 +559,6 @@ class PreforkServer(CommonServer):
                 raise
 
     def start(self):
-        # Empty the cursor pool, we dont want them to be shared among forked workers.
-        openerp.sql_db.close_all()
         # wakeup pipe, python doesnt throw EINTR when a syscall is interrupted
         # by a signal simulating a pseudo SA_RESTART. We write to a pipe in the
         # signal handler to overcome this behaviour
@@ -609,6 +607,9 @@ class PreforkServer(CommonServer):
             self.stop()
             return rc
 
+        # Empty the cursor pool, we dont want them to be shared among forked workers.
+        openerp.sql_db.close_all()
+
         _logger.debug("Multiprocess starting")
         while 1:
             try:

From fafe368331970ba870d6d0606133c42de7a75230 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 22 Apr 2014 14:21:55 +0200
Subject: [PATCH 17/19] [FIX] report explicitly import tests

bzr revid: al@openerp.com-20140422122155-jw89nc4g0m12mhvo
---
 addons/report/tests/test_reports.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/report/tests/test_reports.py b/addons/report/tests/test_reports.py
index b1853489573..d3718df5e63 100644
--- a/addons/report/tests/test_reports.py
+++ b/addons/report/tests/test_reports.py
@@ -19,7 +19,9 @@
 #
 ##############################################################################
 import logging
+
 import openerp
+import openerp.tests
 
 
 _logger = logging.getLogger(__name__)

From a2b3b47b38bd67007ec88a9d7a375fcf9091b4e8 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Tue, 22 Apr 2014 14:35:33 +0200
Subject: [PATCH 18/19] [FIX] cli mode: initialisation of the addons path do
 not setup the logger (as we only parse the addons path, we ends with the
 default logging config)

bzr revid: chs@openerp.com-20140422123533-b6lcm76ydf8vpw9u
---
 openerp/cli/__init__.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/openerp/cli/__init__.py b/openerp/cli/__init__.py
index 7111112c026..27428369cbc 100644
--- a/openerp/cli/__init__.py
+++ b/openerp/cli/__init__.py
@@ -38,7 +38,8 @@ def main():
     # The only shared option is '--addons-path=' needed to discover additional
     # commands from modules
     if len(args) > 1 and args[0].startswith('--addons-path=') and not args[1].startswith("-"):
-        tools.config.parse_config([args[0]])
+        # parse only the addons-path, do not setup the logger...
+        tools.config._parse_config([args[0]])
         args = args[1:]
 
     # Default legacy command

From 12beacda08dd023c1590ecbedcb76f305695e251 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Tue, 22 Apr 2014 16:32:49 +0200
Subject: [PATCH 19/19] [MERGE] backport of trunk revisions:

9362 fp@tinyerp.com-20140421205739-rki3bctinjy3amzy [MERGE] new module: website_forum_doc + small fixes (close) in forum
9363 fp@tinyerp.com-20140421213850-19gk3hfz8qxa6fw3 [IMP] improved form view for posts

bzr revid: chs@openerp.com-20140422143249-3cfh18tenn3a5ry1
---
 addons/website/static/src/css/editor.css      |   9 +
 addons/website/static/src/css/editor.sass     |   7 +
 addons/website_forum/controllers/main.py      |   7 +-
 addons/website_forum/models/forum.py          |   5 +-
 .../static/src/css/website_forum.css          |  15 +-
 .../static/src/css/website_forum.sass         |  14 +-
 .../static/src/js/website_forum.js            |   7 +-
 addons/website_forum/views/forum.xml          |  28 +-
 addons/website_forum/views/website_forum.xml  | 144 +++++-----
 addons/website_forum_doc/__init__.py          |   4 +
 addons/website_forum_doc/__openerp__.py       |  45 +++
 .../website_forum_doc/controllers/__init__.py |   3 +
 addons/website_forum_doc/controllers/main.py  |  71 +++++
 addons/website_forum_doc/data/doc_data.xml    |  46 +++
 addons/website_forum_doc/data/doc_demo.xml    |  92 ++++++
 addons/website_forum_doc/models/__init__.py   |   3 +
 .../website_forum_doc/models/documentation.py |  75 +++++
 .../security/ir.model.access.csv              |   4 +
 addons/website_forum_doc/views/doc.xml        | 116 ++++++++
 .../website_forum_doc/views/website_doc.xml   | 264 ++++++++++++++++++
 20 files changed, 869 insertions(+), 90 deletions(-)
 create mode 100644 addons/website_forum_doc/__init__.py
 create mode 100644 addons/website_forum_doc/__openerp__.py
 create mode 100644 addons/website_forum_doc/controllers/__init__.py
 create mode 100644 addons/website_forum_doc/controllers/main.py
 create mode 100644 addons/website_forum_doc/data/doc_data.xml
 create mode 100644 addons/website_forum_doc/data/doc_demo.xml
 create mode 100644 addons/website_forum_doc/models/__init__.py
 create mode 100644 addons/website_forum_doc/models/documentation.py
 create mode 100644 addons/website_forum_doc/security/ir.model.access.csv
 create mode 100644 addons/website_forum_doc/views/doc.xml
 create mode 100644 addons/website_forum_doc/views/website_doc.xml

diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css
index eb4c5b2851c..4e9038837f3 100644
--- a/addons/website/static/src/css/editor.css
+++ b/addons/website/static/src/css/editor.css
@@ -106,6 +106,15 @@
   content: "Press The Top-Left Edit Button" !important;
 }
 
+[data-oe-type=html].oe_no_empty:empty:before {
+  content: "" !important;
+}
+
+[data-oe-type=html].oe_no_empty:empty {
+  background-image: none !important;
+  height: 16px !important;
+}
+
 /* ---- EDITOR BAR ---- {{{ */
 table.editorbar-panel {
   cursor: pointer;
diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index fb80fa47277..53eb89a4341 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -86,6 +86,13 @@
 .oe_structure.oe_empty:empty:before, [data-oe-type=html]:empty:before, .oe_structure.oe_empty > .oe_drop_zone.oe_insert:only-child:before, [data-oe-type=html] > .oe_drop_zone.oe_insert:only-child:before
     content: 'Press The Top-Left Edit Button' !important
 
+[data-oe-type=html].oe_no_empty:empty:before
+    content: '' !important
+
+[data-oe-type=html].oe_no_empty:empty
+    background-image: none !important
+    height: 16px !important
+
 // }}}
 
 /* ---- EDITOR BAR ---- {{{ */
diff --git a/addons/website_forum/controllers/main.py b/addons/website_forum/controllers/main.py
index aad4e3e4234..365221f9574 100644
--- a/addons/website_forum/controllers/main.py
+++ b/addons/website_forum/controllers/main.py
@@ -122,6 +122,7 @@ class WebsiteForum(http.Controller):
 
         values = self._prepare_forum_values(forum=forum, searches=post)
         values.update({
+            'main_object': tag or forum,
             'question_ids': question_ids,
             'pager': pager,
             'tag': tag,
@@ -151,6 +152,7 @@ class WebsiteForum(http.Controller):
         values = self._prepare_forum_values(forum=forum, searches={'tags': True}, **post)
         values.update({
             'tags': tags,
+            'main_object': forum,
         })
         return request.website.render("website_forum.tag", values)
 
@@ -196,6 +198,7 @@ class WebsiteForum(http.Controller):
         filters = 'question'
         values = self._prepare_forum_values(forum=forum, searches=post)
         values.update({
+            'main_object': question,
             'question': question,
             'header': {'question_data': True},
             'filters': filters,
@@ -253,7 +256,7 @@ class WebsiteForum(http.Controller):
             'state': 'close',
             'closed_uid': request.uid,
             'closed_date': datetime.today().strftime(tools.DEFAULT_SERVER_DATETIME_FORMAT),
-            'closed_reason_id': post.get('reason_id', False),
+            'closed_reason_id': int(post.get('reason_id', False)),
         }, context=request.context)
         return werkzeug.utils.redirect("/forum/%s/question/%s" % (slug(forum), slug(question)))
 
@@ -430,6 +433,7 @@ class WebsiteForum(http.Controller):
         values = self._prepare_forum_values(forum=forum, searches=searches)
         values .update({
             'users': users,
+            'main_object': forum,
             'notifications': self._get_notifications(),
             'pager': pager,
         })
@@ -574,7 +578,6 @@ class WebsiteForum(http.Controller):
     def badge_users(self, forum, badge, **kwargs):
         user_ids = [badge_user.user_id.id for badge_user in badge.owner_ids]
         users = request.registry['res.users'].browse(request.cr, SUPERUSER_ID, user_ids, context=request.context)
-
         values = self._prepare_forum_values(forum=forum, searches={'badges': True})
         values.update({
             'badge': badge,
diff --git a/addons/website_forum/models/forum.py b/addons/website_forum/models/forum.py
index 662ec10d094..7a8385d1a82 100644
--- a/addons/website_forum/models/forum.py
+++ b/addons/website_forum/models/forum.py
@@ -147,7 +147,7 @@ class Post(osv.Model):
         'state': fields.selection([('active', 'Active'), ('close', 'Close'), ('offensive', 'Offensive')], 'Status'),
         'views': fields.integer('Number of Views'),
         'active': fields.boolean('Active'),
-        'is_correct': fields.boolean('Valid Answer', help='Correct Answer/ Answer on this question accepted.'),
+        'is_correct': fields.boolean('Valid Answer', help='Correct Answer or Answer on this question accepted.'),
         'website_message_ids': fields.one2many(
             'mail.message', 'res_id',
             domain=lambda self: [
@@ -276,8 +276,9 @@ class Post(osv.Model):
 class PostReason(osv.Model):
     _name = "forum.post.reason"
     _description = "Post Closing Reason"
+    _order = 'name'
     _columns = {
-        'name': fields.char('Post Reason', required=True),
+        'name': fields.char('Post Reason', required=True, translate=True),
     }
 
 
diff --git a/addons/website_forum/static/src/css/website_forum.css b/addons/website_forum/static/src/css/website_forum.css
index 1155ded81aa..ab8ea684aae 100644
--- a/addons/website_forum/static/src/css/website_forum.css
+++ b/addons/website_forum/static/src/css/website_forum.css
@@ -10,10 +10,17 @@
   font-size: 200%;
   font-weight: bold;
 }
+.box div.subtitle {
+  margin-top: -4px;
+}
 
 .question .question-name {
   font-size: 150%;
 }
+.question .badge {
+  background-color: #cccccc;
+  margin-left: 4px;
+}
 
 .oe_grey {
   background-color: #eeeeee;
@@ -37,11 +44,15 @@
 }
 
 .oe_answer_true {
-  color: #428bca;
+  color: #3c763d;
 }
 
 .oe_answer_false {
-  color: #999999;
+  color: #bbbbbb;
+}
+
+.favourite_question {
+  color: #bbbbbb !important;
 }
 
 .forum_favourite_question {
diff --git a/addons/website_forum/static/src/css/website_forum.sass b/addons/website_forum/static/src/css/website_forum.sass
index f5bfb667b74..da2df1460aa 100644
--- a/addons/website_forum/static/src/css/website_forum.sass
+++ b/addons/website_forum/static/src/css/website_forum.sass
@@ -8,10 +8,15 @@
   span
     font-size: 200%
     font-weight: bold
+  div.subtitle
+    margin-top: -4px
 
 .question
   .question-name
     font-size: 150%
+  .badge
+    background-color: #ccc
+    margin-left: 4px
 
 .oe_grey
   background-color: #eeeeee
@@ -30,10 +35,13 @@
   color: #eea91e
 
 .oe_answer_true
-  color: #428bca
+  color: #3c763d
 
 .oe_answer_false
-  color: #999999
+  color: #bbbbbb
+
+.favourite_question
+  color: #bbbbbb !important
 
 .forum_favourite_question
   color: #ffcc00 !important
@@ -63,4 +71,4 @@ a.no-decoration
     font: 1.2em "Helvetica Neue", Helvetica, Arial, sans-serif !important
   .text-tags .text-tag .text-button
     font: 1.2em "Helvetica Neue", Helvetica, Arial, sans-serif !important
-    height: 1.2em !important
\ No newline at end of file
+    height: 1.2em !important
diff --git a/addons/website_forum/static/src/js/website_forum.js b/addons/website_forum/static/src/js/website_forum.js
index eed4947aab9..9053c573efb 100644
--- a/addons/website_forum/static/src/js/website_forum.js
+++ b/addons/website_forum/static/src/js/website_forum.js
@@ -70,11 +70,10 @@ $(document).ready(function () {
                     $link.parent().append($warning);
                 }
             } else {
-                $link.parents().find(".oe_answer_true").removeClass("oe_answer_true alert alert-info").addClass('oe_answer_false');
-                $link.parents().find(".answer_correct").removeClass("answer_correct alert alert-info")
                 if (data) {
-                    $link.removeClass("oe_answer_false").addClass('oe_answer_true');
-                    $link.parents('.forum_answer').first().addClass("answer_correct alert alert-info");
+                    $link.addClass("oe_answer_true").removeClass('oe_answer_false');
+                } else {
+                    $link.removeClass("oe_answer_true").addClass('oe_answer_false');
                 }
             }
         });
diff --git a/addons/website_forum/views/forum.xml b/addons/website_forum/views/forum.xml
index 7c6048ec250..233aeae40be 100644
--- a/addons/website_forum/views/forum.xml
+++ b/addons/website_forum/views/forum.xml
@@ -58,19 +58,31 @@
             <field name="arch" type="xml">
                 <form string="Forum Post" version="7.0">
                     <sheet>
-                        <h1><field name="name" placeholder="Name"/></h1>
+                        <label for="name" class="oe_edit_only"/>
+                        <h1>
+                            <field name="name" placeholder="Name"/>
+                        </h1>
                         <group>
-                            <field name="tag_ids" widget="many2many_tags"/>
-                            <field name="forum_id"/>
-                            <field name="parent_id"/>
-                            <field name="content" placeholder="e.g. Once upon a time..." widget="html"/>
                             <group>
-                                <field name="create_date"/>
+                                <field name="forum_id"/>
+                                <field name="parent_id"/>
+                            </group><group>
+                                <field name="tag_ids" widget="many2many_tags"/>
+                                <field name="state"/>
+                                <field name="closed_reason_id"/>
+                                <field name="closed_uid"/>
+                                <field name="closed_date"/>
+                            </group><group>
                                 <field name="create_uid"/>
-                            </group>
-                            <group>
+                                <field name="create_date"/>
                                 <field name="write_uid"/>
                                 <field name="write_date"/>
+                            </group><group>
+                                <field name="is_correct"/>
+                                <field name="views"/>
+                                <field name="vote_count"/>
+                                <field name="favourite_count"/>
+                                <field name="child_count"/>
                             </group>
                         </group>
                     </sheet>
diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index fd21c2cd1f0..9af62b8a56a 100644
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -26,10 +26,6 @@
         <t t-set="head">
             <link rel='stylesheet' href="/web/static/lib/jquery.textext/jquery.textext.css"/>
             <link rel='stylesheet' href='/website_forum/static/src/css/website_forum.css'/>
-            <!--
-            FP Note: Why do we need this ? Can we remove this code?
-            The problem is that you add your script for every page, not only for the forum
-            -->
             <script type="text/javascript" src="/website_forum/static/src/js/website_forum.js"/>
             <script type="text/javascript" src="/web/static/lib/jquery.textext/jquery.textext.js"/>
             <script type="text/javascript" src="/web/static/lib/ckeditor/ckeditor.js"/>
@@ -90,7 +86,7 @@
                 </div>
                 <div class="col-sm-3" id="right-column">
                     <a t-if="not header.get('ask_hide')" class="btn btn-primary btn-lg btn-block mb16" t-attf-href="/forum/#{slug(forum)}/ask">Ask a Question</a>
-                    <div class="panel panel-default">
+                    <div class="panel panel-default" id="about_forum">
                         <div class="panel-heading">
                             <h3 class="panel-title">About This Forum</h3>
                         </div>
@@ -136,38 +132,33 @@
 <template id="display_post">
     <div class="question clearfix">
         <div class="pull-left text-center">
-            <div t-attf-class="box #{question.child_count and 'oe_green' or 'oe_grey'}">
+            <div t-attf-class="box #{question.is_correct and 'oe_green' or 'oe_grey'} #{(question.child_count == 0) and 'text-muted' or ''}">
                 <span t-esc="question.child_count"/>
-                <span t-if="question.has_validated_answer" class="fa fa-2x fa-check-circle"/>
-                <div t-if="question.child_count&gt;1">Answers</div>
-                <div t-if="question.child_count&lt;=1">Answer</div>
-            </div>
-            <div class="text-muted text-center">
-                <span t-field="question.views"/> Views
+                <div t-if="question.child_count&gt;1" class="subtitle">Answers</div>
+                <div t-if="question.child_count&lt;=1" class="subtitle">Answer</div>
             </div>
         </div>
-        <div class="pull-right text-center">
-            <div class="box oe_grey">
-                <span t-esc="question.vote_count or 0"/>
-                <div t-if="question.vote_count&gt;1">Votes</div>
-                <div t-if="question.vote_count&lt;=1">Vote</div>
-            </div>
-        </div>
-        <div style="margin-left: 95px;">
+        <div style="margin-left: 95px; margin-top:-8px;">
             <div class="question-name">
                 <a t-attf-href="/forum/#{ slug(forum) }/question/#{ slug(question) }" t-field="question.name"/>
                     <span t-if="not question.active"><b> [Deleted]</b></span>
                     <span t-if="question.state == 'close'"><b> [Closed]</b></span>
             </div>
+            <t t-foreach="question.tag_ids" t-as="tag">
+                <a t-attf-href="/forum/#{ slug(forum) }/tag/#{ tag.id }/questions" class="badge pull-right" t-field="tag.name"/>
+            </t>
             <div class="text-muted">
                 by <a t-attf-href="/forum/#{ slug(forum) }/user/#{ question.create_uid.id }"
                     t-field="question.create_uid" t-field-options='{"widget": "contact", "country_image": true, "fields": ["name", "country_id"]}'
                     style="display: inline-block;"/>
                 on <span t-field="question.write_date" t-field-options='{"format":"short"}'/>
+                with <b t-field="question.views"/> views
+                <span t-if="question.vote_count&gt;0"> and 
+                    <b t-esc="question.vote_count or 0"/>
+                    <t t-if="question.vote_count&gt;1">votes</t>
+                    <t t-if="question.vote_count==1">vote</t>
+                </span>
             </div>
-            <t t-foreach="question.tag_ids" t-as="tag">
-                <a t-attf-href="/forum/#{ slug(forum) }/tag/#{ tag.id }/questions" class="badge" t-field="tag.name"/>
-            </t>
         </div>
     </div>
 </template>
@@ -335,23 +326,36 @@
 <!-- Moderation: close a question -->
 <template id="close_question">
     <t t-call="website_forum.header">
-        <h3 class=""><b>Close question</b></h3><br/>
-        <form t-attf-action="/forum/#{slug(forum)}/question/#{slug(question)}/close" method="post" role="form">
+        <h1 class="mt0">Close question</h1>
+        <p class="text-muted">
+            If you close this question, it will be hidden for most users. Only
+            users having a high karma can see closed questions to moderate
+            them.
+        </p>
+        <form t-attf-action="/forum/#{ slug(forum) }/question/#{slug(post)}/close" method="post" role="form" class="form-horizontal mt32 mb64">
             <input name="post_id" t-att-value="question.id" type="hidden"/>
-            <span class="pull-left">Close the question:</span>
-            <a t-attf-href="/forum/#{ slug(forum) }/question/#{ slug(question) }" t-field="question.name"/>
-            <div class="mt16">
-                <label class="col-md-2 control-label mb16" for="reason">Reasons:</label>
-                <div class="col-md-9 mb16">
-                    <select class="form-control" name="reason">
+            <div class="form-group">
+                <label class="col-md-3 control-label" for="reason">Question:</label>
+                <div class="col-md-8 mt8">
+                    <span t-field="post.name"/>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-md-3 control-label" for="reason">Reason:</label>
+                <div class="col-md-8">
+                    <select class="form-control" name="reason_id">
                         <t t-foreach="reasons or []" t-as="reason">
                             <option t-att-value="reason.id" t-att-selected="reason.id == question.closed_reason_id.id"><t t-esc="reason.name"/></option>
                         </t>
                     </select>
                 </div>
             </div>
-            <div>
-                <button class="btn btn-primary btn-lg">Close</button>
+            <div class="form-group">
+                <div class="col-md-offset-3 col-md-8">
+                    <button class="btn btn-primary">Close question</button>
+                    <span class="text-muted">or</span>
+                    <a class="btn btn-link" t-attf-href="/forum/#{ slug(forum) }/question/#{ slug(post) }">back to question</a>
+                </div>
             </div>
         </form>
     </t>
@@ -383,27 +387,27 @@
         <span id="vote_count" t-esc="post.vote_count"/>
         <a t-attf-class="vote_down fa fa-thumbs-down no-decoration #{post.user_vote == -1 and 'text-warning' or ''}" 
             t-attf-href="/forum/#{slug(post.forum_id)}/post/#{slug(post)}/downvote"/>
-        <div>
+        <div t-if="vote_count &gt; 1" class="subtitle">
             votes
         </div>
+        <div t-if="vote_count &lt; 2" class="subtitle">
+            vote
+        </div>
     </div>
 </template>
 
 <!-- Specific Post Layout -->
 <template id="post_description_full" name="Question Navigation">
     <t t-call="website_forum.header">
-
         <div t-attf-class="question #{not question.active and 'alert alert-danger' or ''}">
             <div class="text-center pull-left">
                 <t t-call="website_forum.vote">
                     <t t-set="post" t-value="question"/>
                 </t>
-                <div class="text-muted">
-                    <span t-esc="question.child_count"/>
-                    <span t-if="question.child_count&gt;1">Answers</span>
-                    <span t-if="question.child_count&lt;=1">Answer</span>
+                <div class="text-muted text-center">
+                    <span t-field="question.views"/> Views
                 </div>
-                <div>
+                <div class="mt4">
                     <a t-attf-href="/forum/#{slug(question.forum_id)}/question/#{slug(question)}/toggle_favourite"
                         t-attf-class="favourite_question no-decoration fa fa-2x fa-star #{question.user_favourite and 'forum_favourite_question' or ''}"/>
                 </div>
@@ -414,6 +418,19 @@
                     <span t-if="not question.active"><b> [Deleted]</b></span>
                     <span t-if="question.state == 'close'"><b> [Closed]</b></span>
                 </h1>
+                <div class="alert alert-info" t-if="question.state == 'close'">
+                    <p class="mt32 mb16 text-center">
+                        <b>The question has been closed for reason: <i t-esc="question.closed_reason_id.name"/>
+                        <br/>
+                        <t t-if="question.closed_uid">
+                            <i>by <a t-attf-href="/forum/#{ slug(forum) }/user/#{ slug(question.closed_uid) }" t-field="question.closed_uid"/> </i>
+                        </t>
+                        on <span t-field="question.closed_date"/></b>
+                    </p>
+                    <div t-if="question.state == 'close' and user.karma&gt;=500" class="mb24 text-center">
+                        <a class="fa fa-arrow-right" t-attf-href="/forum/#{ slug(forum) }/question/#{slug(question)}/reopen"> Reopen</a>
+                    </div>
+                </div>
                 <t t-raw="question.content"/>
 
                 <div class="mt16 clearfix">
@@ -423,29 +440,28 @@
                                 <a t-attf-href="/forum/#{ slug(forum) }/tag/#{ tag.id }/questions" class="badge" t-field="tag.name"/>
                             </t>
                         </div>
-                        <ul class="list-inline">
+                        <ul class="list-inline" id="options">
                             <li t-if="user.id == question.create_uid.id or user.karma&gt;=50">
                                 <a style="cursor: pointer" data-toggle="collapse" class="text-muted fa fa-comment-o"
                                       t-attf-data-target="#comment#{ question._name.replace('.','') + '-' + str(question.id) }">
-                                    comment
+                                    Comment
                                 </a>
                             </li>
                             <li t-if="question.state != 'close' and ((user.id == question.create_uid.id and can_close_own) or can_close_all)">
-                                <a class="text-muted fa fa-times" t-attf-href="/forum/#{ slug(forum) }/question/#{slug(question)}/ask_for_close">close</a>
+                                <a class="text-muted fa fa-times" t-attf-href="/forum/#{ slug(forum) }/question/#{slug(question)}/ask_for_close"> Close</a>
                             </li>
                             <li t-if="question.state == 'close' and ((user.id == question.create_uid.id and can_close_own) or can_close_all)">
                                 <a class="text-muted fa fa-undo" t-attf-href="/forum/#{ slug(forum) }/question/#{slug(question)/reopen">reopen</a>
                             </li>
                             <li t-if="(user.id == question.create_uid.id and can_edit_own) or can_edit_all">
-                                <a class="text-muted fa fa-edit" t-attf-href="/forum/#{ slug(forum) }/post/#{slug(question)}/edit">edit</a>
+                                <a class="text-muted fa fa-edit" t-attf-href="/forum/#{ slug(forum) }/post/#{slug(question)}/edit"> Edit</a>
                             </li>
                             <li t-if="question.active and ((user.id == question.create_uid.id and can_unlink_own) or can_unlink_all)">
-                                <a class="text-muted fa fa-trash-o" t-attf-href="/forum/#{ slug(forum) }/question/#{slug(question)}/delete">delete</a>
+                                <a class="text-muted fa fa-trash-o" t-attf-href="/forum/#{ slug(forum) }/question/#{slug(question)}/delete"> Delete</a>
                             </li>
                             <li t-if="not question.active and ((user.id == question.create_uid.id and can_unlink_own) or can_unlink_all)">
-                                <a class="text-muted fa fa-trash-o" t-attf-href="/forum/#{ slug(forum) }/question/#{slug(question)}/undelete">undelete</a>
+                                <a class="text-muted fa fa-trash-o" t-attf-href="/forum/#{ slug(forum) }/question/#{slug(question)}/undelete"> Undelete</a>
                             </li>
-                            <li><a class="text-muted fa fa-share" t-attf-href="/forum/#{slug(forum)}/question/#{slug(question)}">share</a></li>
                         </ul>
                     </div>
                     <div>
@@ -458,15 +474,6 @@
                             <div t-field="question.create_uid" t-field-options='{"widget": "contact", "badges": true, "fields": ["karma"]}'/>
                         </div>
                     </div>
-                    <div class="alert alert-info" t-if="question.state == 'close'">
-                        <p class="mt32 mb32 text-center">
-                            <b>The question has been closed for the following reason "<span t-field="question.closed_reason_id.name"/>"
-                            <t t-if="question.closed_uid">
-                                <i>by <a t-attf-href="/forum/#{ slug(forum) }/user/#{ slug(question.closed_uid) }" t-field="question.closed_uid.name"/> </i>
-                            </t>
-                            <br/>close date <span t-field="question.closed_date"/></b>
-                        </p>
-                    </div>
                 </div>
                 <t t-call="website_forum.post_comment">
                     <t t-set="object" t-value="question"/>
@@ -477,13 +484,13 @@
 
         <div t-foreach="question.child_ids" t-as="answer" class="mt16 mb32">
             <a t-attf-id="answer-#{str(answer.id)}"/>
-            <div t-attf-class="forum_answer #{answer.is_correct and 'alert alert-info answer_correct' or ''}" t-attf-id="answer_#{answer.id}" >
+            <div t-attf-class="forum_answer" t-attf-id="answer_#{answer.id}" >
                 <div class="text-center pull-left">
                     <t t-call="website_forum.vote">
                         <t t-set="post" t-value="answer"/>
                     </t>
-                    <div class="text-muted">
-                        <a t-attf-class="accept_answer fa fa-2x fa-check-circle no-decoration oe_answer_true #{answer.is_correct and 'oe_answer_true' or 'oe_answer_false'}"
+                    <div class="text-muted mt8">
+                        <a t-attf-class="accept_answer fa fa-2x fa-check-circle no-decoration #{answer.is_correct and 'oe_answer_true' or 'oe_answer_false'}"
                             t-attf-href="/forum/#{slug(question.forum_id)}/post/#{slug(answer)}/toggle_correct"/>
                     </div>
                 </div>
@@ -493,19 +500,18 @@
                         <ul class="list-inline pull-right">
                             <li t-if="user.id == answer.create_uid.id or user.karma&gt;=50">
                                 <a style="cursor: pointer" data-toggle="collapse" class="text-muted fa fa-comment-o"
-                                      t-attf-data-target="#comment#{ answer._name.replace('.','') + '-' + str(answer.id) }">comment
+                                      t-attf-data-target="#comment#{ answer._name.replace('.','') + '-' + str(answer.id) }"> Comment
                                 </a>
                             </li>
                             <li t-if="(user.id == answer.create_uid.id and can_edit_own) or can_edit_all">
-                                <a class="text-muted fa fa-edit" t-attf-href="/forum/#{slug(forum)}/post/#{slug(answer)}/edit">edit</a>
+                                <a class="text-muted fa fa-edit" t-attf-href="/forum/#{slug(forum)}/post/#{slug(answer)}/edit"> Edit</a>
                             </li>
                             <li t-if="(user.id == answer.create_uid.id and can_unlink_own) or can_unlink_all">
-                                <a class="text-muted fa fa-trash-o" t-attf-href="/forum/#{slug(forum)}/post/#{slug(answer)}/delete">delete</a>
+                                <a class="text-muted fa fa-trash-o" t-attf-href="/forum/#{slug(forum)}/post/#{slug(answer)}/delete"> Delete</a>
                             </li>
                             <li t-if="user.id == answer.create_uid.id">
-                                <a class="text-muted fa fa-magic" t-attf-href="/forum/#{slug(forum)}/post/#{slug(answer)}/convert_to_comment">Convert as a comment</a>
+                                <a class="text-muted fa fa-magic" t-attf-href="/forum/#{slug(forum)}/post/#{slug(answer)}/convert_to_comment"> Convert as a comment</a>
                             </li>
-                            <li><a class="text-muted fa fa-share" t-attf-href="/forum/#{slug(forum)}/question/#{slug(question)}/#answer_#{answer.id}">share</a></li>
                         </ul>
                         <span t-field="answer.create_uid.image" t-field-options='{"widget": "image", "class":"pull-left img img-circle img-avatar"}'/>
                         <div>
@@ -537,7 +543,7 @@
 <template id="post_comment">
     <div class="row clearfix">
         <div class="col-sm-10 col-sm-offset-2">
-            <div t-foreach="reversed(object.website_message_ids)" t-as="message" class="comment oe_comment_grey mb8">
+            <div t-foreach="reversed(object.website_message_ids)" t-as="message" class="comment oe_comment_grey">
                 <small class="text-muted">
                     <button type="button" t-if="user.partner_id.id == message.author_id.id and user.karma&gt;=750"
                         t-attf-href="/forum/#{slug(forum)}/post/#{slug(object)}/comment/#{slug(message)}/delete" 
@@ -552,9 +558,9 @@
                 </small>
             </div>
             <div class="css_editable_mode_hidden">
-                <form t-attf-id="comment#{ object._name.replace('.','') + '-' + str(object.id) }" class="collapse"
+                <form t-attf-id="comment#{ object._name.replace('.','') + '-' + str(object.id) }" class="collapse oe_comment_grey"
                         t-attf-action="/forum/#{slug(forum)}/post/#{slug(object)}/comment" method="POST">
-                    <input name="post_id" t-att-value="object.id" type="hidden"/>
+                    <input name="post_id" t-att-value="object.id" type="hidden" class="mt8"/>
                     <textarea name="comment" class="form-control" placeholder="Comment this post..."/>
                     <button type="submit" class="btn btn-primary mt8">Post</button>
                 </form>
@@ -778,7 +784,7 @@
                 </tr>
                 </table>
                 <div class="well well-sm">
-                    <span t-field="user.partner_id.website_description"/>
+                    <span t-field="user.partner_id.website_description" class="oe_no_empty"/>
                     <t t-if="uid == user.id">
                         <a class="fa fa-arrow-right" t-attf-href="/forum/#{slug(forum)}/user/#{slug(user)}/edit"> Edit Your Bio</a>
                     </t>
@@ -831,7 +837,7 @@
                 </div>
             </div>
             <div class="tab-pane" id="followed_question">
-                <div t-foreach="followed" t-as="question">
+                <div t-foreach="followed" t-as="question" class="mb16">
                     <t t-call="website_forum.display_post"/>
                 </div>
             </div>
diff --git a/addons/website_forum_doc/__init__.py b/addons/website_forum_doc/__init__.py
new file mode 100644
index 00000000000..bde83af3aea
--- /dev/null
+++ b/addons/website_forum_doc/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+
+import controllers
+import models
diff --git a/addons/website_forum_doc/__openerp__.py b/addons/website_forum_doc/__openerp__.py
new file mode 100644
index 00000000000..e933e2c51da
--- /dev/null
+++ b/addons/website_forum_doc/__openerp__.py
@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2014-Today OpenERP SA (<http://www.openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+{
+    'name': 'Documentation',
+    'category': 'Website',
+    'summary': 'Forum, Documentation',
+    'version': '1.0',
+    'description': """
+Documentation based on question and pertinent answers of Forum
+        """,
+    'author': 'OpenERP SA',
+    'depends': [
+        'website_forum'
+    ],
+    'data': [
+        'data/doc_data.xml',
+        'security/ir.model.access.csv',
+        'views/doc.xml',
+        'views/website_doc.xml',
+    ],
+    'demo': [
+        'data/doc_demo.xml',
+    ],
+    'installable': True,
+    'application': True,
+}
diff --git a/addons/website_forum_doc/controllers/__init__.py b/addons/website_forum_doc/controllers/__init__.py
new file mode 100644
index 00000000000..bbd183e955b
--- /dev/null
+++ b/addons/website_forum_doc/controllers/__init__.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+import main
diff --git a/addons/website_forum_doc/controllers/main.py b/addons/website_forum_doc/controllers/main.py
new file mode 100644
index 00000000000..4075479af47
--- /dev/null
+++ b/addons/website_forum_doc/controllers/main.py
@@ -0,0 +1,71 @@
+# -*- coding: utf-8 -*-
+
+
+from openerp.addons.web import http
+from openerp.addons.web.http import request
+from openerp.addons.website.models.website import slug
+
+
+class WebsiteDoc(http.Controller):
+    @http.route(['/forum/how-to', '/forum/how-to/<model("forum.documentation.toc"):toc>'], type='http', auth="public", website=True, multilang=True)
+    def toc(self, toc=None, **kwargs):
+        cr, uid, context, toc_id = request.cr, request.uid, request.context, False
+        if toc:
+            sections = toc.child_ids
+            forum = toc.forum_id
+        else:
+            toc_obj = request.registry['forum.documentation.toc']
+            obj_ids = toc_obj.search(cr, uid, [('parent_id', '=', False)], context=context)
+            sections = toc_obj.browse(cr, uid, obj_ids, context=context)
+            forum = sections and sections[0].forum_id or False
+        value = {
+            'toc': toc,
+            'main_object': toc or forum,
+            'forum': forum,
+            'sections': sections,
+        }
+        return request.website.render("website_forum_doc.documentation", value)
+
+    @http.route(['/forum/how-to/<model("forum.documentation.toc"):toc>/<model("forum.post"):post>'], type='http', auth="public", website=True, multilang=True)
+    def post(self, toc, post, **kwargs):
+        # TODO: implement a redirect instead of crash
+        assert post.documentation_toc_id.id == toc.id, "Wrong post!"
+        value = {
+            'toc': toc,
+            'post': post,
+            'main_object': post,
+            'forum': post.forum_id
+        }
+        return request.website.render("website_forum_doc.documentation_post", value)
+
+    @http.route('/forum/<model("forum.forum"):forum>/question/<model("forum.post"):post>/promote', type='http', auth="user", multilang=True, website=True)
+    def post_toc(self, forum, post, **kwargs):
+        cr, uid, context, toc_id = request.cr, request.uid, request.context, False
+        user = request.registry['res.users'].browse(cr, uid, uid, context=context)
+        assert user.karma >= 200, 'Not enough karma'
+        toc_obj = request.registry['forum.documentation.toc']
+        obj_ids = toc_obj.search(cr, uid, [], context=context)
+        tocs = toc_obj.browse(cr, uid, obj_ids, context=context)
+        value = {
+            'post': post,
+            'forum': post.forum_id,
+            'chapters': filter(lambda x: not x.child_ids, tocs)
+        }
+        return request.website.render("website_forum_doc.promote_question", value)
+
+    @http.route('/forum/<model("forum.forum"):forum>/promote_ok', type='http', auth="user", multilang=True, website=True)
+    def post_toc_ok(self, forum, post_id, toc_id, **kwargs):
+        cr, uid, context = request.cr, request.uid, request.context
+        user = request.registry['res.users'].browse(cr, uid, uid, context=context)
+        assert user.karma >= 200, 'Not enough karma'
+
+        toc_obj = request.registry['forum.documentation.toc']
+        stage_ids = toc_obj.search(cr, uid, [], limit=1, context=context)
+
+        post_obj = request.registry['forum.post']
+        post_obj.write(cr, uid, [int(post_id)], {
+            'documentation_toc_id': toc_id and int(toc_id) or False,
+            'documentation_stage_id': stage_ids and stage_ids[0] or False
+        }, context=context)
+        return request.redirect('/forum/'+str(forum.id)+'/question/'+str(post_id))
+
diff --git a/addons/website_forum_doc/data/doc_data.xml b/addons/website_forum_doc/data/doc_data.xml
new file mode 100644
index 00000000000..8252ff99d89
--- /dev/null
+++ b/addons/website_forum_doc/data/doc_data.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="menu_questions" model="website.menu">
+            <field name="name">Documentation</field>
+            <field name="url" eval="'/forum/how-to'"/>
+            <field name="parent_id" ref="website.main_menu"/>
+            <field name="sequence" type="int">65</field>
+        </record>
+
+        <!-- JUMP TO DOCUMENTATION AT INSTALL -->
+        <record id="action_open_documentation" model="ir.actions.act_url">
+            <field name="name">Documentation</field>
+            <field name="target">self</field>
+            <field name="url" eval="'/forum/how-to'"/>
+        </record>
+        <record id="base.open_menu" model="ir.actions.todo">
+            <field name="action_id" ref="action_open_documentation"/>
+            <field name="state">open</field>
+        </record>
+
+        <!-- Stages -->
+
+        <record id="stage_ideas" model="forum.documentation.stage">
+            <field name="name">Ideas</field>
+            <field name="sequence">1</field>
+        </record>
+
+        <record id="stage_draft" model="forum.documentation.stage">
+            <field name="name">Draft</field>
+            <field name="sequence">2</field>
+        </record>
+
+        <record id="stage_review" model="forum.documentation.stage">
+            <field name="name">Review</field>
+            <field name="sequence">3</field>
+        </record>
+
+        <record id="stage_publish" model="forum.documentation.stage">
+            <field name="name">Publish</field>
+            <field name="sequence">4</field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/website_forum_doc/data/doc_demo.xml b/addons/website_forum_doc/data/doc_demo.xml
new file mode 100644
index 00000000000..0b98c483782
--- /dev/null
+++ b/addons/website_forum_doc/data/doc_demo.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <!-- Table Of Content -->
+        <record id="toc_functional_doc" model="forum.documentation.toc">
+            <field name="name">Functional Documentation</field>
+            <field name="introduction" type="html">
+                <p class="text-muted">
+                    This documentation is produced using the best posts from the
+                    <a href="/forum">community forum</a>.
+                </p>
+            </field>
+            <field name="forum_id" ref="website_forum.forum_help"/>
+        </record>
+        <record id="toc_sale" model="forum.documentation.toc">
+            <field name="name">Sales Management</field>
+            <field name="parent_id" ref="toc_functional_doc"/>
+            <field name="introduction" type="html">
+                <p class="text-muted">
+                    Tracks leads, boost opportunities and close deals.
+                    This serie of how-to will help you develop your business.
+                </p>
+            </field>
+            <field name="forum_id" ref="website_forum.forum_help"/>
+        </record>
+        <record id="toc_sale_customer" model="forum.documentation.toc">
+            <field name="name">Customers</field>
+            <field name="parent_id" ref="toc_sale"/>
+            <field name="forum_id" ref="website_forum.forum_help"/>
+        </record>
+        <record id="toc_sale_so" model="forum.documentation.toc">
+            <field name="name">Sales orders</field>
+            <field name="parent_id" ref="toc_sale"/>
+            <field name="forum_id" ref="website_forum.forum_help"/>
+        </record>
+        <record id="toc_0" model="forum.documentation.toc">
+            <field name="name">Sales &amp; Warehouse</field>
+            <field name="parent_id" ref="toc_sale"/>
+            <field name="forum_id" ref="website_forum.forum_help"/>
+        </record>
+        <record id="toc_crm" model="forum.documentation.toc">
+            <field name="name">Customer Relationship Management</field>
+            <field name="parent_id" ref="toc_functional_doc"/>
+            <field name="forum_id" ref="website_forum.forum_help"/>
+        </record>
+        <record id="toc_crm_lead" model="forum.documentation.toc">
+            <field name="name">Lead &amp; Opportunity</field>
+            <field name="parent_id" ref="toc_crm"/>
+            <field name="forum_id" ref="website_forum.forum_help"/>
+        </record>
+        <record id="toc_crm_claim" model="forum.documentation.toc">
+            <field name="name">Claims</field>
+            <field name="parent_id" ref="toc_crm"/>
+            <field name="forum_id" ref="website_forum.forum_help"/>
+        </record>
+        <record id="toc_crm_after_sale" model="forum.documentation.toc">
+            <field name="name">After-sale communication</field>
+            <field name="parent_id" ref="toc_crm"/>
+            <field name="forum_id" ref="website_forum.forum_help"/>
+        </record>
+        <record id="toc_website" model="forum.documentation.toc">
+            <field name="name">Website</field>
+            <field name="parent_id" ref="toc_functional_doc"/>
+            <field name="forum_id" ref="website_forum.forum_help"/>
+        </record>
+        <record id="toc_cms_ecommerce" model="forum.documentation.toc">
+            <field name="name">CMS &amp; eCommerce</field>
+            <field name="parent_id" ref="toc_website"/>
+            <field name="forum_id" ref="website_forum.forum_help"/>
+        </record>
+        <record id="toc_hrm" model="forum.documentation.toc">
+            <field name="name">Human Resources Management</field>
+            <field name="parent_id" ref="toc_functional_doc"/>
+            <field name="forum_id" ref="website_forum.forum_help"/>
+        </record>
+        <record id="toc_hrm_contract" model="forum.documentation.toc">
+            <field name="name">Employee Contract</field>
+            <field name="parent_id" ref="toc_hrm"/>
+            <field name="forum_id" ref="website_forum.forum_help"/>
+        </record>
+
+        <!-- Questions -->
+        <record id="website_forum.question_0" model="forum.post">
+            <field name="documentation_toc_id" ref="toc_hrm_contract"/>
+        </record>
+        <record id="website_forum.question_1" model="forum.post">
+            <field name="documentation_toc_id" ref="toc_cms_ecommerce"/>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/website_forum_doc/models/__init__.py b/addons/website_forum_doc/models/__init__.py
new file mode 100644
index 00000000000..d64a59f8004
--- /dev/null
+++ b/addons/website_forum_doc/models/__init__.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+import documentation
diff --git a/addons/website_forum_doc/models/documentation.py b/addons/website_forum_doc/models/documentation.py
new file mode 100644
index 00000000000..c393f6eec56
--- /dev/null
+++ b/addons/website_forum_doc/models/documentation.py
@@ -0,0 +1,75 @@
+# -*- coding: utf-8 -*-
+
+import openerp
+from openerp.osv import osv, fields
+
+class Documentation(osv.Model):
+    _name = 'forum.documentation.toc'
+    _description = 'Documentation ToC'
+    _inherit = ['website.seo.metadata']
+    _order = "parent_left"
+    _parent_order = "sequence, name"
+    _parent_store = True
+    def name_get(self, cr, uid, ids, context=None):
+        if isinstance(ids, (list, tuple)) and not len(ids):
+            return []
+        if isinstance(ids, (long, int)):
+            ids = [ids]
+        reads = self.read(cr, uid, ids, ['name','parent_id'], context=context)
+        res = []
+        for record in reads:
+            name = record['name']
+            if record['parent_id']:
+                name = record['parent_id'][1]+' / '+name
+            res.append((record['id'], name))
+        return res
+
+    def _name_get_fnc(self, cr, uid, ids, prop, unknow_none, context=None):
+        res = self.name_get(cr, uid, ids, context=context)
+        return dict(res)
+
+    _columns = {
+        'sequence': fields.integer('Sequence'),
+        'display_name': fields.function(_name_get_fnc, type="char", string='Full Name'),
+        'name': fields.char('Name', required=True, translate=True),
+        'introduction': fields.html('Introduction', translate=True),
+        'parent_id': fields.many2one('forum.documentation.toc', 'Parent Table Of Content', ondelete='cascade'),
+        'child_ids': fields.one2many('forum.documentation.toc', 'parent_id', 'Children Table Of Content'),
+        'parent_left': fields.integer('Left Parent', select=True),
+        'parent_right': fields.integer('Right Parent', select=True),
+        'post_ids': fields.one2many('forum.post', 'documentation_toc_id', 'Posts'),
+        'forum_id': fields.many2one('forum.forum', 'Forum', required=True),
+    }
+
+    _constraints = [
+        (osv.osv._check_recursion, 'Error ! You cannot create recursive categories.', ['parent_id'])
+    ]
+
+
+class DocumentationStage(osv.Model):
+    _name = 'forum.documentation.stage'
+    _description = 'Post Stage'
+    _order = 'sequence'
+    _columns = {
+        'sequence': fields.integer('Sequence'),
+        'name': fields.char('Stage Name', required=True, translate=True),
+    }
+
+
+class Post(osv.Model):
+    _inherit = 'forum.post'
+    _columns = {
+        'documentation_toc_id': fields.many2one('forum.documentation.toc', 'Documentation ToC', ondelete='set null'),
+        'documentation_stage_id': fields.many2one('forum.documentation.stage', 'Documentation Stage'),
+        'color': fields.integer('Color Index')
+    }
+    def _read_group_stage_ids(self, cr, uid, ids, domain, read_group_order=None, access_rights_uid=None, context=None):
+        stage_obj = self.pool.get('forum.documentation.stage')
+        stage_ids = stage_obj.search(cr, uid, [], context=context)
+        result = stage_obj.name_get(cr, uid, stage_ids, context=context)
+        return result, {}
+
+    _group_by_full = {
+        'documentation_stage_id': _read_group_stage_ids,
+    }
+
diff --git a/addons/website_forum_doc/security/ir.model.access.csv b/addons/website_forum_doc/security/ir.model.access.csv
new file mode 100644
index 00000000000..64995ad7081
--- /dev/null
+++ b/addons/website_forum_doc/security/ir.model.access.csv
@@ -0,0 +1,4 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+all_documentation_toc,forum.documentation.toc,model_forum_documentation_toc,,1,0,0,0
+users_documentation_toc,forum.documentation.toc,model_forum_documentation_toc,base.group_user,1,1,1,1
+users_documentation_stage,forum.documentation.stage,model_forum_documentation_stage,base.group_user,1,1,1,1
diff --git a/addons/website_forum_doc/views/doc.xml b/addons/website_forum_doc/views/doc.xml
new file mode 100644
index 00000000000..d5f309a0567
--- /dev/null
+++ b/addons/website_forum_doc/views/doc.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+        <!-- DOCUMENTATION TOC VIEWS -->
+
+        <record id="view_documentation_toc_list" model="ir.ui.view">
+            <field name="name">forum.documentation.toc.list</field>
+            <field name="model">forum.documentation.toc</field>
+            <field name="arch" type="xml">
+                <tree string="Documentation TOC" editable="bottom">
+                    <field name="sequence" widget="handle"/>
+                    <field name="name"/>
+                    <field name="forum_id"/>
+                    <field name="parent_id"/>
+                </tree>
+            </field>
+        </record>
+        <record id="action_documentation_toc" model="ir.actions.act_window">
+            <field name="name">Documentation</field>
+            <field name="res_model">forum.documentation.toc</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree</field>
+        </record>
+        <menuitem id="menu_documentation"
+            parent="website_forum.menu_website_forum" groups="base.group_user"
+            name="Documentation ToC" action="action_documentation_toc" sequence="20"/>
+
+
+        <record id="view_documentation_toc_list" model="ir.ui.view">
+            <field name="name">forum.documentation.toc.list</field>
+            <field name="model">forum.documentation.toc</field>
+            <field name="arch" type="xml">
+                <tree string="Documentation TOC" editable="bottom">
+                    <field name="sequence" widget="handle"/>
+                    <field name="name"/>
+                    <field name="parent_id"/>
+                </tree>
+            </field>
+        </record>
+        <record id="action_documentation_toc" model="ir.actions.act_window">
+            <field name="name">Documentation</field>
+            <field name="res_model">forum.documentation.toc</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree</field>
+        </record>
+        <menuitem id="menu_documentation"
+            parent="website_forum.menu_website_forum" groups="base.group_user"
+            name="Documentation ToC" action="action_documentation_toc" sequence="20"/>
+
+
+        <!-- Project Task Kanban View -->
+        <record model="ir.ui.view" id="view_forum_post_kanban">
+            <field name="name">forum.post.kanban</field>
+            <field name="model">forum.post</field>
+            <field name="arch" type="xml">
+                <kanban default_group_by="documentation_stage_id" >
+                    <field name="documentation_stage_id"/>
+                    <field name="create_uid"/>
+                    <field name="color"/>
+                    <templates>
+                    <t t-name="kanban-box">
+                        <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click">
+                            <div class="oe_dropdown_toggle oe_dropdown_kanban" groups="base.group_user">
+                                <span class="oe_e">í</span>
+                                <ul class="oe_dropdown_menu">
+                                    <li t-if="widget.view.is_action_enabled('edit')"><a type="edit">Edit...</a></li>
+                                    <li t-if="widget.view.is_action_enabled('delete')"><a type="delete">Delete</a></li>
+                                    <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
+                                </ul>
+                            </div>
+                            <div class="oe_kanban_content">
+                                <div><b><field name="name"/></b></div>
+                                <div class="oe_kanban_bottom_right">
+                                    <img t-att-src="kanban_image('res.users', 'image_small', record.create_uid.raw_value)" t-att-title="record.create_uid.value" width="24" height="24" class="oe_kanban_avatar"/>
+                                </div>
+                            </div>
+                            <div class="oe_clear"></div>
+                        </div>
+                    </t>
+                    </templates>
+                </kanban>
+            </field>
+        </record>
+
+        <record id="action_forum_doc_post" model="ir.actions.act_window">
+            <field name="name">Documentation Posts</field>
+            <field name="res_model">forum.post</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">kanban,tree,form</field>
+            <field name="domain">[('documentation_toc_id','&lt;&gt;', False)]</field>
+        </record>
+        <menuitem id="menu_forum_doc_posts"
+            parent="website_forum.menu_website_forum" name="Documentation Posts"
+            action="action_forum_doc_post" sequence="25"/>
+
+        <record id="view_forum_post_doc_form" model="ir.ui.view">
+            <field name="name">forum.post.form.doc</field>
+            <field name="model">forum.post</field>
+            <field name="inherit_id" ref="website_forum.view_forum_post_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='parent_id']" position="after">
+                    <field name="documentation_toc_id"/>
+                </xpath>
+                <xpath expr="//sheet" position="before">
+                    <header>
+                        <field name="documentation_stage_id" widget="statusbar"/>
+                    </header>
+                </xpath>
+            </field>
+        </record>
+
+
+
+    </data>
+</openerp>
diff --git a/addons/website_forum_doc/views/website_doc.xml b/addons/website_forum_doc/views/website_doc.xml
new file mode 100644
index 00000000000..ee06ac7f964
--- /dev/null
+++ b/addons/website_forum_doc/views/website_doc.xml
@@ -0,0 +1,264 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <!-- Layout add nav and footer -->
+        <template id="header_footer_custom" inherit_id="website.layout"
+            name="Footer Documentation Link">
+            <xpath expr="//footer//ul[@name='products']" position="inside">
+                <li><a href="/forum/how-to">Documentation</a></li>
+            </xpath>
+        </template>
+
+        <!-- Page Index -->
+        <template id="toc" name="Documentation Index">
+            <t t-set="level" t-value="level+1"/>
+            <t t-foreach="titles" t-as="title">
+                <div t-attf-class="h#{str(level) + (level&lt;3 and ' page-header' or '')}">
+                    <t t-esc="title.name"/>
+                    <small t-if="len(title.post_ids)">
+                        <t t-esc="len(title.post_ids)"/>
+                        <t t-if="len(title.post_ids)==1">essay</t>
+                        <t t-if="len(title.post_ids)&gt;1">essays</t>
+                    </small>
+                </div>
+
+                <ul t-if="title.post_ids" class="mt32">
+                    <li t-foreach="title.post_ids" t-as="post">
+                        <a t-attf-href="/forum/how-to/#{slug(title)}/#{slug(post)}" t-field="post.name"/>
+                    </li>
+                </ul>
+
+                <t t-set="titles" t-value="title.child_ids"/>
+                <t t-call="website_forum_doc.toc"/>
+            </t>
+        </template>
+
+        <template id="breadcrumb" name="Documentation Breadcrumb">
+            <t t-if="toc.parent_id">
+                <t t-call="website_forum_doc.breadcrumb">
+                    <t t-set="toc" t-value="toc.parent_id"/>
+                </t>
+            </t>
+            <li t-if="toc">
+                <a t-attf-href="/forum/how-to/#{ slug(toc) }" t-field="toc.name"/>
+            </li>
+        </template>
+
+        <template id="documentation" name="Documentation Index">
+            <t t-call="website.layout">
+                <section class="container mt16" t-if="toc">
+                    <div class="row">
+                        <div class="col-sm-8">
+                            <ol class="breadcrumb mb0">
+                                <t t-call="website_forum_doc.breadcrumb">
+                                    <t t-set="toc" t-value="toc.parent_id"/>
+                                </t>
+                                <li class="active">
+                                    <span t-field="toc.name"/>
+                                </li>
+                            </ol>
+                        </div>
+                        <div class="col-sm-4 text-right">
+                            <form class="navbar-form navbar-right mt0" role="search" t-attf-action="/forum/#{ slug(forum) }" method="get">
+                                <div class="form-group">
+                                    <input type="search" class="form-control"
+                                        name="search" placeholder="Search..."
+                                        t-att-value="search or ''"/>
+                                    <button type="submit" class="btn btn-default">Search</button>
+                                </div>
+                            </form>
+                        </div>
+                    </div>
+                </section>
+                <section class="container">
+                    <t t-set="level" t-value="toc and 1 or 0"/>
+                    <h1 class="page-header" t-if="toc">
+                        <t t-esc="toc.name"/>
+                    </h1>
+                    <t t-set="titles" t-value="sections"/>
+                    <t t-call="website_forum_doc.toc"/>
+                </section>
+                <div class="oe_structure"/>
+            </t>
+        </template>
+
+        <template id="documentation_post" name="Documentation Question">
+            <t t-call="website.layout">
+                <section class="container mt16" t-if="toc">
+                    <div class="row">
+                        <div class="col-sm-8">
+                            <ol class="breadcrumb mb0">
+                                <t t-call="website_forum_doc.breadcrumb">
+                                    <t t-set="toc" t-value="toc.parent_id"/>
+                                </t>
+                                <li>
+                                    <a t-attf-href="/forum/how-to/#{ slug(toc) }" t-field="toc.name"/>
+                                </li>
+                            </ol>
+                        </div>
+                        <div class="col-sm-4 text-right" t-if="forum">
+                            <form class="navbar-form navbar-right mt0" role="search" t-attf-action="/forum/#{ slug(forum) }" method="get">
+                                <div class="form-group">
+                                    <input type="search" class="form-control"
+                                        name="search" placeholder="Search..."
+                                        t-att-value="search or ''"/>
+                                    <button type="submit" class="btn btn-default">Search</button>
+                                </div>
+                            </form>
+                        </div>
+                    </div>
+                </section>
+
+                <section class="container">
+                    <div class="row">
+                        <div class="col-sm-9">
+                            <h1 class="page-header" t-field="post.name"/>
+                            <blockquote t-if="bool(post.content)">
+                                <t t-raw="post.content"/>
+                            </blockquote>
+
+                            <t t-if="post.child_ids">
+                                <t t-raw="post.child_ids[0].content"/>
+                            </t>
+                            <div t-if="len(toc.post_ids)&gt;1">
+                                <h2 class="page-header">Related topics</h2>
+                                <ul>
+                                    <t t-foreach="toc.post_ids" t-as="topic">
+                                        <li t-if="post.id != topic.id">
+                                            <a t-attf-href="/forum/how-to/#{slug(toc)}/#{slug(topic)}" t-field="post.name"/>
+                                        </li>
+                                    </t>
+                                </ul>
+                            </div>
+                        </div><div class="col-sm-3">
+                            <div class="panel panel-default mt48" id="about_doc">
+                                <div class="panel-heading">
+                                    <h3 class="panel-title">Need more info?</h3>
+                                </div>
+                                <div class="panel-body">
+                                    <div class="text-muted">
+                                        This documentation page has been extracted
+                                        from the Q&amp;A section where you can
+                                        discuss it and get feedback.
+                                    </div>
+                                    &amp;nbsp; <a t-attf-href="/forum/#{slug(forum)}/question/#{slug(post)}" class="fa fa-arrow-right mt16"> Related question</a>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </section>
+                <div class="oe_structure mt16 mb16"/>
+            </t>
+        </template>
+
+
+        <!--TOC ON FORUM POST-->
+        <template id="forum_question_doc" inherit_id="website_forum.post_description_full" name="Forum Post to Doc">
+            <xpath expr="//ul[@id='options']" position="inside">
+                <li t-if="(not question.documentation_stage_id) and user.karma&gt;=200">
+                    <a t-attf-href="/forum/#{ slug(forum) }/question/#{slug(question)}/promote" class="text-muted fa fa-bookmark-o">
+                        Promote to Doc
+                    </a>
+                </li>
+            </xpath>
+            <xpath expr="//hr" position="before">
+                <div class="alert alert-success alert-dismissable mt16" t-if="question.documentation_toc_id">
+                    <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&amp;times;</button>
+                    This question has been included in the <a href="/forum/how-to">official documentation</a>.
+                </div>
+            </xpath>
+        </template>
+
+        <template id="promote_question">
+            <t t-call="website.layout">
+                <section class="container">
+                    <h1 class="page-header">Promote question to documentation</h1>
+                    <p>
+                        To be promoted in the official documentation the question
+                        and answer must satisfy the following criteria:
+                    </p>
+                    <ul>
+                        <li>The question title is short and descriptive</li>
+                        <li>The question describes a real business problem, not a software problem</li>
+                        <li>The answer is understandable for someone who does not know Odoo</li>
+                    </ul>
+                    <p>
+                        Before submiting the question, help us improve its quality by
+                        editing the question and the main answer.
+                    </p>
+                </section>
+                <div class="container">
+                    <div class="well">
+                        <form t-attf-action="/forum/#{ slug(forum) }/promote_ok" method="post" role="form" class="form-horizontal">
+                            <input name="post_id" t-att-value="post.id" type="hidden"/>
+                            <div class="form-group">
+                                <label class="col-md-3 control-label" for="reason">Question:</label>
+                                <div class="col-md-8 mt8">
+                                    <span t-field="post.name"/>
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <label class="col-md-3 control-label" for="reason">Publish in Chapter:</label>
+                                <div class="col-md-8">
+                                    <select class="form-control" name="toc_id">
+                                        <option/>
+                                        <t t-foreach="chapters or []" t-as="chapter">
+                                            <option t-att-value="chapter.id"><t t-esc="chapter.display_name"/></option>
+                                        </t>
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <div class="col-md-offset-3 col-md-8">
+                                    <button class="btn btn-primary">Push to documentation</button>
+                                    <span class="text-muted">or</span>
+                                    <a class="btn btn-link" t-attf-href="/forum/#{ slug(forum) }/question/#{ slug(post) }">cancel</a>
+                                </div>
+                            </div>
+                        </form>
+                    </div>
+                </div>
+                <section class="container">
+                    <h2 class="page-header">Samples</h2>
+                    <div class="row">
+                        <div class="col-sm-6">
+                            <h4>Good question titles</h4>
+                            <ul>
+                                <li>How to forecast sales revenues?</li>
+                                <li>How to compute future inventories for a product?</li>
+                            </ul>
+
+                        </div>
+                        <div class="col-sm-6">
+                            <h4>Bad questions</h4>
+                            <ul>
+                                <li>What report should I use to compute probabilities per stage?</li>
+                                <li>What's the available stock field?</li>
+                            </ul>
+                        </div>
+                    </div>
+                    <div class="row mb64">
+                        <div class="col-sm-6">
+                            <h4>Good answer structure</h4>
+                            <ol>
+                                <li>Describe the business solution</li>
+                                <li>Explain how to implement it in OpenERP</li>
+                                <li>Benefits of having done this setup</li>
+                            </ol>
+                        </div>
+                        <div class="col-sm-6">
+                            <h4>Bad answer structure</h4>
+                            <ol>
+                                <li>Explain how to configure in OpenERP</li>
+                                <li>No business benefit</li>
+                            </ol>
+                        </div>
+                    </div>
+                </section>
+            </t>
+        </template>
+
+
+    </data>
+</openerp>