From ed97a70b1082dbd64236569f617f9e70a9d69fd4 Mon Sep 17 00:00:00 2001
From: Yannick Tivisse <yti@odoo.com>
Date: Fri, 21 Aug 2015 16:53:29 +0200
Subject: [PATCH] [REM] Remove res_partner_5, replace him by res_partner_3

---
 addons/account/demo/account_invoice_demo.yml      |  2 +-
 .../demo/partner_bank.xml                         |  2 +-
 addons/calendar/calendar_demo.xml                 |  2 +-
 addons/crm/crm_action_rule_demo.xml               |  2 +-
 addons/crm/crm_lead_demo.xml                      |  2 +-
 addons/crm/test/crm_lead_merge.yml                | 12 ++++++------
 addons/crm_claim/crm_claim_demo.xml               |  2 +-
 addons/crm_partner_assign/res_partner_demo.xml    |  2 +-
 addons/event/data/event_demo.xml                  |  2 +-
 addons/mail/data/mail_demo.xml                    | 12 ++++++------
 addons/membership/membership_demo.yml             |  4 ++--
 addons/point_of_sale/point_of_sale_demo.xml       |  2 +-
 addons/project_issue/project_issue_demo.xml       |  4 ++--
 addons/website_customer/website_customer_demo.xml |  2 +-
 addons/website_event/data/event_demo.xml          |  2 +-
 .../data/website_event_track_demo.xml             |  2 +-
 addons/website_partner/data/demo.xml              |  2 +-
 openerp/addons/base/res/res_partner_demo.xml      | 15 ---------------
 openerp/addons/base/res/res_partner_demo.yml      |  4 ++--
 19 files changed, 31 insertions(+), 46 deletions(-)

diff --git a/addons/account/demo/account_invoice_demo.yml b/addons/account/demo/account_invoice_demo.yml
index 3c95f219cf1..5565e919a83 100644
--- a/addons/account/demo/account_invoice_demo.yml
+++ b/addons/account/demo/account_invoice_demo.yml
@@ -60,7 +60,7 @@
 -
   !record {model: account.invoice, id: demo_invoice_invest_sale}:
     company_id: base.main_company
-    partner_id: base.res_partner_5
+    partner_id: base.res_partner_3
     currency_id: base.EUR
     type: 'out_invoice'
     date_invoice: !eval time.strftime('%Y-%m')+'-08'
diff --git a/addons/account_bank_statement_import/demo/partner_bank.xml b/addons/account_bank_statement_import/demo/partner_bank.xml
index 09c14d42308..596c9007817 100644
--- a/addons/account_bank_statement_import/demo/partner_bank.xml
+++ b/addons/account_bank_statement_import/demo/partner_bank.xml
@@ -25,7 +25,7 @@
 
         <record id="qif_partner_bank_2" model="res.partner.bank">
             <field name="acc_number">10987654322</field>
-            <field name="partner_id" ref="base.res_partner_5"></field>
+            <field name="partner_id" ref="base.res_partner_3"></field>
             <field name="acc_type">bank</field>
             <field name="bank_id" ref="base.res_bank_1"/>
         </record>
diff --git a/addons/calendar/calendar_demo.xml b/addons/calendar/calendar_demo.xml
index 09c976a1244..041501cba24 100644
--- a/addons/calendar/calendar_demo.xml
+++ b/addons/calendar/calendar_demo.xml
@@ -34,7 +34,7 @@
         <record id="calendar_event_2" model="calendar.event">
             <field eval="1" name="active"/>            
             <field name="user_id" ref="base.user_demo"/>
-            <field name="partner_ids" eval="[(6,0,[ref('base.partner_root'),ref('base.res_partner_4'),ref('base.res_partner_5')])]"/>
+            <field name="partner_ids" eval="[(6,0,[ref('base.partner_root'),ref('base.res_partner_4'),ref('base.res_partner_3')])]"/>
             <field name="name">Initial discussion</field>
             <field name="description">Discussion with partner for product.</field>
             <field name="categ_ids" eval="[(6,0,[ref('categ_meet3')])]"/>
