From a609fb30c6e2fbf9acd18983f9bfd97fe3debd61 Mon Sep 17 00:00:00 2001
From: ced <>
Date: Fri, 19 Oct 2007 12:15:27 +0000
Subject: [PATCH] Fix demo data to avoid movement on different account charts

bzr revid: ced-2890de0b213e168924269a31a255fcb2fb8f9a63
---
 addons/account/account_demo.xml        | 111 ------------------------
 addons/l10n_be/account_demo.xml        | 113 ++++++++++++++++++++++---
 addons/purchase/purchase_unit_test.xml |   4 +-
 addons/sale/sale_unit_test.xml         |   4 +-
 4 files changed, 103 insertions(+), 129 deletions(-)

diff --git a/addons/account/account_demo.xml b/addons/account/account_demo.xml
index b1226bef383..83f9eed58cd 100644
--- a/addons/account/account_demo.xml
+++ b/addons/account/account_demo.xml
@@ -90,116 +90,5 @@
 		<field name="date_stop" eval="time.strftime('%Y')+'-12-31'"/>
 	</record>
 
-	<!-- Invoices -->
-	<record model="account.invoice" id="invoice_1">
-		<field name="currency_id" ref="base.EUR"/>
-		<field name="company_id" ref="base.main_company"/>
-		<field name="address_invoice_id" ref="base.res_partner_address_8"/>
-		<field name="partner_id" ref="base.res_partner_agrolait"/>
-		<field name="journal_id" ref="account.sales_journal"/>
-		<field name="state">draft</field>
-		<field name="type">out_invoice</field>
-		<field name="account_id" ref="account.a_recv"/>
-		<field name="address_contact_id" ref="base.res_partner_address_8"/>
-	</record>
-	<record model="account.invoice.line" id="invoice_1_line_1">
-		<field name="name">Otpez Laptop without OS</field>
-		<field name="invoice_id" ref="invoice_1"/>
-		<field name="price_unit">642</field>
-		<field name="quantity">4</field>
-		<field name="account_id" ref="account.a_sale"/>
-	</record>
-	<record model="account.invoice.line" id="invoice_1_line_2">
-		<field name="name">Linutop</field>
-		<field name="invoice_id" ref="invoice_1"/>
-		<field name="price_unit">280</field>
-		<field name="quantity">2</field>
-		<field name="account_id" ref="account.a_sale"/>
-	</record>
-		
-	<record model="account.invoice" id="invoice_2">
-		<field name="currency_id" ref="base.EUR"/>
-		<field name="company_id" ref="base.main_company"/>
-		<field name="address_invoice_id" ref="base.res_partner_address_8"/>
-		<field name="partner_id" ref="base.res_partner_agrolait"/>
-		<field name="journal_id" ref="account.sales_journal"/>
-		<field name="state">draft</field>
-		<field name="type">out_invoice</field>
-		<field name="account_id" ref="account.a_recv"/>
-		<field name="address_contact_id" ref="base.res_partner_address_8"/>
-		<field name="date_invoice" eval="time.strftime('%Y-%m') + '-01'" />
-	</record>
-	<record model="account.invoice.line" id="invoice_2_line_1">
-		<field name="name">8-port Switch</field>
-		<field name="invoice_id" ref="invoice_2"/>
-		<field name="price_unit">50</field>
-		<field name="quantity">3</field>
-		<field name="account_id" ref="account.a_sale"/>
-	</record>
-	<record model="account.invoice.line" id="invoice_2_line_2">
-		<field name="name">30m RJ45 wire</field>
-		<field name="invoice_id" ref="invoice_2"/>
-		<field name="price_unit">25</field>
-		<field name="quantity">20</field>
-		<field name="account_id" ref="account.a_sale"/>
-	</record>
-	<workflow model="account.invoice" ref="invoice_2" action="invoice_open" />
-		
-	<record model="account.invoice" id="invoice_3">
-		<field name="currency_id" ref="base.EUR"/>
-		<field name="company_id" ref="base.main_company"/>
-		<field name="address_invoice_id" ref="base.res_partner_address_8"/>
-		<field name="partner_id" ref="base.res_partner_agrolait"/>
-		<field name="journal_id" ref="account.sales_journal"/>
-		<field name="state">draft</field>
-		<field name="type">out_invoice</field>
-		<field name="account_id" ref="account.a_recv"/>
-		<field name="address_contact_id" ref="base.res_partner_address_8"/>
-		<field name="date_invoice" eval="time.strftime('%Y-%m') + '-08'" />
-	</record>
-	<record model="account.invoice.line" id="invoice_3_line_1">
-		<field name="name">TypeMatrix Dvorak Keyboard</field>
-		<field name="invoice_id" ref="invoice_3"/>
-		<field name="price_unit">90</field>
-		<field name="quantity">5</field>
-		<field name="account_id" ref="account.a_sale"/>
-	</record>
-	<record model="account.invoice.line" id="invoice_3_line_2">
-		<field name="name">Ergonomic Mouse</field>
-		<field name="invoice_id" ref="invoice_3"/>
-		<field name="price_unit">15</field>
-		<field name="quantity">5</field>
-		<field name="account_id" ref="account.a_sale"/>
-	</record>
-	<workflow model="account.invoice" ref="invoice_3" action="invoice_open" />
-		
-	<record model="account.invoice" id="invoice_4">
-		<field name="currency_id" ref="base.EUR"/>
-		<field name="company_id" ref="base.main_company"/>
-		<field name="address_invoice_id" ref="base.res_partner_address_8"/>
-		<field name="partner_id" ref="base.res_partner_agrolait"/>
-		<field name="journal_id" ref="account.sales_journal"/>
-		<field name="state">draft</field>
-		<field name="type">out_invoice</field>
-		<field name="account_id" ref="account.a_recv"/>
-		<field name="address_contact_id" ref="base.res_partner_address_8"/>
-		<field name="date_invoice" eval="time.strftime('%Y-%m') + '-15'" />
-	</record>
-	<record model="account.invoice.line" id="invoice_4_line_1">
-		<field name="name">Desktop Computer Table</field>
-		<field name="invoice_id" ref="invoice_4"/>
-		<field name="price_unit">80</field>
-		<field name="quantity">5</field>
-		<field name="account_id" ref="account.a_sale"/>
-	</record>
-	<record model="account.invoice.line" id="invoice_4_line_2">
-		<field name="name">Desktop Lamp</field>
-		<field name="invoice_id" ref="invoice_4"/>
-		<field name="price_unit">20</field>
-		<field name="quantity">5</field>
-		<field name="account_id" ref="account.a_sale"/>
-	</record>
-	<workflow model="account.invoice" ref="invoice_4" action="invoice_open" />
-
 </data>
 </terp>
