[FIX] stock: always close created cursors

Avoid leaks in case of exception.

closes odoo/odoo#93866

X-original-commit: b0e22ba19d01f87980ee7b72d6c78998d92bd8f2
Signed-off-by: Christophe Simonis <chs@odoo.com>

addons/stock/models/stock_orderpoint.py

@@ -561,8 +561,10 @@ class StockWarehouseOrderpoint(models.Model):
                     )
 
             if use_new_cursor:
-                cr.commit()
-                cr.close()
+                try:
+                    cr.commit()
+                finally:
+                    cr.close()
                 _logger.info("A batch of %d orderpoints is processed and committed", len(orderpoints_batch_ids))
 
         return {}

addons/stock/wizard/stock_scheduler_compute.py

@@ -20,25 +20,24 @@ class StockSchedulerCompute(models.TransientModel):
 
     def _procure_calculation_orderpoint(self):
         # 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.cursor()
-        self = self.with_env(self.env(cr=new_cr))
-        scheduler_cron = self.sudo().env.ref('stock.ir_cron_scheduler_action')
-        # Avoid to run the scheduler multiple times in the same time
-        try:
-            with tools.mute_logger('odoo.sql_db'):
-                self._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')
+        with self.pool.cursor() as new_cr:
+            self = self.with_env(self.env(cr=new_cr))
+            scheduler_cron = self.sudo().env.ref('stock.ir_cron_scheduler_action')
+            # Avoid to run the scheduler multiple times in the same time
+            try:
+                with tools.mute_logger('odoo.sql_db'):
+                    self._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')
+                self._cr.rollback()
+                return {}
+
+            for company in self.env.user.company_ids:
+                cids = (self.env.user.company_id | self.env.user.company_ids).ids
+                self.env['procurement.group'].with_context(allowed_company_ids=cids).run_scheduler(
+                    use_new_cursor=self._cr.dbname,
+                    company_id=company.id)
             self._cr.rollback()
-            self._cr.close()
-            return {}
-
-        for company in self.env.user.company_ids:
-            cids = (self.env.user.company_id | self.env.user.company_ids).ids
-            self.env['procurement.group'].with_context(allowed_company_ids=cids).run_scheduler(
-                use_new_cursor=self._cr.dbname,
-                company_id=company.id)
-        new_cr.close()
         return {}
 
     def procure_calculation(self):