[IMP] base: Improve partners/employees demo data

- Update all the pictures
- Rename the partners with a name that is easy to say for an English speaker (No more 'Agwoleight')
- Update all the addresses/phone numbers in the american format
- Unify the demo data with the new theme (Wood shop/manufacture,...)

68 files changed, 266 insertions, 221 deletions

diff --git a/odoo/addons/base/data/res_partner_demo.xml b/odoo/addons/base/data/res_partner_demo.xml
index 2785589ea82..35fffb4df8d 100644
--- a/odoo/addons/base/data/res_partner_demo.xml
+++ b/odoo/addons/base/data/res_partner_demo.xml
@@ -40,267 +40,298 @@
         -->
 
         <record id="res_partner_1" model="res.partner">
-            <field name="name">ASUSTeK</field>
+            <field name="name">Wood Corner</field>
             <field eval="[(6, 0, [ref('res_partner_category_14'), ref('res_partner_category_12')])]" name="category_id"/>
             <field name="supplier">1</field>
             <field eval="0" name="customer"/>
             <field name="is_company">1</field>
-            <field name="city">Taipei</field>
-            <field name="zip">106</field>
-            <field name="country_id" ref="base.tw"/>
-            <field name="street">31 Hong Kong street</field>
-            <field name="email">asusteK@yourcompany.example.com</field>
-            <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="street">1164 Cambridge Drive</field>
+            <field name="city">White Tanks</field>
+            <field name="state_id"  model="res.country.state" search="[('code','ilike','AZ')]"/>
+            <field name="zip">85340</field>
+            <field name="country_id" ref="base.us"/>
+            <field name="email">wood.corner26@example.com</field>
+            <field name="phone">(623)-853-7197</field>
+            <field name="website">http://www.wood-corner.com</field>
+            <field name="image" type="base64" file="base/static/img/res_partner_1-image.png"/>
         </record>
         <record id="res_partner_2" model="res.partner">
-            <field name="name">Agrolait</field>
+            <field name="name">Deco Addict</field>
             <field eval="[(6, 0, [ref('base.res_partner_category_14')])]" name="category_id"/>
             <field name="is_company">1</field>
-            <field name="city">Wavre</field>
-            <field name="zip">1300</field>
-            <field name="country_id" ref="base.be"/>
-            <field name="street">69 rue de Namur</field>
-            <field name="email">agrolait@yourcompany.example.com</field>
-            <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="street">325 Elsie Drive</field>
+            <field name="city">Franklin</field>
+            <field name="state_id"  model="res.country.state" search="[('code','ilike','WV')]"/>
+            <field name="zip">26807</field>
+            <field name="country_id" ref="base.us"/>
+            <field name="email">deco.addict82@example.com</field>
+            <field name="phone">(603)-996-3829</field>
+            <field name="website">http://www.deco-addict.com</field>
+            <field name="image" type="base64" file="base/static/img/res_partner_2-image.png"/>
         </record>
         <record id="res_partner_3" model="res.partner">
-            <field name="name">China Export</field>
+            <field name="name">Gemini Furniture</field>
             <field name="supplier">1</field>
             <field eval="[(6, 0, [ref('res_partner_category_8'), ref('res_partner_category_14')])]" name="category_id"/>
             <field name="is_company">1</field>
-            <field name="city">Shanghai</field>
-            <field name="zip">200000</field>
-            <field model="res.country" name="country_id" search="[('name','=','China')]"/>
-            <field name="country_id" ref="base.cn"/>
-            <field name="street">52 Chop Suey street</field>
-            <field name="email">chinaexport@yourcompany.example.com</field>
-            <field name="phone">+86 21 6484 5671</field>
-            <field name="website">http://www.chinaexport.com/</field>
+            <field name="street">1128 Lunetta Street</field>
+            <field name="city">Tampa</field>
+            <field name="state_id"  model="res.country.state" search="[('code','ilike','FL')]"/>
+            <field name="zip">33634</field>
+            <field name="country_id" ref="base.us"/>
+            <field name="email">gemini.furniture39@example.com</field>
+            <field name="phone">(941)-284-4875</field>
+            <field name="website">http://www.gemini-furniture.com/</field>
             <field name="image" type="base64" file="base/static/img/res_partner_3-image.png"/>
         </record>
         
         <record id="res_partner_4" model="res.partner">
-            <field name="name">Delta PC</field>
+            <field name="name">Ready Mat</field>
             <field eval="[(6, 0, [ref('res_partner_category_14'), ref('res_partner_category_12')])]" name="category_id"/>
             <field eval="0" name="customer"/>
             <field eval="1" name="supplier"/>
             <field name="is_company">1</field>
-            <field name="city">Fremont</field>
-            <field name="zip">94538</field>
+            <field name="street">92 Emily Drive</field>
+            <field name="city">Columbia</field>
+            <field name="state_id"  model="res.country.state" search="[('code','ilike','SC')]"/>
+            <field name="zip">29201</field>
             <field name="country_id" ref="base.us"/>
-            <field model="res.country.state" name="state_id" search="[('code','ilike','ca')]"/>
-            <field name="street">3661 Station Street</field>
-            <field name="email">deltapc@yourcompany.example.com</field>
-            <field name="phone">+1 510 340 2385</field>
-            <field name="website">http://www.distribpc.com/</field>
+            <field name="email">ready.mat28@example.com</field>
+            <field name="phone">(803)-873-6126</field>
+            <field name="website">http://www.ready-mat.com/</field>
             <field name="image" type="base64" file="base/static/img/res_partner_4-image.png"/>
         </record>
 
         <record id="res_partner_10" model="res.partner">
             <field name="name">The Jackson Group</field>
             <field name="is_company">1</field>
-            <field name="city">Miami</field>
-            <field name="zip">33169</field>
+            <field name="street">823  Turkey Pen Lane</field>
+            <field name="city">Auburn</field>
+            <field name="state_id"  model="res.country.state" search="[('code','ilike','AL')]"/>
+            <field name="zip">36830</field>
             <field name="country_id" ref="base.us"/>
-            <field model="res.country.state" name="state_id" search="[('code','=','FL')]"/>
-            <field name="email">jackson@yourcompany.example.com</field>
-            <field name="phone">+1 786 525 0724</field>
-            <field name="street">3203 Lamberts Branch Road</field>
+            <field name="email">jackson.group82@example.com</field>
+            <field name="phone">(334)-502-1024</field>
             <field name="image" type="base64" file="base/static/img/res_partner_10-image.jpg"/>
         </record>
   
         <record id="res_partner_12" model="res.partner">
-            <field name="name">Camptocamp</field>
+            <field name="name">Azure Interior</field>
             <field eval="[(6, 0, [ref('res_partner_category_11')])]" name="category_id"/>
             <field name="supplier">1</field>
             <field name="customer">1</field>
             <field name="is_company">1</field>
-            <field name="city">Le Bourget du Lac</field>
-            <field name="zip">73377</field>
-            <field name="phone">+33 4 49 23 44 54</field>
-            <field name="country_id" ref="base.fr"/>
-            <field name="street">93, Press Avenue</field>
-            <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="street">3404  Edgewood Road</field>
+            <field name="city">Jonesboro</field>
+            <field name="state_id" model="res.country.state" search="[('code','ilike','AR')]"/>
+            <field name="zip">72401</field>
+            <field name="phone">(870)-931-0505</field>
+            <field name="country_id" ref="base.us"/>
+            <field name="email">azure.Interior24@example.com</field>
+            <field name="website">http://www.azure-interior.com</field>
+            <field name="image" type="base64" file="base/static/img/res_partner_12-image.png"/>
         </record>
 
         <record id="res_partner_18" model="res.partner">
-            <field name="name">Think Big Systems</field>
+            <field name="name">Lumber Inc</field>
             <field name="is_company">1</field>
-            <field name="city">London</field>
-            <field name="email">thinkbig@yourcompany.example.com</field>
-            <field name="phone">+1 857 349 3049</field>
-            <field name="country_id" ref="base.uk"/>
-            <field name="street">89 Lingfield Tower</field>
-            <field name="website">http://www.think-big.com</field>
+            <field name="street">3202  Hannah Street</field>
+            <field name="city">Asheville</field>
+            <field name="state_id" model="res.country.state" search="[('code','ilike','NC')]"/>
+            <field name="zip">28801</field>
+            <field name="email">lumber-inv92@example.com</field>
+            <field name="phone">(828)-316-0593</field>
+            <field name="country_id" ref="base.us"/>
+            <field name="website">http://www.lumber-inc.com</field>
             <field name="image" type="base64" file="base/static/img/res_partner_18-image.png"/>
         </record>
 
         <record id="res_partner_address_1" model="res.partner">
-            <field name="name">Tang Tsui</field>
+            <field name="name">Willie Burke</field>
             <field name="parent_id" eval="ref('res_partner_1')"/>
             <field name="function">Service Manager</field>
-            <field name="email">tang@asustek.com</field>
+            <field name="email">willie.burke80@example.com</field>
+            <field name="phone">(846)-523-2111</field>
             <field name="supplier">1</field>
             <field eval="0" name="customer"/>
         </record>
         <record id="res_partner_address_2" model="res.partner">
-            <field name="name">Joseph Walters</field>
+            <field name="name">Ron Gibson</field>
             <field name="parent_id" eval="ref('res_partner_1')"/>
             <field name="function">Store Manager</field>
-            <field name="email">joseph.walters@asustek.com</field>
+            <field name="email">ron.gibson76@example.com</field>
+            <field name="phone">(976)-397-4091</field>
             <field name="supplier">1</field>
             <field eval="0" name="customer"/>
         </record>
         <record id="res_partner_address_3" model="res.partner">
-            <field name="function">Functional Consultant</field>
+            <field name="name">Douglas Fletcher</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="function">Functional Consultant</field>
+            <field name="email">douglas.fletcher51@example.com</field>
+            <field name="phone">(132)-553-7242</field>
         </record>
         <record id="res_partner_address_4" model="res.partner">
-            <field name="function">Analyst</field>
+            <field name="name">Floyd Steward</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="function">Analyst</field>
+            <field name="email">floyd.steward34@example.com</field>
+            <field name="phone">(145)-138-3401</field>
         </record>
         <record id="res_partner_address_5" model="res.partner">
-            <field name="function">Marketing Manager</field>
+            <field name="name">Edwin Hansen</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="function">Marketing Manager</field>
+            <field name="email">edwin.hansen58@example.com</field>
+            <field name="phone">(943)-352-2555</field>
         </record>
         <record id="res_partner_address_7" model="res.partner">
-            <field name="name">Richard Ellis</field>
+            <field name="name">Billy Fox</field>
             <field name="parent_id" eval="ref('res_partner_4')"/>
             <field name="function">Production Supervisor</field>
-            <field name="email">richard.ellis@deltapc.example.com</field>
+            <field name="email">billy.fox45@example.com</field>
+            <field name="phone">(915)-498-5611</field>
             <field name="supplier">1</field>
             <field eval="0" name="customer"/>
         </record>
         <record id="res_partner_address_10" model="res.partner">
-            <field name="function">Senior Consultant</field>
+            <field name="name">Jesse Brown</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="function">Senior Consultant</field>
+            <field name="email">jesse.brown74@example.com</field>
+            <field name="phone">(829)-386-3277</field>
         </record>
         <record id="res_partner_address_11" model="res.partner">
-            <field name="function">Director</field>
+            <field name="name">Soham Palmer</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="function">Director</field>
+            <field name="email">soham.palmer15@example.com</field>
+            <field name="phone">(379)-167-2040</field>
         </record>
         <record id="res_partner_address_13" model="res.partner">
-            <field name="function">Senior Associate</field>
+            <field name="name">Kim Snyder</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="function">Senior Associate</field>
+            <field name="email">kim.snyder96@example.com</field>
+            <field name="phone">(215)-379-4865</field>
         </record>
         <record id="res_partner_address_14" model="res.partner">
-            <field name="function">Analyst</field>
+            <field name="name">Edith Sanchez</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="function">Analyst</field>
+            <field name="email">edith.sanchez68@example.com</field>
+            <field name="phone">(938)-175-2048</field>
         </record>
         <record id="res_partner_address_15" model="res.partner">
+            <field name="name">Brandon Freeman</field>
             <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="email">brandon.freeman55@example.com</field>
+            <field name="phone">(355)-687-3262</field>
         </record>
         <record id="res_partner_address_16" model="res.partner">
+            <field name="name">Nicole Ford</field>
             <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="email">nicole.ford75@example.com</field>
+            <field name="phone">(946)-638-6034</field>
         </record>
         <record id="res_partner_address_17" model="res.partner">
+            <field name="name">Toni Rhodes</field>
             <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="email">toni.rhodes11@example.com</field>
+            <field name="phone">(198)-539-4948</field>
         </record>
         <record id="res_partner_address_18" model="res.partner">
+            <field name="name">Gordon Owens</field>
             <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="email">gordon.owens47@example.com</field>
+            <field name="phone">(336)-723-6569</field>
         </record>
         <record id="res_partner_address_24" model="res.partner">
+            <field name="name">Theodore Gardner</field>
             <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="email">theodore.gardner36@example.com</field>
+            <field name="phone">(186)-612-6561</field>
         </record>
         <record id="res_partner_address_25" model="res.partner">
-            <field name="function">Order Clerk</field>
+            <field name="name">Oscar Morgan</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="function">Order Clerk</field>
+            <field name="email">oscar.morgan11@example.com</field>
+            <field name="phone">(561)-239-1744</field>
+        </record>
+        <record id="res_partner_address_27" model="res.partner">
+            <field name="name">Tom Ruiz</field>
+            <field name="parent_id" eval="ref('res_partner_1')"/>
+            <field name="function">Software Developer</field>
+            <field name="supplier">1</field>
+            <field name="email">tom.ruiz89@example.com</field>
+            <field name="phone">(102)-834-1602</field>
+            <field eval="0" name="customer"/>
         </record>
         <record id="res_partner_address_28" model="res.partner">
+            <field name="name">Colleen Diaz</field>
             <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="email">colleen.diaz83@example.com</field>
+            <field name="phone">(255)-595-8393</field>
         </record>
         <record id="res_partner_address_30" model="res.partner">
+            <field name="name">Lorraine Douglas</field>
             <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="email">lorraine.douglas35@example.com</field>
+            <field name="phone">(443)-648-9155</field>
         </record>
         <record id="res_partner_address_31" model="res.partner">
-            <field name="name">Edward Foster</field>
+            <field name="name">Addison Olson</field>
             <field name="parent_id" eval="ref('res_partner_2')"/>
             <field name="function">Sales Representative</field>
-            <field name="email">efoster@seagate.com</field>
+            <field name="email">addison.olson28@example.com</field>
+            <field name="phone">(223)-399-7637</field>
             <field name="supplier">1</field>
             <field eval="0" name="customer"/>
         </record>
         <record id="res_partner_address_32" model="res.partner">
-            <field name="function">Sales Manager</field>
+            <field name="name">Sandra Neal</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="function">Sales Manager</field>
+            <field name="email">sandra.neal80@example.com</field>
+            <field name="phone">(430)-371-7293</field>
         </record>
         <record id="res_partner_address_33" model="res.partner">
-            <field name="function">Financial Manager</field>
+            <field name="name">Julie Richards</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="function">Financial Manager</field>
+            <field name="email">julie.richards84@example.com</field>
+            <field name="phone">(225)-148-7811</field>
         </record>
         <record id="res_partner_address_34" model="res.partner">
-            <field name="function">Knowledge Manager</field>
+            <field name="name">Travis Mendoza</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>
-        </record>
-        <record id="res_partner_address_27" model="res.partner">
-            <field name="name">Arthur Gomez</field>
-            <field name="parent_id" eval="ref('res_partner_1')"/>
-            <field name="function">Software Developer</field>
-            <field name="supplier">1</field>
-            <field eval="0" name="customer"/>
+            <field name="function">Knowledge Manager</field>
+            <field name="email">travis.mendoza24@example.com</field>
+            <field name="phone">(840)-944-8661</field>
         </record>
         <record id="res_partner_main1" model="res.partner">
