[IMP]: (Work in progress)* Changed demo references according to changes in server, Aim is to add more common names and easy demo.

* Improved xml_id of demo like res_partner_1 instead of specific record name like res_partner_asus so in future we can change that record value easily avoiding confusions in names

bzr revid: rpa@tinyerp.com-20120619071624-3d9mcl9m76gp2s0c

41 files changed, 124 insertions, 125 deletions

diff --git a/addons/account/account_unit_test.xml b/addons/account/account_unit_test.xml
index ad4540b9806..7795c2700cc 100644
--- a/addons/account/account_unit_test.xml
+++ b/addons/account/account_unit_test.xml
@@ -5,7 +5,7 @@
         <record id="test_invoice_1" model="account.invoice">
             <field name="currency_id" ref="base.EUR"/>
             <field name="company_id" ref="base.main_company"/>
-            <field name="partner_id" ref="base.res_partner_asus"/>
+            <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>
diff --git a/addons/account/project/analytic_account_demo.xml b/addons/account/project/analytic_account_demo.xml
index ec89d280774..ce85c869121 100644
--- a/addons/account/project/analytic_account_demo.xml
+++ b/addons/account/project/analytic_account_demo.xml
@@ -126,7 +126,7 @@
             <field eval="str(time.localtime()[0] - 1) + '-08-07'" name="date_start"/>
             <field eval="time.strftime('%Y-12-31')" name="date"/>
             <field name="parent_id" ref="analytic_integration"/>
-            <field name="partner_id" ref="base.res_partner_c2c"/>
+            <field name="partner_id" ref="base.res_partner_12"/>
             <field name="state">open</field>
         </record>
         <record id="analytic_agrolait" model="account.analytic.account">
@@ -134,14 +134,14 @@
             <field name="code">3</field>
             <field name="parent_id" ref="analytic_customers"/>
             <field name="type">normal</field>
-            <field name="partner_id" ref="base.res_partner_agrolait"/>
+            <field name="partner_id" ref="base.res_partner_2"/>
         </record>
         <record id="analytic_asustek" model="account.analytic.account">
             <field name="name">Asustek</field>
             <field name="code">4</field>
             <field name="type">normal</field>
             <field name="parent_id" ref="analytic_customers"/>
-            <field name="partner_id" ref="base.res_partner_asus"/>
+            <field name="partner_id" ref="base.res_partner_1"/>
         </record>
         <record id="analytic_distripc" model="account.analytic.account">
             <field name="name">DistriPC</field>
@@ -150,7 +150,8 @@
             <field name="type">normal</field>
             <field name="partner_id" ref="base.res_partner_4"/>
         </record>
-        <record id="analytic_sednacom" model="account.analytic.account">
+        <!--To remove or change ID-->
+        <!--record id="analytic_sednacom" model="account.analytic.account">
             <field name="name">Sednacom</field>
             <field name="code">2</field>
             <field eval="str(time.localtime()[0] - 1) + '-05-09'" name="date_start"/>
@@ -159,7 +160,7 @@
             <field name="type">normal</field>
             <field name="partner_id" ref="base.res_partner_sednacom"/>
             <field name="state">open</field>
-        </record>
+        </record-->
         <record id="analytic_thymbra" model="account.analytic.account">
             <field name="name">Thymbra</field>
             <field name="code">3</field>
@@ -202,7 +203,7 @@
             <field eval="time.strftime('%Y-%m-%d')" name="date"/>
             <field name="type">normal</field>
             <field name="parent_id" ref="analytic_partners"/>
-            <field name="partner_id" ref="base.res_partner_c2c"/>
+            <field name="partner_id" ref="base.res_partner_12"/>
             <field name="state">open</field>
         </record>
         <record id="analytic_project_2_support" model="account.analytic.account">
diff --git a/addons/account/test/account_report.yml b/addons/account/test/account_report.yml
index 7ce1843bfa3..64f8ccf838f 100644
--- a/addons/account/test/account_report.yml
+++ b/addons/account/test/account_report.yml
@@ -4,7 +4,7 @@
   !record {model: account.invoice, id: test_invoice_1}:
     currency_id: base.EUR
     company_id: base.main_company
-    partner_id: base.res_partner_asus
+    partner_id: base.res_partner_1
     state: draft
     type: out_invoice
     account_id: account.a_recv
@@ -23,7 +23,7 @@
 -
   !python {model: res.partner}: |
     import netsvc, tools, os
-    (data, format) = netsvc.LocalService('report.account.overdue').create(cr, uid, [ref('base.res_partner_asus'),ref('base.res_partner_agrolait'),ref('base.res_partner_c2c')], {}, {})
+    (data, format) = netsvc.LocalService('report.account.overdue').create(cr, uid, [ref('base.res_partner_1'),ref('base.res_partner_2'),ref('base.res_partner_12')], {}, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'account-report_overdue.'+format), 'wb+').write(data)
 -
diff --git a/addons/account/test/test_edi_invoice.yml b/addons/account/test/test_edi_invoice.yml
index 9460bbcf085..f94d1896810 100644
--- a/addons/account/test/test_edi_invoice.yml
+++ b/addons/account/test/test_edi_invoice.yml
@@ -5,7 +5,7 @@
 -
   !record {model: account.invoice, id: invoice_edi_1}:
     journal_id: 1
-    partner_id: base.res_partner_agrolait
+    partner_id: base.res_partner_2
     currency_id: base.EUR
     company_id: 1
     account_id: account.a_pay
diff --git a/addons/account_payment/account_payment_demo.xml b/addons/account_payment/account_payment_demo.xml
index 02170c38fea..c222e00b947 100644
--- a/addons/account_payment/account_payment_demo.xml
+++ b/addons/account_payment/account_payment_demo.xml
@@ -4,7 +4,7 @@
     	<record id="partner_bank_1" model="res.partner.bank">
             <field name="name">Reserve Bank</field>
             <field name="acc_number">00987654321</field>
-            <field name="partner_id" ref="base.res_partner_agrolait"></field>
+            <field name="partner_id" ref="base.res_partner_2"></field>
             <field name="state">bank</field>
             <field name="bank" ref="base.res_bank_1"/>
         </record>
diff --git a/addons/account_payment/test/account_payment_demo.yml b/addons/account_payment/test/account_payment_demo.yml
index 14add1475c7..27b81e9f0f6 100644
--- a/addons/account_payment/test/account_payment_demo.yml
+++ b/addons/account_payment/test/account_payment_demo.yml
@@ -8,6 +8,6 @@
   !record {model: payment.line, id: payment_line_0}:
     name: Test
     communication: Test
-    partner_id: base.res_partner_agrolait
+    partner_id: base.res_partner_2
     order_id: payment_order_2
     amount_currency: 100.00