diff --git a/addons/crm/crm_action_rule_demo.xml b/addons/crm/crm_action_rule_demo.xml
index ad5a936924a..24dfac9c492 100644
--- a/addons/crm/crm_action_rule_demo.xml
+++ b/addons/crm/crm_action_rule_demo.xml
@@ -52,7 +52,7 @@ object.write({'team_id': sales_team.id})
             <field name="kind">on_create</field>
             <field name="filter_id" ref="filter_usa_lead"/>
             <field name="act_user_id" ref="base.user_root"/>
-            <field name="act_followers" eval="[(6,0,[ref('base.res_partner_4'), ref('base.res_partner_5'), ref('base.res_partner_6')])]"/>
+            <field name="act_followers" eval="[(6,0,[ref('base.res_partner_4'), ref('base.res_partner_3'), ref('base.res_partner_6')])]"/>
             <field name="server_action_ids" eval="[(6,0,[ref('action_set_team_sales_department')])]"/>
         </record>
     </data>
diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml
index 1f337a82142..fa3401f36df 100644
--- a/addons/crm/crm_lead_demo.xml
+++ b/addons/crm/crm_lead_demo.xml
@@ -646,7 +646,7 @@ Andrew</p>]]></field>
             <field name="contact_name">John M. Brown</field>
             <field name="partner_name">Epic Technologies</field>
             <field name="email_from">john.b@tech.info</field>
-            <field name="partner_id" ref="base.res_partner_5"/>
+            <field name="partner_id" ref="base.res_partner_3"/>
             <field name="country_id" ref="base.us"/>
             <field name="zip">60610</field>
             <field name="city">Chicago</field>
diff --git a/addons/crm/test/crm_lead_merge.yml b/addons/crm/test/crm_lead_merge.yml
index 0659b55054c..e3c043a7fe4 100644
--- a/addons/crm/test/crm_lead_merge.yml
+++ b/addons/crm/test/crm_lead_merge.yml
@@ -7,7 +7,7 @@
   !record {model: crm.lead, id: test_crm_opp_1}:
     type: 'opportunity'
     name: 'Test opportunity 1'
-    partner_id: base.res_partner_5
+    partner_id: base.res_partner_3
     stage_id: stage_lead1
     description: This is the description of the test opp 1.
 -
@@ -39,7 +39,7 @@
   I check for the resulting merged opp (based on name and partner).
 -
   !python {model: crm.lead}: |
-    merge_id = self.search(cr, uid, [('name', '=', 'Test opportunity 1'), ('partner_id','=', ref("base.res_partner_5"))])
+    merge_id = self.search(cr, uid, [('name', '=', 'Test opportunity 1'), ('partner_id','=', ref("base.res_partner_3"))])
     
     assert merge_id, 'Fail to create merge opportunity wizard'
     merge_result = self.browse(cr, uid, merge_id)[0]
@@ -96,13 +96,13 @@
   !record {model: crm.lead, id: test_crm_opp_02}:
     type: 'opportunity'
     name: 'Test opportunity 2'
-    partner_id: base.res_partner_5
+    partner_id: base.res_partner_3
     stage_id: stage_lead1
 -
   !record {model: crm.lead, id: test_crm_opp_03}:
     type: 'opportunity'
     name: 'Test opportunity 3'
-    partner_id: base.res_partner_5
+    partner_id: base.res_partner_3
     stage_id: stage_lead1
 -
   !python {model: crm.lead}: |
@@ -119,10 +119,10 @@
   I check for the resulting merged opp (based on name and partner).
 -
   !python {model: crm.lead}: |
-    merge_id = self.search(cr, uid, [('name', '=', 'Test opportunity 2'), ('partner_id','=', ref("base.res_partner_5"))])
+    merge_id = self.search(cr, uid, [('name', '=', 'Test opportunity 2'), ('partner_id','=', ref("base.res_partner_3"))])
     assert merge_id, 'Fail to create merge opportunity wizard'
     merge_result = self.browse(cr, uid, merge_id)[0]