-          <field name="customer" eval="False"/>
-          <field name="parent_id" eval="ref('main_partner')"/>
-          <field name="function">Chief Executive Officer (CEO)</field>
-          <field name="name">Mark Davis</field>
-          <field name="email">mark.davis@yourcompany.example.com</field>
+            <field name="name">Chester Reed</field>
+            <field name="parent_id" eval="ref('main_partner')"/>
+            <field name="function">Chief Executive Officer (CEO)</field>
+            <field name="customer" eval="False"/>
+            <field name="email">chester.reed79@example.com</field>
+            <field name="phone">(979)-904-8902</field>
         </record>
         <record id="res_partner_main2" model="res.partner">
-          <field name="customer" eval="False"/>
-          <field name="parent_id" eval="ref('main_partner')"/>
-          <field name="function">Chief Operations Officer (COO)</field>
-          <field name="name">Roger Scott</field>
-          <field name="email">roger.scott@yourcompany.example.com</field>
+            <field name="name">Dwayne Newman</field>
+            <field name="function">Chief Operations Officer (COO)</field>
+            <field name="customer" eval="False"/>
+            <field name="parent_id" eval="ref('main_partner')"/>
+            <field name="email">dwayne.newman28@example.com</field>
+            <field name="phone">(614)-177-4937</field>
         </record>
     </data>
 </odoo>
diff --git a/odoo/addons/base/data/res_partner_image_demo.xml b/odoo/addons/base/data/res_partner_image_demo.xml
index 541f38ea513..a74973eedb4 100644
--- a/odoo/addons/base/data/res_partner_image_demo.xml
+++ b/odoo/addons/base/data/res_partner_image_demo.xml
@@ -3,95 +3,103 @@
     <data noupdate="0">
 
         <record id="base.res_partner_address_1" model="res.partner">
-            <field name="image" type="base64" file="base/static/img/res_partner_address_1-image.png"/>
+            <field name="image" type="base64" file="base/static/img/res_partner_address_1.jpg"/>
         </record>
 
         <record id="base.res_partner_address_2" model="res.partner">
-            <field name="image" type="base64" file="base/static/img/res_partner_address_2-image.png"/>
+            <field name="image" type="base64" file="base/static/img/res_partner_address_2.jpg"/>
+        </record>
+
+        <record id="base.res_partner_address_3" model="res.partner">
+            <field name="image" type="base64" file="base/static/img/res_partner_address_3.jpg"/>
         </record>
 
         <record id="base.res_partner_address_4" model="res.partner">
-            <field name="image" type="base64" file="base/static/img/res_partner_address_4-image.png"/>
+            <field name="image" type="base64" file="base/static/img/res_partner_address_4.jpg"/>
         </record>
 
         <record id="base.res_partner_address_5" model="res.partner">
-            <field name="image" type="base64" file="base/static/img/res_partner_address_5-image.png"/>
+            <field name="image" type="base64" file="base/static/img/res_partner_address_5.jpg"/>
         </record>
 
         <record id="base.res_partner_address_7" model="res.partner">
-            <field name="image" type="base64" file="base/static/img/res_partner_address_7-image.png"/>
+            <field name="image" type="base64" file="base/static/img/res_partner_address_7.jpg"/>
         </record>
 
         <record id="base.res_partner_address_10" model="res.partner">
-            <field name="image" type="base64" file="base/static/img/res_partner_address_10-image.png"/>
+            <field name="image" type="base64" file="base/static/img/res_partner_address_10.jpg"/>
         </record>
 
         <record id="base.res_partner_address_11" model="res.partner">
-            <field name="image" type="base64" file="base/static/img/res_partner_address_11-image.png"/>
+            <field name="image" type="base64" file="base/static/img/res_partner_address_11.jpg"/>
         </record>
 
         <record id="base.res_partner_address_13" model="res.partner">
-            <field name="image" type="base64" file="base/static/img/res_partner_address_13-image.png"/>
+            <field name="image" type="base64" file="base/static/img/res_partner_address_13.jpg"/>
         </record>
 
         <record id="base.res_partner_address_14" model="res.partner">
-            <field name="image" type="base64" file="base/static/img/res_partner_address_14-image.png"/>
+            <field name="image" type="base64" file="base/static/img/res_partner_address_14.jpg"/>
         </record>
 
         <record id="base.res_partner_address_15" model="res.partner">
-            <field name="image" type="base64" file="base/static/img/res_partner_address_15-image.png"/>
+            <field name="image" type="base64" file="base/static/img/res_partner_address_15.jpg"/>
         </record>
 
         <record id="base.res_partner_address_16" model="res.partner">
-            <field name="image" type="base64" file="base/static/img/res_partner_address_16-image.png"/>
+            <field name="image" type="base64" file="base/static/img/res_partner_address_16.jpg"/>
         </record>
 
         <record id="base.res_partner_address_17" model="res.partner">
-            <field name="image" type="base64" file="base/static/img/res_partner_address_17-image.png"/>
+            <field name="image" type="base64" file="base/static/img/res_partner_address_17.jpg"/>
         </record>
 
         <record id="base.res_partner_address_18" model="res.partner">
-            <field name="image" type="base64" file="base/static/img/res_partner_address_18-image.png"/>
+            <field name="image" type="base64" file="base/static/img/res_partner_address_18.jpg"/>
         </record>
 
         <record id="base.res_partner_address_24" model="res.partner">
-            <field name="image" type="base64" file="base/static/img/res_partner_address_24-image.png"/>
+            <field name="image" type="base64" file="base/static/img/res_partner_address_24.jpg"/>
         </record>
 
         <record id="base.res_partner_address_25" model="res.partner">
-            <field name="image" type="base64" file="base/static/img/res_partner_address_25-image.png"/>
+            <field name="image" type="base64" file="base/static/img/res_partner_address_25.jpg"/>
         </record>
 
         <record id="base.res_partner_address_27" model="res.partner">
-            <field name="image" type="base64" file="base/static/img/res_partner_address_27-image.png"/>
+            <field name="image" type="base64" file="base/static/img/res_partner_address_27.jpg"/>
         </record>
 
         <record id="base.res_partner_address_28" model="res.partner">
-            <field name="image" type="base64" file="base/static/img/res_partner_address_28-image.png"/>
+            <field name="image" type="base64" file="base/static/img/res_partner_address_28.jpg"/>
         </record>
 
         <record id="base.res_partner_address_30" model="res.partner">
-            <field name="image" type="base64" file="base/static/img/res_partner_address_30-image.png"/>
+            <field name="image" type="base64" file="base/static/img/res_partner_address_30.jpg"/>
+        </record>
+
+        <record id="base.res_partner_address_31" model="res.partner">
+            <field name="image" type="base64" file="base/static/img/res_partner_address_31.jpg"/>
         </record>
 
         <record id="base.res_partner_address_32" model="res.partner">
-            <field name="image" type="base64" file="base/static/img/res_partner_address_32-image.png"/>
+            <field name="image" type="base64" file="base/static/img/res_partner_address_32.jpg"/>
         </record>
 
         <record id="base.res_partner_address_33" model="res.partner">
-            <field name="image" type="base64" file="base/static/img/res_partner_address_33-image.png"/>
+            <field name="image" type="base64" file="base/static/img/res_partner_address_33.jpg"/>
         </record>
 
         <record id="base.res_partner_address_34" model="res.partner">
-            <field name="image" type="base64" file="base/static/img/res_partner_address_34-image.png"/>
+            <field name="image" type="base64" file="base/static/img/res_partner_address_34.jpg"/>
         </record>
 
         <record id="base.res_partner_main1" model="res.partner">
-            <field name="image" type="base64" file="base/static/img/res_partner_main1-image.png"/>
+            <field name="image" type="base64" file="base/static/img/res_partner_main1.jpg"/>
         </record>
 
         <record id="base.res_partner_main2" model="res.partner">
-            <field name="image" type="base64" file="base/static/img/res_partner_main2-image.png"/>
+            <field name="image" type="base64" file="base/static/img/res_partner_main2.jpg"/>
         </record>
 
     </data>
diff --git a/odoo/addons/base/data/res_users_demo.xml b/odoo/addons/base/data/res_users_demo.xml
index 6801ef989fe..faee5b8f40b 100644
--- a/odoo/addons/base/data/res_users_demo.xml
+++ b/odoo/addons/base/data/res_users_demo.xml
@@ -3,15 +3,17 @@
     <data noupdate="1">
 
         <record id="partner_demo" model="res.partner">
-            <field name="name">Demo User</field>
+            <field name="name">Marc Brown</field>
             <field name="company_id" ref="main_company"/>
             <field name="customer" eval="False"/>
-            <field name="email">demo@yourcompany.example.com</field>
             <field name="company_name">YourCompany</field>
-            <field name="street">Avenue des Dessus-de-Lives, 2</field>
-            <field name="city">Namur (Loyers)</field>
-            <field name="zip">5101</field>
-            <field name="country_id" ref="be"/>
+            <field name="street">3575  Buena Vista Avenue</field>
+            <field name="city">Eugene</field>
+            <field name="state_id"  model="res.country.state" search="[('code','ilike','OR')]"/>
+            <field name="zip">97401</field>
+            <field name="country_id" ref="us"/>
+            <field name="email">mark.brown23@example.com</field>
+            <field name="phone">(441)-695-2334</field>
         </record>
 
         <record id="main_partner" model="res.partner">
@@ -38,6 +40,7 @@
         </record>
 
         <record model="res.partner" id="base.partner_root">
+            <field name="name">Mitchell Stephens</field>
             <field name="company_name">YourCompany</field>
             <field name="street">215 Vine St</field>
             <field name="city">Scranton</field>
@@ -53,15 +56,18 @@
 
         <!-- Portal : partner and user -->
         <record id="partner_demo_portal" model="res.partner">
-            <field name="name">Demo Portal User</field>
-            <field name="email">demo.portal@yourcompany.example.com</field>
+            <field name="name">Joel Willis</field>
+            <field name="email">joel.willis63@example.com</field>
             <field name="supplier" eval="False"/>
             <field name="customer" eval="True"/>
-            <field name="city">Vivegnis</field>
-            <field name="zip">4683</field>
-            <field name="country_id" ref="base.be"/>
+            <field name="street">858 Lynn Street</field>
+            <field name="city">Bayonne</field>
+            <field model="res.country.state" name="state_id" search="[('code','ilike','NJ')]"/>
+            <field name="zip">07002</field>
+            <field name="country_id" ref="base.us"/>
             <field name="company_name">YourCompany</field>
-            <field name="street">Rue Cesar de Paepe, 43</field>
+            <field name="image" type="base64" file="base/static/img/partner_demo_portal.jpg"/>
+            <field name="phone">(683)-556-5104</field>
         </record>
         <record id="demo_user0" model="res.users" context="{'no_reset_password': True}">
             <field name="partner_id" ref="partner_demo_portal"/>
diff --git a/odoo/addons/base/static/img/partner_demo_portal.jpg b/odoo/addons/base/static/img/partner_demo_portal.jpg
new file mode 100644
index 00000000000..8a5b63e7d83
--- /dev/null
+++ b/odoo/addons/base/static/img/partner_demo_portal.jpg
diff --git a/odoo/addons/base/static/img/partner_root-image.jpg b/odoo/addons/base/static/img/partner_root-image.jpg
index 72590f5c2d1..6438e80b9b5 100644
--- a/odoo/addons/base/static/img/partner_root-image.jpg
+++ b/odoo/addons/base/static/img/partner_root-image.jpg
diff --git a/odoo/addons/base/static/img/res_partner_1-image.jpg b/odoo/addons/base/static/img/res_partner_1-image.jpg
deleted file mode 100644
index df71b44f975..00000000000
--- a/odoo/addons/base/static/img/res_partner_1-image.jpg
+++ /dev/null
diff --git a/odoo/addons/base/static/img/res_partner_1-image.png b/odoo/addons/base/static/img/res_partner_1-image.png
new file mode 100644
index 00000000000..3e9d76fa33d
--- /dev/null
+++ b/odoo/addons/base/static/img/res_partner_1-image.png
diff --git a/odoo/addons/base/static/img/res_partner_12-image.jpg b/odoo/addons/base/static/img/res_partner_12-image.jpg
deleted file mode 100644
index 27b85e0ea1e..00000000000
--- a/odoo/addons/base/static/img/res_partner_12-image.jpg
+++ /dev/null
diff --git a/odoo/addons/base/static/img/res_partner_12-image.png b/odoo/addons/base/static/img/res_partner_12-image.png
new file mode 100644
index 00000000000..35e86d3d238
--- /dev/null
+++ b/odoo/addons/base/static/img/res_partner_12-image.png
diff --git a/odoo/addons/base/static/img/res_partner_18-image.png b/odoo/addons/base/static/img/res_partner_18-image.png
index a58db29f763..233cfec3c93 100644
--- a/odoo/addons/base/static/img/res_partner_18-image.png
+++ b/odoo/addons/base/static/img/res_partner_18-image.png
diff --git a/odoo/addons/base/static/img/res_partner_2-image.jpg b/odoo/addons/base/static/img/res_partner_2-image.jpg
deleted file mode 100644
index 4a9ff1ac786..00000000000
--- a/odoo/addons/base/static/img/res_partner_2-image.jpg
+++ /dev/null
diff --git a/odoo/addons/base/static/img/res_partner_2-image.png b/odoo/addons/base/static/img/res_partner_2-image.png
new file mode 100644
index 00000000000..588436e2787
--- /dev/null
+++ b/odoo/addons/base/static/img/res_partner_2-image.png
diff --git a/odoo/addons/base/static/img/res_partner_3-image.png b/odoo/addons/base/static/img/res_partner_3-image.png
index 1183937b953..46e45b50ae7 100644
--- a/odoo/addons/base/static/img/res_partner_3-image.png
+++ b/odoo/addons/base/static/img/res_partner_3-image.png
diff --git a/odoo/addons/base/static/img/res_partner_4-image.png b/odoo/addons/base/static/img/res_partner_4-image.png
index 8a656008e59..1af9ef30457 100644
--- a/odoo/addons/base/static/img/res_partner_4-image.png
+++ b/odoo/addons/base/static/img/res_partner_4-image.png
diff --git a/odoo/addons/base/static/img/res_partner_address_1-image.png b/odoo/addons/base/static/img/res_partner_address_1-image.png
deleted file mode 100644
index f3a4c47f877..00000000000
--- a/odoo/addons/base/static/img/res_partner_address_1-image.png
+++ /dev/null
diff --git a/odoo/addons/base/static/img/res_partner_address_1.jpg b/odoo/addons/base/static/img/res_partner_address_1.jpg
new file mode 100644
index 00000000000..8004cc41119
--- /dev/null
+++ b/odoo/addons/base/static/img/res_partner_address_1.jpg
diff --git a/odoo/addons/base/static/img/res_partner_address_10-image.png b/odoo/addons/base/static/img/res_partner_address_10-image.png
deleted file mode 100644
index 8bfa12b77c3..00000000000
--- a/odoo/addons/base/static/img/res_partner_address_10-image.png
+++ /dev/null
diff --git a/odoo/addons/base/static/img/res_partner_address_10.jpg b/odoo/addons/base/static/img/res_partner_address_10.jpg
new file mode 100644
index 00000000000..d5d73910084
--- /dev/null
+++ b/odoo/addons/base/static/img/res_partner_address_10.jpg
diff --git a/odoo/addons/base/static/img/res_partner_address_11-image.png b/odoo/addons/base/static/img/res_partner_address_11-image.png
deleted file mode 100644
index 7b35d5587e0..00000000000
--- a/odoo/addons/base/static/img/res_partner_address_11-image.png
+++ /dev/null
diff --git a/odoo/addons/base/static/img/res_partner_address_11.jpg b/odoo/addons/base/static/img/res_partner_address_11.jpg
new file mode 100644
index 00000000000..41dca98aead
--- /dev/null
+++ b/odoo/addons/base/static/img/res_partner_address_11.jpg
diff --git a/odoo/addons/base/static/img/res_partner_address_13-image.png b/odoo/addons/base/static/img/res_partner_address_13-image.png
deleted file mode 100644
index 76522fb3e26..00000000000
--- a/odoo/addons/base/static/img/res_partner_address_13-image.png
+++ /dev/null
diff --git a/odoo/addons/base/static/img/res_partner_address_13.jpg b/odoo/addons/base/static/img/res_partner_address_13.jpg
new file mode 100644
index 00000000000..bf1dc8c1bec
--- /dev/null
+++ b/odoo/addons/base/static/img/res_partner_address_13.jpg
diff --git a/odoo/addons/base/static/img/res_partner_address_14-image.png b/odoo/addons/base/static/img/res_partner_address_14-image.png
deleted file mode 100644
index 171022ee28d..00000000000
--- a/odoo/addons/base/static/img/res_partner_address_14-image.png
+++ /dev/null
diff --git a/odoo/addons/base/static/img/res_partner_address_14.jpg b/odoo/addons/base/static/img/res_partner_address_14.jpg
new file mode 100644
index 00000000000..c0e9afee2c0
--- /dev/null
+++ b/odoo/addons/base/static/img/res_partner_address_14.jpg
diff --git a/odoo/addons/base/static/img/res_partner_address_15-image.png b/odoo/addons/base/static/img/res_partner_address_15-image.png
deleted file mode 100644
index ea0e5f49aaa..00000000000
--- a/odoo/addons/base/static/img/res_partner_address_15-image.png
+++ /dev/null
diff --git a/odoo/addons/base/static/img/res_partner_address_15.jpg b/odoo/addons/base/static/img/res_partner_address_15.jpg
new file mode 100644
index 00000000000..52c1920c649
--- /dev/null
+++ b/odoo/addons/base/static/img/res_partner_address_15.jpg
diff --git a/odoo/addons/base/static/img/res_partner_address_16-image.png b/odoo/addons/base/static/img/res_partner_address_16-image.png
deleted file mode 100644
index 82055c17481..00000000000
--- a/odoo/addons/base/static/img/res_partner_address_16-image.png
+++ /dev/null
diff --git a/odoo/addons/base/static/img/res_partner_address_16.jpg b/odoo/addons/base/static/img/res_partner_address_16.jpg
new file mode 100644
index 00000000000..c2e4428651e
--- /dev/null
+++ b/odoo/addons/base/static/img/res_partner_address_16.jpg
diff --git a/odoo/addons/base/static/img/res_partner_address_17-image.png b/odoo/addons/base/static/img/res_partner_address_17-image.png
deleted file mode 100644
index 8fbf90c847e..00000000000
--- a/odoo/addons/base/static/img/res_partner_address_17-image.png
+++ /dev/null
diff --git a/odoo/addons/base/static/img/res_partner_address_17.jpg b/odoo/addons/base/static/img/res_partner_address_17.jpg
new file mode 100644
index 00000000000..a6a2e5f839a
--- /dev/null
+++ b/odoo/addons/base/static/img/res_partner_address_17.jpg
diff --git a/odoo/addons/base/static/img/res_partner_address_18-image.png b/odoo/addons/base/static/img/res_partner_address_18-image.png
deleted file mode 100644
index 8dfe300e1e3..00000000000
--- a/odoo/addons/base/static/img/res_partner_address_18-image.png
+++ /dev/null
diff --git a/odoo/addons/base/static/img/res_partner_address_18.jpg b/odoo/addons/base/static/img/res_partner_address_18.jpg
new file mode 100644
index 00000000000..f3758fcb82d
--- /dev/null
+++ b/odoo/addons/base/static/img/res_partner_address_18.jpg
diff --git a/odoo/addons/base/static/img/res_partner_address_2-image.png b/odoo/addons/base/static/img/res_partner_address_2-image.png
deleted file mode 100644
index 3ca35173570..00000000000
--- a/odoo/addons/base/static/img/res_partner_address_2-image.png
+++ /dev/null
diff --git a/odoo/addons/base/static/img/res_partner_address_2.jpg b/odoo/addons/base/static/img/res_partner_address_2.jpg
new file mode 100644
index 00000000000..dcbaf260cc0
--- /dev/null
+++ b/odoo/addons/base/static/img/res_partner_address_2.jpg
diff --git a/odoo/addons/base/static/img/res_partner_address_24-image.png b/odoo/addons/base/static/img/res_partner_address_24-image.png
deleted file mode 100644
index 7f176bee063..00000000000
--- a/odoo/addons/base/static/img/res_partner_address_24-image.png
+++ /dev/null
diff --git a/odoo/addons/base/static/img/res_partner_address_24.jpg b/odoo/addons/base/static/img/res_partner_address_24.jpg
new file mode 100644
index 00000000000..3e5f9457e47
--- /dev/null
+++ b/odoo/addons/base/static/img/res_partner_address_24.jpg
diff --git a/odoo/addons/base/static/img/res_partner_address_25-image.png b/odoo/addons/base/static/img/res_partner_address_25-image.png
deleted file mode 100644
index e508b59d3c6..00000000000
--- a/odoo/addons/base/static/img/res_partner_address_25-image.png
+++ /dev/null
diff --git a/odoo/addons/base/static/img/res_partner_address_25.jpg b/odoo/addons/base/static/img/res_partner_address_25.jpg
new file mode 100644
index 00000000000..6c3e004c168
--- /dev/null
+++ b/odoo/addons/base/static/img/res_partner_address_25.jpg
diff --git a/odoo/addons/base/static/img/res_partner_address_27-image.png b/odoo/addons/base/static/img/res_partner_address_27-image.png
deleted file mode 100644
index 3bcc8df87d7..00000000000
--- a/odoo/addons/base/static/img/res_partner_address_27-image.png
+++ /dev/null
diff --git a/odoo/addons/base/static/img/res_partner_address_27.jpg b/odoo/addons/base/static/img/res_partner_address_27.jpg
new file mode 100644
index 00000000000..5c3569b62fc
--- /dev/null
+++ b/odoo/addons/base/static/img/res_partner_address_27.jpg
diff --git a/odoo/addons/base/static/img/res_partner_address_28-image.png b/odoo/addons/base/static/img/res_partner_address_28-image.png
deleted file mode 100644
index 12856052b0d..00000000000
--- a/odoo/addons/base/static/img/res_partner_address_28-image.png
+++ /dev/null
diff --git a/odoo/addons/base/static/img/res_partner_address_28.jpg b/odoo/addons/base/static/img/res_partner_address_28.jpg
new file mode 100644
index 00000000000..fdf962529f3
--- /dev/null
+++ b/odoo/addons/base/static/img/res_partner_address_28.jpg
diff --git a/odoo/addons/base/static/img/res_partner_address_3.jpg b/odoo/addons/base/static/img/res_partner_address_3.jpg
new file mode 100644
index 00000000000..cf30fdf3679
--- /dev/null
+++ b/odoo/addons/base/static/img/res_partner_address_3.jpg
diff --git a/odoo/addons/base/static/img/res_partner_address_30-image.png b/odoo/addons/base/static/img/res_partner_address_30-image.png
deleted file mode 100644
index 7a8186b7903..00000000000
--- a/odoo/addons/base/static/img/res_partner_address_30-image.png
+++ /dev/null
diff --git a/odoo/addons/base/static/img/res_partner_address_30.jpg b/odoo/addons/base/static/img/res_partner_address_30.jpg
new file mode 100644
index 00000000000..e6e223faca8
--- /dev/null
+++ b/odoo/addons/base/static/img/res_partner_address_30.jpg
diff --git a/odoo/addons/base/static/img/res_partner_address_31.jpg b/odoo/addons/base/static/img/res_partner_address_31.jpg
new file mode 100644
index 00000000000..ecead1fae72
--- /dev/null
+++ b/odoo/addons/base/static/img/res_partner_address_31.jpg
diff --git a/odoo/addons/base/static/img/res_partner_address_32-image.png b/odoo/addons/base/static/img/res_partner_address_32-image.png
deleted file mode 100644
index 7da8761aaef..00000000000
--- a/odoo/addons/base/static/img/res_partner_address_32-image.png
+++ /dev/null
diff --git a/odoo/addons/base/static/img/res_partner_address_32.jpg b/odoo/addons/base/static/img/res_partner_address_32.jpg
new file mode 100644
index 00000000000..502e684746b
--- /dev/null
+++ b/odoo/addons/base/static/img/res_partner_address_32.jpg
diff --git a/odoo/addons/base/static/img/res_partner_address_33-image.png b/odoo/addons/base/static/img/res_partner_address_33-image.png
deleted file mode 100644
index b56304c8efe..00000000000
--- a/odoo/addons/base/static/img/res_partner_address_33-image.png
+++ /dev/null
diff --git a/odoo/addons/base/static/img/res_partner_address_33.jpg b/odoo/addons/base/static/img/res_partner_address_33.jpg
new file mode 100644
index 00000000000..c6009f9eb95
--- /dev/null
+++ b/odoo/addons/base/static/img/res_partner_address_33.jpg
diff --git a/odoo/addons/base/static/img/res_partner_address_34-image.png b/odoo/addons/base/static/img/res_partner_address_34-image.png
deleted file mode 100644
index 8725d743c58..00000000000
--- a/odoo/addons/base/static/img/res_partner_address_34-image.png
+++ /dev/null
diff --git a/odoo/addons/base/static/img/res_partner_address_34.jpg b/odoo/addons/base/static/img/res_partner_address_34.jpg
new file mode 100644
index 00000000000..44ebebd24ef
--- /dev/null
+++ b/odoo/addons/base/static/img/res_partner_address_34.jpg
diff --git a/odoo/addons/base/static/img/res_partner_address_4-image.png b/odoo/addons/base/static/img/res_partner_address_4-image.png
deleted file mode 100644
index fa0f846c8fc..00000000000
--- a/odoo/addons/base/static/img/res_partner_address_4-image.png
+++ /dev/null
diff --git a/odoo/addons/base/static/img/res_partner_address_4.jpg b/odoo/addons/base/static/img/res_partner_address_4.jpg
new file mode 100644
index 00000000000..9358491105b
--- /dev/null
+++ b/odoo/addons/base/static/img/res_partner_address_4.jpg
diff --git a/odoo/addons/base/static/img/res_partner_address_5-image.png b/odoo/addons/base/static/img/res_partner_address_5-image.png
deleted file mode 100644
index db074e864c6..00000000000
--- a/odoo/addons/base/static/img/res_partner_address_5-image.png
+++ /dev/null
diff --git a/odoo/addons/base/static/img/res_partner_address_5.jpg b/odoo/addons/base/static/img/res_partner_address_5.jpg
new file mode 100644
index 00000000000..8a9edd8d12b
--- /dev/null
+++ b/odoo/addons/base/static/img/res_partner_address_5.jpg
diff --git a/odoo/addons/base/static/img/res_partner_address_7-image.png b/odoo/addons/base/static/img/res_partner_address_7-image.png
deleted file mode 100644
index d7996627cd4..00000000000
--- a/odoo/addons/base/static/img/res_partner_address_7-image.png
+++ /dev/null
diff --git a/odoo/addons/base/static/img/res_partner_address_7.jpg b/odoo/addons/base/static/img/res_partner_address_7.jpg
new file mode 100644
index 00000000000..3a2b514c33b
--- /dev/null
+++ b/odoo/addons/base/static/img/res_partner_address_7.jpg
diff --git a/odoo/addons/base/static/img/res_partner_main1-image.png b/odoo/addons/base/static/img/res_partner_main1-image.png
deleted file mode 100644
index ca64a2d598b..00000000000
--- a/odoo/addons/base/static/img/res_partner_main1-image.png
+++ /dev/null
diff --git a/odoo/addons/base/static/img/res_partner_main1.jpg b/odoo/addons/base/static/img/res_partner_main1.jpg
new file mode 100644
index 00000000000..cfc6f311c55
--- /dev/null
+++ b/odoo/addons/base/static/img/res_partner_main1.jpg
diff --git a/odoo/addons/base/static/img/res_partner_main2-image.png b/odoo/addons/base/static/img/res_partner_main2-image.png
deleted file mode 100644
index f056a0c3ce8..00000000000
--- a/odoo/addons/base/static/img/res_partner_main2-image.png
+++ /dev/null
diff --git a/odoo/addons/base/static/img/res_partner_main2.jpg b/odoo/addons/base/static/img/res_partner_main2.jpg
new file mode 100644
index 00000000000..c76f3f51263
--- /dev/null
+++ b/odoo/addons/base/static/img/res_partner_main2.jpg
diff --git a/odoo/addons/base/static/img/user_demo-image.jpg b/odoo/addons/base/static/img/user_demo-image.jpg
index 47ccb5c0a01..62ea75fb8f0 100644
--- a/odoo/addons/base/static/img/user_demo-image.jpg
+++ b/odoo/addons/base/static/img/user_demo-image.jpg
diff --git a/odoo/addons/base/tests/test_api.py b/odoo/addons/base/tests/test_api.py
index 1a8476d39b5..270a8d75df4 100644
--- a/odoo/addons/base/tests/test_api.py
+++ b/odoo/addons/base/tests/test_api.py
@@ -76,7 +76,7 @@ class TestAPI(common.TransactionCase):
     @mute_logger('odoo.models')
     def test_05_immutable(self):
         """ Check that a recordset remains the same, even after updates. """
