odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] Merged HSA's branch for base module improvements 

bzr revid: pso@tinyerp.com-20120829053423-dqyoovo3ar5wa54c
This commit is contained in:
pso (OpenERP) 2012-08-29 11:04:23 +05:30
parent 3abb393247 8c4ce402d1
commit ad9919e8b9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openerp/addons/base/res/res_users.py
View File

@ -51,7 +51,7 @@ class groups(osv.osv):
else:
res[g.id] = g.name
return res
_columns = {
'name': fields.char('Name', size=64, required=True, translate=True),
'users': fields.many2many('res.users', 'res_groups_users_rel', 'gid', 'uid', 'Users'),
@ -61,7 +61,7 @@ class groups(osv.osv):
'menu_access': fields.many2many('ir.ui.menu', 'ir_ui_menu_group_rel', 'gid', 'menu_id', 'Access Menu'),
'comment' : fields.text('Comment', size=250, translate=True),
'category_id': fields.many2one('ir.module.category', 'Application', select=True),
'full_name': fields.function(_get_full_name, type='char', string='Group Name'),
'full_name': fields.function(_get_full_name, type='char', string='Group Name', size=256, store=True),
}
_sql_constraints = [
@ -810,7 +810,7 @@ class users_view(osv.osv):
for app, kind, gs in self.pool.get('res.groups').get_groups_by_application(cr, uid, context):
if kind == 'selection':
# selection group field
tips = ['%s: %s' % (g.name, g.comment or '') for g in gs]
tips = ['%s' % (g.comment or '') for g in gs]
res[name_selection_groups(map(int, gs))] = {
'type': 'selection',
'string': app and app.name or _('Other'),