diff options
| author | GPA (OpenERP) <gpa@tinyerp.com> | 2010-11-25 11:50:02 +0100 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2010-11-25 11:50:02 +0100 |
| commit | f4c509bcfb2ca305c889a1bd57d4fd0e8cb6b7a0 (patch) | |
| tree | 4a123484176c4cbcb54daf5864f37754c8627845 /bin/tools | |
| parent | 37f2e927e71be71befccdbc6bd03abbffdd39b0e (diff) | |
| parent | 9de5e301e1cd721d2aa7521b648b297969bfcef0 (diff) | |
[MERGE] ir.ui.menu,rng: support for embedded web icons for menuitems
bzr revid: odo@openerp.com-20101125105002-o6pbzql6lsqhx60w
Diffstat (limited to 'bin/tools')
| -rw-r--r-- | bin/tools/convert.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/bin/tools/convert.py b/bin/tools/convert.py index d6f935a7251..756004f1e78 100644 --- a/bin/tools/convert.py +++ b/bin/tools/convert.py @@ -284,7 +284,7 @@ form: module.record_id""" % (xml_id,) d_search = rec.get("search",'').encode('utf-8') d_id = rec.get("id",'') ids = [] - + if d_search: idref = _get_idref(self, cr, self.uid, d_model, context={}, idref={}) ids = self.pool.get(d_model).search(cr, self.uid, unsafe_eval(d_search, idref)) @@ -556,7 +556,7 @@ form: module.record_id""" % (xml_id,) values = {'parent_id': False} if rec.get('parent', False) is False and len(m_l) > 1: - # No parent attribute specified and the menu name has several menu components, + # No parent attribute specified and the menu name has several menu components, # try to determine the ID of the parent according to menu path pid = False res = None @@ -637,6 +637,10 @@ form: module.record_id""" % (xml_id,) values['sequence'] = int(rec.get('sequence')) if rec.get('icon'): values['icon'] = str(rec.get('icon')) + if rec.get('web_icon'): + values['web_icon'] = "%s,%s" %(self.module, str(rec.get('web_icon'))) + if rec.get('web_icon_hover'): + values['web_icon_hover'] = "%s,%s" %(self.module, str(rec.get('web_icon_hover'))) if rec.get('groups'): g_names = rec.get('groups','').split(',') |