diff --git a/addons/crm/test/process/action_rule.yml b/addons/crm/test/process/action_rule.yml
index b13c9b086cc..1818278a82e 100644
--- a/addons/crm/test/process/action_rule.yml
+++ b/addons/crm/test/process/action_rule.yml
@@ -4,7 +4,7 @@
   !python {model: base.action.rule}: |
     modle_id = self.pool.get("ir.model").search(cr, uid, [('name', '=', 'crm.lead')])
     from datetime import datetime
-    new_id = self.create(cr, uid, {'name': 'New Rule', 'model_id': modle_id[0],  'trg_user_id': ref('base.user_root'), 'trg_partner_id': ref('base.res_partner_asus'), 'act_user_id': ref('base.user_demo') })
+    new_id = self.create(cr, uid, {'name': 'New Rule', 'model_id': modle_id[0],  'trg_user_id': ref('base.user_root'), 'trg_partner_id': ref('base.res_partner_1'), 'act_user_id': ref('base.user_demo') })
     lead_obj = self.pool.get("crm.lead")
     self._check(cr, uid)
 -
@@ -12,7 +12,7 @@
 -
   !record {model: crm.lead, id: crm_lead_test_rules_id}:
     name: 'Test lead rules'
-    partner_id: base.res_partner_asus
+    partner_id: base.res_partner_1
 -
   I check record rule is apply and responsible is changed.
 -
diff --git a/addons/crm/test/process/lead2opportunity2win.yml b/addons/crm/test/process/lead2opportunity2win.yml
index c1caf394c2e..bbaaff7e362 100644
--- a/addons/crm/test/process/lead2opportunity2win.yml
+++ b/addons/crm/test/process/lead2opportunity2win.yml
@@ -22,14 +22,14 @@
   I convert lead into opportunity for exiting customer.
 -
   !python {model: crm.lead}: |
-    self.convert_opportunity(cr, uid ,[ref("crm_case_qrecorp0")], ref("base.res_partner_agrolait"))
+    self.convert_opportunity(cr, uid ,[ref("crm_case_qrecorp0")], ref("base.res_partner_2"))
 -
   I check details of converted opportunity. 
 -
   !python {model: crm.lead}: |
     lead = self.browse(cr, uid, ref('crm_case_qrecorp0'))
     assert lead.type == 'opportunity', 'Lead is not converted to opportunity!'
-    assert lead.partner_id.id == ref("base.res_partner_agrolait"), 'Partner missmatch!'
+    assert lead.partner_id.id == ref("base.res_partner_2"), 'Partner missmatch!'
     assert lead.stage_id.id == ref("stage_lead1"), 'Stage of opportunity is incorrect!'
 -
   Now I begin communication and schedule a phone call with the customer.
diff --git a/addons/crm_profiling/crm_profiling_demo.xml b/addons/crm_profiling/crm_profiling_demo.xml
index 6a0ca130ec3..0995d286d93 100644
--- a/addons/crm_profiling/crm_profiling_demo.xml
+++ b/addons/crm_profiling/crm_profiling_demo.xml
@@ -153,22 +153,22 @@
 	Partners
 	-->
 
-	<record model="res.partner" id="base.res_partner_asus">
+	<record model="res.partner" id="base.res_partner_1">
 		<field name="answers_ids" eval="[(6,0,[ref('partner_quality1'), ref('nb_employees2'), ref('sector2'), ref('partner_tiny1')])]" />
 		<field name="category_id" eval="[(6,0,[ref('base.res_partner_category_3'), ref('base.res_partner_category_16')])]"/>
 	</record>
-	<record model="res.partner" id="base.res_partner_agrolait">
+	<record model="res.partner" id="base.res_partner_2">
 		<field name="answers_ids" eval="[(6,0,[ref('partner_quality1'), ref('nb_employees1'), ref('sector1'), ref('partner_tiny1')])]" />
 		<field name="category_id" eval="[(6,0,[ref('base.res_partner_category_3'), ref('base.res_partner_category_17')])]"/>
 	</record>
-	<record model="res.partner" id="base.res_partner_c2c">
+	<record model="res.partner" id="base.res_partner_12">
 		<field name="answers_ids" eval="[(6,0,[ref('partner_quality3'), ref('nb_employees3'), ref('sector3'), ref('partner_tiny1')])]" />
 		<field name="category_id" eval="[(6,0,[ref('base.res_partner_category_5'), ref('base.res_partner_category_15')])]"/>
 	</record>
-	<record model="res.partner" id="base.res_partner_sednacom">
+	<!--record model="res.partner" id="base.res_partner_sednacom">
 		<field name="answers_ids" eval="[(6,0,[ref('partner_quality2'), ref('nb_employees1'), ref('sector2'), ref('partner_tiny1')])]" />
 		<field name="category_id" eval="[(6,0,[ref('base.res_partner_category_4'), ref('base.res_partner_category_16')])]"/>
-	</record>
+	</record-->
 	<record model="res.partner" id="base.res_partner_thymbra">
 		<field name="answers_ids" eval="[(6,0,[ref('partner_quality3'), ref('nb_employees3'), ref('sector3'), ref('partner_tiny1')])]" />
 		<field name="category_id" eval="[(6,0,[ref('base.res_partner_category_5'), ref('base.res_partner_category_15')])]"/>
diff --git a/addons/edi/test/edi_partner_test.yml b/addons/edi/test/edi_partner_test.yml
index cca39417927..9fc523bf84f 100644
--- a/addons/edi/test/edi_partner_test.yml
+++ b/addons/edi/test/edi_partner_test.yml
@@ -9,12 +9,12 @@
   !python {model: edi.document}: |
       import json
       partner_obj = self.pool.get('res.partner')
-      tokens = self.export_edi(cr, uid, [partner_obj.browse(cr, uid, ref('base.res_partner_agrolait'))])
+      tokens = self.export_edi(cr, uid, [partner_obj.browse(cr, uid, ref('base.res_partner_2'))])
       doc = self.get_document(cr, uid, tokens[0], context=context)
       edi_doc, = json.loads(doc)
 
       # check content of the document
-      assert edi_doc.get('__id').endswith('.res_partner_agrolait'), 'Incorrect external ID'
+      assert edi_doc.get('__id').endswith('.res_partner_2'), 'Incorrect external ID'
       assert edi_doc.get('__model') == 'res.partner', 'Incorrect/Missing __model'
       assert edi_doc.get('__module') == 'base', 'Incorrect/Missing __module'
       assert edi_doc.get('__last_update'), 'Missing __last_update'
@@ -32,8 +32,8 @@
       edi_doc['__attachments'] = [attachment]
       doc = json.dumps([edi_doc])
       result, = self.import_edi(cr, uid, edi_document=doc)
