Priyesh (OpenERP) has proposed merging
lp:~openerp-dev/openobject-server/trunk-formatting-modules-rst2html-pso into
lp:openobject-server.
Requested reviews:
Anto (abo-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-formatting-modules-rst2html-pso/+merge/120781
Hello,
Task : Formatting modules
Improved module description field with function and make it html
Improved base module description
Kindly review it.
Thanks,
Priyesh
--
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-formatting-modules-rst2html-pso/+merge/120781
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-server/trunk-formatting-modules-rst2html-pso.
=== modified file 'openerp/addons/base/__openerp__.py'
--- openerp/addons/base/__openerp__.py 2012-08-14 14:56:56 +0000
+++ openerp/addons/base/__openerp__.py 2012-08-22 13:51:24 +0000
@@ -25,20 +25,21 @@
'name': 'Base',
'version': '1.3',
'category': 'Hidden',
- 'description': """The kernel of OpenERP, needed for all installation.""",
+ 'description': """
+The kernel of OpenERP, needed for all installation.
+===================================================
+""",
'author': 'OpenERP SA',
'maintainer': 'OpenERP SA',
'website': 'http://www.openerp.com',
'depends': [],
- 'init_xml': [
+ 'data': [
'base_data.xml',
'security/base_security.xml',
'base_menu.xml',
'res/res_security.xml',
'res/res_config.xml',
- 'data/res.country.state.csv'
- ],
- 'update_xml': [
+ 'data/res.country.state.csv',
'ir/wizard/wizard_menu_view.xml',
'ir/ir.xml',
'ir/ir_filters.xml',
@@ -77,7 +78,7 @@
'res/res_widget_data.xml',
'publisher_warranty/publisher_warranty_data.xml',
],
- 'demo_xml': [
+ 'demo': [
'base_demo.xml',
'res/res_partner_demo.xml',
'res/res_partner_demo.yml',
=== modified file 'openerp/addons/base/base_menu.xml'
--- openerp/addons/base/base_menu.xml 2012-07-18 10:11:29 +0000
+++ openerp/addons/base/base_menu.xml 2012-08-22 13:51:24 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
- <data>
+ <data noupdate="1">
<!-- Top menu item -->
<menuitem name="Reporting"
=== modified file 'openerp/addons/base/module/module.py'
--- openerp/addons/base/module/module.py 2012-08-14 10:00:07 +0000
+++ openerp/addons/base/module/module.py 2012-08-22 13:51:24 +0000
@@ -29,6 +29,7 @@
from openerp.tools.parse_version import parse_version
from openerp.tools.translate import _
from openerp.osv import fields, osv, orm
+from docutils.core import publish_string
_logger = logging.getLogger(__name__)
@@ -94,6 +95,15 @@
'module %s', name, exc_info=True)
return info
+ 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):
+ desc = self.get_module_info(module.name).get('description', '')
+ overrides = dict(embed_stylesheet=False, doctitle_xform=False, output_encoding='unicode')
+ output = publish_string(source=desc, writer_name='html', settings_overrides=overrides)
+ res[module.id] = output
+ return res
+
def _get_latest_version(self, cr, uid, ids, field_name=None, arg=None, context=None):
res = dict.fromkeys(ids, '')
for m in self.browse(cr, uid, ids):
@@ -182,7 +192,7 @@
'category_id': fields.many2one('ir.module.category', 'Category', readonly=True, select=True),
'shortdesc': fields.char('Module Name', size=64, readonly=True, translate=True),
'summary': fields.char('Summary', size=64, readonly=True, translate=True),
- 'description': fields.text("Description", readonly=True, translate=True),
+ 'description': fields.function(_get_desc, string='Description', type='html', method=True, readonly=True),
'author': fields.char("Author", size=128, readonly=True),
'maintainer': fields.char('Maintainer', size=128, readonly=True),
'contributors': fields.text('Contributors', readonly=True),
=== modified file 'openerp/addons/base/module/module_view.xml'
--- openerp/addons/base/module/module_view.xml 2012-08-16 17:15:21 +0000
+++ openerp/addons/base/module/module_view.xml 2012-08-22 13:51:24 +0000
@@ -38,7 +38,7 @@
<field name="model">ir.module.module</field>
<field name="arch" type="xml">
<search string="Search modules">
- <field name="name" filter_domain="['|', '|', '|', ('description', 'ilike', self), ('summary', 'ilike', self), ('shortdesc', 'ilike', self), ('name',
+ <field name="name" filter_domain="['|', '|', ('summary', 'ilike', self), ('shortdesc', 'ilike', self), ('name',
'ilike', self)]"/>
<filter name="app" icon="terp-check" string="Apps" domain="[('application', '=', 1)]"/>
<filter name="extra" icon="terp-check" string="Extra" domain="[('application', '=', 0)]"/>
=== modified file 'openerp/addons/base/res/res_config.xml'
--- openerp/addons/base/res/res_config.xml 2012-08-07 12:51:38 +0000
+++ openerp/addons/base/res/res_config.xml 2012-08-22 13:51:24 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
- <data>
+ <data noupdate="1">
<record id="res_config_view_base" model="ir.ui.view">
<field name="name">res.config.view.base</field>
<field name="model">res.config</field>
=== modified file 'openerp/addons/base/res/res_security.xml'
--- openerp/addons/base/res/res_security.xml 2012-04-04 09:08:18 +0000
+++ openerp/addons/base/res/res_security.xml 2012-08-22 13:51:24 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
-<data noupdate="0">
+<data noupdate="1">
<record model="res.groups" id="group_partner_manager">
<field name="name">Partner Manager</field>
=== modified file 'openerp/addons/base/security/base_security.xml'
--- openerp/addons/base/security/base_security.xml 2012-07-02 13:03:39 +0000
+++ openerp/addons/base/security/base_security.xml 2012-08-22 13:51:24 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<openerp>
- <data noupdate="0">
+ <data noupdate="1">
<!--
Users Groups
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
