diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml
index 6625b292d22..843b731d5c6 100644
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@@ -151,7 +151,7 @@
             <field name="code">X11004</field>
             <field name="name">Bank Current Account - (test)</field>
             <field ref="cas" name="parent_id"/>
-            <field name="type">other</field>
+            <field name="type">liquidity</field>
             <field name="user_type" ref="account_type_asset"/>
         </record>
 
@@ -159,7 +159,7 @@
             <field name="code">X11005</field>
             <field name="name">Cash - (test)</field>
             <field ref="cas" name="parent_id"/>
-            <field name="type">other</field>
+            <field name="type">liquidity</field>
             <field name="user_type" ref="account_type_asset"/>
         </record>
 
diff --git a/addons/account_voucher/voucher.py b/addons/account_voucher/voucher.py
index ca4c4286034..7d848242a1b 100644
--- a/addons/account_voucher/voucher.py
+++ b/addons/account_voucher/voucher.py
@@ -84,7 +84,7 @@ class account_voucher(osv.osv):
     
     def _get_partner(self, cr, uid, context={}):
         return context.get('partner_id', False)
-        
+    
     _name = 'account.voucher'
     _description = 'Accounting Voucher'
     _order = "date desc, id desc"
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index b778272551a..1abf4ec1ea1 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -45,7 +45,7 @@
                                     <field name="pay_now" on_change="onchange_payment(pay_now, journal_id, partner_id)" required="1"/>
                                     <field name="account_id" 
                                          attrs="{'invisible':[('pay_now','!=','pay_now')]}"
-                                          domain="[('user_type.report_type','=','asset'), ('type','=','other')]"/>
+                                          domain="[('type','=','liquidity')]"/>
                                          <!-- should select income accounts only. Or use the journal for this ? -->
                                     <field name="reference"
                                          attrs="{'invisible':[('pay_now','!=','pay_now')]}"
diff --git a/addons/l10n_in/l10n_in_chart.xml b/addons/l10n_in/l10n_in_chart.xml
index 3cc4de43a4c..3a043231d0f 100644
--- a/addons/l10n_in/l10n_in_chart.xml
+++ b/addons/l10n_in/l10n_in_chart.xml
@@ -1,74 +1,72 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-    <!--
-    #
-    # Indian Accounts tree
-    #
-    -->
-    <!--
-    Account Type
-    -->
-     <record model="account.account.type" id="account_type_income_view">
-        <field name="name">Income View</field>
-        <field name="code">view</field>
-        <field name="report_type">income</field>
-    </record>
-    <record model="account.account.type" id="account_type_expense_view">
-        <field name="name">Expense View</field>
-        <field name="code">expense</field>
-        <field name="report_type">expense</field>
-    </record>
-    <record model="account.account.type" id="account_type_asset_view">
-        <field name="name">Asset View</field>
-        <field name="code">asset</field>
-        <field name="report_type">asset</field>
-    </record>
-    <record model="account.account.type" id="account_type_liability_view">
-        <field name="name">Liability View</field>
-        <field name="code">liability</field>
-        <field name="report_type">liability</field>
-    </record>
+        <!--
+        #
+        # Indian Accounts tree
+        #
+        -->
+        <!--
+        Account Type
+        -->
+         <record model="account.account.type" id="account_type_income_view">
+            <field name="name">Income View</field>
+            <field name="code">view</field>
+            <field name="report_type">income</field>
+        </record>
+        <record model="account.account.type" id="account_type_expense_view">
+            <field name="name">Expense View</field>
+            <field name="code">expense</field>
+            <field name="report_type">expense</field>
+        </record>
+        <record model="account.account.type" id="account_type_asset_view">
+            <field name="name">Asset View</field>
+            <field name="code">asset</field>
+            <field name="report_type">asset</field>
+        </record>
+        <record model="account.account.type" id="account_type_liability_view">
+            <field name="name">Liability View</field>
+            <field name="code">liability</field>
+            <field name="report_type">liability</field>
+        </record>
 
-    <record model="account.account.type" id="account_type_root_ind1">
-        <field name="name">View</field>
-        <field name="code">view</field>
-    </record>
-    <record model="account.account.type" id="account_type_asset1">
-        <field name="name">Asset</field>
-        <field name="code">asset</field>
-        <field name="report_type">asset</field>
-    </record>
-    <record model="account.account.type" id="account_type_liability1">
-        <field name="name">Liability</field>
-        <field name="code">liability</field>
-        <field name="report_type">liability</field>
-    </record>
-    <record model="account.account.type" id="account_type_expense1">
-        <field name="name">Expense</field>
-        <field name="code">expense</field>
-        <field name="report_type">expense</field>
-    </record>
-    <record model="account.account.type" id="account_type_income1" >
-        <field name="name">Income</field>
-        <field name="code">income</field>
-        <field name="report_type">income</field>
-    </record>
-    <record model="account.account.type" id="account_type_closed1">
-        <field name="name">Closed</field>
-        <field name="code">closed</field>
-    </record>
+        <record model="account.account.type" id="account_type_root_ind1">
+            <field name="name">View</field>
+            <field name="code">view</field>
+        </record>
+        <record model="account.account.type" id="account_type_asset1">
+            <field name="name">Asset</field>
+            <field name="code">asset</field>
+            <field name="report_type">asset</field>
+        </record>
+        <record model="account.account.type" id="account_type_liability1">
+            <field name="name">Liability</field>
+            <field name="code">liability</field>
+            <field name="report_type">liability</field>
+        </record>
+        <record model="account.account.type" id="account_type_expense1">
+            <field name="name">Expense</field>
+            <field name="code">expense</field>
+            <field name="report_type">expense</field>
+        </record>
+        <record model="account.account.type" id="account_type_income1" >
+            <field name="name">Income</field>
+            <field name="code">income</field>
+            <field name="report_type">income</field>
+        </record>
+        <record model="account.account.type" id="account_type_closed1">
+            <field name="name">Closed</field>
+            <field name="code">closed</field>
+        </record>
 
-    <!-- ## account chart -->
+        <!-- ## account chart -->
 
         <record model="account.account.template" id="root">
             <field name="name">Indian Chart of Account</field>
             <field name="code">0</field>
             <field name="type">view</field>
             <field name="user_type" ref="account_type_root_ind1"/>
-
             <field name="reconcile" eval="False"/>
-
         </record>
 
         <record model="account.account.template" id="IA_AC0">
@@ -76,310 +74,252 @@
             <field name="code">IA_AC0</field>
             <field name="type">view</field>
             <field name="user_type" ref="account_type_root_ind1"/>
-
             <field name="reconcile" eval="False"/>
-
             <field name="parent_id" ref="root"/>
         </record>
 
