diff options
| author | Martin Trigaux <mat@odoo.com> | 2015-10-07 16:40:54 +0200 |
|---|---|---|
| committer | Martin Trigaux <mat@odoo.com> | 2015-10-07 16:42:33 +0200 |
| commit | e256262b0e0917888dcccc4b9c29aa54ce753a54 (patch) | |
| tree | e3b88909b10559a458117eb6b69b192f87076c98 /addons/gamification/models/challenge.py | |
| parent | eb18cad599a09da0fe20634d29fe5b1427b08102 (diff) | |
| parent | 422f3b5d8a8068eef9b7bfa7527e2e8f121aa2ab (diff) | |
[MERGE] Forward-port 9.0 up to 422f3b5d
Diffstat (limited to 'addons/gamification/models/challenge.py')
| -rw-r--r-- | addons/gamification/models/challenge.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/addons/gamification/models/challenge.py b/addons/gamification/models/challenge.py index d4d524ed17a..1e4097850c3 100644 --- a/addons/gamification/models/challenge.py +++ b/addons/gamification/models/challenge.py @@ -290,15 +290,18 @@ class gamification_challenge(osv.Model): cr.execute("""SELECT gg.id FROM gamification_goal as gg, gamification_challenge as gc, - res_users as ru + res_users as ru, + res_users_log as log WHERE gg.challenge_id = gc.id AND gg.user_id = ru.id - AND gg.write_date < ru.login_date + AND ru.id = log.create_uid + AND gg.write_date < log.create_date AND gg.closed IS false AND gc.id IN %s AND (gg.state = 'inprogress' OR (gg.state = 'reached' AND (gg.end_date >= %s OR gg.end_date IS NULL))) + GROUP BY gg.id """, (tuple(ids), yesterday.strftime(DF))) goal_ids = [res[0] for res in cr.fetchall()] # update every running goal already generated linked to selected challenges |