[MERGE] sale: fix ambiguous demo data

lp bug: https://launchpad.net/bugs/515590 fixed

bzr revid: ls@numerigraphe.fr-20100202080602-6713yq20xqe6u0w8

diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml
index a21d875..ba24ebc 100644 (file)
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@@ -67,7 +67,6 @@ your own accounts.
             <field name="name">Main Receivable</field>
             <field name="code">x 40000</field>
             <field name="type">receivable</field>
-            <field name="user_type" ref="account.account_type_asset"/>
             <field eval="ref('minimal_0')" name="parent_id"/>
             <field name="company_id" ref="base.main_company"/>
             <field eval="True" name="reconcile"/>
@@ -83,7 +82,6 @@ your own chart of account.
             <field name="name">Main Payable</field>
             <field name="code">x 440000</field>
             <field name="type">payable</field>
-            <field name="user_type" ref="account.account_type_liability"/>
             <field eval="ref('minimal_0')" name="parent_id"/>
             <field name="company_id" ref="base.main_company"/>
             <field eval="True" name="reconcile"/>
@@ -99,7 +97,6 @@ your own chart of account.
             <field name="name">Petty Cash</field>
             <field name="code">x 570000</field>
             <field name="type">other</field>
-            <field name="user_type" ref="account.account_type_cash_moves"/>
             <field eval="ref('minimal_0')" name="parent_id"/>
             <field name="company_id" ref="base.main_company"/>
             <field name="user_type" ref="account_type_cash_moves"/>
@@ -114,7 +111,6 @@ your own chart of account.
             <field name="name">Products Purchase</field>
             <field name="code">x 600000</field>
             <field name="type">other</field>
-            <field name="user_type" ref="account.account_type_expense"/>
             <field eval="ref('minimal_0')" name="parent_id"/>
             <field name="company_id" ref="base.main_company"/>
             <field name="user_type" ref="account_type_expense"/>
@@ -129,7 +125,6 @@ your own chart of account.
             <field name="name">Products Sales</field>
             <field name="code">x 701000</field>
             <field name="type">other</field>
-            <field name="user_type" ref="account.account_type_income"/>
             <field eval="ref('minimal_0')" name="parent_id"/>
             <field name="user_type" ref="account_type_income"/>
             <field name="company_id" ref="base.main_company"/>