-
-
Notifications
You must be signed in to change notification settings - Fork 410
OLD 7.0 2015 01 16
Xavier Brochard edited this page Oct 29, 2021
·
1 revision
Conflict:
diff --cc openerp/addons/base/res/res_users.py
index e1ce2e5,0e48898..0000000
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@@ -705,10 -705,9 +705,16 @@@ class groups_view(osv.osv)
def update_user_groups_view(self, cr, uid, context=None):
# the view with id 'base.user_groups_view' inherits the user form view,
# and introduces the reified group fields
++<<<<<<< HEAD
+ if context is None:
+ context = {}
+ if not context or context.get('install_mode'):
+ context = dict(context)
++=======
+ if not context or context.get('install_mode'):
+ # use installation/admin language for translatable names in the view
+ context = dict(context or {})
++>>>>>>> odoo/7.0
context.update(self.pool['res.users'].context_get(cr, uid))
view = self.get_user_groups_view(cr, uid, context)
if view:
resolved as:
diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index e1ce2e5..0e48898 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -705,10 +705,9 @@ class groups_view(osv.osv):
def update_user_groups_view(self, cr, uid, context=None):
# the view with id 'base.user_groups_view' inherits the user form view,
# and introduces the reified group fields
- if context is None:
- context = {}
if not context or context.get('install_mode'):
- context = dict(context)
+ # use installation/admin language for translatable names in the view
+ context = dict(context or {})
context.update(self.pool['res.users'].context_get(cr, uid))
view = self.get_user_groups_view(cr, uid, context)
if view:
(basically reverting https://github.com/OCA/OCB/commit/df635820d and use https://github.com/odoo/odoo/commit/894143cb4ceaff068dcc3f01f419276156229d95)
Committed as https://github.com/OCA/OCB/commit/fbb986be30f025d82f87a640b6e40db82ff63ee8 by @hbrunn
Website | Online Demo | Community | Documentation | Help