-      assert result[0] == 'res.partner' and result[1] > ref('base.res_partner_agrolait'),\
-         "Expected (%r,> %r) after import 1, got %r" % ('res.partner', ref('base.res_partner_agrolait'), result)
+      assert result[0] == 'res.partner' and result[1] > ref('base.res_partner_2'),\
+         "Expected (%r,> %r) after import 1, got %r" % ('res.partner', ref('base.res_partner_2'), result)
 
       # export the same partner we just created, and see if the output matches the input
       tokens = self.export_edi(cr, uid, [partner_obj.browse(cr, uid, result[1])])
diff --git a/addons/event/event_demo.xml b/addons/event/event_demo.xml
index 81dad07b5e4..91a3f695216 100644
--- a/addons/event/event_demo.xml
+++ b/addons/event/event_demo.xml
@@ -60,7 +60,7 @@
         <field name="email">s.l@agrolait.be</field>
         <field name="phone">003281588558</field>
         <field name="event_id" ref="event_1"/>
-        <field name="partner_id" ref="base.res_partner_agrolait"/>
+        <field name="partner_id" ref="base.res_partner_2"/>
         <field name="nb_register">5</field>
     </record>
 
@@ -68,29 +68,17 @@
         <field name="name">ASUStek</field>
         <field name="email">info@asustek.com</field>
         <field name="phone">+ 1 64 61 04 01</field>
-        <field name="partner_id" ref="base.res_partner_asus"/>
+        <field name="partner_id" ref="base.res_partner_1"/>
         <field name="event_id" ref="event_1"/>
         <field name="nb_register">10</field>
     </record>
 
-
-    <record id="reg_0_1" model="event.registration">
-        <field name="name">Syleam</field>
-        <field name="email">contact@syleam.fr</field>
-        <field name="phone">+33 (0) 2 33 31 22 10</field>
-        <field name="partner_id" ref="base.res_partner_sednacom"/>
-        <field name="event_id" ref="event_0"/>
-        <field name="nb_register">6</field>
-    </record>
-
-
-
     <record id="reg_0_2" model="event.registration">
         <field name="name">Camptocamp</field>
         <field name="email">openerp@camptocamp.com</field>
         <field name="phone">+41 21 619 10 04 </field>
         <field name="event_id" ref="event_2"/>
-        <field name="partner_id" ref="base.res_partner_c2c"/>
+        <field name="partner_id" ref="base.res_partner_12"/>
         <field name="nb_register">5</field>
     </record>
 
diff --git a/addons/event/test/ui/demo_data.yml b/addons/event/test/ui/demo_data.yml
index 0fbb2bfa676..fd237eeda0e 100644
--- a/addons/event/test/ui/demo_data.yml
+++ b/addons/event/test/ui/demo_data.yml
@@ -3,7 +3,7 @@
 -
   !record {model: event.registration, id: reg_0_1}:
     event_id: event_0
-    partner_id: base.res_partner_asus
+    partner_id: base.res_partner_1
     name: 'Ticket for Concert'
 -
   I create event record to call product onchange and team onchange.
diff --git a/addons/event_sale/test/confirm.yml b/addons/event_sale/test/confirm.yml
index 53bc7b8b0a1..a58978d8b01 100644
--- a/addons/event_sale/test/confirm.yml
+++ b/addons/event_sale/test/confirm.yml
@@ -20,7 +20,7 @@
     I create a sale order
 -
     !record {model: sale.order, id: order}:
-         partner_id: base.res_partner_agrolait
+         partner_id: base.res_partner_2
          note: Invoice after delivery
          payment_term: account.account_payment_term
 -
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_demo.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_demo.xml
index ee6bdf23538..ebd6f2f0fe9 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_demo.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_demo.xml
@@ -11,9 +11,9 @@
             <field name="customer_name">Offered developments</field>
             <field name="factor">100.0</field>
         </record>
-        <record id="account.analytic_sednacom" model="account.analytic.account">
+        <!--record id="account.analytic_sednacom" model="account.analytic.account">
             <field name="to_invoice" ref="timesheet_invoice_factor1"/>
-        </record>
+        </record-->
         <record id="account.analytic_thymbra" model="account.analytic.account">
             <field name="to_invoice" ref="timesheet_invoice_factor1"/>
         </record>
diff --git a/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml b/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml
index 334a80fde9c..9da5e1d06af 100644
--- a/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml
+++ b/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml
@@ -4,7 +4,7 @@
   I create an account analytic line.
 -
   !record {model: account.analytic.line, id: account_analytic_line_developyamlforhrmodule0 }:
-    account_id: account.analytic_sednacom
+    account_id: account.analytic_agrolait
     amount: -1.0
     general_account_id: account.a_expense
     journal_id: hr_timesheet.analytic_journal
@@ -16,20 +16,20 @@
 -
   Assign partner name and price list in analytic account.
 -
-  !record {model: account.analytic.account, id: account.analytic_sednacom}:
-    partner_id: base.res_partner_desertic_hispafuentes
+  !record {model: account.analytic.account, id: account.analytic_agrolait}:
+    partner_id: base.res_partner_2
     pricelist_id: product.list0
 -
   I open this account and make the state as pending.
 -
   !python {model: account.analytic.account}: |
-    self.set_open(cr, uid, [ref('account.analytic_sednacom')], None)
-    self.set_pending(cr, uid, [ref('account.analytic_sednacom')], None)
+    self.set_open(cr, uid, [ref('account.analytic_agrolait')], None)
+    self.set_pending(cr, uid, [ref('account.analytic_agrolait')], None)
 -
   I assign account on analytic account line.
 -
   !python {model: hr.analytic.timesheet}: |
-    self.on_change_account_id(cr, uid, [ref('account_analytic_line_developyamlforhrmodule0')], ref('account.analytic_sednacom'))
+    self.on_change_account_id(cr, uid, [ref('account_analytic_line_developyamlforhrmodule0')], ref('account.analytic_agrolait'))
 -
   I create invoice on analytic Line using "Invoice analytic Line" wizard.
 -
@@ -83,4 +83,4 @@
   !python {model: hr.timesheet.invoice.create.final}: |
     import netsvc
     wkf_service = netsvc.LocalService("workflow")
-    res = self.do_create(cr, uid, [ref("hr_timesheet_invoice_create_final_0")], {"active_ids": [ref("account.analytic_sednacom")]})
+    res = self.do_create(cr, uid, [ref("hr_timesheet_invoice_create_final_0")], {"active_ids": [ref("account.analytic_agrolait")]})
diff --git a/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml b/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml
index e38ad31ea12..43b330ac114 100644
--- a/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml
+++ b/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml
@@ -66,7 +66,7 @@
 -
   !record {model: hr_timesheet_sheet.sheet, id: hr_timesheet_sheet_sheet_deddk0}:
     timesheet_ids:
-      - account_id: account.analytic_sednacom
+      - account_id: account.analytic_agrolait
         date: !eval time.strftime('%Y-%m-%d')
         name: 'Develop yaml for hr module'
         user_id: base.user_qdp
