[REM] Remove res_partner_6, replace him by res_partner_1

15 files changed, 35 insertions, 51 deletions

diff --git a/addons/account/demo/account_invoice_demo.yml b/addons/account/demo/account_invoice_demo.yml
index 5565e919a83..0f7efbddb95 100644
--- a/addons/account/demo/account_invoice_demo.yml
+++ b/addons/account/demo/account_invoice_demo.yml
@@ -130,7 +130,7 @@
 -
   !record {model: account.invoice, id: demo_invoice_equipment_purchase}:
     company_id: base.main_company
-    partner_id: base.res_partner_6
+    partner_id: base.res_partner_1
     currency_id: base.EUR
     type: 'in_invoice'
     date_invoice: !eval time.strftime('%Y')+'-01-15'
diff --git a/addons/calendar/calendar_demo.xml b/addons/calendar/calendar_demo.xml
index 041501cba24..06952db35b0 100644
--- a/addons/calendar/calendar_demo.xml
+++ b/addons/calendar/calendar_demo.xml
@@ -20,7 +20,7 @@
         <record id="calendar_event_1" model="calendar.event">
             <field eval="1" name="active"/>
             <field name="user_id" ref="base.user_root"/>
-            <field name="partner_ids" eval="[(6,0,[ref('base.res_partner_6')])]"/>
+            <field name="partner_ids" eval="[(6,0,[ref('base.res_partner_1')])]"/>
             <field name="name">Follow-up for Project proposal</field>
             <field name="description">Meeting to discuss project plan and hash out the details of implementation.</field>
             <field eval="time.strftime('%Y-%m-03 10:20:00')" name="start"/>
@@ -61,7 +61,7 @@
         <record id="calendar_event_4" 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_demo'),ref('base.res_partner_6')])]"/>
+            <field name="partner_ids" eval="[(6,0,[ref('base.partner_demo'),ref('base.res_partner_1')])]"/>
             <field name="name">Requirements review</field>
             <field name="categ_ids" eval="[(6,0,[ref('categ_meet3')])]"/>
             <field eval="time.strftime('%Y-%m-20 8:00:00')" name="start"/>
@@ -85,7 +85,7 @@
         <record id="calendar_event_6" 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_1'),ref('base.res_partner_4'),ref('base.res_partner_6'),ref('base.res_partner_8')])]"/>
+            <field name="partner_ids" eval="[(6,0,[ref('base.partner_root'),ref('base.res_partner_1'),ref('base.res_partner_4'),ref('base.res_partner_1'),ref('base.res_partner_8')])]"/>
             <field name="name">Presentation for new Services</field>
             <field name="categ_ids" eval="[(6,0,[ref('categ_meet1'), ref('categ_meet2')])]"/>
             <field eval="time.strftime('%Y-%m-18 2:00:00')" name="start"/>
diff --git a/addons/crm/crm_action_rule_demo.xml b/addons/crm/crm_action_rule_demo.xml
index 24dfac9c492..e7f05dca512 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_3'), 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_1')])]"/>
             <field name="server_action_ids" eval="[(6,0,[ref('action_set_team_sales_department')])]"/>
         </record>
     </data>
diff --git a/addons/crm_claim/crm_claim_demo.xml b/addons/crm_claim/crm_claim_demo.xml
index de1426d9827..793b5aabc07 100644
--- a/addons/crm_claim/crm_claim_demo.xml
+++ b/addons/crm_claim/crm_claim_demo.xml
@@ -20,7 +20,7 @@
         
         <record id="crm_claim_2" model="crm.claim">
             <field eval="time.strftime('%Y-%m-11 11:19:25')" name="date"/>
-            <field name="partner_id" ref="base.res_partner_6"/>
+            <field name="partner_id" ref="base.res_partner_1"/>
             <field eval="&quot;0&quot;" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;Damaged Products&quot;" name="name"/>
diff --git a/addons/crm_claim/test/ui/claim_demo.yml b/addons/crm_claim/test/ui/claim_demo.yml
index 044e0482e93..4e89f9c3ab5 100644
--- a/addons/crm_claim/test/ui/claim_demo.yml
+++ b/addons/crm_claim/test/ui/claim_demo.yml
@@ -3,7 +3,7 @@
 -
   !record {model: crm.claim, id: crm_claim_4}:
     name: 'Damaged Product'
-    partner_id: base.res_partner_6
+    partner_id: base.res_partner_1
 -
   I Update the message for claim.
 -
diff --git a/addons/crm_partner_assign/res_partner_demo.xml b/addons/crm_partner_assign/res_partner_demo.xml
index ab75985a59a..0164fc963d2 100644
--- a/addons/crm_partner_assign/res_partner_demo.xml
+++ b/addons/crm_partner_assign/res_partner_demo.xml
@@ -93,13 +93,13 @@
         <record model="res.partner" id="base.res_partner_4">
             <field name="assigned_partner_id" eval="ref('base.res_partner_11')"/>
         </record>
-        <record model="res.partner" id="base.res_partner_6">
+        <record model="res.partner" id="base.res_partner_1">
             <field name="assigned_partner_id" eval="ref('base.res_partner_9')"/>
         </record>
         <record model="res.partner" id="base.res_partner_1">
             <field name="assigned_partner_id" eval="ref('base.res_partner_2')"/>
         </record>
-        <record model="res.partner" id="base.res_partner_6">
+        <record model="res.partner" id="base.res_partner_1">
             <field name="assigned_partner_id" eval="ref('base.res_partner_13')"/>
         </record>
         <record model="res.partner" id="base.res_partner_9">
diff --git a/addons/event/data/event_demo.xml b/addons/event/data/event_demo.xml
index 1450ce664bb..dafc42df2a5 100644
--- a/addons/event/data/event_demo.xml
+++ b/addons/event/data/event_demo.xml
@@ -33,7 +33,7 @@
         <field eval="(DateTime.now() + timedelta(days=5)).strftime('%Y-%m-%d 18:00:00')" name="date_end"/>
         <field name="seats_availability">limited</field>
         <field name="seats_max">500</field>
-        <field name="address_id" ref="base.res_partner_6"/>
+        <field name="address_id" ref="base.res_partner_1"/>
         <field name="event_type_id" ref="event_type_1"/>
         <field name="description"><![CDATA[
 <div class="oe_structure">
diff --git a/addons/mail/data/mail_demo.xml b/addons/mail/data/mail_demo.xml
index 2ae92c95649..d4af7291e0e 100644
--- a/addons/mail/data/mail_demo.xml
+++ b/addons/mail/data/mail_demo.xml
@@ -21,7 +21,7 @@
         <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">
+        <record id="base.res_partner_1" model="res.partner">
             <field name="notify_email">none</field>
         </record>
         <record id="base.res_partner_7" model="res.partner">
diff --git a/addons/membership/membership_demo.yml b/addons/membership/membership_demo.yml
index aececeaf53c..6bed172d4b0 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_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_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_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 e0639995b9b..95fdfa6d7a2 100644
--- a/addons/point_of_sale/point_of_sale_demo.xml
+++ b/addons/point_of_sale/point_of_sale_demo.xml
@@ -7,7 +7,7 @@
         <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_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_1'  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>
         <record id='base.res_partner_9'  model='res.partner'> <field name='barcode'>0420900000007</field> </record>
diff --git a/addons/project_issue/project_issue_demo.xml b/addons/project_issue/project_issue_demo.xml
index 6d31654e8ab..9ecb9d0b217 100644
--- a/addons/project_issue/project_issue_demo.xml
+++ b/addons/project_issue/project_issue_demo.xml
@@ -126,7 +126,7 @@
             <field eval="time.strftime('%Y-%m-26  11:10:00')" name="date"/>
             <field name="priority">2</field>
             <field name="user_id" ref="base.user_root"/>
-            <field name="partner_id" ref="base.res_partner_6"/>
+            <field name="partner_id" ref="base.res_partner_1"/>
             <field name="team_id" ref="sales_team.team_sales_department"/>
             <field eval="1" name="active"/>
             <field eval="2.0" name="duration"/>
@@ -139,7 +139,7 @@
             <field eval="time.strftime('%Y-%m-25  13:35:00')" name="date"/>
             <field name="priority">2</field>
             <field name="user_id" ref="base.user_root"/>
-            <field name="partner_id" ref="base.res_partner_6"/>
+            <field name="partner_id" ref="base.res_partner_1"/>
             <field name="team_id" ref="sales_team.team_sales_department"/>
             <field eval="1" name="active"/>
             <field eval="7.3" name="duration"/>
@@ -218,7 +218,7 @@
             <field eval="time.strftime('%Y-%m-15 10:35:15')" name="date"/>
             <field name="priority">1</field>
             <field name="user_id" ref="base.user_root"/>
-            <field name="partner_id" ref="base.res_partner_6"/>
+            <field name="partner_id" ref="base.res_partner_1"/>
             <field name="team_id" ref="sales_team.team_sales_department"/>
             <field eval="1" name="active"/>
             <field eval="2.45" name="duration"/>
diff --git a/addons/stock/stock_demo.yml b/addons/stock/stock_demo.yml
index a2dc7e537f4..974340cae77 100644
--- a/addons/stock/stock_demo.yml
+++ b/addons/stock/stock_demo.yml
@@ -65,7 +65,7 @@
  !record {model: stock.picking, id: outgoing_shipment_main_warehouse}:
     picking_type_id: stock.picking_type_out
     origin: 'outgoing shipment main_warehouse'
-    partner_id: base.res_partner_6
+    partner_id: base.res_partner_1
     location_id: stock.stock_location_stock
     location_dest_id: stock.stock_location_customers
     move_lines:
@@ -79,7 +79,7 @@
  !record {model: stock.picking, id: outgoing_shipment_main_warehouse1}:
     picking_type_id: stock.picking_type_out
     origin: 'outgoing shipment'
-    partner_id: base.res_partner_6
+    partner_id: base.res_partner_1
     date: !eval "'%s-%s-15' %((datetime.now()-timedelta(days=60)).year, (datetime.now()-timedelta(days=60)).month)"
     location_id: stock.stock_location_stock
     location_dest_id: stock.stock_location_customers
@@ -100,7 +100,7 @@
  !record {model: stock.picking, id: outgoing_shipment_main_warehouse2}:
     picking_type_id: stock.picking_type_out
     origin: 'outgoing shipment your_company warehouse'
-    partner_id: base.res_partner_6
+    partner_id: base.res_partner_1
     date: !eval "'%s-%s-15' % ((datetime.now()-timedelta(days=30)).month,(datetime.now()-timedelta(days=30)).month)"
     location_id: stock.stock_location_stock
     location_dest_id: stock.stock_location_customers
@@ -115,7 +115,7 @@
  !record {model: stock.picking, id: outgoing_shipment_main_warehouse3}:
     picking_type_id: stock.picking_type_out
     origin: 'your company warehouse'
-    partner_id: base.res_partner_6
+    partner_id: base.res_partner_1
     location_id: stock.stock_location_stock
     location_dest_id: stock.stock_location_customers
     move_lines:
@@ -145,7 +145,7 @@
  !record {model: stock.picking, id: incomming_shipment1}:
     picking_type_id: stock.picking_type_in
     origin: 'incoming_shipment'
-    partner_id: base.res_partner_6
+    partner_id: base.res_partner_1
     location_id: stock.stock_location_suppliers
     location_dest_id: stock.stock_location_stock
     move_lines:
@@ -159,7 +159,7 @@
  !record {model: stock.picking, id: incomming_shipment2}:
     picking_type_id: stock.picking_type_in
     origin: 'incoming_shipment main_warehouse'
-    partner_id: base.res_partner_6
+    partner_id: base.res_partner_1
     location_id: stock.stock_location_suppliers
     location_dest_id: stock.stock_location_stock
     move_lines:
@@ -173,7 +173,7 @@
  !record {model: stock.picking, id: incomming_shipment3}:
     picking_type_id: stock.picking_type_in
     origin: 'incoming_shipment your_company warehouse'
-    partner_id: base.res_partner_6
+    partner_id: base.res_partner_1
     location_id: stock.stock_location_suppliers
     location_dest_id: stock.stock_location_stock
     move_lines:
@@ -187,7 +187,7 @@
  !record {model: stock.picking, id: incomming_shipment4}:
    picking_type_id: stock.picking_type_in
    origin: 'incoming_shipment_main_warehouse'
-   partner_id: base.res_partner_6
+   partner_id: base.res_partner_1
    location_id: stock.stock_location_suppliers
    location_dest_id: stock.stock_location_stock
    move_lines:
@@ -203,7 +203,7 @@
  !record {model: stock.picking, id: incomming_chicago_warehouse}:
     picking_type_id: chi_picking_type_in
     origin: 'incoming_chicago_warehouse'
-    partner_id: base.res_partner_6
+    partner_id: base.res_partner_1
     location_id: stock.stock_location_suppliers
     location_dest_id: stock.stock_location_shop0
     move_lines:
@@ -218,7 +218,7 @@
  !record {model: stock.picking, id: incomming_chicago_warehouse1}:
     picking_type_id: chi_picking_type_in
     origin: 'incoming_shipment_chicago_warehouse'
-    partner_id: base.res_partner_6
+    partner_id: base.res_partner_1
     location_id: stock.stock_location_suppliers
     location_dest_id: stock.stock_location_shop0
     move_lines:
@@ -239,7 +239,7 @@
  !record {model: stock.picking, id: incomming_chicago_warehouse2}:
     picking_type_id: chi_picking_type_in
     origin: 'incoming_shipment chicago_warehouse'
-    partner_id: base.res_partner_6
+    partner_id: base.res_partner_1
     location_id: stock.stock_location_suppliers
     location_dest_id: stock.stock_location_shop0
     move_lines:
@@ -253,7 +253,7 @@
  !record {model: stock.picking, id: incomming_chicago_warehouse3}:
     picking_type_id: chi_picking_type_in
     origin: 'chicago_warehouse'
-    partner_id: base.res_partner_6
+    partner_id: base.res_partner_1
     date: !eval "'%s-%s-2' % ((datetime.now()-timedelta(days=30)).month,(datetime.now()-timedelta(days=30)).month)"
     location_id: stock.stock_location_suppliers
     location_dest_id: stock.stock_location_shop0
@@ -270,7 +270,7 @@
  !record {model: stock.picking, id: outgoing_chicago_warehouse}:
     picking_type_id: chi_picking_type_out
     origin: 'outgoing_chicago_warehouse'
-    partner_id: base.res_partner_6
+    partner_id: base.res_partner_1
     location_id: stock.stock_location_shop0
     location_dest_id: stock.stock_location_customers
     move_lines:
@@ -284,7 +284,7 @@
  !record {model: stock.picking, id: outgoing_chicago_warehouse1}:
     picking_type_id: chi_picking_type_out
     origin: 'outgoing_shipment_chicago_warehouse'
-    partner_id: base.res_partner_6
+    partner_id: base.res_partner_1
     location_id: stock.stock_location_shop0
     location_dest_id: stock.stock_location_customers
     move_lines:
@@ -304,7 +304,7 @@
  !record {model: stock.picking, id: outgoing_chicago_warehouse2}:
     picking_type_id: chi_picking_type_out
     origin: 'chicago_warehouse'
-    partner_id: base.res_partner_6
+    partner_id: base.res_partner_1
     location_id: stock.stock_location_shop0
     location_dest_id: stock.stock_location_customers
     move_lines:
@@ -320,7 +320,7 @@
     origin: 'outgoing chicago warehouse'
     location_id: stock.stock_location_shop0
     location_dest_id: stock.stock_location_customers
-    partner_id: base.res_partner_6
+    partner_id: base.res_partner_1
     move_lines:
       - product_id: product.product_product_5
         product_uom: product.product_uom_unit
diff --git a/addons/website_event/data/event_demo.xml b/addons/website_event/data/event_demo.xml
index e02c2a9b220..1017f3e6160 100644
--- a/addons/website_event/data/event_demo.xml
+++ b/addons/website_event/data/event_demo.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-        <record id="base.res_partner_6" model="res.partner">
+        <record id="base.res_partner_1" model="res.partner">
             <field name="website_published">True</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 8a559188779..94985b2b49f 100644
--- a/addons/website_event_track/data/website_event_track_demo.xml
+++ b/addons/website_event_track/data/website_event_track_demo.xml
@@ -88,7 +88,7 @@
         <field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 8:30:00')"></field>
         <field name="location_id" ref="website_event_track.event_track_location6"/>
         <field name="duration" eval="1"/>
-        <field eval="[(4, ref('base.res_partner_6'))]" name="speaker_ids"/>
+        <field eval="[(4, ref('base.res_partner_1'))]" name="speaker_ids"/>
         <field name="state">published</field>
     </record>
     <record id="event_track8" model="event.track">
diff --git a/openerp/addons/base/res/res_partner_demo.xml b/openerp/addons/base/res/res_partner_demo.xml
index 14774e145b6..f0fc91fce00 100644
--- a/openerp/addons/base/res/res_partner_demo.xml
+++ b/openerp/addons/base/res/res_partner_demo.xml
@@ -126,22 +126,6 @@
             <field name="image" type="base64" file="base/static/img/res_partner_4-image.png"/>
         </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"/>
-            <field eval="1" name="supplier"/>
-            <field eval="0" name="customer"/>
-            <field name="is_company">1</field>
-            <field name="zip">90001</field>
-            <field name="city">Los Angeles</field>
-            <field name="country_id" ref="base.us"/>
-            <field model="res.country.state" name="state_id" search="[('code','ilike','ca')]"/>
-            <field name="street">23 Rockwell Lane</field>
-            <field name="email">openelecapplications@yourcompany.example.com</field>
-            <field name="phone">+1 312 349 2121</field>
-            <field name="image" type="base64" file="base/static/img/res_partner_6-image.jpg"/>
-        </record>
-
         <record id="res_partner_7" model="res.partner">
             <field name="name">Bank Wealthy and sons</field>
             <field eval="[(6, 0, [ref('res_partner_category_8'), ref('res_partner_category_4')])]" name="category_id"/>
@@ -478,7 +462,7 @@
         </record>
         <record id="res_partner_address_12" model="res.partner">
             <field name="name">James Miller</field>
-            <field name="parent_id" eval="ref('res_partner_6')"/>
+            <field name="parent_id" eval="ref('res_partner_1')"/>
             <field name="function">Electrical Supervisor</field>
             <field name="supplier">1</field>
             <field eval="0" name="customer"/>