From 27be515eabb4b099a6aed4ad89f80be4ba8c4178 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Thu, 3 Apr 2014 16:37:17 +0200 Subject: [PATCH 1/3] [FIX] res.partner: missing index on `parent_id` column bzr revid: odo@openerp.com-20140403143717-dy2bszaevsyivryo --- openerp/addons/base/res/res_partner.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py index d66c69daaa7..5d97311c01d 100644 --- a/openerp/addons/base/res/res_partner.py +++ b/openerp/addons/base/res/res_partner.py @@ -216,7 +216,7 @@ class res_partner(osv.osv, format_address): 'name': fields.char('Name', size=128, required=True, select=True), 'date': fields.date('Date', select=1), 'title': fields.many2one('res.partner.title', 'Title'), - 'parent_id': fields.many2one('res.partner', 'Related Company'), + 'parent_id': fields.many2one('res.partner', 'Related Company', select=True), 'child_ids': fields.one2many('res.partner', 'parent_id', 'Contacts', domain=[('active','=',True)]), # force "active_test" domain to bypass _search() override 'ref': fields.char('Reference', size=64, select=1), 'lang': fields.selection(_lang_get, 'Language', From a59b438ceb469857a75cff9c13d626dbf206a49d Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Thu, 3 Apr 2014 16:58:15 +0200 Subject: [PATCH 2/3] [FIX] share: at module init force re-generation of the user groups view without the shared groups bzr revid: chs@openerp.com-20140403145815-i3q3cprl2rvdfunf --- addons/share/res_users.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/addons/share/res_users.py b/addons/share/res_users.py index 25fd25c234f..9f0a47c6674 100644 --- a/addons/share/res_users.py +++ b/addons/share/res_users.py @@ -19,6 +19,7 @@ # ############################################################################## from openerp.osv import fields, osv +from openerp import SUPERUSER_ID class res_groups(osv.osv): _name = "res.groups" @@ -28,6 +29,10 @@ class res_groups(osv.osv): help="Group created to set access rights for sharing data with some users.") } + def init(self, cr): + # force re-generation of the user groups view without the shared groups + self.update_user_groups_view(cr, SUPERUSER_ID) + def get_application_groups(self, cr, uid, domain=None, context=None): if domain is None: domain = [] From c6b281c3f00599ca3d6e45bccdf62fbbca46262d Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Thu, 3 Apr 2014 17:31:29 +0200 Subject: [PATCH 3/3] [FIX] share: move inheritance from res.user before the one from res.groups because res.groups need the change on res.users in its init() function. [FIX] share: call parent init() if present in res.groups bzr revid: chs@openerp.com-20140403153129-jq9zc7ityoy25c73 --- addons/share/res_users.py | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/addons/share/res_users.py b/addons/share/res_users.py index 9f0a47c6674..fb0dd163b6e 100644 --- a/addons/share/res_users.py +++ b/addons/share/res_users.py @@ -21,6 +21,14 @@ from openerp.osv import fields, osv from openerp import SUPERUSER_ID +class res_users(osv.osv): + _name = 'res.users' + _inherit = 'res.users' + _columns = { + 'share': fields.boolean('Share User', readonly=True, + help="External user with limited access, created only for the purpose of sharing data.") + } + class res_groups(osv.osv): _name = "res.groups" _inherit = 'res.groups' @@ -32,6 +40,9 @@ class res_groups(osv.osv): def init(self, cr): # force re-generation of the user groups view without the shared groups self.update_user_groups_view(cr, SUPERUSER_ID) + parent_class = super(res_groups, self) + if hasattr(parent_class, 'init'): + parent_class.init(cr) def get_application_groups(self, cr, uid, domain=None, context=None): if domain is None: @@ -39,15 +50,5 @@ class res_groups(osv.osv): domain.append(('share', '=', False)) return super(res_groups, self).get_application_groups(cr, uid, domain=domain, context=context) -res_groups() - -class res_users(osv.osv): - _name = 'res.users' - _inherit = 'res.users' - _columns = { - 'share': fields.boolean('Share User', readonly=True, - help="External user with limited access, created only for the purpose of sharing data.") - } -res_users() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: