[MERGE] res.users inherits res.partner

bzr revid: al@openerp.com-20120815184824-uupx3d3o0ldr70f0

openerp/addons/base/base.sql

@@ -146,17 +146,15 @@ select setval('ir_ui_menu_id_seq', 2);
 
 CREATE TABLE res_users (
     id serial NOT NULL,
-    name varchar(64) not null,
     active boolean default True,
     login varchar(64) NOT NULL UNIQUE,
     password varchar(64) default null,
-    email varchar(64) default null,
-    context_tz varchar(64) default null,
-    signature text,
-    context_lang varchar(64) default '',
+    tz varchar(64) default null,
+    lang varchar(64) default '',
     -- No FK references below, will be added later by ORM
     -- (when the destination rows exist)
     company_id int,
+    partner_id int,
     primary key(id)
 );
 alter table res_users add constraint res_users_login_uniq unique (login);
@@ -385,7 +383,7 @@ CREATE TABLE ir_model_relation (
 -- Users
 ---------------------------------
 
-insert into res_users (id,login,password,name,active,company_id,context_lang) values (1,'admin','admin','Administrator',True,1,'en_US');
+insert into res_users (id,login,password,active,company_id,partner_id,lang) values (1,'admin','admin',True,1,1,'en_US');
 insert into ir_model_data (name,module,model,noupdate,res_id) values ('user_root','base','res.users',True,1);
 
 -- Compatibility purpose, to remove V6.0

openerp/addons/base/base_data.xml

@@ -1094,19 +1094,23 @@
             <field name="currency_id" ref="base.EUR"/>
         </record>
 
-        <record model="res.users" id="base.user_root">
-            <field name="signature">Administrator</field>
+        <record model="res.partner" id="base.partner_root">
+            <field name="name">Administrator</field>
+            <field name="company_id" ref="main_company"/>
+            <field name="customer" eval="False"/>
+        </record>
+
+        <record model="res.users" id="base.user_root">
+            <field name="partner_id" ref="base.partner_root"/>
             <field name="company_id" ref="main_company"/>
-            <field name="menu_id" ref="action_menu_admin"/>
             <field name="company_ids" eval="[(4, ref('main_company'))]"/>
+            <field name="menu_id" ref="action_menu_admin"/>
+            <field name="signature">Administrator</field>
         </record>
 
         <record id="main_partner" model="res.partner">
             <field name="company_id" ref="main_company"/>
         </record>
-        <record id="EUR" model="res.currency">
-            <field name="company_id" ref="main_company"/>
-        </record>
 
         <!-- The Following currency rates are considered as on 1st Jan,2010 against EUR. -->
         <!-- Currencies -->

openerp/addons/base/ir/ir_actions.py

@@ -625,8 +625,8 @@ class actions_server(osv.osv):
 
                 if not email_from:
                     _logger.debug('--email-from command line option is not specified, using a fallback value instead.')
-                    if user.user_email:
-                        email_from = user.user_email
+                    if user.email:
+                        email_from = user.email
                     else:
                         email_from = "%s@%s" % (user.login, gethostname())
 

openerp/addons/base/publisher_warranty/publisher_warranty.py

@@ -86,7 +86,7 @@ class publisher_warranty_contract(osv.osv):
             db_create_date = self.pool.get('ir.config_parameter').get_param(cr, uid, 'database.create_date')
             user = self.pool.get("res.users").browse(cr, uid, uid)
             user_name = user.name
-            email = user.user_email
+            email = user.email
 
             msg = {'contract_name': valid_contract.name,
                 'tb': tb,
@@ -333,7 +333,7 @@ def get_sys_logs(cr, uid):
         "db_create_date": db_create_date,
         "version": release.version,
         "contracts": [c.name for c in contracts],
-        "language": user.context_lang,
+        "language": user.lang,
     }
 
     add_arg = {"timeout":30} if sys.version_info >= (2,6) else {}

openerp/addons/base/res/res_company.py

@@ -149,11 +149,9 @@ class res_company(osv.osv):
 
     def _search(self, cr, uid, args, offset=0, limit=None, order=None,
             context=None, count=False, access_rights_uid=None):
-
         if context is None:
             context = {}
-        user_preference = context.get('user_preference', False)
-        if user_preference:
+        if context.get('user_preference'):
             # We browse as superuser. Otherwise, the user would be able to
             # select only the currently visible companies (according to rules,
             # which are probably to allow to see the child companies) even if

openerp/addons/base/res/res_partner.py

@@ -20,6 +20,7 @@
 ##############################################################################
 
 import math
+import openerp
 import os
 from osv import osv, fields
 import re
@@ -27,6 +28,10 @@ import tools
 from tools.translate import _
 import logging
 import pooler
+import pytz
+
+def _tz_get(self,cr,uid, context=None):
+    return [(x, x) for x in pytz.all_timezones]
 
 class res_payterm(osv.osv):
     _description = 'Payment term'
@@ -150,7 +155,12 @@ class res_partner(osv.osv):
         'parent_id': fields.many2one('res.partner', 'Owned by'),
         'child_ids': fields.one2many('res.partner', 'parent_id', 'Contacts'),
         'ref': fields.char('Reference', size=64, select=1),
-        'lang': fields.selection(_lang_get, 'Language', help="If the selected language is loaded in the system, all documents related to this partner will be printed in this language. If not, it will be english."),
+        'lang': fields.selection(_lang_get, 'Language',
+            help="If the selected language is loaded in the system, all documents related to this partner will be printed in this language. If not, it will be english."),
+        'tz': fields.selection(_tz_get,  'Timezone', size=64,
+            help="The partner's timezone, used to output proper date and time values inside printed reports. "
+                 "It is important to set a value for this field. You should use the same timezone "
+                 "that is otherwise used to pick and render date and time values: your computer's timezone."),
         'user_id': fields.many2one('res.users', 'Salesperson', help='The internal user that is in charge of communicating with this partner if any.'),
         'vat': fields.char('VAT',size=32 ,help="Value Added Tax number. Check the box if the partner is subjected to the VAT. Used by the VAT legal statement."),
         'bank_ids': fields.one2many('res.partner.bank', 'partner_id', 'Banks'),
@@ -165,10 +175,10 @@ class res_partner(osv.osv):
         'supplier': fields.boolean('Supplier', help="Check this box if the partner is a supplier. If it's not checked, purchase people will not see it when encoding a purchase order."),
         'employee': fields.boolean('Employee', help="Check this box if the partner is an Employee."),
         'function': fields.char('Job Position', size=128),
-        'type': fields.selection( [('default','Default'),('invoice','Invoice'),
+        'type': fields.selection( [('default','Default'), ('invoice','Invoice'),
                                    ('delivery','Delivery'), ('contact','Contact'),
-                                   ('other','Other')],
-                   'Address Type', help="Used to select automatically the right address according to the context in sales and purchases documents."),
+                                   ('other', 'Other')], 'Address Type',
+            help="Used to select automatically the right address according to the context in sales and purchases documents."),
         'street': fields.char('Street', size=128),
         'street2': fields.char('Street2', size=128),
         'zip': fields.char('Zip', change_default=True, size=24),
@@ -217,13 +227,15 @@ class res_partner(osv.osv):
 
     def _get_default_image(self, cr, uid, is_company, context=None):
         if is_company:
-            image_path = os.path.join( tools.config['root_path'], 'addons', 'base', 'res', 'company_icon.png')
+            image_path = openerp.modules.get_module_resource('base', 'static/src/img', 'company_image.png')
         else:
-            image_path = os.path.join( tools.config['root_path'], 'addons', 'base', 'res', 'photo.png')
+            image_path = openerp.modules.get_module_resource('base', 'static/src/img', 'partner_image.png')
         return tools.image_resize_image_big(open(image_path, 'rb').read().encode('base64'))
 
     _defaults = {
         'active': True,
+        'lang': lambda self, cr, uid, context: context.get('lang', 'en_US'),
+        'tz': lambda self, cr, uid, context: context.get('tz', False),
         'customer': True,
         'category_id': _default_category,
         'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'res.partner', context=c),

openerp/addons/base/res/res_partner_view.xml

@@ -95,7 +95,7 @@
             <field name="arch" type="xml">
                 <form string="Partners" version="7.0">
                 <sheet>
-                    <field name="image_small" widget='image' class="oe_avatar oe_left"/>
+                    <field name="image_medium" widget='image' class="oe_avatar oe_left"/>
                     <div class="oe_title">
                         <div class="oe_edit_only">
                             <label for="name"/> (

openerp/addons/base/res/res_users.py

@@ -20,11 +20,9 @@
 #
 ##############################################################################
 
-import logging
+
 from functools import partial
-
-import pytz
-
+import logging
 from lxml import etree
 from lxml.builder import E
 import netsvc
@@ -96,59 +94,22 @@ class groups(osv.osv):
 
 groups()
 
-def _lang_get(self, cr, uid, context=None):
-    obj = self.pool.get('res.lang')
-    ids = obj.search(cr, uid, [('translatable','=',True)])
-    res = obj.read(cr, uid, ids, ['code', 'name'], context=context)
-    res = [(r['code'], r['name']) for r in res]
-    return res
+class res_users(osv.osv):
+    """ User class. A res.users record models an OpenERP user and is different
+        from an employee.
 
-def _tz_get(self,cr,uid, context=None):
-    return [(x, x) for x in pytz.all_timezones]
-
-class users(osv.osv):
+        res.users class now inherits from res.partner. The partner model is
+        used to store the data related to the partner: lang, name, address,
+        avatar, ... The user model is now dedicated to technical data.
+    """
     __admin_ids = {}
     _uid_cache = {}
+    _inherits = {
+        'res.partner': 'partner_id',
+    }
     _name = "res.users"
     _description = 'Users'
-    _order = 'name'
-
-    WELCOME_MAIL_SUBJECT = u"Welcome to OpenERP"
-    WELCOME_MAIL_BODY = u"An OpenERP account has been created for you, "\
-        "\"%(name)s\".\n\nYour login is %(login)s, "\
-        "you should ask your supervisor or system administrator if you "\
-        "haven't been given your password yet.\n\n"\
-        "If you aren't %(name)s, this email reached you errorneously, "\
-        "please delete it."
-
-    def get_welcome_mail_subject(self, cr, uid, context=None):
-        """ Returns the subject of the mail new users receive (when
-        created via the res.config.users wizard), default implementation
-        is to return config_users.WELCOME_MAIL_SUBJECT
-        """
-        return self.WELCOME_MAIL_SUBJECT
-    def get_welcome_mail_body(self, cr, uid, context=None):
-        """ Returns the subject of the mail new users receive (when
-        created via the res.config.users wizard), default implementation
-        is to return config_users.WELCOME_MAIL_BODY
-        """
-        return self.WELCOME_MAIL_BODY
-
-    def get_current_company(self, cr, uid):
-        cr.execute('select company_id, res_company.name from res_users left join res_company on res_company.id = company_id where res_users.id=%s' %uid)
-        return cr.fetchall()
-
-    def send_welcome_email(self, cr, uid, id, context=None):
-        if isinstance(id,list): id = id[0]
-        user = self.read(cr, uid, id, ['email','login','name', 'user_email'], context=context)
-        email = user['email'] or user['user_email']
-
-        ir_mail_server = self.pool.get('ir.mail_server')
-        msg = ir_mail_server.build_email(email_from=None, # take config default
-                                         email_to=[email],
-                                         subject=self.get_welcome_mail_subject(cr, uid, context=context),
-                                         body=(self.get_welcome_mail_body(cr, uid, context=context) % user))
-        return ir_mail_server.send_email(cr, uid, msg, context=context)
+    _order = 'login'
 
     def _set_new_password(self, cr, uid, id, name, value, args, context=None):
         if value is False:
@@ -164,85 +125,67 @@ class users(osv.osv):
 
     def _get_password(self, cr, uid, ids, arg, karg, context=None):
         return dict.fromkeys(ids, '')
-
-    def _get_image(self, cr, uid, ids, name, args, context=None):
-        result = dict.fromkeys(ids, False)
-        for obj in self.browse(cr, uid, ids, context=context):
-            result[obj.id] = tools.image_get_resized_images(obj.image)
-        return result
-    
-    def _set_image(self, cr, uid, id, name, value, args, context=None):
-        return self.write(cr, uid, [id], {'image': tools.image_resize_image_big(value)}, context=context)
     
     _columns = {
         'id': fields.integer('ID'),
-        'name': fields.char('User Name', size=64, required=True, select=True,
-                            help="The new user's real name, used for searching"
-                                 " and most listings"),
+        'login_date': fields.date('Latest connection', select=1),
+        'partner_id': fields.many2one('res.partner', required=True,
+            string='Related Partner', ondelete='cascade',
+            help='Partner-related data of the user'),
         'login': fields.char('Login', size=64, required=True,
-                             help="Used to log into the system"),
-        'password': fields.char('Password', size=64, invisible=True, help="Keep empty if you don't want the user to be able to connect on the system."),
+            help="Used to log into the system"),
+        'password': fields.char('Password', size=64, invisible=True,
+            help="Keep empty if you don't want the user to be able to connect on the system."),
         'new_password': fields.function(_get_password, type='char', size=64,
-                                fnct_inv=_set_new_password,
-                                string='Set Password', help="Specify a value only when creating a user or if you're changing the user's password, "
-                                                            "otherwise leave empty. After a change of password, the user has to login again."),
-        'user_email': fields.char('Email', size=64),
+            fnct_inv=_set_new_password, string='Set Password',
+            help="Specify a value only when creating a user or if you're "\
+                 "changing the user's password, otherwise leave empty. After "\
+                 "a change of password, the user has to login again."),
         'signature': fields.text('Signature', size=64),
-        'image': fields.binary("Avatar",
-            help="This field holds the image used as avatar for the "\
-                 "user. The image is base64 encoded, and PIL-supported. "\
-                 "It is limited to a 1024x1024 px image."),
-        'image_medium': fields.function(_get_image, fnct_inv=_set_image,
-            string="Medium-sized avatar", type="binary", multi="_get_image",
-            store = {
-                'res.users': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
-            },
-            help="Medium-sized image of the user. It is automatically "\
-                 "resized as a 180x180 px image, with aspect ratio preserved. "\
-                 "Use this field in form views or some kanban views."),
-        'image_small': fields.function(_get_image, fnct_inv=_set_image,
-            string="Smal-sized avatar", type="binary", multi="_get_image",
-            store = {
-                'res.users': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
-            },
-            help="Small-sized image of the user. It is automatically "\
-                 "resized as a 50x50 px image, with aspect ratio preserved. "\
-                 "Use this field anywhere a small image is required."),
         'active': fields.boolean('Active'),
         'action_id': fields.many2one('ir.actions.actions', 'Home Action', help="If specified, this action will be opened at logon for this user, in addition to the standard menu."),
         'menu_id': fields.many2one('ir.actions.actions', 'Menu Action', help="If specified, the action will replace the standard menu for this user."),
         'groups_id': fields.many2many('res.groups', 'res_groups_users_rel', 'uid', 'gid', 'Groups'),
-
         # Special behavior for this field: res.company.search() will only return the companies
         # available to the current user (should be the user's companies?), when the user_preference
         # context is set.
         'company_id': fields.many2one('res.company', 'Company', required=True,
-            help="The company this user is currently working for.", context={'user_preference': True}),
-
+            help='The company this user is currently working for.', context={'user_preference': True}),
         'company_ids':fields.many2many('res.company','res_company_users_rel','user_id','cid','Companies'),
-        'context_lang': fields.selection(_lang_get, 'Language', required=True,
-            help="The default language used in the graphical user interface, when translations are available. To add a new language, you can use the 'Load a Translation' wizard available from the 'Administration' menu."),
-        'context_tz': fields.selection(_tz_get,  'Timezone', size=64,
-            help="The user's timezone, used to output proper date and time values inside printed reports. "
-                 "It is important to set a value for this field. You should use the same timezone "
-                 "that is otherwise used to pick and render date and time values: your computer's timezone."),
-        'date': fields.datetime('Latest Connection', readonly=True),
+        # backward compatibility fields
+        'user_email': fields.related('email', type='char',
+            deprecated='Use the email field instead of user_email. This field will be removed with OpenERP 7.1.'),
     }
 
     def on_change_company_id(self, cr, uid, ids, company_id):
-        return {
-                'warning' : {
+        return {'warning' : {
                     'title': _("Company Switch Warning"),
                     'message': _("Please keep in mind that documents currently displayed may not be relevant after switching to another company. If you have unsaved changes, please make sure to save and close all forms before switching to a different company. (You can click on Cancel in the User Preferences now)"),
                 }
         }
 
+    def onchange_type(self, cr, uid, ids, is_company, context=None):
+        """ Wrapper on the user.partner onchange_type, because some calls to the
+            partner form view applied to the user may trigger the
+            partner.onchange_type method, but applied to the user object.
+        """
+        partner_ids = [user.partner_id.id for user in self.browse(cr, uid, ids, context=context)]
+        return self.pool.get('res.partner').onchange_type(cr, uid, partner_ids, is_company, context=context)
+
+    def onchange_address(self, cr, uid, ids, use_parent_address, parent_id, context=None):
+        """ Wrapper on the user.partner onchange_address, because some calls to the
+            partner form view applied to the user may trigger the
+            partner.onchange_type method, but applied to the user object.
+        """
+        partner_ids = [user.partner_id.id for user in self.browse(cr, uid, ids, context=context)]
+        return self.pool.get('res.partner').onchange_address(cr, uid, partner_ids, use_parent_address, parent_id, context=context)
+
     def read(self,cr, uid, ids, fields=None, context=None, load='_classic_read'):
         def override_password(o):
             if 'password' in o and ( 'id' not in o or o['id'] != uid ):
                 o['password'] = '********'
             return o
-        result = super(users, self).read(cr, uid, ids, fields, context, load)
+        result = super(res_users, self).read(cr, uid, ids, fields, context, load)
         canwrite = self.pool.get('ir.model.access').check(cr, uid, 'res.users', 'write', False)
         if not canwrite:
             if isinstance(ids, (int, float)):
@@ -263,21 +206,10 @@ class users(osv.osv):
         ('login_key', 'UNIQUE (login)',  'You can not have two users with the same login !')
     ]
 
-    def _get_email_from(self, cr, uid, ids, context=None):
-        if not isinstance(ids, list):
-            ids = [ids]
-        res = dict.fromkeys(ids, False)
-        for user in self.browse(cr, uid, ids, context=context):
-            if user.user_email:
-                res[user.id] = "%s <%s>" % (user.name, user.user_email)
-        return res
-
-    def _get_admin_id(self, cr):
-        if self.__admin_ids.get(cr.dbname) is None:
-            ir_model_data_obj = self.pool.get('ir.model.data')
-            mdid = ir_model_data_obj._get_id(cr, 1, 'base', 'user_root')
-            self.__admin_ids[cr.dbname] = ir_model_data_obj.read(cr, 1, [mdid], ['res_id'])[0]['res_id']
-        return self.__admin_ids[cr.dbname]
+    def _get_default_image(self, cr, uid, context=None):
+        """ Override of res.partner: multicolor avatars ! """
+        image_path = openerp.modules.get_module_resource('base', 'static/src/img', 'avatar%d.png' % random.randint(0, 6))
+        return tools.image_resize_image_big(open(image_path, 'rb').read().encode('base64'))
 
     def _get_company(self,cr, uid, context=None, uid2=False):
         if not uid2:
@@ -315,27 +247,29 @@ class users(osv.osv):
             pass
         return result
 
-    def _get_default_image(self, cr, uid, context=None):
-        # default image file name: avatar0 -> avatar6.png, choose randomly
-        image_path = openerp.modules.get_module_resource('base', 'static/src/img', 'avatar%d.png' % random.randint(0, 6))
-        return tools.image_resize_image_big(open(image_path, 'rb').read().encode('base64'))
-
     _defaults = {
         'password' : '',
-        'context_lang': lambda self, cr, uid, context: context.get('lang', 'en_US'),
-        'context_tz': lambda self, cr, uid, context: context.get('tz', False),
-        'image': _get_default_image,
-        'image_small': _get_default_image,
-        'image_medium': _get_default_image,
         'active' : True,
+        'customer': False,
         'menu_id': _get_menu,
         'company_id': _get_company,
         'company_ids': _get_companies,
         'groups_id': _get_group,
+        'image': lambda self, cr, uid, context: self._get_default_image(cr, uid, context),
     }
 
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+        """ Override of res.users fields_view_get.
+            - if the view is specified: resume with normal behavior
+            - else: the default view is overrided and redirected to the partner
+              view
+        """
+        if not view_id and view_type == 'form':
+            return self.pool.get('res.partner').fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu)
+        return super(res_users, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu)
+
     # User can write to a few of her own fields (but not her groups for example)
-    SELF_WRITEABLE_FIELDS = ['password', 'signature', 'action_id', 'company_id', 'user_email', 'name', 'image', 'image_medium', 'image_small']
+    SELF_WRITEABLE_FIELDS = ['password', 'signature', 'action_id', 'company_id', 'email', 'name', 'image', 'image_medium', 'image_small']
 
     def write(self, cr, uid, ids, values, context=None):
         if not hasattr(ids, '__iter__'):
@@ -350,7 +284,7 @@ class users(osv.osv):
                         del values['company_id']
                 uid = 1 # safe fields only, so we write as super-user to bypass access rights
 
-        res = super(users, self).write(cr, uid, ids, values, context=context)
+        res = super(res_users, self).write(cr, uid, ids, values, context=context)
 
         # clear caches linked to the users
         self.pool.get('ir.model.access').call_cache_clearing_methods(cr)
@@ -372,7 +306,7 @@ class users(osv.osv):
             for id in ids:
                 if id in self._uid_cache[db]:
                     del self._uid_cache[db][id]
-        return super(users, self).unlink(cr, uid, ids, context=context)
+        return super(res_users, self).unlink(cr, uid, ids, context=context)
 
     def name_search(self, cr, user, name='', args=None, operator='ilike', context=None, limit=100):
         if not args:
@@ -395,17 +329,23 @@ class users(osv.osv):
                        name=(copy_pattern % user2copy['name']),
                        )
         copydef.update(default)
-        return super(users, self).copy(cr, uid, id, copydef, context)
+        return super(res_users, self).copy(cr, uid, id, copydef, context)
 
     def context_get(self, cr, uid, context=None):
         user = self.browse(cr, uid, uid, context)
         result = {}
-        for k in self._columns.keys():
+        for k in self._all_columns.keys():
             if k.startswith('context_'):
+                context_key = k[8:]
+            elif k in ['lang', 'tz']:
+                context_key = k
+            else:
+                context_key = False
+            if context_key:
                 res = getattr(user,k) or False
                 if isinstance(res, browse_record):
                     res = res.id
-                result[k[8:]] = res or False
+                result[context_key] = res or False
         return result
 
     def action_get(self, cr, uid, context=None):
@@ -460,7 +400,7 @@ class users(osv.osv):
                                 AND active FOR UPDATE NOWAIT""",
                        (tools.ustr(login), tools.ustr(password)))
             cr.execute("""UPDATE res_users
-                            SET date = now() AT TIME ZONE 'UTC'
+                            SET login_date = now() AT TIME ZONE 'UTC'
                             WHERE login=%s AND password=%s AND active
                             RETURNING id""",
                        (tools.ustr(login), tools.ustr(password)))
@@ -565,9 +505,6 @@ class users(osv.osv):
                    (uid, module, ext_id))
         return bool(cr.fetchone())
 
-users()
-
-
 
 #
 # Extension of res.groups and res.users with a relation for "implied" or 

openerp/addons/base/res/res_users_view.xml

@@ -109,8 +109,8 @@
                             <page string="Preferences">
                                 <group>
                                     <group name="preferences">
-                                        <field name="context_lang"/>
-                                        <field name="context_tz"/>
+                                        <field name="lang"/>
+                                        <field name="tz"/>
                                     </group>
                                     <group groups="base.group_no_one">
                                         <field name="action_id"/>
@@ -118,7 +118,7 @@
                                     </group>
                                 </group>
                                 <group>
-                                    <field name="user_email" widget="email"/>
+                                    <field name="email" widget="email"/>
                                     <field name="signature"/>
                                 </group>
                             </page>
@@ -142,7 +142,7 @@
                 <tree string="Users">
                     <field name="name"/>
                     <field name="login"/>
-                    <field name="context_lang"/>
+                    <field name="lang"/>
                     <field name="date"/>
                 </tree>
             </field>
@@ -203,15 +203,15 @@
                         (<field name="login" readonly="1" class="oe_inline"/>)
                     </h1>
                     <group name="preferences" col="4">
-                        <field name="context_lang" readonly="0"/>
+                        <field name="lang" readonly="0"/>
                         <field name="company_id" readonly="0"
                             groups="base.group_multi_company" on_change="on_change_company_id(company_id)"/>
-                        <field name="context_tz" readonly="0"/>
+                        <field name="tz" readonly="0"/>
                         <field name="company_id" widget="selection" readonly="0"
                             groups="base.group_multi_company" on_change="on_change_company_id(company_id)"/>
                     </group>
                     <group string="Email Preferences">
-                        <field name="user_email" widget="email" readonly="0"/>
+                        <field name="email" widget="email" readonly="0"/>
                         <field name="signature" readonly="0"/>
                     </group>
                     <footer>

openerp/service/web_services.py

@@ -75,10 +75,10 @@ def _initialize_db(serv, id, db_name, demo, lang, user_password):
             mids = modobj.search(cr, 1, [('state', '=', 'installed')])
             modobj.update_translations(cr, 1, mids, lang)
 
-        cr.execute('UPDATE res_users SET password=%s, context_lang=%s, active=True WHERE login=%s', (
+        cr.execute('UPDATE res_users SET password=%s, lang=%s, active=True WHERE login=%s', (
             user_password, lang, 'admin'))
-        cr.execute('SELECT login, password, name ' \
-                   '  FROM res_users ' \
+        cr.execute('SELECT login, password ' \
+                   ' FROM res_users ' \
                    ' ORDER BY login')
         serv.actions[id].update(users=cr.dictfetchall(), clean=True)
         cr.commit()
@@ -425,7 +425,7 @@ OpenERP is an ERP+CRM program for small and medium businesses.
 The whole source code is distributed under the terms of the
 GNU Public Licence.
 
-(c) 2003-TODAY, Fabien Pinckaers - Tiny sprl''')
+(c) 2003-TODAY - OpenERP SA''')
 
         if extended:
             return info, release.version