Merge remote-tracking branch 'origin/17.0' into 17.0

# Conflicts:
#	testserver_o2b/__manifest__.py

testserver_o2b/__manifest__.py

@@ -1,12 +1,13 @@
 # -*- coding: utf-8 -*-
 {
-    'name': "testserver_o2b",
+    'name': "Set as testserver Open2Bizz",
 
     'summary': """
         This module males an Odoo env into a test env!""",
 
     'description': """
         This module males an Odoo env into a test env!
+        Only to be used when installed as TEST env. Open2Bizz
     """,
 
     'author': "Open2bizz",
@@ -14,7 +15,7 @@
     'category': 'Uncategorized',
     'version': '17.0.1.0.0',
     'license': 'LGPL-3',
-    'depends': ['web_environment_ribbon', 'mail','base',],
+    'depends': ['web_environment_ribbon', 'mail','base','mailcatcher_menu'],
     'data': [
         'views/views.xml',
         'views/templates.xml',