diff --git a/addons/l10n_in/__init__.py b/addons/l10n_in/__init__.py
index 9eb002375e0..db0c795ae73 100644
--- a/addons/l10n_in/__init__.py
+++ b/addons/l10n_in/__init__.py
@@ -28,6 +28,6 @@
 ##############################################################################
 
 import installer
-import account_wizard
+import account_multi_chart_wizard
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/l10n_in/__openerp__.py b/addons/l10n_in/__openerp__.py
index a0b8f990531..ba901562a0b 100644
--- a/addons/l10n_in/__openerp__.py
+++ b/addons/l10n_in/__openerp__.py
@@ -36,15 +36,12 @@ Indian accounting chart and localization.
     ],
     "demo_xml": [],
     "update_xml": [
-#        "l10n_in_chart.xml",
         "l10n_in_partnership_private_chart.xml",
-        "installer_view.xml",
         "account_tax_code_template.xml",
-#        "account_tax_code.xml",
         "l10n_in_public_firm_chart.xml",
-        "account_tax.xml",
         "l10n_in_wizard.xml",
-        "account_wizard_view.xml",
+        "installer_view.xml",
+        "account_multi_chart_wizard_view.xml",
     ],
     "auto_install": False,
     "installable": True,
diff --git a/addons/l10n_in/account_wizard.py b/addons/l10n_in/account_multi_chart_wizard.py
similarity index 58%
rename from addons/l10n_in/account_wizard.py
rename to addons/l10n_in/account_multi_chart_wizard.py
index eb6f0dd1491..ea7974dd430 100644
--- a/addons/l10n_in/account_wizard.py
+++ b/addons/l10n_in/account_multi_chart_wizard.py
@@ -19,17 +19,29 @@
 #
 ##############################################################################
 import tools
-from osv import  osv
 from osv import fields, osv
+from os.path import join as opj
 
-class account_wizard(osv.osv_memory):
+class account_multi_charts_wizard(osv.osv_memory):
     _inherit ='wizard.multi.charts.accounts'
     _columns = {
-        'sales_tax_central': fields.boolean('Sales tax central'),     
-        'vat_resellers': fields.boolean('VAT resellers'),
+        'sales_tax': fields.boolean('Sales tax central'),     
+        'vat': fields.boolean('VAT resellers'),
         'service_tax': fields.boolean('Service tax'),
         'excise_duty': fields.boolean('Excise duty'),
     }    
 
+    def execute(self, cr, uid, ids, context=None):
+        super(account_multi_charts_wizard, self).execute(cr, uid, ids, context)
+        obj_multi = self.browse(cr, uid, ids[0])
+        if obj_multi.chart_template_id.name == 'Public Firm Chart of Account':
+            path = tools.file_open(opj('l10n_in', 'account_sale_tax.xml'))
+            tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None)
+            path.close()   
+        elif obj_multi.chart_template_id.name == 'Partnership/Private Firm Chart of Account':
+            path = tools.file_open(opj('l10n_in', 'account_vat.xml'))
+            tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None)
+            path.close() 
+            
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_in/account_wizard_view.xml b/addons/l10n_in/account_multi_chart_wizard_view.xml
similarity index 87%
rename from addons/l10n_in/account_wizard_view.xml
rename to addons/l10n_in/account_multi_chart_wizard_view.xml
index 7af266c7a81..449b3af70b9 100644
--- a/addons/l10n_in/account_wizard_view.xml
+++ b/addons/l10n_in/account_multi_chart_wizard_view.xml
@@ -10,9 +10,9 @@
             <field name="arch" type="xml">
                 <field name="purchase_tax_rate" position="after">
                     <newline/>
-                    <field name="sales_tax_central"/>
-                    <field name="vat_resellers"/>
+                    <field name="sales_tax"/>
                     <field name="service_tax"/>
+                    <field name="vat"/>
                     <field name="excise_duty"/>
                 </field>
             </field>
diff --git a/addons/l10n_in/account_tax_code_template.xml b/addons/l10n_in/account_tax_code_template.xml
index 466d3f147b4..55dbf427e86 100644
--- a/addons/l10n_in/account_tax_code_template.xml
+++ b/addons/l10n_in/account_tax_code_template.xml
@@ -3,8 +3,13 @@
 <openerp>
     <data noupdate="True">
 
+        <record model="account.tax.code.template" id="vat_code_tax_01">
+            <field name="name">Tax</field>
+        </record>
+
         <record model="account.tax.code.template" id="vat_code_balance_net_01">
-            <field name="name">Tax balance to pay</field>
+            <field name="name">Tax Balance to Pay</field>
+            <field name="parent_id" ref="vat_code_tax_01"/>
         </record>
 
         <record model="account.tax.code.template" id="vat_code_due_tva_01">
@@ -13,23 +18,24 @@
         </record>
 
         <record model="account.tax.code.template" id="vat_code_payable_01">
-            <field name="name">Tax payable</field>
+            <field name="name">Tax Payable</field>
             <field name="parent_id" ref="vat_code_balance_net_01"/>
         </record>
 
         <record model="account.tax.code.template" id="vat_code_base_net_01">
