diff options
| author | Harry (OpenERP) <hmo@tinyerp.com> | 2010-10-05 14:24:14 +0530 |
|---|---|---|
| committer | Harry (OpenERP) <hmo@tinyerp.com> | 2010-10-05 14:24:14 +0530 |
| commit | 6ba07005eb8aaf656ae4738c1528485cbdd4fdbf (patch) | |
| tree | 46b46cd447a75993364a09a20e70066c4a6f8564 /bin/addons/base/base.sql | |
| parent | baba6829dc1586acf86eb845eb0be727bed62b13 (diff) | |
| parent | 863766e16afe32b046e5e5bf0f7e0a6384be025b (diff) | |
[MERGE] merged from openobject-server branch
bzr revid: hmo@tinyerp.com-20101005085414-u0eni6ot4lshvmps
Diffstat (limited to 'bin/addons/base/base.sql')
| -rw-r--r-- | bin/addons/base/base.sql | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/bin/addons/base/base.sql b/bin/addons/base/base.sql index 84676a7f59b..eb9eb5b9d75 100644 --- a/bin/addons/base/base.sql +++ b/bin/addons/base/base.sql @@ -148,7 +148,6 @@ CREATE TABLE res_users ( context_lang varchar(64) default '', -- No FK references below, will be added later by ORM -- (when the destination rows exist) - action_id int, company_id int, primary key(id) ); @@ -345,7 +344,7 @@ CREATE TABLE ir_model_data ( -- Users --------------------------------- -insert into res_users (id,login,password,name,action_id,active,company_id) values (1,'admin','admin','Administrator',NULL,True,1); +insert into res_users (id,login,password,name,active,company_id) values (1,'admin','admin','Administrator',True,1); 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 |