From 8c4ce402d1aa11e99c7d4e87bbb7e35f68334bc4 Mon Sep 17 00:00:00 2001 From: Hardik Date: Tue, 28 Aug 2012 12:11:11 +0530 Subject: [PATCH 1/6] [IMP]Improved base module as per requirement. bzr revid: hsa@tinyerp.com-20120828064111-msyv13aa07az17zo --- openerp/addons/base/res/res_config.py | 17 +++++++++++++++++ openerp/addons/base/res/res_users.py | 6 +++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/openerp/addons/base/res/res_config.py b/openerp/addons/base/res/res_config.py index 3f4a052a36b..3399cd1153e 100644 --- a/openerp/addons/base/res/res_config.py +++ b/openerp/addons/base/res/res_config.py @@ -553,4 +553,21 @@ class res_config_settings(osv.osv_memory): 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 len(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: diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py index cddc02673b8..3078d94fd9d 100644 --- a/openerp/addons/base/res/res_users.py +++ b/openerp/addons/base/res/res_users.py @@ -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', store=True), } _sql_constraints = [ @@ -815,7 +815,7 @@ class users_view(osv.osv): 'type': 'selection', 'string': app and app.name or _('Other'), 'selection': [(False, '')] + [(g.id, g.name) for g in gs], - 'help': '\n'.join(tips), + 'help': g.comment, } else: # boolean group fields From 00a456096399c39c5cd8e82772ddc36685efa003 Mon Sep 17 00:00:00 2001 From: "pso (OpenERP)" Date: Tue, 28 Aug 2012 18:17:50 +0530 Subject: [PATCH 2/6] [MERGE] Merged MDI's branch to fix the issue of name_get of ir.actions.todo bzr revid: pso@tinyerp.com-20120828124750-1kbqgdq0mrc0av2b --- openerp/addons/base/res/res_config.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/openerp/addons/base/res/res_config.py b/openerp/addons/base/res/res_config.py index 3f4a052a36b..8dcd5f769fe 100644 --- a/openerp/addons/base/res/res_config.py +++ b/openerp/addons/base/res/res_config.py @@ -552,5 +552,22 @@ class res_config_settings(osv.osv_memory): 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 len(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: From 3abb39324779a68b2c28233ffb4a311200864c4f Mon Sep 17 00:00:00 2001 From: "pso (OpenERP)" Date: Tue, 28 Aug 2012 18:26:23 +0530 Subject: [PATCH 3/6] [IMP] Improvements bzr revid: pso@tinyerp.com-20120828125623-1nq457mpd1dijq4j --- openerp/addons/base/res/res_config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/addons/base/res/res_config.py b/openerp/addons/base/res/res_config.py index 8dcd5f769fe..d6b42e970bf 100644 --- a/openerp/addons/base/res/res_config.py +++ b/openerp/addons/base/res/res_config.py @@ -557,7 +557,7 @@ class res_config_settings(osv.osv_memory): """ Override name_get method to return an appropriate configuration wizard name, and not the generated name.""" - if not len(ids): + if not ids: return [] # name_get may receive int id instead of an id list if isinstance(ids, (int, long)): From 525a0e6a8b347b32845a55703632e6c63e5b93db Mon Sep 17 00:00:00 2001 From: Hardik Date: Fri, 31 Aug 2012 14:16:52 +0530 Subject: [PATCH 4/6] [IMP]Add tooltip and add multi currencies field into hidden fields bzr revid: hsa@tinyerp.com-20120831084652-9qyud713yeagm4pi --- openerp/addons/base/res/res_users.py | 2 +- openerp/addons/base/security/base_security.xml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py index 21fc5e2dc5b..439817b5518 100644 --- a/openerp/addons/base/res/res_users.py +++ b/openerp/addons/base/res/res_users.py @@ -815,7 +815,7 @@ class users_view(osv.osv): '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 diff --git a/openerp/addons/base/security/base_security.xml b/openerp/addons/base/security/base_security.xml index 11be6e35bd1..2f55444828e 100644 --- a/openerp/addons/base/security/base_security.xml +++ b/openerp/addons/base/security/base_security.xml @@ -17,6 +17,8 @@ Employee + + 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. @@ -26,6 +28,7 @@ Multi Currencies + From 6abc8a1d762573a598cf3bb19175af8270635c38 Mon Sep 17 00:00:00 2001 From: Hardik Date: Mon, 3 Sep 2012 18:55:42 +0530 Subject: [PATCH 5/6] [IMP]Search by Advanced for groups using fnct_search bzr revid: hsa@tinyerp.com-20120903132542-xzfow8u5qbgxvbt2 --- openerp/addons/base/res/res_users.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py index 3078d94fd9d..47ad27c25f0 100644 --- a/openerp/addons/base/res/res_users.py +++ b/openerp/addons/base/res/res_users.py @@ -52,6 +52,9 @@ class groups(osv.osv): res[g.id] = g.name return res + def _search_group(self, cr, uid, obj, name, args, context=None): + return [('name',args[0][1],args[0][2])] + _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 +64,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', store=True), + 'full_name': fields.function(_get_full_name, type='char', string='Group Name', fnct_search=_search_group), } _sql_constraints = [ From 8ce3484f3e71fd3bde6657e6944613856c4f8831 Mon Sep 17 00:00:00 2001 From: "Harry (OpenERP)" Date: Thu, 6 Sep 2012 12:19:12 +0530 Subject: [PATCH 6/6] [FIX] res_users: tips on groups bzr revid: hmo@tinyerp.com-20120906064912-pp1xgtjswbykh2gh --- openerp/addons/base/res/res_users.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py index 19e954bf7b0..246b05cbd1f 100644 --- a/openerp/addons/base/res/res_users.py +++ b/openerp/addons/base/res/res_users.py @@ -818,7 +818,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' % (g.comment or '') for g in gs] + tips = ['%s: %s' % (g.name, g.comment) for g in gs if g.comment] res[name_selection_groups(map(int, gs))] = { 'type': 'selection', 'string': app and app.name or _('Other'),