@@ -93,7 +93,7 @@
 -
   !record {model: hr_timesheet_sheet.sheet, id: hr_timesheet_sheet_sheet_deddk0}:
     timesheet_ids:
-      - account_id: account.analytic_sednacom
+      - account_id: account.analytic_agrolait
         date: !eval time.strftime('%Y-%m-%d')
         name: 'Develop yaml for hr module'
         unit_amount: 2.00
diff --git a/addons/l10n_be/account_demo.xml b/addons/l10n_be/account_demo.xml
index 88a59c75ab3..c91585a807e 100644
--- a/addons/l10n_be/account_demo.xml
+++ b/addons/l10n_be/account_demo.xml
@@ -6,7 +6,7 @@
         <record id="invoice_1" model="account.invoice">
             <field name="currency_id" ref="base.EUR"/>
             <field name="company_id" ref="base.main_company"/>
-            <field name="partner_id" ref="base.res_partner_agrolait"/>
+            <field name="partner_id" ref="base.res_partner_2"/>
             <field name="journal_id" ref="account.sales_journal"/>
             <field name="state">draft</field>
             <field name="type">out_invoice</field>
@@ -31,7 +31,7 @@
         <record id="invoice_2" model="account.invoice">
             <field name="currency_id" ref="base.EUR"/>
             <field name="company_id" ref="base.main_company"/>
-            <field name="partner_id" ref="base.res_partner_agrolait"/>
+            <field name="partner_id" ref="base.res_partner_2"/>
             <field name="journal_id" ref="account.sales_journal"/>
             <field name="state">draft</field>
             <field name="type">out_invoice</field>
@@ -58,7 +58,7 @@
         <record id="invoice_3" model="account.invoice">
             <field name="currency_id" ref="base.EUR"/>
             <field name="company_id" ref="base.main_company"/>
-            <field name="partner_id" ref="base.res_partner_agrolait"/>
+            <field name="partner_id" ref="base.res_partner_2"/>
             <field name="journal_id" ref="account.sales_journal"/>
             <field name="state">draft</field>
             <field name="type">out_invoice</field>
@@ -85,7 +85,7 @@
         <record id="invoice_4" model="account.invoice">
             <field name="currency_id" ref="base.EUR"/>
             <field name="company_id" ref="base.main_company"/>
-            <field name="partner_id" ref="base.res_partner_agrolait"/>
+            <field name="partner_id" ref="base.res_partner_2"/>
             <field name="journal_id" ref="account.sales_journal"/>
             <field name="state">draft</field>
             <field name="type">out_invoice</field>
diff --git a/addons/l10n_ch/demo/dta_demo.xml b/addons/l10n_ch/demo/dta_demo.xml
index 5aa00b9c505..bbbc1e8687c 100644
--- a/addons/l10n_ch/demo/dta_demo.xml
+++ b/addons/l10n_ch/demo/dta_demo.xml
@@ -10,7 +10,7 @@
     <record model="res.partner.bank" id="agro_bank">
         <field name="name">Fortis account</field>
         <field name="acc_number">123456</field>
-        <field name="partner_id" ref="base.res_partner_agrolait"/>
+        <field name="partner_id" ref="base.res_partner_2"/>
         <field name="state">bvrbank</field>
         <field name="post_number">01-23456-5</field>
         <field name="bank" ref="partner_bank"/>
@@ -32,7 +32,7 @@
         <field name="name">V11 invoice</field>
         <field name="amount_total">54150</field>
         <field name="number">1</field>
-        <field name="partner_id" ref="base.res_partner_agrolait"/>
+        <field name="partner_id" ref="base.res_partner_2"/>
         <field name="account_id" ref="account.a_recv"/>
         <field name="currency_id" ref="base.EUR"/>
         <field name="company_id" ref="base.main_partner"/>
diff --git a/addons/l10n_ch/test/l10n_ch_dta.yml b/addons/l10n_ch/test/l10n_ch_dta.yml
index c79ec55adb8..7ef00493c4b 100644
--- a/addons/l10n_ch/test/l10n_ch_dta.yml
+++ b/addons/l10n_ch/test/l10n_ch_dta.yml
@@ -12,7 +12,7 @@
     currency_id: base.EUR
     account_id: account.a_pay
     type : in_invoice
-    partner_id: base.res_partner_agrolait
+    partner_id: base.res_partner_2
     reference_type: bvr
     reference: 11111111111111111111 
     date_invoice: !eval "'%s-01-01' %(datetime.now().year)"
@@ -77,7 +77,7 @@
     move_line_id: !ref {model: account.move.line, search: "[('ref','=','11111111111111111111')]"}
     #name  (reference)
     order_id: dta_payment_order
-    partner_id: base.res_partner_agrolait
+    partner_id: base.res_partner_2
     state: normal
     
 -
diff --git a/addons/l10n_ch/test/l10n_ch_v11.yml b/addons/l10n_ch/test/l10n_ch_v11.yml
index 4bc7ce1097b..7db3a16d6c3 100644
--- a/addons/l10n_ch/test/l10n_ch_v11.yml
+++ b/addons/l10n_ch/test/l10n_ch_v11.yml
@@ -12,7 +12,7 @@
     currency_id: base.EUR
     account_id: account.a_recv
     type : out_invoice
-    partner_id: base.res_partner_agrolait
+    partner_id: base.res_partner_2
     reference_type: bvr
     reference: 12345676
     date_invoice: !eval "'%s-01-01' %(datetime.now().year)"
diff --git a/addons/l10n_ch/test/l10n_ch_v11_part.yml b/addons/l10n_ch/test/l10n_ch_v11_part.yml
index 71b16455f81..94edef860f5 100644
--- a/addons/l10n_ch/test/l10n_ch_v11_part.yml
+++ b/addons/l10n_ch/test/l10n_ch_v11_part.yml
@@ -13,7 +13,7 @@
     currency_id: base.EUR
     account_id: account.a_recv
     type : out_invoice
-    partner_id: base.res_partner_agrolait
+    partner_id: base.res_partner_2
     reference_type: bvr
     reference: 20009997
     date_invoice: !eval "'%s-01-01' %(datetime.now().year)"
diff --git a/addons/marketing_campaign/test/marketing_campaign.yml b/addons/marketing_campaign/test/marketing_campaign.yml
index 1b7a7fa2ae3..358df9c0ede 100644
--- a/addons/marketing_campaign/test/marketing_campaign.yml
+++ b/addons/marketing_campaign/test/marketing_campaign.yml
@@ -70,7 +70,7 @@
   Now I increase credit limit of customer
 -
   !python {model: res.partner}: |
-    self.write(cr, uid, [ref("base.res_partner_agrolait")], {'credit_limit':41000}, context=context)
+    self.write(cr, uid, [ref("base.res_partner_2")], {'credit_limit':41000}, context=context)
 -
   I process followup of second activity after set draft.
 -