-        domain = [('name', 'ilike', 'j')]
+        domain = [('name', 'ilike', 'g')]
         partners = self.env['res.partner'].search(domain)
         self.assertTrue(partners)
         ids = partners.ids
@@ -136,7 +136,7 @@ class TestAPI(common.TransactionCase):
     @mute_logger('odoo.models')
     def test_40_new_new(self):
         """ Call new-style methods in the new API style. """
-        partners = self.env['res.partner'].search([('name', 'ilike', 'j')])
+        partners = self.env['res.partner'].search([('name', 'ilike', 'g')])
         self.assertTrue(partners)
 
         # call method write on partners itself, and check its effect
@@ -147,7 +147,7 @@ class TestAPI(common.TransactionCase):
     @mute_logger('odoo.models')
     def test_45_new_new(self):
         """ Call new-style methods on records (new API style). """
-        partners = self.env['res.partner'].search([('name', 'ilike', 'j')])
+        partners = self.env['res.partner'].search([('name', 'ilike', 'g')])
         self.assertTrue(partners)
 
         # call method write on partner records, and check its effects
@@ -291,29 +291,29 @@ class TestAPI(common.TransactionCase):
 
         # reading ONE partner should fetch them ALL
         for partner in partners:
-            partner.country_id
+            partner.state_id
             break
         partner_ids_with_field = [partner.id
                                   for partner in partners
-                                  if 'country_id' in partner._cache]
+                                  if 'state_id' in partner._cache]
         self.assertItemsEqual(partner_ids_with_field, partners.ids)
 
-        # partners' countries are ready for prefetching
-        country_ids = {cid
+        # partners' states are ready for prefetching
+        state_ids = {sid
                        for partner in partners
-                       for cid in partner._cache['country_id']}
-        self.assertTrue(len(country_ids) > 1)
-        self.assertItemsEqual(country_ids, partners._prefetch['res.country'])
+                       for sid in partner._cache['state_id']}
+        self.assertTrue(len(state_ids) > 1)
+        self.assertItemsEqual(state_ids, partners._prefetch['res.country.state'])
 
         # reading ONE partner country should fetch ALL partners' countries
         for partner in partners:
-            if partner.country_id:
-                partner.country_id.name
+            if partner.state_id:
+                partner.state_id.name
                 break
-        country_ids_with_field = [country.id
-                                  for country in partners.mapped('country_id')
-                                  if 'name' in country._cache]
-        self.assertItemsEqual(country_ids_with_field, country_ids)
+        state_ids_with_field = [state.id
+                                  for state in partners.mapped('state_id')
+                                  if 'name' in state._cache]
+        self.assertItemsEqual(state_ids_with_field, state_ids)
 
     @mute_logger('odoo.models')
     def test_60_prefetch_object(self):
diff --git a/odoo/addons/base/tests/test_expression.py b/odoo/addons/base/tests/test_expression.py
index e047a7acad3..9f628054f02 100644
--- a/odoo/addons/base/tests/test_expression.py
+++ b/odoo/addons/base/tests/test_expression.py
@@ -215,15 +215,15 @@ class TestExpression(TransactionCase):
         Partner = self.env['res.partner']
 
         # testing equality with name
-        partners = Partner.search([('parent_id', '=', 'Agrolait')])
+        partners = Partner.search([('parent_id', '=', 'Deco Addict')])
         self.assertTrue(partners)
 
         # testing the in operator with name
-        partners = Partner.search([('parent_id', 'in', 'Agrolait')])
+        partners = Partner.search([('parent_id', 'in', 'Deco Addict')])
         self.assertTrue(partners)
 
         # testing the in operator with a list of names
-        partners = Partner.search([('parent_id', 'in', ['Agrolait', 'ASUStek'])])
+        partners = Partner.search([('parent_id', 'in', ['Deco Addict', 'Wood Corner'])])
         self.assertTrue(partners)
 
         # check if many2one works with empty search list