-            <record model="account.account.template" id="IA_AC01">
-                <field name="name">Assets</field>
-                <field name="code">IA_AC01</field>
-                <field name="type">view</field>
-                <field name="user_type" ref="account_type_asset_view"/>
-
-                <field name="reconcile" eval="False"/>
-
-                <field name="parent_id" ref="IA_AC0"/>
-            </record>
-
-                <record model="account.account.template" id="IA_AC011">
-                    <field name="name">Current Assets</field>
-                    <field name="code">IA_AC011</field>
-                    <field name="type">view</field>
-                    <field name="user_type" ref="account_type_asset1"/>
-
-                    <field name="reconcile" eval="False"/>
-
-                    <field name="parent_id" ref="IA_AC01"/>
-                </record>
-
-                    <record model="account.account.template" id="IA_AC0111">
-                        <field name="name">Bank Account</field>
-                        <field name="code">IA_AC0111</field>
-                        <field name="type">receivable</field>
-                        <field name="user_type" ref="account_type_asset1"/>
-
-                        <field name="reconcile" eval="False"/>
-
-                        <field name="parent_id" ref="IA_AC011"/>
-                    </record>
-
-                    <record model="account.account.template" id="IA_AC0112">
-                        <field name="name">Cash In Hand Account</field>
-                        <field name="code">IA_AC0112</field>
-                        <field name="type">view</field>
-                        <field name="user_type" ref="account_type_asset1"/>
-
-                        <field name="reconcile" eval="False"/>
-
-                        <field name="parent_id" ref="IA_AC011"/>
-                    </record>
-
-                        <record model="account.account.template" id="IA_AC01121">
-                            <field name="name">Cash Account</field>
-                            <field name="code">IA_AC01121</field>
-                            <field name="type">receivable</field>
-                            <field name="user_type" ref="account_type_asset1"/>
-
-                            <field name="reconcile" eval="False"/>
-
-                            <field name="parent_id" ref="IA_AC0112"/>
-                        </record>
-
-                    <record model="account.account.template" id="IA_AC0113">
-                        <field name="name">Deposit Account</field>
-                        <field name="code">IA_AC0113</field>
-                        <field name="type">receivable</field>
-                        <field name="user_type" ref="account_type_asset1"/>
-
-                        <field name="reconcile" eval="False"/>
-
-                        <field name="parent_id" ref="IA_AC011"/>
-                    </record>
-
-                    <record model="account.account.template" id="IA_AC0114">
-                        <field name="name">Loan &amp; Advance(Assets) Account</field>
-                        <field name="code">IA_AC0114</field>
-                        <field name="type">receivable</field>
-                        <field name="user_type" ref="account_type_asset1"/>
-
-                        <field name="reconcile" eval="False"/>
-
-                        <field name="parent_id" ref="IA_AC011"/>
-                    </record>
-
-                    <record model="account.account.template" id="IA_AC0116">
-                        <field name="name">Total Sundry Debtors Account</field>
-                        <field name="code">IA_AC0116</field>
-                        <field name="type">view</field>
-                        <field name="user_type" ref="account_type_asset1"/>
-
-                        <field name="reconcile" eval="False"/>
-
-                        <field name="parent_id" ref="IA_AC011"/>
-                    </record>
-
-                        <record model="account.account.template" id="IA_AC01161">
-                            <field name="name">Sundry Debtors Account</field>
-                            <field name="code">IA_AC01161</field>
-                            <field name="type">receivable</field>
-                            <field name="user_type" ref="account_type_asset1"/>
-
-                            <field name="reconcile" eval="False"/>
-
-                            <field name="parent_id" ref="IA_AC0116"/>
-                        </record>
-
-                <record model="account.account.template" id="IA_AC012">
-                    <field name="name">Fixed Assets</field>
-                    <field name="code">IA_AC012</field>
-                    <field name="type">receivable</field>
-                    <field name="user_type" ref="account_type_asset1"/>
-
-                    <field name="reconcile" eval="False"/>
-
-                    <field name="parent_id" ref="IA_AC01"/>
-                </record>
-
-                <record model="account.account.template" id="IA_AC013">
-                    <field name="name">Investment</field>
-                    <field name="code">IA_AC013</field>
-                    <field name="type">receivable</field>
-                    <field name="user_type" ref="account_type_asset1"/>
-
-                    <field name="reconcile" eval="False"/>
-
-                    <field name="parent_id" ref="IA_AC01"/>
-                </record>
-
-                <record model="account.account.template" id="IA_AC014">
-                    <field name="name">Misc. Expenses(Asset)</field>
-                    <field name="code">IA_AC014</field>
-                    <field name="type">receivable</field>
-                    <field name="user_type" ref="account_type_asset1"/>
-
-                    <field name="reconcile" eval="False"/>
-
-                    <field name="parent_id" ref="IA_AC01"/>
-                </record>
-
-
-            <record model="account.account.template" id="IA_AC02">
-                <field name="name">Liabilities</field>
-                <field name="code">IA_AC02</field>
-                <field name="type">view</field>
-                <field name="user_type" ref="account_type_liability_view"/>
-
-                <field name="reconcile" eval="False"/>
-
-                <field name="parent_id" ref="IA_AC0"/>
-            </record>
-
-                <record model="account.account.template" id="IA_AC021">
-                    <field name="name">Current Liabilities</field>
-                    <field name="code">IA_AC021</field>
-                    <field name="type">view</field>
-                    <field name="user_type" ref="account_type_liability1"/>
-
-                    <field name="reconcile" eval="False"/>
-
-                    <field name="parent_id" ref="IA_AC02"/>
-                </record>
-
-                    <record model="account.account.template" id="IA_AC0211">
-                        <field name="name">Duties &amp; Taxes</field>
-                        <field name="code">IA_AC0211</field>
-                        <field name="type">payable</field>
-                        <field name="user_type" ref="account_type_liability1"/>
-
-                        <field name="reconcile" eval="False"/>
-
-                        <field name="parent_id" ref="IA_AC021"/>
-                    </record>
-
-                    <record model="account.account.template" id="IA_AC0212">
-                        <field name="name">Provision</field>
-                        <field name="code">IA_AC0212</field>
-                        <field name="type">payable</field>
-                        <field name="user_type" ref="account_type_liability1"/>
-
-                        <field name="reconcile" eval="False"/>
-
-                        <field name="parent_id" ref="IA_AC021"/>
-                    </record>
-
-                    <record model="account.account.template" id="IA_AC0213">
-                        <field name="name">Total Sundry Creditors</field>
-                        <field name="code">IA_AC0213</field>
-                        <field name="type">view</field>
-                        <field name="user_type" ref="account_type_liability1"/>
-
-                        <field name="reconcile" eval="False"/>
-
-                        <field name="parent_id" ref="IA_AC021"/>
-                    </record>
-
-                        <record model="account.account.template" id="IA_AC02131">
-                            <field name="name">Sundry Creditors</field>
-                            <field name="code">IA_AC02131</field>
-                            <field name="type">payable</field>
-                            <field name="user_type" ref="account_type_liability1"/>
-
-                            <field name="reconcile" eval="False"/>
-
-                            <field name="parent_id" ref="IA_AC0213"/>
-                        </record>
-
-                <record model="account.account.template" id="IA_AC022">
-                    <field name="name">Branch/Division</field>
-                    <field name="code">IA_AC022</field>
-                    <field name="type">payable</field>
-                    <field name="user_type" ref="account_type_liability1"/>
-
-                    <field name="reconcile" eval="False"/>
-
-                    <field name="parent_id" ref="IA_AC02"/>
-                </record>
-
-                <record model="account.account.template" id="IA_AC023">
-                    <field name="name">Share Holder/Owner Fund</field>
-                    <field name="code">IA_AC023</field>
-                    <field name="type">view</field>
-                    <field name="user_type" ref="account_type_liability1"/>
-
-                    <field name="reconcile" eval="False"/>
-
-                    <field name="parent_id" ref="IA_AC02"/>
-                </record>
-
-
-                    <record model="account.account.template" id="IA_AC0231">
-                        <field name="name">Capital Account</field>
-                        <field name="code">IA_AC0231</field>
-                        <field name="type">payable</field>
-                        <field name="user_type" ref="account_type_liability1"/>
-
-                        <field name="reconcile" eval="False"/>
-
-                        <field name="parent_id" ref="IA_AC023"/>
-                    </record>
-
-                    <record model="account.account.template" id="IA_AC0232">
-                        <field name="name">Reserve and Surplus Account</field>
-                        <field name="code">IA_AC0232</field>
-                        <field name="type">payable</field>
-                        <field name="user_type" ref="account_type_liability1"/>
-
-                        <field name="reconcile" eval="False"/>
-
-                        <field name="parent_id" ref="IA_AC023"/>
-                    </record>
-
-                <record model="account.account.template" id="IA_AC024">
-                    <field name="name">Loan(Liability) Account</field>
-                    <field name="code">IA_AC024</field>
-                    <field name="type">view</field>
-                    <field name="user_type" ref="account_type_liability1"/>
-
-                    <field name="reconcile" eval="False"/>
-
-                    <field name="parent_id" ref="IA_AC02"/>
-                </record>
-
-                    <record model="account.account.template" id="IA_AC0241">
-                        <field name="name">Bank OD Account</field>
-                        <field name="code">IA_AC0241</field>
-                        <field name="type">payable</field>
-                        <field name="user_type" ref="account_type_liability1"/>
-
-                        <field name="reconcile" eval="False"/>
-
-                        <field name="parent_id" ref="IA_AC024"/>
-                    </record>
-
-                    <record model="account.account.template" id="IA_AC0242">
-                        <field name="name">Secured Loan Account</field>
-                        <field name="code">IA_AC0242</field>
-                        <field name="type">payable</field>
-                        <field name="user_type" ref="account_type_liability1"/>
-
-                        <field name="reconcile" eval="False"/>
-
-                        <field name="parent_id" ref="IA_AC024"/>
-                    </record>
-
-                    <record model="account.account.template" id="IA_AC0243">
-                        <field name="name">Unsecured Loan Account</field>
-                        <field name="code">IA_AC0243</field>
-                        <field name="type">payable</field>
-                        <field name="user_type" ref="account_type_liability1"/>
-
-                        <field name="reconcile" eval="False"/>
-
-                        <field name="parent_id" ref="IA_AC024"/>
-                    </record>
-
-                <record model="account.account.template" id="IA_AC025">
-                    <field name="name">Suspense Account</field>
-                    <field name="code">IA_AC025</field>
-                    <field name="type">payable</field>
-                    <field name="user_type" ref="account_type_liability1"/>
-
-                    <field name="reconcile" eval="False"/>
-
-                    <field name="parent_id" ref="IA_AC02"/>
-                </record>
+        <record model="account.account.template" id="IA_AC01">
+            <field name="name">Assets</field>
+            <field name="code">IA_AC01</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account_type_asset_view"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="IA_AC0"/>
+        </record>
+
+        <record model="account.account.template" id="IA_AC011">
+            <field name="name">Current Assets</field>
+            <field name="code">IA_AC011</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account_type_asset1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="IA_AC01"/>
+        </record>
+
+        <record model="account.account.template" id="IA_AC0111">
+            <field name="name">Bank Account</field>
+            <field name="code">IA_AC0111</field>
+            <field name="type">liquidity</field>
+            <field name="user_type" ref="account_type_asset1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="IA_AC011"/>
+        </record>
+
+        <record model="account.account.template" id="IA_AC0112">
+            <field name="name">Cash In Hand Account</field>
+            <field name="code">IA_AC0112</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account_type_asset1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="IA_AC011"/>
+        </record>
+
+        <record model="account.account.template" id="IA_AC01121">
+            <field name="name">Cash Account</field>
+            <field name="code">IA_AC01121</field>
+            <field name="type">liquidity</field>
+            <field name="user_type" ref="account_type_asset1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="IA_AC0112"/>
+        </record>
+
+        <record model="account.account.template" id="IA_AC0113">
+            <field name="name">Deposit Account</field>
+            <field name="code">IA_AC0113</field>
+            <field name="type">receivable</field>
+            <field name="user_type" ref="account_type_asset1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="IA_AC011"/>
+        </record>
+
+        <record model="account.account.template" id="IA_AC0114">
+            <field name="name">Loan &amp; Advance(Assets) Account</field>
+            <field name="code">IA_AC0114</field>
+            <field name="type">receivable</field>
+            <field name="user_type" ref="account_type_asset1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="IA_AC011"/>
+        </record>
+
+        <record model="account.account.template" id="IA_AC0116">
+            <field name="name">Total Sundry Debtors Account</field>
+            <field name="code">IA_AC0116</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account_type_asset1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="IA_AC011"/>
+        </record>
+
+        <record model="account.account.template" id="IA_AC01161">
+            <field name="name">Sundry Debtors Account</field>
+            <field name="code">IA_AC01161</field>
+            <field name="type">receivable</field>
+            <field name="user_type" ref="account_type_asset1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="IA_AC0116"/>
+        </record>
+
+        <record model="account.account.template" id="IA_AC012">
+            <field name="name">Fixed Assets</field>
+            <field name="code">IA_AC012</field>
+            <field name="type">receivable</field>
+            <field name="user_type" ref="account_type_asset1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="IA_AC01"/>
+        </record>
+
+        <record model="account.account.template" id="IA_AC013">
+            <field name="name">Investment</field>
+            <field name="code">IA_AC013</field>
+            <field name="type">receivable</field>
+            <field name="user_type" ref="account_type_asset1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="IA_AC01"/>
+        </record>
+
+        <record model="account.account.template" id="IA_AC014">
+            <field name="name">Misc. Expenses(Asset)</field>
+            <field name="code">IA_AC014</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account_type_asset1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="IA_AC01"/>
+        </record>
+
+        <record model="account.account.template" id="IA_AC02">
+            <field name="name">Liabilities</field>
+            <field name="code">IA_AC02</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account_type_liability_view"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="IA_AC0"/>
+        </record>
+
+        <record model="account.account.template" id="IA_AC021">
+            <field name="name">Current Liabilities</field>
+            <field name="code">IA_AC021</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account_type_liability1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="IA_AC02"/>
+        </record>
+
+        <record model="account.account.template" id="IA_AC0211">
+            <field name="name">Duties &amp; Taxes</field>
+            <field name="code">IA_AC0211</field>
+            <field name="type">payable</field>
+            <field name="user_type" ref="account_type_liability1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="IA_AC021"/>
+        </record>
+
+        <record model="account.account.template" id="IA_AC0212">
+            <field name="name">Provision</field>
+            <field name="code">IA_AC0212</field>
+            <field name="type">payable</field>
+            <field name="user_type" ref="account_type_liability1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="IA_AC021"/>
+        </record>
+
+        <record model="account.account.template" id="IA_AC0213">
+            <field name="name">Total Sundry Creditors</field>
+            <field name="code">IA_AC0213</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account_type_liability1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="IA_AC021"/>
+        </record>
+
+        <record model="account.account.template" id="IA_AC02131">
+            <field name="name">Sundry Creditors</field>
+            <field name="code">IA_AC02131</field>
+            <field name="type">payable</field>
+            <field name="user_type" ref="account_type_liability1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="IA_AC0213"/>
+        </record>
+
+        <record model="account.account.template" id="IA_AC022">
+            <field name="name">Branch/Division</field>
+            <field name="code">IA_AC022</field>
+            <field name="type">payable</field>
+            <field name="user_type" ref="account_type_liability1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="IA_AC02"/>
+        </record>
+
+        <record model="account.account.template" id="IA_AC023">
+            <field name="name">Share Holder/Owner Fund</field>
+            <field name="code">IA_AC023</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account_type_liability1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="IA_AC02"/>
+        </record>
+
+        <record model="account.account.template" id="IA_AC0231">
+            <field name="name">Capital Account</field>
+            <field name="code">IA_AC0231</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account_type_liability1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="IA_AC023"/>
+        </record>
+
+        <record model="account.account.template" id="IA_AC0232">
+            <field name="name">Reserve and Surplus Account</field>
+            <field name="code">IA_AC0232</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account_type_liability1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="IA_AC023"/>
+        </record>
+
+        <record model="account.account.template" id="IA_AC024">
+            <field name="name">Loan(Liability) Account</field>
+            <field name="code">IA_AC024</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account_type_liability1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="IA_AC02"/>
+        </record>
+
+        <record model="account.account.template" id="IA_AC0241">
+            <field name="name">Bank OD Account</field>
+            <field name="code">IA_AC0241</field>
+            <field name="type">payable</field>
+            <field name="user_type" ref="account_type_liability1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="IA_AC024"/>
+        </record>
+
+        <record model="account.account.template" id="IA_AC0242">
+            <field name="name">Secured Loan Account</field>
+            <field name="code">IA_AC0242</field>
+            <field name="type">payable</field>
+            <field name="user_type" ref="account_type_liability1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="IA_AC024"/>
+        </record>
+
+        <record model="account.account.template" id="IA_AC0243">
+            <field name="name">Unsecured Loan Account</field>
+            <field name="code">IA_AC0243</field>
+            <field name="type">payable</field>
+            <field name="user_type" ref="account_type_liability1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="IA_AC024"/>
+        </record>
+
+        <record model="account.account.template" id="IA_AC025">
+            <field name="name">Suspense Account</field>
+            <field name="code">IA_AC025</field>
+            <field name="type">payable</field>
+            <field name="user_type" ref="account_type_liability1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="IA_AC02"/>
+        </record>
 
 
         <record model="account.account.template" id="IA_AC1">