@@ -92,7 +92,7 @@
   Now I increase credit limit of customer
 -
   !python {model: res.partner}: |
-    self.write(cr, uid, [ref("base.res_partner_agrolait")], {'credit_limit':151000}, context=context)
+    self.write(cr, uid, [ref("base.res_partner_2")], {'credit_limit':151000}, context=context)
 -
   I process followup of third activity after set draft.
 -
diff --git a/addons/membership/membership_demo.xml b/addons/membership/membership_demo.xml
index 9479543305a..48a8260b0a4 100644
--- a/addons/membership/membership_demo.xml
+++ b/addons/membership/membership_demo.xml
@@ -32,7 +32,7 @@
     </record>
 
 <!-- Join Memberships  -->
-    <function model="res.partner" name="create_membership_invoice" eval="(ref('base.res_partner_agrolait'), ref('membership_0'), {'amount':180})"/>
+    <function model="res.partner" name="create_membership_invoice" eval="(ref('base.res_partner_2'), ref('membership_0'), {'amount':180})"/>
 
 <!-- Demo data for free member -->
     <record id="base.res_partner_desertic_hispafuentes" model="res.partner">
@@ -41,10 +41,10 @@
 
 <!-- Demo data for associate member -->
     <record id="base.res_partner_9" model="res.partner">
-        <field name="associate_member" ref="base.res_partner_agrolait"/>
+        <field name="associate_member" ref="base.res_partner_2"/>
     </record>
     <record id="base.res_partner_8" model="res.partner">
-        <field name="associate_member" ref="base.res_partner_agrolait"/>
+        <field name="associate_member" ref="base.res_partner_2"/>
     </record>
 
     </data>
diff --git a/addons/mrp/mrp_demo.xml b/addons/mrp/mrp_demo.xml
index 6a581d7fc37..f8454634923 100644
--- a/addons/mrp/mrp_demo.xml
+++ b/addons/mrp/mrp_demo.xml
@@ -63,7 +63,7 @@
       <!--
     Resource: res.company
     -->
-		<record id="stock.res_company_tinyshop0" model="res.company">
+		<record id="stock.res_company_1" model="res.company">
 			<field eval="1.0" name="manufacturing_lead"/>
 		</record>
         <!--
@@ -931,7 +931,7 @@
     </record>
     <record id="orange_supplier_asus" model="product.supplierinfo">
         <field name="product_id" ref="product_orange"/>
-        <field name="name" ref="base.res_partner_asus"/>
+        <field name="name" ref="base.res_partner_1"/>
         <field name="min_qty">1.0</field>
         <field name="product_uom" ref="product.product_uom_kgm"/>
     </record>
@@ -961,7 +961,7 @@
     </record>
     <record id="water_supplier_agrolait" model="product.supplierinfo">
         <field name="product_id" ref="product_water"/>
-        <field name="name" ref="base.res_partner_agrolait"/>
+        <field name="name" ref="base.res_partner_2"/>
         <field name="product_uom" ref="product_uom_litre"/>
         <field name="min_qty">2.0</field>
     </record>
@@ -1066,7 +1066,7 @@
     </record>
     <record id="buttons_supplier_asus" model="product.supplierinfo">
         <field name="product_id" ref="product_buttons"/>
-        <field name="name" ref="base.res_partner_asus"/>
+        <field name="name" ref="base.res_partner_1"/>
         <field name="product_uom" ref="product.product_uom_unit"/>
         <field name="min_qty">100.0</field>
     </record>
diff --git a/addons/multi_company/multi_company_demo.xml b/addons/multi_company/multi_company_demo.xml
index 766733034b7..aa5eaea2571 100644
--- a/addons/multi_company/multi_company_demo.xml
+++ b/addons/multi_company/multi_company_demo.xml
@@ -554,18 +554,18 @@
         Resource: res.partner
         -->
 
-        <record id="base.res_partner_asus" model="res.partner">
+        <record id="base.res_partner_1" model="res.partner">
         <field name="company_id" ref="res_company_oerp_us"/>
         </record>
-        <record id="base.res_partner_agrolait" model="res.partner">
+        <record id="base.res_partner_2" model="res.partner">
                     <field name="company_id" ref="res_company_oerp_be"/>
         </record>
-        <record id="base.res_partner_c2c" model="res.partner">
+        <record id="base.res_partner_12" model="res.partner">
                    <field name="company_id" ref="res_company_oerp_be"/>
         </record>
-        <record id="base.res_partner_sednacom" model="res.partner">
+        <!--record id="base.res_partner_sednacom" model="res.partner">
                   <field name="company_id" ref="res_company_oerp_be"/>
-        </record>
+        </record-->
         <record id="base.res_partner_thymbra" model="res.partner">
                    <field name="company_id" ref="res_company_oerp_in"/>
         </record>
diff --git a/addons/point_of_sale/point_of_sale_demo.xml b/addons/point_of_sale/point_of_sale_demo.xml
index 8d5fdc67d63..d4056da1296 100644
--- a/addons/point_of_sale/point_of_sale_demo.xml
+++ b/addons/point_of_sale/point_of_sale_demo.xml
@@ -46,7 +46,7 @@
             <field eval="450.0" name="amount_untaxed"/>
             <field model="account.move" name="move_id" search="[('name', '=', u'SAJ/2010/010')]"/>
             <field eval="450.0" name="amount_total"/>
-            <field name="partner_id" ref="base.res_partner_agrolait"/>
+            <field name="partner_id" ref="base.res_partner_2"/>
             <field name="name">Invoice from POS: POS/019</field>
         </record>
         <record id="account_invoice_line_pcbasicpc0" model="account.invoice.line">
@@ -59,7 +59,7 @@
             <field name="company_id" ref="base.main_company"/>
             <field eval="[(6,0,[])]" name="invoice_line_tax_id"/>
             <field eval="1.0" name="quantity"/>
-            <field name="partner_id" ref="base.res_partner_agrolait"/>
+            <field name="partner_id" ref="base.res_partner_2"/>
             <field name="product_id" ref="product.product_product_pc1"/>
         </record>
         <record id="stock_picking_out0" model="stock.picking">
@@ -80,7 +80,7 @@
             <field name="sale_journal" ref="account.sales_journal"/>
             <field name="shop_id" ref="sale.shop"/>
             <field name="date_order" eval="time.strftime('%Y-%m-%d %H:%M:%S')"/>
-            <field name="partner_id" ref="base.res_partner_agrolait"/>
+            <field name="partner_id" ref="base.res_partner_2"/>
             <field eval="1" name="nb_print"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="base.main_company"/>
@@ -100,7 +100,7 @@
             <field name="date" eval="time.strftime('%Y-%m-%d')"/>
         </record>
         <record id="account_bank_statement_line_paymentpos0" model="account.bank.statement.line">