diff --git a/addons/l10n_be/account_demo.xml b/addons/l10n_be/account_demo.xml
index ec2f80b92e3..ae1a3d32009 100644
--- a/addons/l10n_be/account_demo.xml
+++ b/addons/l10n_be/account_demo.xml
@@ -1,32 +1,117 @@
 <?xml version="1.0"?>
 <terp>
 <data noupdate="1">
-	<record model="account.invoice" id="ceci_est_une_facture">
+
+	<!-- Invoices -->
+	<record model="account.invoice" id="invoice_1">
 		<field name="currency_id" ref="base.EUR"/>
 		<field name="company_id" ref="base.main_company"/>
-		<field name="address_invoice_id" ref="base.res_partner_address_tang"/>
-		<field name="partner_id" ref="base.res_partner_asus"/>
+		<field name="address_invoice_id" ref="base.res_partner_address_8"/>
+		<field name="partner_id" ref="base.res_partner_agrolait"/>
 		<field name="journal_id" ref="account.sales_journal"/>
 		<field name="state">draft</field>
 		<field name="type">out_invoice</field>
 		<field name="account_id" ref="a_recv"/>
-		<field name="name">Sample invoice</field>
-		<field name="address_contact_id" ref="base.res_partner_address_tang"/>
+		<field name="address_contact_id" ref="base.res_partner_address_8"/>
 	</record>
