diff --git a/addons/account/account_unit_test.xml b/addons/account/account_unit_test.xml
index 7795c2700cc..5fb1c55b669 100644
--- a/addons/account/account_unit_test.xml
+++ b/addons/account/account_unit_test.xml
@@ -8,7 +8,7 @@
             <field name="partner_id" ref="base.res_partner_1"/>
             <field name="journal_id" ref="account.sales_journal"/>
             <field name="state">draft</field>
-            <field name="type">out_invoice</field>
+            <field name="type">in_invoice</field>
             <field name="account_id" ref="account.a_recv"/>
             <field name="name">Test invoice 1</field>
         </record>
diff --git a/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_data.xml b/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_data.xml
index d9dcbaa66c4..bc5e64d620f 100644
--- a/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_data.xml
+++ b/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_data.xml
@@ -6,6 +6,10 @@
         <field name="name">Office National de Sécurité Sociale (ONSS)</field>
         <field name="supplier">1</field>
         <field eval="0" name="customer"/>
+        <field name="street">54 Rue Jean Baptiste Colette BP </field>
+        <field name="city">Attiches</field>
+        <field name="zip">59551</field>
+        <field name="country_id" ref="base.fr"/>
     </record>
     <record id="contrib_register_onss" model="hr.contribution.register">
         <field name="name">ONSS</field>
@@ -16,6 +20,11 @@
         <field name="name">Fiscal Administration</field>
         <field name="supplier">1</field>
         <field eval="0" name="customer"/>
+        <field name="street">Shanghai Branch</field>
+        <field name="street2">Anshun Road 83, Room 1603 - </field>
+        <field name="city">Shanghai</field>
+        <field name="zip">200052</field>
+        <field name="country_id" ref="base.cn"/>
     </record>
     <record id="contrib_register_pp" model="hr.contribution.register">
         <field name="name">Fiscal Administration</field>
diff --git a/addons/l10n_uk/demo/demo.xml b/addons/l10n_uk/demo/demo.xml
index 8db565f990e..59c4c8f8fb2 100644
--- a/addons/l10n_uk/demo/demo.xml
+++ b/addons/l10n_uk/demo/demo.xml
@@ -6,7 +6,7 @@
             <field name="street">12, Hill Lane</field>
             <field name="zip">HA4 7JW</field>
             <field name="city">Ruislip</field>
-            <field name="country_id" model="res.country" search="[('code','=','uk')]"/>
+            <field name="country_id" ref="base.uk"/>
             <field name="phone">+44 845 643 4548</field>
             <field name="fax">08455274653</field>
             <field name="website">http://www.smartmode.co.uk</field>
@@ -20,6 +20,10 @@
             <field name="email">vadim@smartmode.co.uk</field>
             <field name="active">1</field>
             <field name="type">default</field>
+            <field name="street">88 Wood Street, 10th floor</field>
+            <field name="zip">EC2V 7RS</field>
+            <field name="city">London</field>
+            <field name="country_id" ref="base.uk"/>
         </record>
     </data>
 </openerp>
diff --git a/addons/lunch/lunch_demo.xml b/addons/lunch/lunch_demo.xml
index 7e5e2f3ac8f..c0b5e41083e 100644
--- a/addons/lunch/lunch_demo.xml
+++ b/addons/lunch/lunch_demo.xml
@@ -18,10 +18,19 @@
 
         <record model="res.partner" id="partner_coin_gourmand">
             <field name="name">Coin gourmand</field>
+            <field name="city">Tirana</field>
+            <field name="country_id" ref="base.al"/>
+            <field name="street">Rr. e Durrësit, Pall. M.C. Inerte</field>
+            <field name="street2">Kati.1, Laprakë, Tirana, Shqipëri</field>
         </record>
 
         <record model="res.partner" id="partner_pizza_inn">
             <field name="name">Pizza Inn</field>
+            <field name="city">New Delhi TN</field>
+            <field name="country_id" ref="base.in"/>
+            <field name="street">#8, 1 st Floor,iscore complex</field>
+            <field name="street2">Gandhi Gramam,Gandhi Nagar</field>
+            <field name="zip">607308</field>
         </record>
 
         <record model="lunch.product" id="product_cheese_ham">
diff --git a/addons/multi_company/multi_company_demo.xml b/addons/multi_company/multi_company_demo.xml
index a8c1a0f3840..fffd93e2ab9 100644
--- a/addons/multi_company/multi_company_demo.xml
+++ b/addons/multi_company/multi_company_demo.xml
@@ -4,18 +4,39 @@
 <!--                      Partner                        -->
         <record id="res_partner_oerp_editor" model="res.partner">
             <field name="name">OpenERP Editor</field>
+            <field name="street">Plot No 61- Sector 8</field>
+            <field name="city">Faridabad (Delhi- NCR)</field>
+            <field name="zip">121006</field>
+            <field name="country_id" ref="base.in"/>
         </record>
         <record id="res_partner_oerp_us" model="res.partner">
             <field name="name">OpenERP US</field>
+            <field name="street">2035 N. Evergreen Terrace</field>
+            <field name="street2">Arlington Heights</field>
+            <field name="country_id" ref="base.us"/>
         </record>
         <record id="res_partner_oerp_in" model="res.partner">
             <field name="name">OpenERP IN</field>
+            <field name="street">Top Floor, Mehta Mahal,15</field>
+            <field name="street2">Matthew Road, Opera House</field>
+            <field name="city">Mumbai 27</field>
+            <field name="zip">400004</field>
+            <field name="country_id" ref="base.in"/>
         </record>
         <record id="res_partner_oerp_be" model="res.partner">
             <field name="name">OpenERP BE</field>
+            <field name="street">Avenue de l'Artisanat 2</field>
+            <field name="city">Braine-l'Alleud</field>
+            <field name="zip">1420</field>
+            <field name="country_id" ref="base.be"/>
         </record>
         <record id="res_partner_odoo" model="res.partner">
             <field name="name">Odoo</field>
+            <field name="street">RM#25-502, 126, Yijiang Road</field>
+            <field name="street2">Pudong</field>
+            <field name="city">Shanghai</field>
+            <field name="zip">201</field>
+            <field name="country_id" ref="base.cn"/>
         </record>
 
 <!--                      Company                        -->
diff --git a/addons/portal/portal_demo.xml b/addons/portal/portal_demo.xml
index 7e48b7918f2..bc75d6ed4a9 100644
--- a/addons/portal/portal_demo.xml
+++ b/addons/portal/portal_demo.xml
@@ -9,6 +9,10 @@
             <field name="supplier" eval="False"/>
             <field name="customer" eval="True"/>
             <field name="notification_email_send">none</field>
+            <field name="city">Vivegnis</field>
+            <field name="zip">4683</field>
+            <field name="country_id" ref="base.be"/>
+            <field name="street">Rue Cesar de Paepe, 43</field>
         </record>
         <record id="demo_user0" model="res.users">
             <field name="partner_id" ref="partner_demo_portal"/>
diff --git a/addons/sale_crm/sale_crm_demo.xml b/addons/sale_crm/sale_crm_demo.xml
index 0c2822719dd..25f653548d1 100644
--- a/addons/sale_crm/sale_crm_demo.xml
+++ b/addons/sale_crm/sale_crm_demo.xml
@@ -23,7 +23,7 @@
             <field name="journal_id" ref="account.sales_journal"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field name="state">draft</field>
-            <field name="type">out_invoice</field>
+            <field name="type">in_invoice</field>
             <field name="account_id" ref="account.a_recv"/>
             <field name="name">Test invoice 1</field>
         </record>