-            <field name="partner_id" ref="base.res_partner_agrolait"/>
+            <field name="partner_id" ref="base.res_partner_2"/>
             <field model="account.bank.statement" name="statement_id" search="[('name', '=', u'10')]"/>
             <field name="type">general</field>
             <field model="pos.order" name="pos_statement_id" search="[('name', '=', u'POS/019')]"/>
diff --git a/addons/point_of_sale/test/02_order_to_invoice.yml b/addons/point_of_sale/test/02_order_to_invoice.yml
index fb570a61a75..95eec81831c 100644
--- a/addons/point_of_sale/test/02_order_to_invoice.yml
+++ b/addons/point_of_sale/test/02_order_to_invoice.yml
@@ -3,7 +3,7 @@
 -
   !record {model: pos.order, id: pos_order_pos1}:
     company_id: base.main_company
-    partner_id: base.res_partner_asus
+    partner_id: base.res_partner_1
     lines:
       - name: OL/0001
         product_id: product.product_product_pc1
diff --git a/addons/product/product_demo.xml b/addons/product/product_demo.xml
index a331d5c8b6b..22cd4b074c3 100644
--- a/addons/product/product_demo.xml
+++ b/addons/product/product_demo.xml
@@ -690,14 +690,14 @@
     -->
 
         <record id="supplierinfo1" model="product.supplierinfo">
-            <field name="name" ref="base.res_partner_asus"/>
+            <field name="name" ref="base.res_partner_1"/>
             <field name="qty">10</field>
             <field name="min_qty">1</field>
             <field name="product_id" ref="product_product_mb1"/>
             <field name="delay">5</field>
         </record>
         <record id="supplierinfo2" model="product.supplierinfo">
-            <field name="name" ref="base.res_partner_asus"/>
+            <field name="name" ref="base.res_partner_1"/>
             <field name="qty">10</field>
             <field name="min_qty">1</field>
             <field name="product_id" ref="product_product_mb2"/>
diff --git a/addons/project/test/project_demo.yml b/addons/project/test/project_demo.yml
index 3bcae52e238..bc09fc0ba83 100644
--- a/addons/project/test/project_demo.yml
+++ b/addons/project/test/project_demo.yml
@@ -1,6 +1,6 @@
 -
   !record {model: project.project, id: project_integrate_openerp, view: False}:
-    partner_id: base.res_partner_agrolait
+    partner_id: base.res_partner_2
 -
   !record {model: project.task, id: project_task_1, view: False}:
     remaining_hours: 10.00
diff --git a/addons/project_issue/project_issue_demo.xml b/addons/project_issue/project_issue_demo.xml
index a213cb02c2e..3b96abd4b8e 100644
--- a/addons/project_issue/project_issue_demo.xml
+++ b/addons/project_issue/project_issue_demo.xml
@@ -6,7 +6,7 @@
         <field eval="time.strftime('%Y-%m-08 10:15:00')" name="date"/>
         <field eval="&quot;5&quot;" name="priority"/>
         <field name="user_id" ref="base.user_root"/>
-        <field name="partner_id" ref="base.res_partner_agrolait"/>
+        <field name="partner_id" ref="base.res_partner_2"/>
         <field name="section_id" ref="crm.section_sales_department"/>
         <field eval="1" name="active"/>
         <field name="categ_id" ref="bug_categ"/>
@@ -21,7 +21,7 @@
         <field eval="time.strftime('%Y-%m-15  12:50:00')" name="date"/>
         <field eval="&quot;3&quot;" name="priority"/>
         <field name="user_id" ref="base.user_root"/>
-        <field name="partner_id" ref="base.res_partner_asus"/>
+        <field name="partner_id" ref="base.res_partner_1"/>
         <field name="section_id" ref="crm.section_sales_department"/>
         <field eval="1" name="active"/>
         <field eval="3.5" name="duration"/>
diff --git a/addons/purchase/purchase_demo.xml b/addons/purchase/purchase_demo.xml
index 6999f85b076..1016ddb2381 100644
--- a/addons/purchase/purchase_demo.xml
+++ b/addons/purchase/purchase_demo.xml
@@ -9,7 +9,7 @@
         <workflow action="purchase_confirm" model="purchase.order" ref="order_purchase2"/>
         <workflow action="purchase_confirm" model="purchase.order" ref="order_purchase6"/>
 
-        <record id="stock.res_company_tinyshop0" model="res.company">
+        <record id="stock.res_company_1" model="res.company">
             <field eval="1.0" name="po_lead"/>
             <field eval="80.0" name="schedule_range"/>
         </record>
diff --git a/addons/purchase/purchase_order_demo.yml b/addons/purchase/purchase_order_demo.yml
index 4ff5b377662..51b6d7939ae 100644
--- a/addons/purchase/purchase_order_demo.yml
+++ b/addons/purchase/purchase_order_demo.yml
@@ -1,6 +1,6 @@
 -
   !record {model: purchase.order, id: order_purchase1}:
-    partner_id: base.res_partner_asus
+    partner_id: base.res_partner_1
     invoice_method: order
     order_line:
       - product_id: product.product_product_pc2
@@ -79,7 +79,7 @@
     uom_id: product.product_uom_gram
 -
   !record {model: purchase.order, id: order_purchase_icecream}:
-    partner_id: base.res_partner_asus
+    partner_id: base.res_partner_1
     order_line:
       - product_id: stock.product_icecream
 
diff --git a/addons/purchase/test/process/edi_purchase_order.yml b/addons/purchase/test/process/edi_purchase_order.yml
index 661536dd5ce..6649807f077 100644
--- a/addons/purchase/test/process/edi_purchase_order.yml
+++ b/addons/purchase/test/process/edi_purchase_order.yml
@@ -2,7 +2,7 @@
   I create a draft Purchase Order
 -
   !record {model: purchase.order, id: purchase_order_edi_1}:
-    partner_id: base.res_partner_agrolait
+    partner_id: base.res_partner_2
     location_id: stock.stock_location_3
     pricelist_id: 1
     order_line:
diff --git a/addons/report_intrastat/test/report_intrastat_report.yml b/addons/report_intrastat/test/report_intrastat_report.yml
index e049c0ffcb8..626f2fde186 100644
--- a/addons/report_intrastat/test/report_intrastat_report.yml
+++ b/addons/report_intrastat/test/report_intrastat_report.yml
@@ -4,7 +4,7 @@
   !record {model: account.invoice, id: test_invoice_1}:
     currency_id: base.EUR
     company_id: base.main_company
-    partner_id: base.res_partner_asus
+    partner_id: base.res_partner_1
     state: draft
     type: out_invoice
     account_id: account.a_recv
diff --git a/addons/sale/sale_demo.xml b/addons/sale/sale_demo.xml
index d9946c812c7..98025c1e22c 100644
--- a/addons/sale/sale_demo.xml
+++ b/addons/sale/sale_demo.xml
@@ -8,7 +8,7 @@
             <field name="shop_id" ref="shop"/>
             <field model="product.pricelist" name="pricelist_id" search="[]"/>
             <field name="user_id" ref="base.user_root"/>
