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

Proposed by Ashvin Rathod (OpenERP)
Status: Merged
Merged at revision: 5320
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-bug-861130-ara
Merge into: lp:openobject-addons
Diff against target: 21 lines (+2/-2)
1 file modified
account/configurable_account_chart.xml (+2/-2)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-bug-861130-ara
Reviewer Review Type Date Requested Status
qdp (OpenERP) Approve
Mustufa Rangwala (Open ERP) (community) Approve
Review via email: mp+77280@code.launchpad.net

Description of the change

Hello,

Fix:can not install generic chart of account

Thanks,

To post a comment you must log in.
5236. By Ashvin Rathod (OpenERP)

[FIX] can not install generic chart of account

Revision history for this message
Mustufa Rangwala (Open ERP) (mra-tinyerp) :
review: Approve
Revision history for this message
qdp (OpenERP) (qdp) wrote :

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

Thanks

review: Approve
Revision history for this message
qdp (OpenERP) (qdp) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account/configurable_account_chart.xml'
2--- account/configurable_account_chart.xml 2011-09-27 15:50:33 +0000
3+++ account/configurable_account_chart.xml 2011-09-28 06:37:24 +0000
4@@ -171,7 +171,7 @@
5 <field ref="conf_cas" name="parent_id"/>
6 <field name="type">receivable</field>
7 <field eval="True" name="reconcile"/>
8- <field name="user_type" ref="conf_account_type_asset"/>
9+ <field name="user_type" ref="conf_account_type_receivable"/>
10 </record>
11
12 <record id="conf_ova" model="account.account.template">
13@@ -212,7 +212,7 @@
14 <field ref="conf_cli" name="parent_id"/>
15 <field name="type">payable</field>
16 <field eval="True" name="reconcile"/>
17- <field name="user_type" ref="conf_account_type_liability"/>
18+ <field name="user_type" ref="conf_account_type_payable"/>
19 </record>
20
21 <record id="conf_iva" model="account.account.template">

Subscribers

People subscribed via source and target branches

to all changes: