Merge PR #3143 into 16.0

Signed-off-by pedrobaeza

upgrade_analysis/README.rst

@@ -2,7 +2,7 @@
 Upgrade Analysis
 ================
 
-.. 
+..
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
@@ -28,9 +28,16 @@ Upgrade Analysis
 
 |badge1| |badge2| |badge3| |badge4| |badge5|
 
-This module provides the tool to generate the database analysis files that indicate how the Odoo data model and module data have changed between two versions of Odoo. Database analysis files for the core modules are included in the OpenUpgrade distribution so as a migration script developer you will not usually need to use this tool yourself. If you do need to run your analysis of a custom set of modules, please refer to the documentation here: https://doc.therp.nl/openupgrade/analysis.html
+This module provides the tool to generate the database analysis files that indicate
+how the Odoo data model and module data have changed between two versions of Odoo.
+Database analysis files for the core modules are included in the OpenUpgrade
+distribution so as a migration script developer you will not usually need to use
+this tool yourself. If you do need to run your analysis of a custom set of modules,
+please refer to the documentation here: https://doc.therp.nl/openupgrade/analysis.html
 
-This module is just a tool, a continuation of the old openupgrade_records in OpenUpgrade in previous versions. It's not recommended to have this module in a production database.
+This module is just a tool, a continuation of the old openupgrade_records in
+OpenUpgrade in previous versions. It's not recommended to have this module in a
+production database.
 
 **Table of contents**
 
@@ -102,7 +109,7 @@ promote its widespread use.
 
 Current `maintainers <https://odoo-community.org/page/maintainer-role>`__:
 
-|maintainer-StefanRijnhart| |maintainer-legalsylvain| 
+|maintainer-StefanRijnhart| |maintainer-legalsylvain|
 
 This module is part of the `OCA/server-tools <https://github.com/OCA/server-tools/tree/16.0/upgrade_analysis>`_ project on GitHub.
 

upgrade_analysis/models/upgrade_analysis.py

@@ -532,7 +532,16 @@ def generate_module_coverage_file(self, no_changes_modules):
 
         module_domain = [
             ("state", "=", "installed"),
-            ("name", "not in", ["upgrade_analysis", "openupgrade_records"]),
+            (
+                "name",
+                "not in",
+                [
+                    "upgrade_analysis",
+                    "openupgrade_records",
+                    "openupgrade_scripts",
+                    "openupgrade_framework",
+                ],
+            ),
         ]
 
         connection = self.config_id.get_connection()
@@ -552,16 +561,19 @@ def generate_module_coverage_file(self, no_changes_modules):
         module_descriptions = {}
         for module in all_modules:
             status = ""
+            is_new = False
             if module in all_local_modules and module in all_remote_modules:
                 module_description = " %s" % module
             elif module in all_local_modules:
                 module_description = " |new| %s" % module
+                is_new = True
             else:
                 module_description = " |del| %s" % module
 
-            if module in compare.apriori.merged_modules:
+            # new modules cannot be merged/renamed in same version
+            if not is_new and module in compare.apriori.merged_modules:
                 status = "Merged into %s. " % compare.apriori.merged_modules[module]
-            elif module in compare.apriori.renamed_modules:
+            elif not is_new and module in compare.apriori.renamed_modules:
                 status = "Renamed to %s. " % compare.apriori.renamed_modules[module]
             elif module in compare.apriori.renamed_modules.values():
                 status = (

upgrade_analysis/models/upgrade_comparison_config.py

@@ -93,4 +93,10 @@ def new_analysis(self):
 
     def action_show_analysis(self):
         self.ensure_one()
-        return {}
+        return {
+            "type": "ir.actions.act_window",
+            "name": "Analyses",
+            "res_model": "upgrade.analysis",
+            "view_mode": "tree,form",
+            "domain": [("id", "in", self.analysis_ids.ids)],
+        }

upgrade_analysis/readme/DESCRIPTION.rst

@@ -1,3 +1,10 @@
-This module provides the tool to generate the database analysis files that indicate how the Odoo data model and module data have changed between two versions of Odoo. Database analysis files for the core modules are included in the OpenUpgrade distribution so as a migration script developer you will not usually need to use this tool yourself. If you do need to run your analysis of a custom set of modules, please refer to the documentation here: https://doc.therp.nl/openupgrade/analysis.html
+This module provides the tool to generate the database analysis files that indicate
+how the Odoo data model and module data have changed between two versions of Odoo.
+Database analysis files for the core modules are included in the OpenUpgrade
+distribution so as a migration script developer you will not usually need to use
+this tool yourself. If you do need to run your analysis of a custom set of modules,
+please refer to the documentation here: https://doc.therp.nl/openupgrade/analysis.html
 
-This module is just a tool, a continuation of the old openupgrade_records in OpenUpgrade in previous versions. It's not recommended to have this module in a production database.
+This module is just a tool, a continuation of the old openupgrade_records in
+OpenUpgrade in previous versions. It's not recommended to have this module in a
+production database.