[MERGE] forward port of branch 8.0 up to 780dd98

1 files changed, 8 insertions, 0 deletions

diff --git a/openerp/modules/module.py b/openerp/modules/module.py
index fc5270cbdfa..e6f6eed2160 100644
--- a/openerp/modules/module.py
+++ b/openerp/modules/module.py
@@ -39,6 +39,7 @@ import openerp.release as release
 from openerp.tools.safe_eval import safe_eval as eval
 
 MANIFEST = '__openerp__.py'
+README = ['README.rst', 'README.md', 'README.txt']
 
 _logger = logging.getLogger(__name__)
 
@@ -274,6 +275,13 @@ def load_information_from_description_file(module, mod_path=None):
             finally:
                 f.close()
 
+            if not info.get('description'):
+                readme_path = [opj(mod_path, x) for x in README
+                               if os.path.isfile(opj(mod_path, x))]
+                if readme_path:
+                    readme_text = tools.file_open(readme_path[0]).read()
+                    info['description'] = readme_text
+
             if 'active' in info:
                 # 'active' has been renamed 'auto_install'
                 info['auto_install'] = info['active']