Merge b504045 into 1e77b25

OCA · May 24, 2018 · d2718c3 · d2718c3
2 parents 1e77b25 + b504045
commit d2718c3
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/queue_job/controllers/main.py b/queue_job/controllers/main.py
@@ -71,10 +71,16 @@ def runjob(self, db, job_uuid, **kw):
         env = http.request.env(user=odoo.SUPERUSER_ID)
 
         def retry_postpone(job, message, seconds=None):
-            job.postpone(result=message, seconds=seconds)
-            job.set_pending(reset_retry=False)
-            job.store()
-            env.cr.commit()
+
+            job.env.cr.rollback()
+            job.env.clear()
+            with odoo.api.Environment.manage():
+                with odoo.registry(job.env.cr.dbname).cursor() as new_cr:
+                    job.env = job.env(cr=new_cr)
+                    job.postpone(result=message, seconds=seconds)
+                    job.set_pending(reset_retry=False)
+                    job.store()
+                    new_cr.commit()
 
         job = self._load_job(env, job_uuid)
         if job is None: