[MERGE] forward port of branch 7.0 up to 680f955

1 files changed, 15 insertions, 1 deletions

diff --git a/addons/procurement/wizard/schedulers_all.py b/addons/procurement/wizard/schedulers_all.py
index aab9657ae5d..41538508e78 100644
--- a/addons/procurement/wizard/schedulers_all.py
+++ b/addons/procurement/wizard/schedulers_all.py
@@ -19,10 +19,14 @@
 #
 ##############################################################################
 
+import logging
 import threading
+from openerp import pooler, SUPERUSER_ID, tools
 
 from openerp.osv import fields, osv
 
+_logger = logging.getLogger(__name__)
+
 class procurement_compute_all(osv.osv_memory):
     _name = 'procurement.order.compute.all'
     _description = 'Compute all schedulers'
@@ -45,7 +49,17 @@ class procurement_compute_all(osv.osv_memory):
         """
         proc_obj = self.pool.get('procurement.order')
         #As this function is in a new thread, i need to open a new cursor, because the old one may be closed
-        new_cr = self.pool.db.cursor()
+        new_cr = pooler.get_db(cr.dbname).cursor()
+        scheduler_cron_id = self.pool['ir.model.data'].get_object_reference(new_cr, SUPERUSER_ID, 'procurement', 'ir_cron_scheduler_action')[1]
+        # Avoid to run the scheduler multiple times in the same time
+        try:
+            with tools.mute_logger('openerp.sql_db'):
+                new_cr.execute("SELECT id FROM ir_cron WHERE id = %s FOR UPDATE NOWAIT", (scheduler_cron_id,))
+        except Exception:
+            _logger.info('Attempt to run procurement scheduler aborted, as already running')
+            new_cr.rollback()
+            new_cr.close()
+            return {}
         for proc in self.browse(new_cr, uid, ids, context=context):
             proc_obj.run_scheduler(new_cr, uid, automatic=proc.automatic, use_new_cursor=new_cr.dbname,\
                     context=context)