@@ -387,170 +327,145 @@
             <field name="code">IA_AC1</field>
             <field name="type">view</field>
             <field name="user_type" ref="account_type_root_ind1"/>
-
             <field name="reconcile" eval="False"/>
-
             <field name="parent_id" ref="root"/>
         </record>
 
-            <record model="account.account.template" id="IA_AC11">
-                <field name="name">Expense</field>
-                <field name="code">IA_AC11</field>
-                <field name="type">view</field>
-                <field name="user_type" ref="account_type_expense_view"/>
+        <record model="account.account.template" id="IA_AC11">
+            <field name="name">Expense</field>
+            <field name="code">IA_AC11</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account_type_expense_view"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="IA_AC1"/>
+        </record>
 
-                <field name="reconcile" eval="False"/>
+        <record model="account.account.template" id="IA_AC111">
+            <field name="name">Direct Expenses</field>
+            <field name="code">IA_AC111</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account_type_expense1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="IA_AC11"/>
+        </record>
 
-                <field name="parent_id" ref="IA_AC1"/>
-            </record>
+        <record model="account.account.template" id="IA_AC112">
+            <field name="name">Indirect Expenses</field>
+            <field name="code">IA_AC112</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account_type_expense1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="IA_AC11"/>
+        </record>
 
-                <record model="account.account.template" id="IA_AC111">
-                    <field name="name">Direct Expenses</field>
-                    <field name="code">IA_AC111</field>
-                    <field name="type">other</field>
-                    <field name="user_type" ref="account_type_expense1"/>
-
-                    <field name="reconcile" eval="False"/>
-
-                    <field name="parent_id" ref="IA_AC11"/>
-                </record>
-
-                <record model="account.account.template" id="IA_AC112">
-                    <field name="name">Indirect Expenses</field>
-                    <field name="code">IA_AC112</field>
-                    <field name="type">other</field>
-                    <field name="user_type" ref="account_type_expense1"/>
-
-                    <field name="reconcile" eval="False"/>
-
-                    <field name="parent_id" ref="IA_AC11"/>
-                </record>
-
-                <record model="account.account.template" id="IA_AC113">
-                    <field name="name">Purchase</field>
-                    <field name="code">IA_AC113</field>
-                    <field name="type">other</field>
-                    <field name="user_type" ref="account_type_expense1"/>
-
-                    <field name="reconcile" eval="False"/>
-
-                    <field name="parent_id" ref="IA_AC11"/>
-                </record>
-                <record model="account.account.template" id="IA_AC114">
-                    <field name="name">Opening Stock</field>
-                    <field name="code">IA_AC114</field>
-                    <field name="type">other</field>
-                    <field name="user_type" ref="account_type_expense1"/>
-
-                    <field name="reconcile" eval="False"/>
-
-                    <field name="parent_id" ref="IA_AC11"/>
-                </record>
-                <record model="account.account.template" id="IA_AC115">
-                    <field name="name">Salary Expenses</field>
-                    <field name="code">IA_AC115</field>
-                    <field name="type">other</field>
-                    <field name="user_type" ref="account_type_expense1"/>
-
-                    <field name="reconcile" eval="False"/>
-
-                    <field name="parent_id" ref="IA_AC11"/>
-                </record>
+        <record model="account.account.template" id="IA_AC113">
+            <field name="name">Purchase</field>
+            <field name="code">IA_AC113</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account_type_expense1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="IA_AC11"/>
+        </record>
+        
+        <record model="account.account.template" id="IA_AC114">
+            <field name="name">Opening Stock</field>
+            <field name="code">IA_AC114</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account_type_expense1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="IA_AC11"/>
+        </record>
+        <record model="account.account.template" id="IA_AC115">
+            <field name="name">Salary Expenses</field>
+            <field name="code">IA_AC115</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account_type_expense1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="IA_AC11"/>
+        </record>
 
 
-            <record model="account.account.template" id="IA_AC12">
-                <field name="name">Income</field>
-                <field name="code">IA_AC12</field>
-                <field name="type">view</field>
-                <field name="user_type" ref="account_type_income_view"/>
+        <record model="account.account.template" id="IA_AC12">
+            <field name="name">Income</field>
+            <field name="code">IA_AC12</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account_type_income_view"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="IA_AC1"/>
+        </record>
 
-                <field name="reconcile" eval="False"/>
+        <record model="account.account.template" id="IA_AC121">
+            <field name="name">Direct Incomes</field>
+            <field name="code">IA_AC121</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account_type_income1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="IA_AC12"/>
+        </record>
 
-                <field name="parent_id" ref="IA_AC1"/>
-            </record>
+        <record model="account.account.template" id="IA_AC122">
+            <field name="name">Indirect Incomes</field>
+            <field name="code">IA_AC122</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account_type_income1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="IA_AC12"/>
+        </record>
 
-                <record model="account.account.template" id="IA_AC121">
-                    <field name="name">Direct Incomes</field>
-                    <field name="code">IA_AC121</field>
-                    <field name="type">other</field>
-                    <field name="user_type" ref="account_type_income1"/>
+        <record model="account.account.template" id="IA_AC123">
+            <field name="name">Sales Account</field>
+            <field name="code">IA_AC123</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account_type_income1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="IA_AC12"/>
+        </record>
+        <record model="account.account.template" id="IA_AC124">
+            <field name="name">Goods Given Account</field>
+            <field name="code">IA_AC124</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account_type_income1"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="IA_AC12"/>
+        </record>
 
-                    <field name="reconcile" eval="False"/>
+        <!-- Tax detail -->
 