-            <field ref="base.res_partner_agrolait" name="partner_id"/>
+            <field ref="base.res_partner_2" name="partner_id"/>
             <field ref="base.res_partner_address_8" name="partner_invoice_id"/>
             <field ref="base.res_partner_address_8" name="partner_shipping_id"/>
             <field name="order_policy">picking</field>
@@ -99,7 +99,7 @@
             <field name="shop_id" ref="shop"/>
             <field model="product.pricelist" name="pricelist_id" search="[]"/>
             <field name="user_id" ref="base.user_demo"/>
-            <field name="partner_id" ref="base.res_partner_agrolait"/>
+            <field name="partner_id" ref="base.res_partner_2"/>
             <field name="partner_invoice_id" ref="base.res_partner_address_8"/>
             <field name="partner_shipping_id" ref="base.res_partner_address_8"/>
             <field name="order_policy">prepaid</field>
diff --git a/addons/sale/test/edi_sale_order.yml b/addons/sale/test/edi_sale_order.yml
index af9a9b3aad6..58ccfb2e42d 100644
--- a/addons/sale/test/edi_sale_order.yml
+++ b/addons/sale/test/edi_sale_order.yml
@@ -2,7 +2,7 @@
   I create a draft Sale Order
 -
   !record {model: sale.order, id: sale_order_edi_1}:
-    partner_id: base.res_partner_agrolait
+    partner_id: base.res_partner_2
     partner_invoice_id: base.res_partner_address_8invoice
     partner_shipping_id: base.res_partner_address_8invoice
     pricelist_id: 1
diff --git a/addons/sale/test/sale_order_demo.yml b/addons/sale/test/sale_order_demo.yml
index 0864b949690..d61361754ee 100644
--- a/addons/sale/test/sale_order_demo.yml
+++ b/addons/sale/test/sale_order_demo.yml
@@ -2,7 +2,7 @@
   In order to test process of the Sale Order, I create sale order
 -
   !record {model: sale.order, id: order}:
-    partner_id: base.res_partner_agrolait
+    partner_id: base.res_partner_2
     note: Invoice after delivery
     payment_term: account.account_payment_term
 -
diff --git a/addons/sale_mrp/test/sale_mrp.yml b/addons/sale_mrp/test/sale_mrp.yml
index a29c2c10d01..6aafce4a71d 100644
--- a/addons/sale_mrp/test/sale_mrp.yml
+++ b/addons/sale_mrp/test/sale_mrp.yml
@@ -38,7 +38,7 @@
     seller_delay: '1'
     seller_ids:
       - delay: 1
-        name: base.res_partner_agrolait
+        name: base.res_partner_2
         min_qty: 2.0
         qty: 5.0
     standard_price: 189.0
diff --git a/addons/stock/stock_demo.xml b/addons/stock/stock_demo.xml
index ec0860f62c7..28b2b28ec71 100644
--- a/addons/stock/stock_demo.xml
+++ b/addons/stock/stock_demo.xml
@@ -180,61 +180,71 @@
 
         <!--  Multi Company -->
 
-        <record id="res_partner_tinyshop0" model="res.partner">
-            <field eval="0" name="customer"/>
-            <field eval="0" name="supplier"/>
+        <!--        Child Company 1-->
+        <record id="res_partner_company_1" model="res.partner">
+            <field eval="1" name="customer"/>
+            <field eval="1" name="supplier"/>
             <field name="is_company">1</field>
             <field eval="1" name="active"/>
-            <field eval="&quot;&quot;&quot;Shop 1&quot;&quot;&quot;" name="name"/>
+            <field name="name">Computech Systems</field>
         </record>
+
+        <!--        TODO: Improve contact-->
         <record id="res_partner_address_fabien0" model="res.partner">
             <field eval="&quot;&quot;&quot;Felix&quot;&quot;&quot;" name="name"/>
-            <field name="parent_id" ref="res_partner_tinyshop0"/>
+            <field name="parent_id" ref="res_partner_company_1"/>
             <field name="use_parent_address" eval="1"/>
             <field eval="1" name="active"/>
         </record>
-        <record id="res_company_shop0" model="res.company">
+
+        <record id="res_company_1" model="res.company">
             <field name="currency_id" ref="base.EUR"/>
-            <field name="partner_id" ref="res_partner_tinyshop0"/>
+            <field name="partner_id" ref="res_partner_company_1"/>
             <field name="parent_id" ref="base.main_company"/>
-            <field eval="&quot;&quot;&quot;Shop 1&quot;&quot;&quot;" name="name"/>
+            <field name="name">Computech Systems</field>
         </record>
-        <record id="res_partner_tinyshop1" model="res.partner">
+
+        <!--        Child Company 2-->
+        <record id="res_partner_company_2" model="res.partner">
             <field eval="1" name="customer"/>
-            <field eval="0" name="supplier"/>
+            <field eval="1" name="supplier"/>
             <field eval="1" name="active"/>
             <field name="is_company">1</field>
-            <field eval="&quot;&quot;&quot;Shop 2&quot;&quot;&quot;" name="name"/>
+            <field name="name">SoftSys Technologies</field>
         </record>
+
+        <!--        TODO: Improve contact -->
         <record id="res_partner_address_eric0" model="res.partner">
             <field eval="&quot;&quot;&quot;Edwin&quot;&quot;&quot;" name="name"/>
-            <field name="parent_id" ref="res_partner_tinyshop1"/>
+            <field name="parent_id" ref="res_partner_company_2"/>
             <field name="use_parent_address" eval="1"/>
             <field eval="1" name="active"/>
         </record>
-        <record id="res_company_tinyshop0" model="res.company">
+
+        <record id="res_company_2" model="res.company">
             <field name="currency_id" ref="base.EUR"/>
-            <field name="partner_id" ref="res_partner_tinyshop1"/>
+            <field name="partner_id" ref="res_partner_company_2"/>
             <field name="parent_id" ref="base.main_company"/>
-            <field eval="&quot;&quot;&quot;Shop 2&quot;&quot;&quot;" name="name"/>
+            <field name="name">SoftSys Technologies</field>
         </record>
+
         <record id="stock_location_shop0" model="stock.location">
             <field model="res.partner" name="partner_id" search="[('name','=','Fabien')]"/>
             <field name="location_id" ref="stock.stock_location_locations"/>
-            <field name="company_id" ref="res_company_shop0"/>
+            <field name="company_id" ref="res_company_1"/>
             <field eval="&quot;&quot;&quot;internal&quot;&quot;&quot;" name="usage"/>
             <field eval="&quot;&quot;&quot;none&quot;&quot;&quot;" name="chained_location_type"/>
             <field eval="1" name="active"/>
