Merge branch 'ADD-16.0-branch' into 'main'

various minor changes

See merge request odoo-openupgrade-wizard/odoo-openupgrade-wizard!22

DEVELOP.md

@@ -158,7 +158,7 @@ See (https://github.com/odoo/odoo/blob/ODOO_VERSION/setup/package.dfdebian)
 - First release : 06/07/2019
 - End LTS : Undefined.
 
-## debian:bullseye (15.0)
+## debian:bullseye (15.0, 16.0)
 - Ubuntu release : 20.04 focal, 20.10 groovy, 21.04 hirsute, 21.10 impish
 - python3.9
 - First release : 14/07/2021

README.md

@@ -140,8 +140,11 @@ You can use default files, if you have a very simple odoo instance without custo
 extra repositories, or dependencies...
 
 **Note:**
+
 - In your repos.yml, preserve ``openupgrade`` and ``server-tools`` repositories
   to have all the features of the librairies available.
+- In your repos.yml file, the odoo project should be in ``./src/odoo``
+  and the openupgrade project should be in ``./src/openupgrade/`` folder.
 
 ## Command: ``pull-submodule``
 

odoo_openupgrade_wizard/cli/cli_pull_submodule.py

@@ -36,12 +36,18 @@ def pull_submodule(ctx, versions):
                         "-b",
                         str(version_cfg["repo_branch"]),
                         version_cfg["repo_url"],
-                        submodule_path,
+                        str(submodule_path),
                     ]
                 )
             else:
                 execute_check_output(
-                    ["git", "pull", "origin", str(version_cfg["repo_branch"])],
+                    [
+                        "git",
+                        "pull",
+                        "origin",
+                        str(version_cfg["repo_branch"]),
+                        "--rebase",
+                    ],
                     working_directory=submodule_path,
                 )
         else:

odoo_openupgrade_wizard/tools/tools_odoo.py

@@ -56,11 +56,10 @@ def get_odoo_addons_path(
     data = data
 
     addons_path = []
+    odoo_folder = get_odoo_folder(migration_step, execution_context)
     for key in data.keys():
         path = root_path / Path(key)
-        if str(path).endswith(
-            get_odoo_folder(migration_step, execution_context)
-        ):
+        if str(path).endswith(odoo_folder):
             # Add two folder for odoo folder
             addons_path.append(path / Path("addons"))
             addons_path.append(