@@ -545,10 +545,10 @@ class TestExpression(TransactionCase):
     def test_like_wildcards(self):
         # check that =like/=ilike expressions are working on an untranslated field
         Partner = self.env['res.partner']
-        partners = Partner.search([('name', '=like', 'A_U_TeK')])
-        self.assertTrue(len(partners) == 1, "Must match one partner (ASUSTeK)")
-        partners = Partner.search([('name', '=ilike', 'c%')])
-        self.assertTrue(len(partners) >= 1, "Must match one partner (China Export)")
+        partners = Partner.search([('name', '=like', 'W_od_C_rn_r')])
+        self.assertTrue(len(partners) == 1, "Must match one partner (Wood Corner)")
+        partners = Partner.search([('name', '=ilike', 'G%')])
+        self.assertTrue(len(partners) >= 1, "Must match one partner (Gemini Furniture)")
 
         # check that =like/=ilike expressions are working on translated field
         Country = self.env['res.country']
@@ -612,7 +612,7 @@ class TestExpression(TransactionCase):
         """ Check that we can exclude translated fields (bug lp:1071710) """
         # first install french language
         self.env['ir.translation'].load_module_terms(['base'], ['fr_FR'])
-
+        self.env.ref('base.res_partner_2').country_id = self.env.ref('base.be')
         # actual test
         Country = self.env['res.country']
         be = self.env.ref('base.be')
@@ -621,13 +621,13 @@ class TestExpression(TransactionCase):
 
         # indirect search via m2o
         Partner = self.env['res.partner']
-        agrolait = Partner.search([('name', '=', 'Agrolait')])
+        deco_addict = Partner.search([('name', '=', 'Deco Addict')])
 
         not_be = Partner.search([('country_id', '!=', 'Belgium')])
-        self.assertNotIn(agrolait, not_be)
+        self.assertNotIn(deco_addict, not_be)
 
         not_be = Partner.with_context(lang='fr_FR').search([('country_id', '!=', 'Belgique')])
-        self.assertNotIn(agrolait, not_be)
+        self.assertNotIn(deco_addict, not_be)
 
     def test_or_with_implicit_and(self):
         # Check that when using expression.OR on a list of domains with at least one