-	<record model="account.invoice.line" id="ceci_est_une_facture_line_1">
-		<field name="name">Basic computer with Dvorak keyboard and left-handed mouse</field>
-		<field name="invoice_id" ref="ceci_est_une_facture"/>
-		<field name="price_unit">250</field>
-		<field name="quantity">1</field>
+	<record model="account.invoice.line" id="invoice_1_line_1">
+		<field name="name">Otpez Laptop without OS</field>
+		<field name="invoice_id" ref="invoice_1"/>
+		<field name="price_unit">642</field>
+		<field name="quantity">4</field>
 		<field name="account_id" ref="a_sale"/>
 	</record>
-	<record model="account.invoice.line" id="ceci_est_une_facture_line_2">
-		<field name="name">Little server with raid 1 and 512ECC ram</field>
-		<field name="invoice_id" ref="ceci_est_une_facture"/>
-		<field name="price_unit">800</field>
+	<record model="account.invoice.line" id="invoice_1_line_2">
+		<field name="name">Linutop</field>
+		<field name="invoice_id" ref="invoice_1"/>
+		<field name="price_unit">280</field>
 		<field name="quantity">2</field>
 		<field name="account_id" ref="a_sale"/>
 	</record>
+		
+	<record model="account.invoice" id="invoice_2">
+		<field name="currency_id" ref="base.EUR"/>
+		<field name="company_id" ref="base.main_company"/>
+		<field name="address_invoice_id" ref="base.res_partner_address_8"/>
+		<field name="partner_id" ref="base.res_partner_agrolait"/>
+		<field name="journal_id" ref="account.sales_journal"/>
+		<field name="state">draft</field>
+		<field name="type">out_invoice</field>
+		<field name="account_id" ref="a_recv"/>
+		<field name="address_contact_id" ref="base.res_partner_address_8"/>
+		<field name="date_invoice" eval="time.strftime('%Y-%m') + '-01'" />
+	</record>
+	<record model="account.invoice.line" id="invoice_2_line_1">
+		<field name="name">8-port Switch</field>
+		<field name="invoice_id" ref="invoice_2"/>
+		<field name="price_unit">50</field>
+		<field name="quantity">3</field>
+		<field name="account_id" ref="a_sale"/>
+	</record>
+	<record model="account.invoice.line" id="invoice_2_line_2">
+		<field name="name">30m RJ45 wire</field>
+		<field name="invoice_id" ref="invoice_2"/>
+		<field name="price_unit">25</field>
+		<field name="quantity">20</field>
+		<field name="account_id" ref="a_sale"/>
+	</record>
+	<workflow model="account.invoice" ref="invoice_2" action="invoice_open" />
+		
+	<record model="account.invoice" id="invoice_3">
+		<field name="currency_id" ref="base.EUR"/>
+		<field name="company_id" ref="base.main_company"/>
+		<field name="address_invoice_id" ref="base.res_partner_address_8"/>
+		<field name="partner_id" ref="base.res_partner_agrolait"/>
+		<field name="journal_id" ref="account.sales_journal"/>
+		<field name="state">draft</field>
+		<field name="type">out_invoice</field>
+		<field name="account_id" ref="a_recv"/>
+		<field name="address_contact_id" ref="base.res_partner_address_8"/>
+		<field name="date_invoice" eval="time.strftime('%Y-%m') + '-08'" />
+	</record>
+	<record model="account.invoice.line" id="invoice_3_line_1">
+		<field name="name">TypeMatrix Dvorak Keyboard</field>
+		<field name="invoice_id" ref="invoice_3"/>
+		<field name="price_unit">90</field>
+		<field name="quantity">5</field>
+		<field name="account_id" ref="a_sale"/>
+	</record>
+	<record model="account.invoice.line" id="invoice_3_line_2">
+		<field name="name">Ergonomic Mouse</field>
+		<field name="invoice_id" ref="invoice_3"/>
+		<field name="price_unit">15</field>
+		<field name="quantity">5</field>
+		<field name="account_id" ref="a_sale"/>
+	</record>
+	<workflow model="account.invoice" ref="invoice_3" action="invoice_open" />
+		
+	<record model="account.invoice" id="invoice_4">
+		<field name="currency_id" ref="base.EUR"/>
+		<field name="company_id" ref="base.main_company"/>
+		<field name="address_invoice_id" ref="base.res_partner_address_8"/>
+		<field name="partner_id" ref="base.res_partner_agrolait"/>
+		<field name="journal_id" ref="account.sales_journal"/>
+		<field name="state">draft</field>
+		<field name="type">out_invoice</field>
+		<field name="account_id" ref="a_recv"/>
+		<field name="address_contact_id" ref="base.res_partner_address_8"/>
+		<field name="date_invoice" eval="time.strftime('%Y-%m') + '-15'" />
+	</record>
+	<record model="account.invoice.line" id="invoice_4_line_1">
+		<field name="name">Desktop Computer Table</field>
+		<field name="invoice_id" ref="invoice_4"/>
+		<field name="price_unit">80</field>
+		<field name="quantity">5</field>
+		<field name="account_id" ref="a_sale"/>
+	</record>
+	<record model="account.invoice.line" id="invoice_4_line_2">
+		<field name="name">Desktop Lamp</field>
+		<field name="invoice_id" ref="invoice_4"/>
+		<field name="price_unit">20</field>
+		<field name="quantity">5</field>
+		<field name="account_id" ref="a_sale"/>
+	</record>
+	<workflow model="account.invoice" ref="invoice_4" action="invoice_open" />
 
 </data>
 </terp>
