diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml
index d0b2d22340c..77fe2101f9e 100644
--- a/addons/crm/crm_lead_demo.xml
+++ b/addons/crm/crm_lead_demo.xml
@@ -508,7 +508,7 @@ Andrew]]>
90.0
Robin Smith
Global Solutions
-
+
Liverpool
L25 4RL
diff --git a/addons/crm_partner_assign/res_partner_demo.xml b/addons/crm_partner_assign/res_partner_demo.xml
index 2a4ae71d1bd..f68277111a6 100644
--- a/addons/crm_partner_assign/res_partner_demo.xml
+++ b/addons/crm_partner_assign/res_partner_demo.xml
@@ -70,7 +70,7 @@
-
+
diff --git a/addons/l10n_in_hr_payroll/test/payment_advice_batch.yml b/addons/l10n_in_hr_payroll/test/payment_advice_batch.yml
index 9f3ec61dda4..4db622dadbc 100644
--- a/addons/l10n_in_hr_payroll/test/payment_advice_batch.yml
+++ b/addons/l10n_in_hr_payroll/test/payment_advice_batch.yml
@@ -5,7 +5,7 @@
-
!record {model: res.partner.bank, id: res_partner_bank_0}:
acc_number: '3025632343043'
- partner_id: base.res_partner_21
+ partner_id: base.res_partner_4
acc_type: bank
bank_id: base.res_bank_1
-
diff --git a/addons/mail/data/mail_demo.xml b/addons/mail/data/mail_demo.xml
index 662691de984..0080a3ff684 100644
--- a/addons/mail/data/mail_demo.xml
+++ b/addons/mail/data/mail_demo.xml
@@ -63,7 +63,7 @@
none
-
+
none
diff --git a/addons/membership/membership_demo.yml b/addons/membership/membership_demo.yml
index dd27919c430..cd4f35fed3e 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_4"),ref("base.res_partner_24"),ref("base.res_partner_2"),ref("base.res_partner_12"),ref("base.res_partner_3"),ref("base.res_partner_21"),ref("base.res_partner_1"),ref("base.res_partner_1"),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_2"),ref("base.res_partner_12"),ref("base.res_partner_3"),ref("base.res_partner_4"),ref("base.res_partner_1"),ref("base.res_partner_1"),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')
@@ -26,7 +26,7 @@
self.create_membership_invoice(cr, uid, ref('base.res_partner_2'), ref('membership_0'), {'amount':180})
self.create_membership_invoice(cr, uid, ref('base.res_partner_18'), ref('membership_1'), {'amount':180})
- self.create_membership_invoice(cr, uid, ref('base.res_partner_21'), ref('membership_1'), {'amount':180})
+ self.create_membership_invoice(cr, uid, ref('base.res_partner_4'), ref('membership_1'), {'amount':180})
self.create_membership_invoice(cr, uid, ref('base.res_partner_22'), ref('membership_1'), {'amount':180})
self.create_membership_invoice(cr, uid, ref('base.res_partner_23'), ref('membership_1'), {'amount':180})
diff --git a/addons/point_of_sale/point_of_sale_demo.xml b/addons/point_of_sale/point_of_sale_demo.xml
index dda31b9c421..5d446e4da2c 100644
--- a/addons/point_of_sale/point_of_sale_demo.xml
+++ b/addons/point_of_sale/point_of_sale_demo.xml
@@ -21,7 +21,7 @@
0421700000006
0421800000005
0421900000004
- 0422100000009
+ 0422100000009
0410100000006
diff --git a/addons/website_partner/data/demo.xml b/addons/website_partner/data/demo.xml
index a9d75d29b80..b00c2b3d9f2 100644
--- a/addons/website_partner/data/demo.xml
+++ b/addons/website_partner/data/demo.xml
@@ -179,7 +179,7 @@ Phase 3: In the third phase recommends prioritizing specific interests of the co
Providing a full range of free software services for the private and public sectors since 1998, Bank Wealthy and sons is now one of the largest independent open source consultancies, with Open Source Support Centres in the UK, Germany, the US and Canada. With a worldwide team of over 40 free software developers, including many active Odoo contributors, Bank Wealthy and sons is Your One-Stop Shop for Open Source Support™.]]>
-
+
Global Solutions helps organisations of all shapes and sizes gain a competitive advantage through Free and Open Source software. Our experienced team can provide strategic advice, implementation, integration with exis...
diff --git a/openerp/addons/base/res/res_partner_demo.xml b/openerp/addons/base/res/res_partner_demo.xml
index 1f943193031..21ff79f61fa 100644
--- a/openerp/addons/base/res/res_partner_demo.xml
+++ b/openerp/addons/base/res/res_partner_demo.xml
@@ -170,20 +170,6 @@
-
- Global Solutions
-
-
-
- 1
- Union Road
- Liverpool
-
- L25 4RL
- globalsolutions@yourcompany.example.com
-
-
-
Vicking Direct
diff --git a/openerp/addons/base/res/res_partner_demo.yml b/openerp/addons/base/res/res_partner_demo.yml
index 42f09a23298..3aa3020da22 100644
--- a/openerp/addons/base/res/res_partner_demo.yml
+++ b/openerp/addons/base/res/res_partner_demo.yml
@@ -133,19 +133,19 @@
-
!record {model: 'res.partner', id: base.res_partner_address_32}:
name: Robin Smith
- parent_id: base.res_partner_21
+ parent_id: base.res_partner_4
function: Sales Manager
email: robin.smith@globalsolutions.example.com
-
!record {model: 'res.partner', id: base.res_partner_address_33}:
name: Morgan Rose
- parent_id: base.res_partner_21
+ parent_id: base.res_partner_4
function: Financial Manager
email: morgan.rose@globalsolutions.example.com
-
!record {model: 'res.partner', id: base.res_partner_address_34}:
name: Kevin Clarke
- parent_id: base.res_partner_21
+ parent_id: base.res_partner_4
function: Knowledge Manager
email: kevin.clarke@globalsolutions.example.com
-