diff --git a/odoo/addons/test_new_api/static/tests/x2many.js b/odoo/addons/test_new_api/static/tests/x2many.js
index d256d026325..a4cb4be9d88 100644
--- a/odoo/addons/test_new_api/static/tests/x2many.js
+++ b/odoo/addons/test_new_api/static/tests/x2many.js
@@ -62,15 +62,15 @@ odoo.define('web.test.x2many', function (require) {
         trigger: '.tab-pane:eq(2).active .o_field_x2many_list_row_add a'
     }, {
         content: "select Admin",
-        trigger: 'tr:has(td:containsExact(Administrator)) .o_list_record_selector input[type="checkbox"]'
+        trigger: 'tr:has(td:containsExact(Mitchell Stephens)) .o_list_record_selector input[type="checkbox"]'
     }, {
         content: "save selected participants",
         trigger: '.o_select_button',
-        extra_trigger: 'tr:has(td:containsExact(Administrator)) .o_list_record_selector input[type="checkbox"]:propChecked',
+        extra_trigger: 'tr:has(td:containsExact(Mitchell Stephens)) .o_list_record_selector input[type="checkbox"]:propChecked',
     }, { // save
         content: "save discussion",
         trigger: 'button.o_form_button_save',
-        extra_trigger: '.tab-pane:eq(2) .o_field_widget tbody tr:has(td:containsExact(Administrator))',
+        extra_trigger: '.tab-pane:eq(2) .o_field_widget tbody tr:has(td:containsExact(Mitchell Stephens))',
     }, { // edit
         content: "edit discussion",
         trigger: 'button.o_form_button_edit',
@@ -91,7 +91,7 @@ odoo.define('web.test.x2many', function (require) {
     }, { // add message b
         content: "create new message b",
         trigger: '.tab-pane:eq(0) .o_field_x2many_list_row_add a',
-        extra_trigger: '.o_web_client:has(textarea[name="message_concat"]:propValue([test] Administrator:a))',
+        extra_trigger: '.o_web_client:has(textarea[name="message_concat"]:propValue([test] Mitchell Stephens:a))',
     }, {
         content: "insert body b",
         trigger: 'textarea[name="body"]:first',
@@ -103,7 +103,7 @@ odoo.define('web.test.x2many', function (require) {
     }, { // change content to trigger on change
         content: "insert content",
         trigger: 'input.o_required_modifier',
-        extra_trigger: 'textarea[name="message_concat"]:first:propValue([test] Administrator:a\n[test] Administrator:b)',
+        extra_trigger: 'textarea[name="message_concat"]:first:propValue([test] Mitchell Stephens:a\n[test] Mitchell Stephens:b)',
         run: 'text test_trigger',
     }, {
         content: "blur the content field",
@@ -111,7 +111,7 @@ odoo.define('web.test.x2many', function (require) {
         run: 'text test_trigger',
     }, {
         content: "check onchange",
-        trigger: 'textarea[name="message_concat"]:first:propValue([test_trigger] Administrator:a\n[test_trigger] Administrator:b)',
+        trigger: 'textarea[name="message_concat"]:first:propValue([test_trigger] Mitchell Stephens:a\n[test_trigger] Mitchell Stephens:b)',
         run: function () {},
     }, { // change message b
         content: "edit message b",
@@ -128,7 +128,7 @@ odoo.define('web.test.x2many', function (require) {
     }, { // add message c
         content: "create new message c",
         trigger: '.tab-pane:eq(0) .o_field_x2many_list_row_add a',
-        extra_trigger: 'textarea[name="message_concat"]:propValue([test_trigger] Administrator:a\n[test_trigger] Administrator:bbb)',
+        extra_trigger: 'textarea[name="message_concat"]:propValue([test_trigger] Mitchell Stephens:a\n[test_trigger] Mitchell Stephens:bbb)',
     }, {
         content: "insert body",
         trigger: 'textarea[name="body"]:first',
@@ -146,11 +146,11 @@ odoo.define('web.test.x2many', function (require) {
         trigger: '.tab-pane:eq(2).active .o_field_x2many_list_row_add a',
     }, {
         content: "select Demo User",
-        trigger: 'tr:has(td:containsExact(Demo User)) .o_list_record_selector input[type="checkbox"]',
+        trigger: 'tr:has(td:containsExact(Marc Brown)) .o_list_record_selector input[type="checkbox"]',
     }, {
         content: "save selected participants",
         trigger: '.o_select_button',
-        extra_trigger: 'tr:has(td:containsExact(Demo User)) .o_list_record_selector input[type="checkbox"]:propChecked',
+        extra_trigger: 'tr:has(td:containsExact(Marc Brown)) .o_list_record_selector input[type="checkbox"]:propChecked',
     }, { // save
         content: "save discussion",
         trigger: 'button.o_form_button_save',
@@ -162,7 +162,7 @@ odoo.define('web.test.x2many', function (require) {
         run: function () {}, // it's a check
     }, {
         content: "check data 2",
-        trigger: '.o_content:has(.tab-pane:eq(0) .o_field_widget tr:has(td:containsExact(bbb)):has(td:containsExact([test_trigger] Administrator)))',
+        trigger: '.o_content:has(.tab-pane:eq(0) .o_field_widget tr:has(td:containsExact(bbb)):has(td:containsExact([test_trigger] Mitchell Stephens)))',
         run: function () {}, // it's a check
     }, {
         content: "check data 3",
@@ -219,18 +219,18 @@ odoo.define('web.test.x2many', function (require) {
     }, {
         content: "open the many2one to select another user",
         trigger: '.o_input_dropdown > input',
-        run: 'text Demo',
+        run: 'text Marc',
     }, {
         content: "select another user",
-        trigger: '.ui-autocomplete li:contains(Demo User)',
+        trigger: '.ui-autocomplete li:contains(Marc Brown)',
         in_modal: false,
     }, {
         content: "test one2many's line onchange after many2one",
-        trigger: '.o_field_widget:contains([test_trigger] Demo User)',
+        trigger: '.o_field_widget:contains([test_trigger] Marc Brown)',
         run: function () {}, // it's a check
     }, {
         content: "test one2many field not triggered onchange",
-        trigger: 'textarea[name="message_concat"]:first:propValueContains([test_trigger] Administrator:e)',
+        trigger: 'textarea[name="message_concat"]:first:propValueContains([test_trigger] Mitchell Stephens:e)',
         in_modal: false,
         run: function () {}, // don't change texarea content
     }, {
@@ -238,11 +238,11 @@ odoo.define('web.test.x2many', function (require) {
         trigger: '.modal-footer button:contains(Save):contains(Close)'
     }, {
         content: "test one2many triggered the onchange on save for the line",
-        trigger: '.o_content:has(.tab-pane:eq(0) .o_field_widget tbody tr td.o_readonly_modifier:contains([test_trigger] Demo User))',
+        trigger: '.o_content:has(.tab-pane:eq(0) .o_field_widget tbody tr td.o_readonly_modifier:contains([test_trigger] Marc Brown))',
         run: function () {}, // it's a check
     }, {
         content: "test one2many triggered the onchange on save",
-        trigger: 'textarea[name="message_concat"]:first:propValueContains([test_trigger] Demo User:e)',
+        trigger: 'textarea[name="message_concat"]:first:propValueContains([test_trigger] Marc Brown:e)',
         run: function () {}, // don't change texarea content
     }, { // remove
         content: "remove b",
@@ -266,7 +266,7 @@ odoo.define('web.test.x2many', function (require) {
         run: function () {}, // it's a check
     }, {
         content: "check data 6",
-        trigger: '.o_content:has(.tab-pane:eq(0) .o_field_widget tbody tr:has(td:containsExact([test_trigger] Administrator)):has(td:containsExact(aaa)))',
+        trigger: '.o_content:has(.tab-pane:eq(0) .o_field_widget tbody tr:has(td:containsExact([test_trigger] Mitchell Stephens)):has(td:containsExact(aaa)))',
         run: function () {}, // it's a check
     }, {
         content: "check data 7",
@@ -284,14 +284,14 @@ odoo.define('web.test.x2many', function (require) {
         content: "select another user",
         trigger: '.o_field_many2one .o_input_dropdown > input',
         extra_trigger: 'body:has(.modal) .tab-pane:eq(0) .o_field_widget tbody tr:has(td:containsExact(d))',
-        run: 'text Demo',
+        run: 'text Marc',
     }, {
         content: "select demo user",
-        trigger: '.ui-autocomplete li a:contains(Demo User)',
+        trigger: '.ui-autocomplete li a:contains(Marc Brown)',
         in_modal: false,
     }, {
         content: "test one2many's line onchange after many2one",
-        trigger: '.o_field_widget:contains([test_trigger] Demo User)',
+        trigger: '.o_field_widget:contains([test_trigger] Marc Brown)',
         run: function () {}, // it's a check
     }, {
         content: "insert body",
@@ -307,7 +307,7 @@ odoo.define('web.test.x2many', function (require) {
         extra_trigger: '.tab-pane:eq(0) .o_field_widget tbody:has(tr td:containsExact(ddd))',
     }, { // check onchange data
         content: "check data 8",
-        trigger: 'textarea[name="message_concat"]:propValueContains([test_trigger] Administrator:aaa\n[test_trigger] Administrator:c\n[test_trigger] Administrator:d\n[test_trigger] Demo User:ddd)',
+        trigger: 'textarea[name="message_concat"]:propValueContains([test_trigger] Mitchell Stephens:aaa\n[test_trigger] Mitchell Stephens:c\n[test_trigger] Mitchell Stephens:d\n[test_trigger] Marc Brown:ddd)',
         run: function () {}, // don't change texarea content
     }, {
         content: "check data 9",
@@ -380,13 +380,13 @@ odoo.define('web.test.x2many', function (require) {
     }, {
         content: "open the many2one to select an other user",
         trigger: '.o_list_view .o_field_many2one[name="author"] .o_input_dropdown > input',
-        run: 'text Demo',
+        run: 'text Marc',
     }, {
         content: "select an other user",
-        trigger: '.ui-autocomplete li a:contains(Demo User)',
+        trigger: '.ui-autocomplete li a:contains(Marc Brown)',
     }, {
         content: "test one2many's line onchange after many2one",
-        trigger: '.o_list_view td:contains([test_trigger2] Demo User)',
+        trigger: '.o_list_view td:contains([test_trigger2] Marc Brown)',
         run: function () {}, // don't blur the many2one
     }, {
         content: "change text value",
@@ -398,7 +398,7 @@ odoo.define('web.test.x2many', function (require) {
         run: 'click'
     }, {
         content: "test one2many onchange",
-        trigger: 'textarea[name="message_concat"]:first:propValueContains([test_trigger2] Demo User:ccccc)',
+        trigger: 'textarea[name="message_concat"]:first:propValueContains([test_trigger2] Marc Brown:ccccc)',
         run: function () {}, // don't change texarea content
     }, {
         content: "click outside to trigger one2many onchange",
@@ -411,7 +411,7 @@ odoo.define('web.test.x2many', function (require) {
         trigger: '.o_list_view .o_data_row td.o_list_record_remove button:visible:last',
     }, {
         content: "test one2many onchange after delete",
-        trigger: '.o_content:not(:has(textarea[name="message_concat"]:propValueContains(Administrator:d)))',
+        trigger: '.o_content:not(:has(textarea[name="message_concat"]:propValueContains(Mitchell Stephens:d)))',
         run: function () {},
     }, { // save
         content: "save discussion",
@@ -419,7 +419,7 @@ odoo.define('web.test.x2many', function (require) {
         extra_trigger: 'body:not(:has(tr:has(td:containsExact(d))))',
     }, { // check saved data
         content: "check data 10",
-        trigger: '.o_field_text:containsExact([test_trigger2] Administrator:aaa\n[test_trigger2] Demo User:ccccc)',
+        trigger: '.o_field_text:containsExact([test_trigger2] Mitchell Stephens:aaa\n[test_trigger2] Marc Brown:ccccc)',
         run: function () {}, // don't change texarea content
     }, {
         content: "check data 11",
@@ -443,7 +443,7 @@ odoo.define('web.test.x2many', function (require) {
         extra_trigger: 'textarea[name="body"]:first:propValueContains(eee)',
     }, { // check saved data
         content: "check data 12",
-        trigger: '.o_field_text[name="message_concat"]:containsExact([test_trigger2] Administrator:aaa\n[test_trigger2] Demo User:ccccc\n[test_trigger2] Administrator:eee)',
+        trigger: '.o_field_text[name="message_concat"]:containsExact([test_trigger2] Mitchell Stephens:aaa\n[test_trigger2] Marc Brown:ccccc\n[test_trigger2] Mitchell Stephens:eee)',
         run: function () {}, // it's a check
     }, {
         content: "check data 13",
diff --git a/odoo/addons/test_new_api/tests/test_new_fields.py b/odoo/addons/test_new_api/tests/test_new_fields.py
index fc117e7ced3..1b458fa604d 100644
--- a/odoo/addons/test_new_api/tests/test_new_fields.py
+++ b/odoo/addons/test_new_api/tests/test_new_fields.py
@@ -802,7 +802,7 @@ class TestFields(common.TransactionCase):
     def test_50_search_many2one(self):
         """ test search through a path of computed fields"""
         messages = self.env['test_new_api.message'].search(
-            [('author_partner.name', '=', 'Demo User')])
+            [('author_partner.name', '=', 'Marc Brown')])
         self.assertEqual(messages, self.env.ref('test_new_api.message_0_1'))
 
     def test_60_x2many_domain(self):
diff --git a/odoo/addons/test_new_api/tests/test_onchange.py b/odoo/addons/test_new_api/tests/test_onchange.py
index 7caf433a467..2a67b28fca5 100644
--- a/odoo/addons/test_new_api/tests/test_onchange.py
+++ b/odoo/addons/test_new_api/tests/test_onchange.py
@@ -440,7 +440,7 @@ class TestOnChange(common.TransactionCase):
 
         onchange_result = {
             'message_name': 'Hey dude!',
-            'message_currency': (1, 'Administrator')
+            'message_currency': (1, 'Mitchell Stephens')
         }
 
         self.env.cache.invalidate()