diff --git a/addons/product/data/product_demo.xml b/addons/product/data/product_demo.xml
index 9aa1f0a07df..ab215f07807 100644
--- a/addons/product/data/product_demo.xml
+++ b/addons/product/data/product_demo.xml
@@ -85,7 +85,6 @@
             <field name="uom_id" ref="uom.product_uom_unit"/>
             <field name="uom_po_id" ref="uom.product_uom_unit"/>
             <field name="default_code">PROD_DEL</field>
-            <field name="company_id"></field>
         </record>
 
         <record id="product_delivery_02" model="product.product">
@@ -97,7 +96,6 @@
             <field name="uom_id" ref="uom.product_uom_unit"/>
             <field name="uom_po_id" ref="uom.product_uom_unit"/>
             <field name="default_code">PROD_DEL02</field>
-            <field name="company_id"></field>
         </record>
 
         <record id="product_order_01" model="product.product">
@@ -260,7 +258,6 @@
             <field name="uom_po_id" ref="uom.product_uom_unit"/>
             <field name="description">Custom computer shipped in kit.</field>
             <field name="default_code">E-COM06</field>
-            <field name="company_id"></field>
         </record>
         <record id="product_product_5c" model="product.product">
             <field name="name">Parts Replacement</field>
@@ -280,7 +277,6 @@
             <field name="uom_po_id" ref="uom.product_uom_unit"/>
             <field name="default_code">E-COM07</field>
             <field name='weight'>0.330</field>
-            <field name="company_id"></field>
         </record>
 
         <record id="product_product_6c" model="product.product">
@@ -322,7 +318,6 @@
             <field name="uom_id" ref="uom.product_uom_unit"/>
             <field name="uom_po_id" ref="uom.product_uom_unit"/>
             <field name="default_code">E-COM10</field>
-            <field name="company_id"></field>
         </record>
 
         <record id="product_product_10" model="product.product">
@@ -441,7 +436,6 @@
             <field name="uom_id" ref="uom.product_uom_unit"/>
             <field name="uom_po_id" ref="uom.product_uom_unit"/>
             <field name="default_code">CPUi5</field>
-            <field name="company_id"></field>
         </record>
 
         <record id="product_product_24" model="product.product">
@@ -477,7 +471,6 @@
             <field name="uom_po_id" ref="uom.product_uom_unit"/>
             <field name="description">Custom Laptop based on customer's requirement.</field>
             <field name="default_code">LAP-CUS</field>
-            <field name="company_id"></field>
         </record>
 
         <record id="consu_delivery_03" model="product.product">
diff --git a/addons/stock/data/stock_demo.xml b/addons/stock/data/stock_demo.xml
index 7bd102a206b..982d24fc9ad 100644
--- a/addons/stock/data/stock_demo.xml
+++ b/addons/stock/data/stock_demo.xml
@@ -153,13 +153,11 @@
             <field name="email">chicago@yourcompany.com</field>
             <field name="phone">+1 312 349 3030</field>
             <field name="website">www.yourcompany.com</field>
-            <field name="company_id"></field>
         </record>
 
         <record id="res_partner_address_41" model="res.partner">
             <field name="name">Steven Hamilton</field>
             <field name="parent_id" ref="res_partner_company_1"/>
-            <field name="company_id"></field>
         </record>
 
         <record id="res_company_1" model="res.company">
diff --git a/odoo/addons/base/data/res_partner_demo.xml b/odoo/addons/base/data/res_partner_demo.xml
index 8b6965d5c3d..fc21f0cbb03 100644
--- a/odoo/addons/base/data/res_partner_demo.xml
+++ b/odoo/addons/base/data/res_partner_demo.xml
@@ -96,7 +96,6 @@
             <field name="phone">(+886) (02) 4162 2023</field>
             <field name="website">http://www.asustek.com</field>
             <field name="image" type="base64" file="base/static/img/res_partner_1-image.jpg"/>
-            <field name="company_id"></field>
         </record>
         <record id="res_partner_2" model="res.partner">
             <field name="name">Agrolait</field>
@@ -110,7 +109,6 @@
             <field name="phone">+32 10 588 558</field>
             <field name="website">http://www.agrolait.com</field>
             <field name="image" type="base64" file="base/static/img/res_partner_2-image.jpg"/>
-            <field name="company_id"></field>
         </record>
         <record id="res_partner_3" model="res.partner">
             <field name="name">China Export</field>
@@ -126,7 +124,6 @@
             <field name="phone">+86 21 6484 5671</field>
             <field name="website">http://www.chinaexport.com/</field>
             <field name="image" type="base64" file="base/static/img/res_partner_3-image.png"/>
-            <field name="company_id"></field>
         </record>
         
         <record id="res_partner_4" model="res.partner">
@@ -144,7 +141,6 @@
             <field name="phone">+1 510 340 2385</field>
             <field name="website">http://www.distribpc.com/</field>
             <field name="image" type="base64" file="base/static/img/res_partner_4-image.png"/>
-            <field name="company_id"></field>
         </record>
 
         <record id="res_partner_10" model="res.partner">
@@ -159,7 +155,6 @@
             <field name="phone">+1 786 525 0724</field>
             <field name="street">3203 Lamberts Branch Road</field>
             <field name="image" type="base64" file="base/static/img/res_partner_10-image.jpg"/>
-            <field name="company_id"></field>
         </record>
   
         <record id="res_partner_12" model="res.partner">
@@ -176,7 +171,6 @@
             <field name="email">camptocamp@yourcompany.example.com</field>
             <field name="website">http://www.camptocamp.com</field>
             <field name="image" type="base64" file="base/static/img/res_partner_12-image.jpg"/>
-            <field name="company_id"></field>
         </record>
 
         <record id="res_partner_18" model="res.partner">
@@ -190,7 +184,6 @@
             <field name="street">89 Lingfield Tower</field>
             <field name="website">http://www.think-big.com</field>
             <field name="image" type="base64" file="base/static/img/res_partner_18-image.png"/>
-            <field name="company_id"></field>
         </record>
 
         <record id="res_partner_address_1" model="res.partner">
@@ -200,7 +193,6 @@
             <field name="email">tang@asustek.com</field>
             <field name="supplier">1</field>
             <field eval="0" name="customer"/>
-            <field name="company_id"></field>
         </record>
         <record id="res_partner_address_2" model="res.partner">
             <field name="name">Joseph Walters</field>
@@ -209,28 +201,24 @@
             <field name="email">joseph.walters@asustek.com</field>
             <field name="supplier">1</field>
             <field eval="0" name="customer"/>
-            <field name="company_id"></field>
         </record>
         <record id="res_partner_address_3" model="res.partner">
             <field name="function">Functional Consultant</field>
             <field name="parent_id" eval="ref('res_partner_2')"/>
             <field name="name">Thomas Passot</field>
             <field name="email">thomas.passot@agrolait.example.com</field>
-            <field name="company_id"></field>
         </record>
         <record id="res_partner_address_4" model="res.partner">
             <field name="function">Analyst</field>
             <field name="parent_id" eval="ref('res_partner_2')"/>
             <field name="name">Michel Fletcher</field>
             <field name="email">michel.fletcher@agrolait.example.com</field>
-            <field name="company_id"></field>
         </record>
         <record id="res_partner_address_5" model="res.partner">
             <field name="function">Marketing Manager</field>
             <field name="parent_id" eval="ref('res_partner_3')"/>
             <field name="name">Chao Wang</field>
             <field name="email">chao.wang@chinaexport.example.com</field>
-            <field name="company_id"></field>
         </record>
         <record id="res_partner_address_7" model="res.partner">
             <field name="name">Richard Ellis</field>
@@ -239,21 +227,18 @@
             <field name="email">richard.ellis@deltapc.example.com</field>
             <field name="supplier">1</field>
             <field eval="0" name="customer"/>
-            <field name="company_id"></field>
         </record>
         <record id="res_partner_address_10" model="res.partner">
             <field name="function">Senior Consultant</field>
             <field name="parent_id" eval="ref('res_partner_3')"/>
             <field name="name">David Simpson</field>
             <field name="email">david.simpson@epic.example.com</field>
-            <field name="company_id"></field>
         </record>
         <record id="res_partner_address_11" model="res.partner">
             <field name="function">Director</field>
             <field name="parent_id" eval="ref('res_partner_3')"/>
             <field name="name">John M. Brown</field>
             <field name="email">john.brown@epic.example.com</field>
-            <field name="company_id"></field>
         </record>
         <record id="res_partner_address_12" model="res.partner">
             <field name="name">James Miller</field>
@@ -261,84 +246,72 @@
             <field name="function">Electrical Supervisor</field>
             <field name="supplier">1</field>
             <field eval="0" name="customer"/>
-            <field name="company_id"></field>
         </record>
         <record id="res_partner_address_13" model="res.partner">
             <field name="function">Senior Associate</field>
             <field name="parent_id" eval="ref('res_partner_4')"/>
             <field name="name">Charlie Bernard</field>
             <field name="email">charlie.bernard@wealthyandsons.example.com</field>
-            <field name="company_id" eval="False"/>
         </record>
         <record id="res_partner_address_14" model="res.partner">
             <field name="function">Analyst</field>
             <field name="parent_id" eval="ref('res_partner_4')"/>
             <field name="name">Jessica Dupont</field>
             <field name="email">jessica.dupont@wealthyandsons.example.com</field>
-            <field name="company_id"></field>
         </record>
         <record id="res_partner_address_15" model="res.partner">
             <field name="function">Creative Director</field>
             <field name="parent_id" eval="ref('res_partner_12')"/>
             <field name="name">Phillipp Miller</field>
             <field name="email">phillipp.miller@mediapole.example.com</field>