-            <field name="name">Tax bases</field>
+            <field name="name">Tax Bases</field>
+            <field name="parent_id" ref="vat_code_tax_01"/>
         </record>
 
+
         <record model="account.tax.code.template" id="vat_code_base_due_01">
-            <field name="name">Base of taxed sales</field>
-            <field name="parent_id" ref="vat_code_balance_net_01"/>
+            <field name="name">Base of Taxed Sales</field>
+            <field name="parent_id" ref="vat_code_base_net_01"/>
         </record>
 
-
         <record model="account.tax.code.template" id="vat_code_receivable_net_01">
-            <field name="name">Base of taxed purchases</field>
-            <field name="parent_id" ref="vat_code_balance_net_01"/>
+            <field name="name">Base of Taxed Purchases</field>
+            <field name="parent_id" ref="vat_code_base_net_01"/>
         </record>
 
     </data>
diff --git a/addons/l10n_in/installer.py b/addons/l10n_in/installer.py
index e4242ad5e91..1b57127d35c 100644
--- a/addons/l10n_in/installer.py
+++ b/addons/l10n_in/installer.py
@@ -41,13 +41,13 @@ class l10n_installer(osv.osv_memory):
         fy_obj = self.pool.get('account.fiscalyear')
         for res in self.read(cr, uid, ids, context=context):
             if res['charts'] =='l10n_in' and res['company_type']=='public_company':
-                fp = tools.file_open(opj('l10n_in', 'l10n_in_public_firm_chart.xml'))
-                tools.convert_xml_import(cr, 'l10n_in', fp, {}, 'init', True, None)
-                fp.close() 
+                path = tools.file_open(opj('l10n_in', 'l10n_in_public_firm_chart.xml'))
+                tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None)
+                path.close() 
             if res['charts'] =='l10n_in' and res['company_type']=='partnership_private_company':
-                fp = tools.file_open(opj('l10n_in', 'l10n_in_partnership_private_chart.xml'))
-                tools.convert_xml_import(cr, 'l10n_in', fp, {}, 'init', True, None)
-                fp.close()      
+                path = tools.file_open(opj('l10n_in', 'l10n_in_partnership_private_chart.xml'))
+                tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None)
+                path.close()      
             if 'date_start' in res and 'date_stop' in res:
                 f_ids = fy_obj.search(cr, uid, [('date_start', '<=', res['date_start']), ('date_stop', '>=', res['date_stop']), ('company_id', '=', res['company_id'][0])], context=context)
                 if not f_ids:
diff --git a/addons/l10n_in/l10n_in_partnership_private_chart.xml b/addons/l10n_in/l10n_in_partnership_private_chart.xml
index 63853401468..f59aaeb407b 100644
--- a/addons/l10n_in/l10n_in_partnership_private_chart.xml
+++ b/addons/l10n_in/l10n_in_partnership_private_chart.xml
@@ -436,7 +436,7 @@
         <record id="indian_chart_template_private" model="account.chart.template">
             <field name="name">Partnership/Private Firm Chart of Account</field>
             <field name="account_root_id" ref="root"/>
-         <!--   <field name="tax_code_root_id" ref="vat_code_tax12"/> -->
+            <field name="tax_code_root_id" ref="vat_code_tax_01"/>
             <field name="bank_account_view_id" ref="101"/>
             <field name="property_account_receivable" ref="120"/>
             <field name="property_account_payable" ref="215"/>
diff --git a/addons/l10n_in/l10n_in_public_firm_chart.xml b/addons/l10n_in/l10n_in_public_firm_chart.xml
index 297e2947352..bcc9a3918a4 100644
--- a/addons/l10n_in/l10n_in_public_firm_chart.xml
+++ b/addons/l10n_in/l10n_in_public_firm_chart.xml
@@ -296,7 +296,7 @@
             <field name="parent_id" ref="a30"/>
         </record>
 		
-        <record model="account.account.template" id="31010">
+        <record model="account.account.template" id="a31010">
             <field name="name">Sales - Division #1, Product Line 010</field>
             <field name="code">31010</field>
             <field name="type">other</field>
@@ -524,18 +524,18 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="a96000"/>
         </record>				
-																		
 
 
+		
         <record id="indian_chart_template_public" model="account.chart.template">
             <field name="name">Public Firm Chart of Account</field>
             <field name="account_root_id" ref="pucblic_root"/>
-            <field name="tax_code_root_id" ref="vat_code_balance_net_01"/> 
+            <field name="tax_code_root_id" ref="vat_code_tax_01"/> 
             <field name="bank_account_view_id" ref="a10100"/> 
             <field name="property_account_receivable" ref="a12100"/>
             <field name="property_account_payable" ref="a21000"/>
             <field name="property_account_expense_categ" ref="a50150"/>
-            <field name="property_account_income_categ" ref="a40000"/>
+            <field name="property_account_income_categ" ref="a31010"/>
             <field name="property_reserve_and_surplus_account" ref="a96000"/> 
             <field name="complete_tax_set" eval="False"/>
         </record>