Merge lp:~therp-nl/ocb-server/6.1-lp1431839_cannot_create_database into lp:ocb-server/6.1

[Ronald Portier (Therp)]

Needed after revision 4330 when creating new database.

Prevents crash of new database creation, because user is originally created with company_id = 1, while company database still completely empty.

[Pedro Manuel Baeza (pedro.baeza)]

This happens also on upstream?

[Holger Brunn (Therp) (hbrunn)]

little remark: Filling in incomplete data here is okay because the real data is filled in in base.xml. And given that we're in init mode, also noupdate records (like main_company) are overwritten

review: Approve (code review)

[Pedro Manuel Baeza (pedro.baeza)]

LGTM

review: Approve (code review)

[Ronald Portier (Therp) (rportier1962)]

@Pedro I do not think it will happen upstream, as the offending revision (which by itself is a welcome improvement) is only on OCB.

[Pedro Manuel Baeza (pedro.baeza)]

@Ronald, I understand. Thanks for the info.

=== modified file 'openerp/addons/base/base.sql'
--- openerp/addons/base/base.sql	2012-03-07 13:05:26 +0000
+++ openerp/addons/base/base.sql	2015-03-13 13:04:31 +0000
@@ -348,9 +348,11 @@
 );
 
 ---------------------------------
--- Users
+-- Company and Users
 ---------------------------------
 
+insert into res_company (id,name) values (1,'Your Company');
+insert into ir_model_data (name,module,model,noupdate,res_id) values ('main_company','base','res.company',True,1);
 insert into res_users (id,login,password,name,active,company_id,context_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);