-                    <field name="parent_id" ref="IA_AC12"/>
-                </record>
+        <record model="account.tax.code.template" id="vat_code_tax1">
+            <field name="name">Tax</field>
+        </record>
 
-                <record model="account.account.template" id="IA_AC122">
-                    <field name="name">Indirect Incomes</field>
-                    <field name="code">IA_AC122</field>
-                    <field name="type">other</field>
-                    <field name="user_type" ref="account_type_income1"/>
+        <record model="account.tax.code.template" id="vat_code_balance_net">
+            <field name="name">Tax Balance to Pay</field>
+            <field name="parent_id" ref="vat_code_tax1"/>
+        </record>
 
-                    <field name="reconcile" eval="False"/>
+        <record model="account.tax.code.template" id="vat_code_due_tva">
+            <field name="name">Tax Due (Tax to pay)</field>
+            <field name="parent_id" ref="vat_code_balance_net"/>
+        </record>
 
-                    <field name="parent_id" ref="IA_AC12"/>
-                </record>
+        <record model="account.tax.code.template" id="vat_code_payable">
+            <field name="name">Tax Payable</field>
+            <field name="parent_id" ref="vat_code_balance_net"/>
+        </record>
 
-                <record model="account.account.template" id="IA_AC123">
-                    <field name="name">Sales Account</field>
-                    <field name="code">IA_AC123</field>
-                    <field name="type">other</field>
-                    <field name="user_type" ref="account_type_income1"/>
-
-                    <field name="reconcile" eval="False"/>
-
-                    <field name="parent_id" ref="IA_AC12"/>
-                </record>
-                <record model="account.account.template" id="IA_AC124">
-                    <field name="name">Goods Given Account</field>
-                    <field name="code">IA_AC124</field>
-                    <field name="type">other</field>
-                    <field name="user_type" ref="account_type_income1"/>
-
-                    <field name="reconcile" eval="False"/>
-
-                    <field name="parent_id" ref="IA_AC12"/>
-                </record>
-
-                <!-- Tax detail -->
-
-                <record model="account.tax.code.template" id="vat_code_tax1">
-                    <field name="name">Tax</field>
-                </record>
-
-                <record model="account.tax.code.template" id="vat_code_balance_net">
-                    <field name="name">Tax Balance to Pay</field>
-                    <field name="parent_id" ref="vat_code_tax1"/>
-                </record>
-
-                <record model="account.tax.code.template" id="vat_code_due_tva">
-                    <field name="name">Tax Due (Tax to pay)</field>
-                    <field name="parent_id" ref="vat_code_balance_net"/>
-                </record>
-
-                <record model="account.tax.code.template" id="vat_code_payable">
-                    <field name="name">Tax Payable</field>
-                    <field name="parent_id" ref="vat_code_balance_net"/>
-                </record>
-
-                <record model="account.tax.code.template" id="vat_code_base_net">
-                    <field name="name">Tax Bases</field>
-                    <field name="parent_id" ref="vat_code_tax1"/>
-                </record>
+        <record model="account.tax.code.template" id="vat_code_base_net">
+            <field name="name">Tax Bases</field>
+            <field name="parent_id" ref="vat_code_tax1"/>
+        </record>
 
 
-                <record model="account.tax.code.template" id="vat_code_base_due">
-                    <field name="name">Base of Taxed Sales</field>
-                    <field name="parent_id" ref="vat_code_base_net"/>
-                </record>
-
-
-                <record model="account.tax.code.template" id="vat_code_receivable_net">
-                    <field name="name">Base of Taxed Purchases</field>
-                    <field name="parent_id" ref="vat_code_base_net"/>
-                </record>
+        <record model="account.tax.code.template" id="vat_code_base_due">
+            <field name="name">Base of Taxed Sales</field>
+            <field name="parent_id" ref="vat_code_base_net"/>
+        </record>
 
 
+        <record model="account.tax.code.template" id="vat_code_receivable_net">
+            <field name="name">Base of Taxed Purchases</field>
+            <field name="parent_id" ref="vat_code_base_net"/>
+        </record>
 
         <record id="opening_journal" model="account.journal">
             <field name="name">Opening Journal</field>
