Hardik Sanchawat (OpenERP) has proposed merging
lp:~openerp-dev/openobject-server/trunk-formatting-modules-base-hsa into
lp:~openerp-dev/openobject-server/trunk-formatting-modules.
Requested reviews:
Priyesh (OpenERP) (pso-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-formatting-modules-base-hsa/+merge/119894
Hello,
I change the description field 'text' to 'html',
set editor width in description.
Thanks
-HSA
--
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-formatting-modules-base-hsa/+merge/119894
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-server/trunk-formatting-modules.
=== modified file 'openerp/addons/base/__openerp__.py'
--- openerp/addons/base/__openerp__.py 2012-08-16 10:36:13 +0000
+++ openerp/addons/base/__openerp__.py 2012-08-16 11:12:22 +0000
@@ -25,7 +25,13 @@
'name': 'Base',
'version': '1.3',
'category': 'Hidden',
+<<<<<<< TREE
'description': """<h1>The kernel of OpenERP, needed for all installation.</h1>""",
+=======
+ 'description': """
+ <p>The kernel of OpenERP, needed for all installation.</p>
+ """,
+>>>>>>> MERGE-SOURCE
'author': 'OpenERP SA',
'maintainer': 'OpenERP SA',
'website': 'http://www.openerp.com',
=== 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-16 11:12:22 +0000
@@ -67,7 +67,7 @@
'child_ids': fields.one2many('ir.module.category', 'parent_id', 'Child Applications'),
'module_nr': fields.function(_module_nbr, string='Number of Modules', type='integer'),
'module_ids' : fields.one2many('ir.module.module', 'category_id', 'Modules'),
- 'description' : fields.text("Description", translate=True),
+ 'description' : fields.html("Description", translate=True),
'sequence' : fields.integer('Sequence'),
'visible' : fields.boolean('Visible'),
'xml_id': fields.function(osv.osv.get_external_id, type='char', size=128, string="External ID"),
=== modified file 'openerp/addons/base/module/module_view.xml'
--- openerp/addons/base/module/module_view.xml 2012-08-16 10:36:13 +0000
+++ openerp/addons/base/module/module_view.xml 2012-08-16 11:12:22 +0000
@@ -133,7 +133,11 @@
</group>
<notebook>
<page string="Description">
+<<<<<<< TREE
<field name="description" widget="text_html"/>
+=======
+ <field name="description" editor_width="750"/>
+>>>>>>> MERGE-SOURCE
</page>
<page string="Technical Data" groups="base.group_no_one">
<group col="4">
_______________________________________________
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
