Harry (OpenERP) has proposed merging
lp:~openerp-dev/openobject-server/trunk-addons-issues5-base-pso into
lp:openobject-server.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-addons-issues5-base-pso/+merge/122450
--
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-addons-issues5-base-pso/+merge/122450
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-server/trunk-addons-issues5-base-pso.
=== modified file 'openerp/addons/base/res/res_config.py'
--- openerp/addons/base/res/res_config.py 2012-07-18 13:50:10 +0000
+++ openerp/addons/base/res/res_config.py 2012-09-03 06:31:18 +0000
@@ -552,5 +552,22 @@
if action_ids:
return act_window.read(cr, uid, action_ids[0], [], context=context)
return {}
+
+ def name_get(self, cr, uid, ids, context=None):
+ """ Override name_get method to return an appropriate configuration wizard
+ name, and not the generated name."""
+
+ if not ids:
+ return []
+ # name_get may receive int id instead of an id list
+ if isinstance(ids, (int, long)):
+ ids = [ids]
+
+ act_window = self.pool.get('ir.actions.act_window')
+ action_ids = act_window.search(cr, uid, [('res_model', '=', self._name)], context=context)
+ name = self._name
+ if action_ids:
+ name = act_window.read(cr, uid, action_ids[0], ['name'], context=context)['name']
+ return [(record.id, name) for record in self.browse(cr, uid , ids, context=context)]
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'openerp/addons/base/res/res_users.py'
--- openerp/addons/base/res/res_users.py 2012-08-31 14:14:15 +0000
+++ openerp/addons/base/res/res_users.py 2012-09-03 06:31:18 +0000
@@ -52,7 +52,7 @@
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'),
@@ -62,7 +62,7 @@
'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 = [
@@ -805,12 +805,12 @@
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'),
'selection': [(False, '')] + [(g.id, g.name) for g in gs],
- 'help': '\n'.join(tips),
+ 'help': ''.join(tips),
}
else:
# boolean group fields
=== modified file 'openerp/addons/base/security/base_security.xml'
--- openerp/addons/base/security/base_security.xml 2012-08-23 14:20:36 +0000
+++ openerp/addons/base/security/base_security.xml 2012-09-03 06:31:18 +0000
@@ -2,6 +2,7 @@
<openerp>
<data noupdate="1">
+<<<<<<< TREE
<!--
Users Groups
Note that the field 'category_id' is set later in
@@ -45,6 +46,56 @@
<record model="ir.ui.menu" id="base.menu_administration">
<field name="groups_id" eval="[(6,0, [ref('group_system'), ref('group_erp_manager')])]"/>
</record>
+=======
+<!--
+ Users Groups
+ [Note] Field 'category_id' is set later in base/module/module_data.xml
+-->
+ <record model="res.groups" id="group_erp_manager">
+ <field name="name">Access Rights</field>
+ </record>
+ <record model="res.groups" id="group_system">
+ <field name="name">Configuration</field>
+ <field name="implied_ids" eval="[(4, ref('group_erp_manager'))]"/>
+ <field name="users" eval="[(4, ref('base.user_root'))]"/>
+ </record>
+
+ <record model="res.groups" id="group_user">
+ <field name="name">Employee</field>
+ <field name="comment">Employee: the user will be able to manage his own human resources stuff (leave request, timesheets, ...), if he is linked to an employee in the system.</field>
+ <field name="users" eval="[(4, ref('base.user_root'))]"/>
+ </record>
+
+ <record model="res.groups" id="group_multi_company">
+ <field name="name">Multi Companies</field>
+ </record>
+
+ <record model="res.groups" id="group_multi_currency">
+ <field name="name">Multi Currencies</field>
+ <field name="category_id" ref="base.module_category_hidden"/>
+ </record>
+
+ <record model="res.groups" id="group_no_one">
+ <field name="name">Technical Features</field>
+ </record>
+
+ <record id="group_sale_salesman" model="res.groups">
+ <field name="name">User</field>
+ </record>
+ <record id="group_sale_manager" model="res.groups">
+ <field name="name">Manager</field>
+ <field name="implied_ids" eval="[(4, ref('group_sale_salesman'))]"/>
+ </record>
+
+ <!-- Set accesses to menu -->
+ <record model="ir.ui.menu" id="base.menu_administration">
+ <field name="groups_id" eval="[(6,0, [ref('group_system'), ref('group_erp_manager')])]"/>
+ </record>
+
+ </data>
+
+ <data noupdate="1">
+>>>>>>> MERGE-SOURCE
<record model="ir.rule" id="res_widget_user_rule">
<field name="name">res.widget.user rule</field>
_______________________________________________
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
