Merge pull request OCA#342 from OCA/10.0

Syncing from upstream OCA/server-tools (10.0)
grueneerde · Aug 2, 2018 · 241d610 · 241d610
2 parents b58cb1b + 0ed0412
commit 241d610
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -74,6 +74,7 @@ addon | version | summary
 [keychain](keychain/) | 10.0.2.0.1 | Store accounts and credentials
 [letsencrypt](letsencrypt/) | 10.0.1.0.0 | Request SSL certificates from letsencrypt.org
 [mail_environment](mail_environment/) | 10.0.1.0.0 | Configure mail servers with server_environment_files
+[mail_log_message_to_process](mail_log_message_to_process/) | 10.0.1.0.0 | Log all messages received, before they start to be processed.
 [mass_editing](mass_editing/) | 10.0.1.1.0 | Mass Editing
 [mass_sorting](mass_sorting/) | 10.0.1.0.0 | Sort any models by any fields list
 [module_auto_update](module_auto_update/) | 10.0.2.0.3 | Automatically update Odoo modules

diff --git a/setup/_metapackage/VERSION.txt b/setup/_metapackage/VERSION.txt
@@ -1 +1 @@
-10.0.20180628.0
+10.0.20180802.0
diff --git a/setup/_metapackage/setup.py b/setup/_metapackage/setup.py
@@ -64,6 +64,7 @@
         'odoo10-addon-keychain',
         'odoo10-addon-letsencrypt',
         'odoo10-addon-mail_environment',
+        'odoo10-addon-mail_log_message_to_process',
         'odoo10-addon-mass_editing',
         'odoo10-addon-mass_sorting',
         'odoo10-addon-module_auto_update',

diff --git a/setup/mail_log_message_to_process/odoo/__init__.py b/setup/mail_log_message_to_process/odoo/__init__.py
@@ -0,0 +1 @@
+__import__('pkg_resources').declare_namespace(__name__)
diff --git a/setup/mail_log_message_to_process/odoo/addons/__init__.py b/setup/mail_log_message_to_process/odoo/addons/__init__.py
@@ -0,0 +1 @@
+__import__('pkg_resources').declare_namespace(__name__)
diff --git a/setup/mail_log_message_to_process/odoo/addons/mail_log_message_to_process b/setup/mail_log_message_to_process/odoo/addons/mail_log_message_to_process
@@ -0,0 +1 @@
+../../../../mail_log_message_to_process
diff --git a/setup/mail_log_message_to_process/setup.py b/setup/mail_log_message_to_process/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		__import__('pkg_resources').declare_namespace(__name__)