From 2da4b1b3f5ed22289fb8db6d664b4e5dabd12810 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 10 Aug 2012 16:05:49 +0200 Subject: [PATCH] [FIX] base.sql: added a partner_id integer field on res.users, to avoid the ORM being unable to set a not null constraint on it. bzr revid: tde@openerp.com-20120810140549-w70l7nzwn4kt1oav --- openerp/addons/base/base.sql | 3 ++- openerp/addons/base/res/res_users.py | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/openerp/addons/base/base.sql b/openerp/addons/base/base.sql index 7b532736165..c6ca6dbb76d 100644 --- a/openerp/addons/base/base.sql +++ b/openerp/addons/base/base.sql @@ -155,6 +155,7 @@ CREATE TABLE res_users ( -- 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); @@ -383,7 +384,7 @@ CREATE TABLE ir_model_relation ( -- Users --------------------------------- -insert into res_users (id,login,password,name,active,company_id,lang) values (1,'admin','admin','Administrator',True,1,'en_US'); +insert into res_users (id,login,password,name,active,company_id,partner_id,lang) values (1,'admin','admin','Administrator',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 diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py index 93291cb2bdd..ab3674a09d9 100644 --- a/openerp/addons/base/res/res_users.py +++ b/openerp/addons/base/res/res_users.py @@ -152,13 +152,13 @@ class users(osv.osv): # 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}), - 'context_company_id': fields.many2one('res.company', 'Company', required=True, - help='The company this user is currently working for.', context={'user_preference': True}), + # 'context_company_id': fields.many2one('res.company', 'Company', required=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'), # backward compatibility fields 'user_email': fields.related('email', type='char', deprecated='Use the email field instead of user_email. This field will be removed as of OpenERP 7.1.'), - 'date': fields.related('date', type='date', + 'date': fields.related('date', type='date', store=True, deprecated='use the login_date field instead of date. This field will be removed as of OpenERP 7.1.'), }