-            <field name="company_id"></field>
         </record>
         <record id="res_partner_address_16" model="res.partner">
             <field name="function">Director</field>
             <field name="parent_id" eval="ref('res_partner_12')"/>
             <field name="name">Ayaan Agarwal</field>
             <field name="email">ayaan.agarwal@bestdesigners.example.com</field>
-            <field name="company_id"></field>
         </record>
         <record id="res_partner_address_17" model="res.partner">
             <field name="function">Managing Partner</field>
             <field name="parent_id" eval="ref('res_partner_10')"/>
             <field name="name">Daniel Jackson</field>
             <field name="email">daniel.jackson@jackson.example.com</field>
-            <field name="company_id"></field>
         </record>
         <record id="res_partner_address_18" model="res.partner">
             <field name="function">Senior Consultant</field>
             <field name="parent_id" eval="ref('res_partner_10')"/>
             <field name="name">William Thomas</field>
             <field name="email">william.jackson@jackson.example.com</field>
-            <field name="company_id"></field>
         </record>
         <record id="res_partner_address_22" model="res.partner">
             <field name="function">Director</field>
             <field name="parent_id" eval="ref('res_partner_2')"/>
             <field name="name">Laith Jubair</field>
             <field name="email">laith.jubair@axelor.example.com</field>
-            <field name="company_id"></field>
         </record>
         <record id="res_partner_address_24" model="res.partner">
             <field name="function">System Analyst</field>
             <field name="parent_id" eval="ref('res_partner_4')"/>
             <field name="name">Robert Anderson</field>
             <field name="email">robert.anderson@chamberworks.example.com</field>
-            <field name="company_id"></field>
         </record>
         <record id="res_partner_address_25" model="res.partner">
             <field name="function">Order Clerk</field>
             <field name="parent_id" eval="ref('res_partner_3')"/>
             <field name="name">Jacob Taylor</field>
             <field name="email">jacob.taylor@millennium.example.com</field>
-            <field name="company_id"></field>
         </record>
         <record id="res_partner_address_28" model="res.partner">
             <field name="function">Business Executive</field>
             <field name="parent_id" eval="ref('res_partner_12')"/>
             <field name="name">Benjamin Flores</field>
             <field name="email">benjamin.flores@nebula.example.com</field>
-            <field name="company_id"></field>
         </record>
         <record id="res_partner_address_30" model="res.partner">
             <field name="function">Functional Consultant</field>
             <field name="parent_id" eval="ref('res_partner_18')"/>
             <field name="name">Lucas Jones</field>
             <field name="email">lucas.jones@thinkbig.example.com</field>
-            <field name="company_id"></field>
         </record>
         <record id="res_partner_address_31" model="res.partner">
             <field name="name">Edward Foster</field>
@@ -347,28 +320,24 @@
             <field name="email">efoster@seagate.com</field>
             <field name="supplier">1</field>
             <field eval="0" name="customer"/>
-            <field name="company_id"></field>
         </record>
         <record id="res_partner_address_32" model="res.partner">
             <field name="function">Sales Manager</field>
             <field name="parent_id" eval="ref('res_partner_4')"/>
             <field name="name">Robin Smith</field>
             <field name="email">robin.smith@globalsolutions.example.com</field>
-            <field name="company_id"></field>
         </record>
         <record id="res_partner_address_33" model="res.partner">
             <field name="function">Financial Manager</field>
             <field name="parent_id" eval="ref('res_partner_4')"/>
             <field name="name">Morgan Rose</field>
             <field name="email">morgan.rose@globalsolutions.example.com</field>
-            <field name="company_id"></field>
         </record>
         <record id="res_partner_address_34" model="res.partner">
             <field name="function">Knowledge Manager</field>
             <field name="parent_id" eval="ref('res_partner_4')"/>
             <field name="name">Kevin Clarke</field>
             <field name="email">kevin.clarke@globalsolutions.example.com</field>
-            <field name="company_id"></field>
         </record>
         <record id="res_partner_address_27" model="res.partner">
             <field name="name">Arthur Gomez</field>
@@ -376,7 +345,6 @@
             <field name="function">Software Developer</field>
             <field name="supplier">1</field>
             <field eval="0" name="customer"/>
-            <field name="company_id"></field>
         </record>
         <record id="res_partner_address_26" model="res.partner">
             <field name="name">Julia Rivero</field>
@@ -384,7 +352,6 @@
             <field name="function">Technical Director</field>
             <field name="supplier">1</field>
             <field eval="0" name="customer"/>
-            <field name="company_id"></field>
         </record>
         <record id="res_partner_address_35" model="res.partner">
             <field name="name">Peter Mitchell</field>
@@ -392,7 +359,6 @@
             <field name="function">Store Manager</field>
             <field name="supplier">1</field>
             <field eval="0" name="customer"/>
-            <field name="company_id"></field>
         </record>
         <record id="res_partner_main1" model="res.partner">
           <field name="customer" eval="False"/>