[REM] Remove res_partner_14, replace him by res_partner_4

12 files changed, 15 insertions, 32 deletions

diff --git a/addons/crm_partner_assign/res_partner_demo.xml b/addons/crm_partner_assign/res_partner_demo.xml
index 573cd5d9c4b..c750779e18c 100644
--- a/addons/crm_partner_assign/res_partner_demo.xml
+++ b/addons/crm_partner_assign/res_partner_demo.xml
@@ -25,7 +25,7 @@
         <record model="res.partner" id="base.res_partner_2">
             <field name="assigned_partner_id" eval="ref('base.res_partner_15')"/>
         </record>
-       <record id="base.res_partner_14" model="res.partner">
+       <record id="base.res_partner_4" model="res.partner">
             <field name="grade_id" ref="res_partner_grade_bronze"/>
             <field name="partner_weight">10</field>
         </record>
@@ -87,7 +87,7 @@
         <record model="res.partner" id="base.res_partner_19">
             <field name="assigned_partner_id" eval="ref('base.res_partner_22')"/>
         </record>
-        <record model="res.partner" id="base.res_partner_14">
+        <record model="res.partner" id="base.res_partner_4">
             <field name="assigned_partner_id" eval="ref('base.res_partner_18')"/>
         </record>
         <record model="res.partner" id="base.res_partner_4">
diff --git a/addons/event/data/event_demo.xml b/addons/event/data/event_demo.xml
index dafc42df2a5..804165b7510 100644
--- a/addons/event/data/event_demo.xml
+++ b/addons/event/data/event_demo.xml
@@ -113,7 +113,7 @@
         <field eval="(DateTime.today()+ timedelta(days=5)).strftime('%Y-%m-%d 7:00:00')" name="date_begin"/>
         <field eval="(DateTime.today()+ timedelta(days=5)).strftime('%Y-%m-%d 16:30:00')" name="date_end"/>
         <field name="event_type_id" ref="event_type_2"/>
-        <field name="address_id" ref="base.res_partner_14"/>
+        <field name="address_id" ref="base.res_partner_4"/>
         <field name="seats_availability">limited</field>
         <field name="seats_max">200</field>
         <field name="description"><![CDATA[
diff --git a/addons/mail/data/mail_demo.xml b/addons/mail/data/mail_demo.xml
index 451eb608d7e..58b71344d68 100644
--- a/addons/mail/data/mail_demo.xml
+++ b/addons/mail/data/mail_demo.xml
@@ -45,7 +45,7 @@
         <record id="base.res_partner_2" model="res.partner">
             <field name="notify_email">none</field>
         </record>
-        <record id="base.res_partner_14" model="res.partner">
+        <record id="base.res_partner_4" model="res.partner">
             <field name="notify_email">none</field>
         </record>
         <record id="base.res_partner_15" model="res.partner">
diff --git a/addons/membership/membership_demo.yml b/addons/membership/membership_demo.yml
index 4af060d48e0..115459a7850 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_12"),ref("base.res_partner_3"),ref("base.res_partner_21"),ref("base.res_partner_1"),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_4"),ref("base.res_partner_24"),ref("base.res_partner_19"),ref("base.res_partner_12"),ref("base.res_partner_3"),ref("base.res_partner_21"),ref("base.res_partner_1"),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')
 
diff --git a/addons/point_of_sale/point_of_sale_demo.xml b/addons/point_of_sale/point_of_sale_demo.xml
index cb61db43f95..794dbf7252f 100644
--- a/addons/point_of_sale/point_of_sale_demo.xml
+++ b/addons/point_of_sale/point_of_sale_demo.xml
@@ -15,7 +15,7 @@
         <record id='base.res_partner_3' model='res.partner'> <field name='barcode'>0421100000002</field> </record>
         <record id='base.res_partner_12' model='res.partner'> <field name='barcode'>0421200000001</field> </record>
         <record id='base.res_partner_2' model='res.partner'> <field name='barcode'>0421300000000</field> </record>
-        <record id='base.res_partner_14' model='res.partner'> <field name='barcode'>0421400000009</field> </record>
+        <record id='base.res_partner_4' model='res.partner'> <field name='barcode'>0421400000009</field> </record>
         <record id='base.res_partner_15' model='res.partner'> <field name='barcode'>0421500000008</field> </record>
         <record id='base.res_partner_16' model='res.partner'> <field name='barcode'>0421600000007</field> </record>
         <record id='base.res_partner_17' model='res.partner'> <field name='barcode'>0421700000006</field> </record>
diff --git a/addons/project_issue/project_issue_demo.xml b/addons/project_issue/project_issue_demo.xml
index 7fc87b14104..2ea86ece2df 100644
--- a/addons/project_issue/project_issue_demo.xml
+++ b/addons/project_issue/project_issue_demo.xml
@@ -84,7 +84,7 @@
             <field eval="time.strftime('%Y-%m-20  15:25:05')" name="date"/>
             <field name="priority">1</field>
             <field name="user_id" ref="base.user_root"/>
-            <field name="partner_id" ref="base.res_partner_14"/>
+            <field name="partner_id" ref="base.res_partner_4"/>
             <field name="team_id" ref="sales_team.team_sales_department"/>
             <field eval="1" name="active"/>
             <field eval="4.0" name="duration"/>
diff --git a/addons/sale/sale_demo.xml b/addons/sale/sale_demo.xml
index b7daad2e249..582393fd12a 100644
--- a/addons/sale/sale_demo.xml
+++ b/addons/sale/sale_demo.xml
@@ -84,9 +84,9 @@
         </record>
 
         <record id="sale_order_3" model="sale.order">
-            <field name="partner_id" ref="base.res_partner_14"/>
-            <field name="partner_invoice_id" ref="base.res_partner_14"/>
-            <field name="partner_shipping_id" ref="base.res_partner_14"/>
+            <field name="partner_id" ref="base.res_partner_4"/>
+            <field name="partner_invoice_id" ref="base.res_partner_4"/>
+            <field name="partner_shipping_id" ref="base.res_partner_4"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="pricelist_id" ref="product.list0"/>
             <field name="order_policy">manual</field>
diff --git a/addons/website_event/data/event_demo.xml b/addons/website_event/data/event_demo.xml
index 1017f3e6160..8fc0430adfc 100644
--- a/addons/website_event/data/event_demo.xml
+++ b/addons/website_event/data/event_demo.xml
@@ -336,7 +336,7 @@
 ]]></field>
         </record>
 