@@ -567,20 +482,18 @@
             <field name="type">situation</field>
         </record>
 
-
-                <!-- Chart template -->
-                <record id="indian_chart_template" model="account.chart.template">
-                    <field name="name">India - Chart of Accounts </field>
-                    <field name="account_root_id" ref="root"/>
-                    <field name="tax_code_root_id" ref="vat_code_tax1"/>
-                    <field name="bank_account_view_id" ref="IA_AC01121"/>
-                    <field name="property_account_receivable" ref="IA_AC01161"/>
-                    <field name="property_account_payable" ref="IA_AC02131"/>
-                    <field name="property_account_expense_categ" ref="IA_AC112"/>
-                    <field name="property_account_income_categ" ref="IA_AC122"/>
-                    <field name="property_reserve_and_surplus_account" ref="IA_AC0232"/>
-                </record>
-
-
+        <!-- Chart template -->
+        <record id="indian_chart_template" model="account.chart.template">
+            <field name="name">India - Chart of Accounts </field>
+            <field name="account_root_id" ref="root"/>
+            <field name="tax_code_root_id" ref="vat_code_tax1"/>
+            <field name="bank_account_view_id" ref="IA_AC01121"/>
+            <field name="property_account_receivable" ref="IA_AC01161"/>
+            <field name="property_account_payable" ref="IA_AC02131"/>
+            <field name="property_account_expense_categ" ref="IA_AC112"/>
+            <field name="property_account_income_categ" ref="IA_AC122"/>
+            <field name="property_reserve_and_surplus_account" ref="IA_AC0232"/>
+        </record>
+        
     </data>
 </openerp>