diff options
| author | Xavier Morel <xmo@openerp.com> | 2014-05-14 15:13:04 +0200 |
|---|---|---|
| committer | Xavier Morel <xmo@openerp.com> | 2014-05-14 15:13:04 +0200 |
| commit | f4d78ae738e474abd4e77dc8fc6cdf8a668a5d72 (patch) | |
| tree | a02d0dedc047ff296517530b50a33556e5d4f6c7 /addons/website_forum/data | |
| parent | 9d9cfd585f56bf64126e7316ea60ea5131a02059 (diff) | |
| parent | 4f5cc00420c6af5430ac921e89f217dcedaa1b8f (diff) | |
Merge branch 'server-trunk'
Conflicts:
addons/mass_mailing/controllers/main.py
Diffstat (limited to 'addons/website_forum/data')
| -rw-r--r-- | addons/website_forum/data/badges_moderation.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/website_forum/data/badges_moderation.xml b/addons/website_forum/data/badges_moderation.xml index 8e3c1b3dda7..41f3eb7fe41 100644 --- a/addons/website_forum/data/badges_moderation.xml +++ b/addons/website_forum/data/badges_moderation.xml @@ -99,7 +99,7 @@ <field name="domain" eval="[('model', '=', 'forum.post'), ('subtype_id', 'in', [ref('website_forum.mt_answer_edit'), ref('website_forum.mt_question_edit')])]"/> <field name="batch_mode">True</field> <field name="batch_distinctive_field" eval="ref('mail.field_mail_message_author_id')" /> - <field name="batch_user_expression">user.partner_id.id</field> + <field name="batch_user_expression">user.id</field> </record> <record model="gamification.challenge" id="challenge_editor"> <field name="name">Editor</field> |