-        <record id="base.res_partner_14" model="res.partner">
+        <record id="base.res_partner_4" model="res.partner">
             <field name="website_published">True</field>
         </record>
         <record id="event.event_2" model="event.event">
diff --git a/addons/website_event_track/data/event_demo.xml b/addons/website_event_track/data/event_demo.xml
index c83d850d82e..402ba0791a3 100644
--- a/addons/website_event_track/data/event_demo.xml
+++ b/addons/website_event_track/data/event_demo.xml
@@ -54,7 +54,7 @@
         <record id="event_sponsor_3" model="event.sponsor">
             <field name="event_id" ref="event.event_0"/>
             <field name="sponsor_type_id" ref="event_sponsor_type3"/>
-            <field name="partner_id" ref="base.res_partner_14"/>
+            <field name="partner_id" ref="base.res_partner_4"/>
             <field name="url">http://openerp.com</field>
         </record>
 
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 94e06fb804d..ecd805001fb 100644
--- a/addons/website_event_track/data/website_event_track_demo.xml
+++ b/addons/website_event_track/data/website_event_track_demo.xml
@@ -213,7 +213,7 @@
         <field name="location_id" ref="website_event_track.event_track_location9"/>
         <field name="duration" eval="0.5"/>
         <field name="color">5</field>
-        <field eval="[(4, ref('base.res_partner_14'))]" name="speaker_ids"/>
+        <field eval="[(4, ref('base.res_partner_4'))]" name="speaker_ids"/>
         <field name="state">confirmed</field>
     </record>
     <record id="event_track20" model="event.track">
diff --git a/openerp/addons/base/res/res_partner_demo.xml b/openerp/addons/base/res/res_partner_demo.xml
index 706f93ece3e..ebcd614da19 100644
--- a/openerp/addons/base/res/res_partner_demo.xml
+++ b/openerp/addons/base/res/res_partner_demo.xml
@@ -156,23 +156,6 @@
             <field name="image" type="base64" file="base/static/img/res_partner_12-image.jpg"/>
         </record>
 
-        <record id="res_partner_14" model="res.partner">
-            <field name="name">Chamber Works</field>
-            <field eval="0" name="supplier"/>
-            <field eval="1" name="customer"/>
-            <field eval="15000.00" name="credit_limit"/>
-            <field eval="[(6, 0, [ref('res_partner_category_7'), ref('res_partner_category_9')])]" name="category_id"/>
-            <field name="is_company">1</field>
-            <field name="city">Detroit</field>
-            <field name="zip">48212</field>
-            <field name="country_id" ref="base.us"/>
-            <field model="res.country.state" name="state_id" search="[('code','ilike','mi')]"/>
-            <field name="street">60, Rosewood Court</field>
-            <field name="email">chamberworks@yourcompany.example.com</field>
-            <field name="phone">+1 313 222 3456</field>
-            <field name="image" type="base64" file="base/static/img/res_partner_14-image.jpg"/>
-        </record>
-
         <record id="res_partner_15" model="res.partner">
             <field name="name">Millennium Industries</field>
             <field eval="0" name="supplier"/>
diff --git a/openerp/addons/base/res/res_partner_demo.yml b/openerp/addons/base/res/res_partner_demo.yml
index dc5be0cd3d5..6e29090548c 100644
--- a/openerp/addons/base/res/res_partner_demo.yml
+++ b/openerp/addons/base/res/res_partner_demo.yml
@@ -97,13 +97,13 @@
 -
   !record {model: 'res.partner', id: base.res_partner_address_23}:
     name: Angel Cook
-    parent_id: base.res_partner_14
+    parent_id: base.res_partner_4
     function: General Manager
     email: angel.cook@chamberworks.example.com
 -
   !record {model: 'res.partner', id: base.res_partner_address_24}:
     name: Robert Anderson
-    parent_id: base.res_partner_14
+    parent_id: base.res_partner_4
     function: System Analyst
     email: robert.anderson@chamberworks.example.com
 -