-    assert merge_result.partner_id.id == ref("base.res_partner_5"), 'Partner mismatch'
+    assert merge_result.partner_id.id == ref("base.res_partner_3"), 'Partner mismatch'
     assert merge_result.type == 'opportunity', 'Type mismatch: when opps get merged together, the result should be a new opp (instead of %s)' % merge_result.type
     tailing_opp = self.search(cr, uid, [('id', '=', ref('test_crm_opp_03'))])
     assert not tailing_opp, 'This tailing opp (id %s) should not exist anymore' % ref('test_crm_opp_03')
diff --git a/addons/crm_claim/crm_claim_demo.xml b/addons/crm_claim/crm_claim_demo.xml
index ea1c7538933..de1426d9827 100644
--- a/addons/crm_claim/crm_claim_demo.xml
+++ b/addons/crm_claim/crm_claim_demo.xml
@@ -57,7 +57,7 @@
         
         <record id="crm_claim_5" model="crm.claim">
             <field eval="time.strftime('%Y-%m-28 16:20:43')" name="date"/>
-            <field name="partner_id" ref="base.res_partner_5"/>
+            <field name="partner_id" ref="base.res_partner_3"/>
             <field eval="&quot;1&quot;" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;Some products missing&quot;" name="name"/>
diff --git a/addons/crm_partner_assign/res_partner_demo.xml b/addons/crm_partner_assign/res_partner_demo.xml
index a0711657810..ab75985a59a 100644
--- a/addons/crm_partner_assign/res_partner_demo.xml
+++ b/addons/crm_partner_assign/res_partner_demo.xml
@@ -82,7 +82,7 @@
             <field name="assigned_partner_id" eval="ref('base.res_partner_23')"/>
         </record>
         <record model="res.partner" id="base.res_partner_3">
-            <field name="assigned_partner_id" eval="ref('base.res_partner_5')"/>
+            <field name="assigned_partner_id" eval="ref('base.res_partner_3')"/>
         </record>
         <record model="res.partner" id="base.res_partner_19">
             <field name="assigned_partner_id" eval="ref('base.res_partner_22')"/>
diff --git a/addons/event/data/event_demo.xml b/addons/event/data/event_demo.xml
index 713b4e2da8d..1450ce664bb 100644
--- a/addons/event/data/event_demo.xml
+++ b/addons/event/data/event_demo.xml
@@ -77,7 +77,7 @@
         <field eval="(DateTime.now() + timedelta(days=3)).strftime('%Y-%m-%d 7:00:00')" name="date_begin"/>
         <field eval="(DateTime.now() + timedelta(days=3)).strftime('%Y-%m-%d 11:00:00')" name="date_end"/>
         <field name="event_type_id" ref="event_type_0"/>
-        <field name="address_id" ref="base.res_partner_5"/>
+        <field name="address_id" ref="base.res_partner_3"/>
         <field name="seats_availability">limited</field>
         <field name="seats_max">350</field>
         <field name="description"><![CDATA[
diff --git a/addons/mail/data/mail_demo.xml b/addons/mail/data/mail_demo.xml
index 6abf51edfba..2ae92c95649 100644
--- a/addons/mail/data/mail_demo.xml
+++ b/addons/mail/data/mail_demo.xml
@@ -18,7 +18,7 @@
         <record id="base.res_partner_4" model="res.partner">
             <field name="notify_email">none</field>
         </record>
-        <record id="base.res_partner_5" model="res.partner">
+        <record id="base.res_partner_3" model="res.partner">
             <field name="notify_email">none</field>
         </record>
         <record id="base.res_partner_6" model="res.partner">
@@ -210,7 +210,7 @@
             ]]></field>
             <field name="message_type">comment</field>
             <field name="subtype_id" ref="mt_comment"/>
-            <field name="author_id" ref="base.res_partner_5"/>
+            <field name="author_id" ref="base.res_partner_3"/>
             <field name="partner_ids" eval="[(6, 0, [ref('base.partner_root')])]"/>
             <field name="date" eval="(DateTime.today() - timedelta(days=1)).strftime('%Y-%m-%d %H:%M')"/>
         </record>
