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

merge 

bzr revid: christophe@tinyerp.com-20080903094811-r4ip70uyybbhynib
This commit is contained in:
Christophe Simonis 2008-09-03 11:48:11 +02:00
parent fe13a01ae9 118db0735c
commit d5090a151f
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bin/addons/base/base.sql
View File

@ -328,6 +328,11 @@ CREATE TABLE ir_model_data (
---------------------------------
-- Users
---------------------------------
insert into res_users (id,login,password,name,action_id,active) values (1,'admin','admin','Administrator',NULL,True);
insert into res_users (id,login,password,name,action_id,active) values (1,'admin',NULL,'Administrator',NULL,True);
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
insert into ir_model_data (name,module,model,noupdate,res_id) values ('user_admin','base','res.users',True,1);
select setval('res_users_id_seq', 2);

1
bin/service/web_services.py
View File

@ -98,6 +98,7 @@ class db(netsvc.Service):
'from res_users ' \
'order by login')
serv.actions[id]['users'] = cr.dictfetchall()
cr.commit()
cr.close()
except Exception, e:
serv.actions[id]['clean'] = False