[FIX] pre-upgrade script to preserve module states during merges

Author: nicomacr

pre_upgrade_scripts/180_190/merge_and_renames.py

@@ -41,15 +41,25 @@ def safe_new_module(cr, module, deps=(), *args, **kwargs):
     for old, into in MERGE_MODULES:
         util.merge_module(cr, old, into, update_dependers=False)
         # Ensure the target module is marked for upgrade
+        old_state = cr.execute_query(
+            SQL(
+                """
+                SELECT state FROM ir_module_module
+                 WHERE name = %(name)s
+                """,
+                name=old,
+            )
+        )
         cr.execute(
             SQL(
                 """
                 UPDATE ir_module_module
-                   SET state = 'to upgrade'
+                   SET state = %(upgrade_state)s
                  WHERE name = %(name)s
                    AND state NOT IN ('installed', 'to install', 'to upgrade')
                 """,
                 name=into,
+                upgrade_state=old_state[0]["state"] if old_state else "to upgrade",
             )
         )
     for old, into in RENAMED_MODULES: