odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[REF] base.sql, web_services: propagated changes in res.users model (lang, not context_lang anymore; tz, not context_tz. 

bzr revid: tde@openerp.com-20120810081836-y4f2nsft9g7p4hl6
This commit is contained in:
Thibault Delavallée 2012-08-10 10:18:36 +02:00
parent f904ae3752
commit d0b4f8413c
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openerp/addons/base/base.sql
View File

@ -150,10 +150,8 @@ CREATE TABLE res_users (
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,
@ -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,name,active,company_id,lang) values (1,'admin','admin','Administrator',True,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

6
openerp/service/web_services.py
View File

@ -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 ' \
' 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