diff --git a/addons/purchase/purchase_unit_test.xml b/addons/purchase/purchase_unit_test.xml
index 03413511598..b0a339a7f78 100644
--- a/addons/purchase/purchase_unit_test.xml
+++ b/addons/purchase/purchase_unit_test.xml
@@ -99,10 +99,10 @@
 		<function model="account.invoice" name="pay_and_reconcile">
 			<value model="purchase.order" eval="[obj(ref('test_purchase_1')).invoice_id.id]" />
 			<value eval="1164" />
-			<value eval="ref('account.cash')" />
+			<value search="[('type', '=', 'cash')]" model="account.account"/>
 			<value eval="ref('account.period_' + str(int(time.strftime('%m'))))" />
 			<value eval="ref('account.bank_journal')" />
-			<value eval="ref('account.cash')" />
+			<value search="[('type', '=', 'cash')]" model="account.account"/>
 			<value eval="ref('account.period_' + str(int(time.strftime('%m'))))" />
 			<value eval="ref('account.bank_journal')" />
 		</function>
diff --git a/addons/sale/sale_unit_test.xml b/addons/sale/sale_unit_test.xml
index ffc9de69fa1..34aa6ddc356 100644
--- a/addons/sale/sale_unit_test.xml
+++ b/addons/sale/sale_unit_test.xml
@@ -68,10 +68,10 @@
 		<function model="account.invoice" name="pay_and_reconcile">
 			<value model="sale.order" eval="[obj(ref('test_order_1')).invoice_ids[0].id]" />
 			<value model="sale.order" eval="obj(ref('test_order_1')).amount_total" />
-			<value eval="ref('account.cash')" />
+			<value search="[('type', '=', 'cash')]" model="account.account"/>
 			<value eval="ref('account.period_' + str(int(time.strftime('%m'))))" />
 			<value eval="ref('account.bank_journal')" />
-			<value eval="ref('account.cash')" />
+			<value search="[('type', '=', 'cash')]" model="account.account"/>
 			<value eval="ref('account.period_' + str(int(time.strftime('%m'))))" />
 			<value eval="ref('account.bank_journal')" />
 		</function>