Merge PR #1328 into 16.0

Signed-off-by rousseldenis

stock_picking_group_by_base/models/stock_picking.py

@@ -2,10 +2,15 @@
 # Copyright 2019-2020 Camptocamp
 # Copyright 2020 ACSONE SA/NV
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+import logging
+
+from psycopg2.errors import LockNotAvailable
 from psycopg2.extensions import AsIs
 
 from odoo import api, models
 
+_logger = logging.getLogger(__name__)
+
 
 class StockPicking(models.Model):
 
@@ -36,25 +41,36 @@ def _create_index_for_grouping(self):
         # create index for the domain expressed into the
         # stock_move._assign_picking_group_domain method
         index_name = "stock_picking_groupby_key_index"
-        self.env.cr.execute(
-            "DROP INDEX IF EXISTS %(index_name)s", dict(index_name=AsIs(index_name))
-        )
-
-        self.env.cr.execute(
-            """
-                CREATE INDEX %(index_name)s
-                ON %(table_name)s %(fields)s
-                %(where)s
-            """,
-            dict(
-                index_name=AsIs(index_name),
-                table_name=AsIs(self._table),
-                fields=tuple(
-                    [AsIs(field) for field in self._get_index_for_grouping_fields()]
+
+        try:
+            self.env.cr.execute(
+                "DROP INDEX IF EXISTS %(index_name)s", dict(index_name=AsIs(index_name))
+            )
+
+            self.env.cr.execute(
+                """
+                    CREATE INDEX %(index_name)s
+                    ON %(table_name)s %(fields)s
+                    %(where)s
+                """,
+                dict(
+                    index_name=AsIs(index_name),
+                    table_name=AsIs(self._table),
+                    fields=tuple(
+                        [AsIs(field) for field in self._get_index_for_grouping_fields()]
+                    ),
+                    where=AsIs(self._get_index_for_grouping_condition()),
                 ),
-                where=AsIs(self._get_index_for_grouping_condition()),
-            ),
-        )
+            )
+        except LockNotAvailable as e:
+            # Do nothing and let module load
+            _logger.warning(
+                "Impossible to create index in stock_picking_group_by_base module"
+                " due to DB Lock problem (%s)",
+                e,
+            )
+        except Exception:
+            raise
 
     def init(self):
         """