Odoo Server (MOVED TO GITHUB)

Merge lp:~zaber/openobject-server/schedule-future into lp:openobject-server/5.0

  1. schedule-future
  2. Merge into 5.0
Proposed by Don Kirkby
Status: Merged
Merge reported by: Jay Vora (Serpent Consulting Services)
Merged at revision: not available
Proposed branch: lp:~zaber/openobject-server/schedule-future
Merge into: lp:openobject-server/5.0
Diff against target: 12 lines (+1/-1)
1 file modified
bin/addons/base/ir/ir_cron.py (+1/-1)
To merge this branch: bzr merge lp:~zaber/openobject-server/schedule-future
Reviewer Review Type Date Requested Status
Jay Vora (Serpent Consulting Services) (community) Approve
Olivier Dony (Odoo) Approve
Christophe Simonis (OpenERP) Pending
Review via email: mp+41250@code.launchpad.net

Description of the change

Stop checking that a job's next time must be in the future before scheduling it. See bug lp:677257 for details.

To post a comment you must log in.
Revision history for this message
Olivier Dony (Odoo) (odo-openerp) :
review: Approve
Revision history for this message
Olivier Dony (Odoo) (odo-openerp) wrote :

This same fix was merged in trunk, so maintenance team could consider backporting it to 5.0 too, as explained on the bug.

Revision history for this message
Jay Vora (Serpent Consulting Services) (jayvora) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/addons/base/ir/ir_cron.py'
2--- bin/addons/base/ir/ir_cron.py 2010-09-06 15:28:25 +0000
3+++ bin/addons/base/ir/ir_cron.py 2010-11-18 23:28:53 +0000
4@@ -123,7 +123,7 @@
5 cr.commit()
6
7
8- cr.execute('select min(nextcall) as min_next_call from ir_cron where numbercall<>0 and active and nextcall>=now()')
9+ cr.execute('select min(nextcall) as min_next_call from ir_cron where numbercall<>0 and active')
10 next_call = cr.dictfetchone()['min_next_call']
11 if next_call:
12 next_call = time.mktime(time.strptime(next_call, '%Y-%m-%d %H:%M:%S'))