@@ -223,7 +223,7 @@
             <field name="message_type">comment</field>
             <field name="subtype_id" ref="mt_comment"/>
             <field name="author_id" ref="base.partner_root"/>
-            <field name="partner_ids" eval="[(6, 0, [ref('base.res_partner_5')])]"/>
+            <field name="partner_ids" eval="[(6, 0, [ref('base.res_partner_3')])]"/>
             <field name="date" eval="(DateTime.today() - timedelta(hours=1)).strftime('%Y-%m-%d %H:%M')"/>
         </record>
         <record id="msg_discus2_2" model="mail.message">
@@ -232,7 +232,7 @@
             <field name="parent_id" ref="msg_discus2"/>
             <field name="message_type">comment</field>
             <field name="subtype_id" ref="mt_comment"/>
-            <field name="author_id" ref="base.res_partner_5"/>
+            <field name="author_id" ref="base.res_partner_3"/>
             <field name="date" eval="(DateTime.today() - timedelta(minutes=35)).strftime('%Y-%m-%d %H:%M')"/>
         </record>
         <record id="msg_discus2_3" model="mail.message">
@@ -242,7 +242,7 @@
             <field name="message_type">comment</field>
             <field name="subtype_id" ref="mt_comment"/>
             <field name="author_id" ref="base.partner_root"/>
-            <field name="partner_ids" eval="[(6, 0, [ref('base.res_partner_5')])]"/>
+            <field name="partner_ids" eval="[(6, 0, [ref('base.res_partner_3')])]"/>
             <field name="date" eval="(DateTime.today() - timedelta(minutes=30)).strftime('%Y-%m-%d %H:%M')"/>
         </record>
         <record id="msg_discus2_4" model="mail.message">
@@ -251,7 +251,7 @@
             <field name="parent_id" ref="msg_discus2"/>
             <field name="message_type">comment</field>
             <field name="subtype_id" ref="mt_comment"/>
-            <field name="author_id" ref="base.res_partner_5"/>
+            <field name="author_id" ref="base.res_partner_3"/>
             <field name="partner_ids" eval="[(6, 0, [ref('base.partner_root')])]"/>
             <field name="date" eval="(DateTime.today() - timedelta(minutes=10)).strftime('%Y-%m-%d %H:%M')"/>
         </record>
diff --git a/addons/membership/membership_demo.yml b/addons/membership/membership_demo.yml
index 32ef50b73a8..aececeaf53c 100644
--- a/addons/membership/membership_demo.yml
+++ b/addons/membership/membership_demo.yml
@@ -11,7 +11,7 @@
 
     if self.pool.get('account.invoice')._default_currency(cr, uid):
         import time
-        invoice_ids = self.create_membership_invoice(cr, uid, [ref("base.res_partner_1"),ref("base.res_partner_14"),ref("base.res_partner_24"),ref("base.res_partner_19"),ref("base.res_partner_8"),ref("base.res_partner_5"),ref("base.res_partner_21"),ref("base.res_partner_6"),ref("base.res_partner_16"),ref("base.res_partner_10")], product_id=ref("membership_1"), datas={"amount":80.00})
+        invoice_ids = self.create_membership_invoice(cr, uid, [ref("base.res_partner_1"),ref("base.res_partner_14"),ref("base.res_partner_24"),ref("base.res_partner_19"),ref("base.res_partner_8"),ref("base.res_partner_3"),ref("base.res_partner_21"),ref("base.res_partner_6"),ref("base.res_partner_16"),ref("base.res_partner_10")], product_id=ref("membership_1"), datas={"amount":80.00})
         invoice_pool = self.pool.get('account.invoice')
         invoice_pool.signal_workflow(cr, uid, invoice_ids, 'invoice_open')
 