-            <field eval="&quot;&quot;&quot;Shop 1&quot;&quot;&quot;" name="name"/>
+            <field name="name">Computech Systems</field>
             <field eval="&quot;&quot;&quot;manual&quot;&quot;&quot;" name="chained_auto_packing"/>
         </record>
         <record id="stock_location_shop1" model="stock.location">
             <field model="res.partner" name="partner_id" search="[('name','=','Eric')]"/>
-            <field name="company_id" ref="res_company_tinyshop0"/>
+            <field name="company_id" ref="res_company_1"/>
             <field name="location_id" ref="stock.stock_location_locations"/>
             <field eval="&quot;&quot;&quot;internal&quot;&quot;&quot;" name="usage"/>
             <field eval="1" name="active"/>
-            <field eval="&quot;&quot;&quot;Shop 2&quot;&quot;&quot;" name="name"/>
+            <field name="name">SoftSys Technologies</field>
         </record>
         <record id="stock_location_intermediatelocation0" model="stock.location">
             <field name="partner_id" ref="base.main_partner"/>
@@ -248,7 +258,7 @@
             <field eval="&quot;&quot;&quot;Shop 1&quot;&quot;&quot;" name="name"/>
             <field name="lot_stock_id" ref="stock_location_shop0"/>
             <field name="partner_id" ref="res_partner_address_fabien0"/>
-            <field name="company_id" ref="res_company_shop0"/>
+            <field name="company_id" ref="res_company_1"/>
             <field name="lot_input_id" ref="stock_location_shop0"/>
         </record>
         <record id="stock_warehouse_shop1" model="stock.warehouse">
@@ -256,7 +266,7 @@
             <field name="name">Shop 2</field>
             <field name="lot_stock_id" ref="stock_location_shop1"/>
             <field name="partner_id" ref="res_partner_address_eric0"/>
-            <field name="company_id" ref="res_company_tinyshop0"/>
+            <field name="company_id" ref="res_company_1"/>
             <field name="lot_input_id" ref="stock_location_shop1"/>
         </record>
 
diff --git a/addons/stock_location/stock_location_demo_cpu1.xml b/addons/stock_location/stock_location_demo_cpu1.xml
index 028c71bd188..79e379f7fda 100644
--- a/addons/stock_location/stock_location_demo_cpu1.xml
+++ b/addons/stock_location/stock_location_demo_cpu1.xml
@@ -46,7 +46,7 @@
             <field name="location_id" ref="stock.stock_location_shop0"/>
             <field name="partner_address_id" ref="base.main_partner"/>
             <field name="invoice_state">none</field>
-            <field name="company_id" ref="stock.res_company_shop0"/>
+            <field name="company_id" ref="stock.res_company_1"/>
             <field name="type_proc">move</field>
             <field eval="0" name="cancel_cascade"/>
             <field name="procure_method">make_to_order</field>
@@ -70,7 +70,7 @@
             <field name="product_max_qty">20.0</field>
             <field name="product_min_qty">10.0</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="company_id" ref="stock.res_company_shop0"/>
+            <field name="company_id" ref="stock.res_company_1"/>
             <field name="warehouse_id" ref="stock.stock_warehouse_shop0"/>
             <field name="location_id" ref="stock.stock_location_shop0"/>
             <field model="product.product" name="product_id" ref="product.product_product_cpu1"/>
@@ -79,13 +79,13 @@
         <record id="sale_shop1" model="sale.shop">
             <field name="name">Shop 1</field>
             <field name="warehouse_id" ref="stock.stock_warehouse_shop0"/>
-            <field name="company_id" ref="stock.res_company_shop0"/>
+            <field name="company_id" ref="stock.res_company_1"/>
             <field model="account.payment.term" name="payment_default_id" search="[]"/>
         </record>
         <record id="sale_shop2" model="sale.shop">
             <field name="name">Shop 2</field>
             <field name="warehouse_id" ref="stock.stock_warehouse_shop1"/>
-            <field name="company_id" ref="stock.res_company_tinyshop0"/>
+            <field name="company_id" ref="stock.res_company_2"/>
             <field model="account.payment.term" name="payment_default_id" search="[]"/>
         </record>
     </data>
diff --git a/addons/stock_planning/test/stock_planning.yml b/addons/stock_planning/test/stock_planning.yml
index 2b75f5a5d94..d6b6d9e9f44 100644
--- a/addons/stock_planning/test/stock_planning.yml
+++ b/addons/stock_planning/test/stock_planning.yml
@@ -191,7 +191,7 @@
     self.product_amt_change(cr, uid, forecast_ids, 5.0, ref('product.product_uom_unit'), ref('product.product_product_20'))
     self.product_amt_change(cr, uid, forecast_ids, 5.0, ref('product.product_uom_unit'), ref('product.product_product_20'))
     self._to_default_uom_factor(cr, uid, ref('product.product_product_20'), ref('product.product_uom_unit'), {})
-    self.onchange_company(cr, uid, forecast_ids, ref('stock.res_company_tinyshop0'))
+    self.onchange_company(cr, uid, forecast_ids, ref('stock.res_partner_2'))
 
 -
   I create Master procurement schedule for the third week of July.
@@ -216,7 +216,7 @@
   Performing an osv_memory action create_planning on module stock.planning.createlines
 -
   !python {model: stock.planning.createlines}: |
-    self.onchange_company(cr, uid, ref("stock_planning_createlines_0"), ref('stock.res_company_tinyshop0'))
+    self.onchange_company(cr, uid, ref("stock_planning_createlines_0"), ref('stock.res_partner_2'))
     self.create_planning(cr, uid, [ref("stock_planning_createlines_0")], {"lang":
       "en_US", "tz": False, "active_model": "ir.ui.menu", "active_ids": [ref("stock_planning.menu_stock_planning_createlines")],
       "active_id": ref("stock_planning.menu_stock_planning_createlines"), "department_id":
@@ -227,7 +227,7 @@
   !python {model: stock.planning}: |
     planning_ids = self.search(cr, uid, [('product_id','=',ref('product.product_product_pc1')),('period_id','=',ref('stock_period_03'))])
     self.write(cr, uid, planning_ids, {'to_procure': 30.0,'planned_outgoing': 40.0,'supply_warehouse_id': ref("stock_warehouse_0")})
-    self.onchange_company(cr, uid, planning_ids, ref('stock.res_company_tinyshop0'))
+    self.onchange_company(cr, uid, planning_ids, ref('stock.res_partner_2'))
     self.onchange_uom(cr, uid, planning_ids, ref('product.product_uom_unit'), ref('product.product_product_pc1'),ref('product.product_uom_unit'), False, False)
     self.product_id_change(cr, uid, planning_ids, ref('product.product_product_20'))
     context = {"lang": "en_US", "tz": False, "active_model": "ir.ui.menu",