Merge lp:~openerp-dev/openobject-addons/trunk-bug-861130-ara into lp:openobject-addons

[Ashvin Rathod (OpenERP)]

Hello,

Fix:can not install generic chart of account

Thanks,

[lp:~openerp-dev/openobject-addons/trunk-bug-861130-ara]

5236. By Ashvin Rathod (OpenERP) on 2011-09-28

[FIX] can not install generic chart of account

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

review: Approve

[qdp (OpenERP) (qdp)]

i had conflicts so i applied the patch manually. I'm rejecting the merge proposal for the sake of clarity.

Thanks

review: Approve

[qdp (OpenERP) (qdp)]

forget about 'rejecting', i manually set it as merged ;-)

=== modified file 'account/configurable_account_chart.xml'
--- account/configurable_account_chart.xml	2011-09-27 15:50:33 +0000
+++ account/configurable_account_chart.xml	2011-09-28 06:37:24 +0000
@@ -171,7 +171,7 @@
 			            <field ref="conf_cas" name="parent_id"/>
 			            <field name="type">receivable</field>
 			            <field eval="True" name="reconcile"/>
-			            <field name="user_type" ref="conf_account_type_asset"/>
+			            <field name="user_type" ref="conf_account_type_receivable"/>
 			        </record>
 
 			        <record id="conf_ova" model="account.account.template">
@@ -212,7 +212,7 @@
 			            <field ref="conf_cli" name="parent_id"/>
 			            <field name="type">payable</field>
 			            <field eval="True" name="reconcile"/>
-			            <field name="user_type" ref="conf_account_type_liability"/>
+			            <field name="user_type" ref="conf_account_type_payable"/>
 			        </record>
 
 			        <record id="conf_iva" model="account.account.template">