@@ -32,7 +32,7 @@
 
         self.create_membership_invoice(cr, uid, ref('base.res_partner_9'), ref('membership_2'), {'amount':180})
         self.create_membership_invoice(cr, uid, ref('base.res_partner_11'), ref('membership_2'), {'amount':180})
-        self.create_membership_invoice(cr, uid, ref('base.res_partner_5'), ref('membership_2'), {'amount':180})
+        self.create_membership_invoice(cr, uid, ref('base.res_partner_3'), ref('membership_2'), {'amount':180})
         self.create_membership_invoice(cr, uid, ref('base.res_partner_3'), ref('membership_2'), {'amount':180})
 
     vals = {'free_member': True}
diff --git a/addons/point_of_sale/point_of_sale_demo.xml b/addons/point_of_sale/point_of_sale_demo.xml
index 0a089379b24..e0639995b9b 100644
--- a/addons/point_of_sale/point_of_sale_demo.xml
+++ b/addons/point_of_sale/point_of_sale_demo.xml
@@ -6,7 +6,7 @@
         <record id='base.res_partner_2'  model='res.partner'> <field name='barcode'>0420200000004</field> </record>
         <record id='base.res_partner_3'  model='res.partner'> <field name='barcode'>0420300000003</field> </record>
         <record id='base.res_partner_4'  model='res.partner'> <field name='barcode'>0420400000002</field> </record>
-        <record id='base.res_partner_5'  model='res.partner'> <field name='barcode'>0420500000001</field> </record>
+        <record id='base.res_partner_3'  model='res.partner'> <field name='barcode'>0420500000001</field> </record>
         <record id='base.res_partner_6'  model='res.partner'> <field name='barcode'>0420600000000</field> </record>
         <record id='base.res_partner_7'  model='res.partner'> <field name='barcode'>0420700000009</field> </record>
         <record id='base.res_partner_8'  model='res.partner'> <field name='barcode'>0420800000008</field> </record>
diff --git a/addons/project_issue/project_issue_demo.xml b/addons/project_issue/project_issue_demo.xml
index f94d94877ec..6d31654e8ab 100644
--- a/addons/project_issue/project_issue_demo.xml
+++ b/addons/project_issue/project_issue_demo.xml
@@ -110,7 +110,7 @@
             <field eval="time.strftime('%Y-%m-24  09:45:00')" name="date"/>
             <field name="priority">1</field>
             <field name="user_id" ref="base.user_root"/>
-            <field name="partner_id" ref="base.res_partner_5"/>
+            <field name="partner_id" ref="base.res_partner_3"/>
             <field name="team_id" ref="sales_team.team_sales_department"/>
             <field eval="1" name="active"/>
             <field eval="4.0" name="duration"/>
@@ -152,7 +152,7 @@
             <field eval="time.strftime('%Y-%m-28  15:40:00')" name="date"/>
             <field name="priority">2</field>
             <field name="user_id" ref="base.user_demo"/>
-            <field name="partner_id" ref="base.res_partner_5"/>
+            <field name="partner_id" ref="base.res_partner_3"/>
             <field eval="1" name="active"/>
             <field eval="1.3" name="duration"/>
             <field name="project_id" ref="project.project_project_4"/>
diff --git a/addons/website_customer/website_customer_demo.xml b/addons/website_customer/website_customer_demo.xml
index a845826854a..f00c4da6d21 100644
--- a/addons/website_customer/website_customer_demo.xml
+++ b/addons/website_customer/website_customer_demo.xml
@@ -90,7 +90,7 @@
                 </ul>
             </field>
         </record>
-        <record id="base.res_partner_5" model="res.partner">
+        <record id="base.res_partner_3" model="res.partner">
             <field name="website_published" eval="True"/>
             <field name="website_short_description">A non-profit international educational and scientific organisation, hosting three departments (aeronautics and aerospace, environmental and applied fluid dynamics, and turbomachinery and propulsion).</field>
             <field name="website_description" type="xml">
