diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py index e0c38c969ec..30b3d203930 100644 --- a/openerp/addons/base/module/module.py +++ b/openerp/addons/base/module/module.py @@ -152,9 +152,17 @@ class module(osv.osv): def _get_desc(self, cr, uid, ids, field_name=None, arg=None, context=None): res = dict.fromkeys(ids, '') for module in self.browse(cr, uid, ids, context=context): - overrides = dict(embed_stylesheet=False, doctitle_xform=False, output_encoding='unicode') - output = publish_string(source=module.description, settings_overrides=overrides, writer=MyWriter()) - res[module.id] = output + path = addons.get_module_resource(module.name, 'description.html') + if path: + desc_file = tools.file_open(path, 'rb') + try: + res[module.id] = desc_file.read() + finally: + desc_file.close() + else: + overrides = dict(embed_stylesheet=False, doctitle_xform=False, output_encoding='unicode') + output = publish_string(source=module.description, settings_overrides=overrides, writer=MyWriter()) + res[module.id] = output return res def _get_latest_version(self, cr, uid, ids, field_name=None, arg=None, context=None): diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml index 3923c9de3bd..9c4ca714c6f 100644 --- a/openerp/addons/base/module/module_view.xml +++ b/openerp/addons/base/module/module_view.xml @@ -70,13 +70,15 @@ ir.module.module.form ir.module.module -
+

-
+
+
- - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -116,7 +120,7 @@
- +