pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Forward-port of latest saas-3, up to revision 9456 (yep I missed one commit)

Browse Source
This commit is contained in:
Martin Trigaux
2014-05-14 11:01:36 +02:00
parent 583fe74ba2 3ff7b48a81
commit 0043a58763
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/gamification/models/challenge.py
+12 -11
View File
@@ -316,19 +316,20 @@ class gamification_challenge(osv.Model):
for challenge in self.browse(cr, uid, ids, context=context):
# goals closed but still opened at the last report date
closed_goals_to_report = goal_obj.search(cr, uid, [
('challenge_id', '=', challenge.id),
('start_date', '>=', challenge.last_report_date),
('end_date', '<=', challenge.last_report_date)
])
if challenge.last_report_date != fields.date.today():
# goals closed but still opened at the last report date
closed_goals_to_report = goal_obj.search(cr, uid, [
('challenge_id', '=', challenge.id),
('start_date', '>=', challenge.last_report_date),
('end_date', '<=', challenge.last_report_date)
])
if len(closed_goals_to_report) > 0:
# some goals need a final report
self.report_progress(cr, uid, challenge, subset_goal_ids=closed_goals_to_report, context=context)
if fields.date.today() >= challenge.next_report_date:
self.report_progress(cr, uid, challenge, context=context)
if fields.date.today() == challenge.next_report_date:
self.report_progress(cr, uid, challenge, context=context)
elif len(closed_goals_to_report) > 0:
# some goals need a final report
self.report_progress(cr, uid, challenge, subset_goal_ids=closed_goals_to_report, context=context)
self.check_challenge_reward(cr, uid, ids, context=context)
return True