diff --git a/addons/website_event/data/event_demo.xml b/addons/website_event/data/event_demo.xml
index d98b9835db5..e02c2a9b220 100644
--- a/addons/website_event/data/event_demo.xml
+++ b/addons/website_event/data/event_demo.xml
@@ -169,7 +169,7 @@
 </div>
 ]]></field>        </record>
 
-        <record id="base.res_partner_5" model="res.partner">
+        <record id="base.res_partner_3" model="res.partner">
             <field name="website_published">True</field>
         </record>
         <record id="event.event_1" model="event.event">
diff --git a/addons/website_event_track/data/website_event_track_demo.xml b/addons/website_event_track/data/website_event_track_demo.xml
index eddc8457de1..8a559188779 100644
--- a/addons/website_event_track/data/website_event_track_demo.xml
+++ b/addons/website_event_track/data/website_event_track_demo.xml
@@ -78,7 +78,7 @@
         <field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 6:30:00')"></field>
         <field name="location_id" ref="website_event_track.event_track_location6"/>
         <field name="duration" eval="0.5"/>
-        <field eval="[(4, ref('base.res_partner_5'))]" name="speaker_ids"/>
+        <field eval="[(4, ref('base.res_partner_3'))]" name="speaker_ids"/>
         <field name="state">announced</field>
     </record>
     <record id="event_track7" model="event.track">
diff --git a/addons/website_partner/data/demo.xml b/addons/website_partner/data/demo.xml
index eab70d2568c..d65ba21b8e7 100644
--- a/addons/website_partner/data/demo.xml
+++ b/addons/website_partner/data/demo.xml
@@ -29,7 +29,7 @@
         <field name="website_published">True</field>
     </record>
 
-    <record id="base.res_partner_5" model="res.partner">
+    <record id="base.res_partner_3" model="res.partner">
         <field name="website_published">True</field>
     </record>
 
diff --git a/openerp/addons/base/res/res_partner_demo.xml b/openerp/addons/base/res/res_partner_demo.xml
index 33cb71191bc..14774e145b6 100644
--- a/openerp/addons/base/res/res_partner_demo.xml
+++ b/openerp/addons/base/res/res_partner_demo.xml
@@ -126,21 +126,6 @@
             <field name="image" type="base64" file="base/static/img/res_partner_4-image.png"/>
         </record>
 
-        <record id="res_partner_5" model="res.partner">
-            <field name="name">Epic Technologies</field>
-            <field eval="[(6, 0, [ref('res_partner_category_2')])]" name="category_id"/>
-            <field name="is_company">1</field>
-            <field eval="0" name="customer"/>
-            <field name="country_id" ref="base.us"/>
-            <field model="res.country.state" name="state_id" search="[('code','ilike','il')]"/>
-            <field name="zip">60610</field>
-            <field name="city">Chicago</field>
-            <field name="email">epic@yourcompany.example.com</field>
-            <field name="phone">+1 312 349 2324</field>
-            <field name="website">http://www.epic-tech.info//</field>
-            <field name="image" type="base64" file="base/static/img/res_partner_5-image.jpg"/>
-        </record>
-
         <record id="res_partner_6" model="res.partner">
             <field name="name">OpenElec Applications</field>
             <field eval="[(6, 0, [ref('res_partner_category_12')])]" name="category_id"/>
diff --git a/openerp/addons/base/res/res_partner_demo.yml b/openerp/addons/base/res/res_partner_demo.yml
index cb3e4ba712e..2b534fb6033 100644
--- a/openerp/addons/base/res/res_partner_demo.yml
+++ b/openerp/addons/base/res/res_partner_demo.yml
@@ -25,13 +25,13 @@
 -
   !record {model: 'res.partner', id: base.res_partner_address_10}:
     name: David Simpson
-    parent_id: base.res_partner_5
+    parent_id: base.res_partner_3
     function: Senior Consultant
     email: david.simpson@epic.example.com
 -
   !record {model: 'res.partner', id: base.res_partner_address_11}:
     name: John M. Brown
-    parent_id: base.res_partner_5
+    parent_id: base.res_partner_3
     function: Director
     email: john.brown@epic.example.com
 -