diff --git a/addons/l10n_in/account_multi_chart_wizard.py b/addons/l10n_in/account_multi_chart_wizard.py
index 784a7b748ca..4fbe1fa2cc5 100644
--- a/addons/l10n_in/account_multi_chart_wizard.py
+++ b/addons/l10n_in/account_multi_chart_wizard.py
@@ -18,18 +18,19 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import tools
+from lxml import etree
 from osv import fields, osv
 from os.path import join as opj
-from lxml import etree
+import tools
+
 
 class account_multi_charts_wizard(osv.osv_memory):
     _inherit ='wizard.multi.charts.accounts'
     _columns = {
-        'sales_tax': fields.boolean('Sales tax central', help='If this field is true it allows you use Sales Tax'),     
-        'vat': fields.boolean('VAT resellers',help='If this field is true it allows you use VAT'),
-        'service_tax': fields.boolean('Service tax', help='If this field is true it allows you use Service tax'),
-        'excise_duty': fields.boolean('Excise duty', help='If this field is true it allows you use Excise duty'),
+        'sales_tax': fields.boolean('Sales Tax', help='If this field is true it allows you use Sales Tax'),     
+        'vat': fields.boolean('VAT',help='If this field is true it allows you use VAT'),
+        'service_tax': fields.boolean('Service Tax', help='If this field is true it allows you use Service tax'),
+        'excise_duty': fields.boolean('Excise Duty', help='If this field is true it allows you use Excise duty'),
         'is_indian_chart': fields.boolean('Flag')
     }    
 
@@ -38,51 +39,49 @@ class account_multi_charts_wizard(osv.osv_memory):
         tax_templ_obj = self.pool.get('account.tax.template')
         res['value'] = {'complete_tax_set': False, 'sale_tax': False, 'purchase_tax': False}        
         data = self.pool.get('account.chart.template').browse(cr, uid, chart_template_id, context=context)
-        if data.name in ('Public Firm Chart of Account','Partnership/Private Firm Chart of Account'):
-            res.update({'value': {'is_indian_chart': True}})
-        else: 
-            res.update({'value': {'is_indian_chart': False}})
-        if data.complete_tax_set:
-            sale_tax_ids = tax_templ_obj.search(cr, uid, [("chart_template_id"
-                                          , "=", chart_template_id), ('type_tax_use', 'in', ('sale','all'))], order="sequence, id desc")
-            purchase_tax_ids = tax_templ_obj.search(cr, uid, [("chart_template_id"
-                                          , "=", chart_template_id), ('type_tax_use', 'in', ('purchase','all'))], order="sequence, id desc")
-            res['value'].update({'sale_tax': sale_tax_ids and sale_tax_ids[0] or False, 'purchase_tax': purchase_tax_ids and purchase_tax_ids[0] or False})        
+        if data.name in ('India - Chart of Accounts for Public Firm','India - Chart of Accounts for Partnership/Private Firm'):
+            res['value'].update({'is_indian_chart': True})
+        else:
+            res['value'].update({'is_indian_chart': False}) 
+        if data.name == 'India - Chart of Accounts for Public Firm':
+            res['value'].update({'sales_tax': True,'vat':True, 'service_tax':True, 'excise_duty': True})
+        elif data.name == 'India - Chart of Accounts for Partnership/Private Firm':
+            res['value'].update({'sales_tax': True,'vat':True})
         return res
             
     def execute(self, cr, uid, ids, context=None):
         obj_multi = self.browse(cr, uid, ids[0])
-        if obj_multi.chart_template_id.name == 'Public Firm Chart of Account':
-            if obj_multi.sales_tax == True:
+        if obj_multi.chart_template_id.name == 'India - Chart of Accounts for Public Firm':
+            if obj_multi.sales_tax:
                 path = tools.file_open(opj('l10n_in', 'tax', 'public_firm_sales_tax.xml'))
                 tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None)
                 path.close()
-            if obj_multi.vat == True:
+            if obj_multi.vat:
                 path = tools.file_open(opj('l10n_in', 'tax', 'public_firm_vat.xml'))
                 tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None)
                 path.close()   
-            if obj_multi.service_tax == True:
+            if obj_multi.service_tax:
                 path = tools.file_open(opj('l10n_in', 'tax', 'public_firm_service.xml'))
                 tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None)
                 path.close()  
-            if obj_multi.excise_duty == True:
+            if obj_multi.excise_duty:
                 path = tools.file_open(opj('l10n_in', 'tax', 'public_firm_excise_duty.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':
-            if obj_multi.sales_tax == True:
+        elif obj_multi.chart_template_id.name == 'India - Chart of Accounts for Partnership/Private Firm':
+            if obj_multi.sales_tax:
                 path = tools.file_open(opj('l10n_in', 'tax', 'privete_sale_tax.xml'))
                 tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None)
                 path.close() 
-            if obj_multi.vat == True:
+            if obj_multi.vat:
                 path = tools.file_open(opj('l10n_in', 'tax', 'private_vat.xml'))
                 tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None)
                 path.close()             
-            if obj_multi.service_tax == True:
+            if obj_multi.service_tax:
                 path = tools.file_open(opj('l10n_in', 'tax', 'private_service.xml'))
                 tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None)
                 path.close()  
-            if obj_multi.excise_duty == True:
+            if obj_multi.excise_duty:
                 path = tools.file_open(opj('l10n_in', 'tax', 'private_exice_duty.xml'))
                 tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None)
                 path.close()   
diff --git a/addons/l10n_in/account_multi_chart_wizard_view.xml b/addons/l10n_in/account_multi_chart_wizard_view.xml
index 63ef1ccc94c..4851392748f 100644
--- a/addons/l10n_in/account_multi_chart_wizard_view.xml
+++ b/addons/l10n_in/account_multi_chart_wizard_view.xml
@@ -8,7 +8,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.view_wizard_multi_chart"/>
             <field name="arch" type="xml">
-                <field name="purchase_tax_rate" position="after">
+                <field name="seq_journal" position="after">
                     <newline/>
                     <field name="is_indian_chart" invisible="1"/>
                     <field name="sales_tax" attrs="{'invisible': [('is_indian_chart','=', False)]}"/>
diff --git a/addons/l10n_in/installer.py b/addons/l10n_in/installer.py
index 1b57127d35c..b189a061da4 100644
--- a/addons/l10n_in/installer.py
+++ b/addons/l10n_in/installer.py
@@ -18,17 +18,16 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
 from osv import fields, osv
+from os.path import join as opj
 import netsvc
 import tools
-from os.path import join as opj
 
 class l10n_installer(osv.osv_memory):
     _inherit = 'account.installer'
     _columns = {
         'company_type':fields.selection([('partnership_private_company', 'Partnership/Private Firm'),
-                                         ('public_company', 'Public Company')], 'Company Type'),        
+                                         ('public_company', 'Public Firm')], 'Company Type', required=True),        
     }
 
     _defaults = {
diff --git a/addons/l10n_in/l10n_in_partnership_private_chart.xml b/addons/l10n_in/l10n_in_partnership_private_chart.xml
index d77ed6424fd..f5185d85426 100644
--- a/addons/l10n_in/l10n_in_partnership_private_chart.xml
+++ b/addons/l10n_in/l10n_in_partnership_private_chart.xml
@@ -238,7 +238,7 @@
 		 <!-- Profit And Loss Account -->
 		 
         <record model="account.account.template" id="3">
-            <field name="name">Profit And Loss Account</field>
+            <field name="name">Profit And Loss</field>
             <field name="code">3</field>
             <field name="type">view</field>
             <field name="user_type" ref="account.data_account_type_view"/>
@@ -277,8 +277,17 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="31"/>
             <field name="note">Amounts earned from providing services to clients, either for cash or on credit. When a service is provided on credit, both this account and Accounts Receivable will increase. When a service is provided for immediate cash, both this account and Cash will increase.</field>
-        </record>		
+        </record>	
 		
+        <record model="account.account.template" id="311">
+            <field name="name">Product Sales</field>
+            <field name="code">311</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_income"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="31"/>
+            <field name="note">Sales of product account</field>
+        </record>			
 		
         <record model="account.account.template" id="80">
             <field name="name">Non-Operating Revenue and Gains</field>
@@ -301,7 +310,7 @@
 		
         <record model="account.account.template" id="910">
             <field name="name">Gain on Sale of Assets</field>
-            <field name="code">910</field>
+            <field name="code">811</field>
             <field name="type">other</field>
             <field name="user_type" ref="account.data_account_type_income"/>
             <field name="reconcile" eval="False"/>
@@ -434,7 +443,7 @@
         <!-- Chart template -->
 		
         <record id="indian_chart_template_private" model="account.chart.template">
-            <field name="name">Partnership/Private Firm Chart of Account</field>
+            <field name="name">India - Chart of Accounts for Partnership/Private Firm</field>
             <field name="account_root_id" ref="root"/>
             <field name="tax_code_root_id" ref="vat_code_tax"/>
             <field name="bank_account_view_id" ref="101"/>
diff --git a/addons/l10n_in/l10n_in_public_firm_chart.xml b/addons/l10n_in/l10n_in_public_firm_chart.xml
index f3a9c4d7c6e..8e84d9b8d79 100644
--- a/addons/l10n_in/l10n_in_public_firm_chart.xml
+++ b/addons/l10n_in/l10n_in_public_firm_chart.xml
@@ -266,7 +266,7 @@
 		 <!-- Profit And Loss Account -->
 		 
         <record model="account.account.template" id="a3">
-            <field name="name">Profit And Loss Account</field>
+            <field name="name">Profit And Loss</field>
             <field name="code">3</field>
             <field name="type">view</field>
             <field name="user_type" ref="account.data_account_type_view"/>
@@ -528,7 +528,7 @@
 
 		
         <record id="indian_chart_template_public" model="account.chart.template">
-            <field name="name">Public Firm Chart of Account</field>
+            <field name="name">India - Chart of Accounts for Public Firm</field>
             <field name="account_root_id" ref="pucblic_root"/>
             <field name="tax_code_root_id" ref="vat_code_tax"/> 
             <field name="bank_account_view_id" ref="a10100"/> 
diff --git a/addons/l10n_in/tax/private_exice_duty.xml b/addons/l10n_in/tax/private_exice_duty.xml
index 825bb4afab0..568d480eb86 100644
--- a/addons/l10n_in/tax/private_exice_duty.xml
+++ b/addons/l10n_in/tax/private_exice_duty.xml
@@ -3,15 +3,6 @@
 <openerp>
 <data noupdate="1">
 
-    <record model="account.account.template" id="128">
-        <field name="name">Exice Duty Receivable</field>
-        <field name="code">128</field>
-        <field name="type">receivable</field>
-        <field name="user_type" ref="account.data_account_type_receivable"/>
-        <field name="reconcile" eval="True"/>
-        <field name="parent_id" ref="10"/>
-    </record>
-		
     <record model="account.account.template" id="219">
         <field name="name">Exice Duty Payable</field>
         <field name="code">219</field>
@@ -29,7 +20,7 @@
         <field name="amount">0.10</field>
         <field name="type">percent</field>
         <field name="type_tax_use">sale</field>
-        <field name="account_collected_id" ref="128"/>
+        <field name="account_collected_id" ref="219"/>
         <field name="account_paid_id" ref="219"/> 		
         <field name="base_code_id" ref="vat_code_base_due"/>
         <field name="base_sign">1</field>
diff --git a/addons/l10n_in/tax/private_service.xml b/addons/l10n_in/tax/private_service.xml
index f5566a5dce1..1ce8cbfe74c 100644
--- a/addons/l10n_in/tax/private_service.xml
+++ b/addons/l10n_in/tax/private_service.xml
@@ -3,15 +3,6 @@
 <openerp>
 <data noupdate="1">
 
-    <record model="account.account.template" id="126">
-        <field name="name">Service Tax Receivable</field>
-        <field name="code">126</field>
-        <field name="type">receivable</field>
-        <field name="user_type" ref="account.data_account_type_receivable"/>
-        <field name="reconcile" eval="True"/>
-        <field name="parent_id" ref="10"/>
-    </record>
-		
     <record model="account.account.template" id="218">
         <field name="name">Service Tax Payable</field>
         <field name="code">218</field>
@@ -28,7 +19,7 @@
         <field name="price_include" eval="1"/>
         <field name="amount">0.12</field>
         <field name="type">percent</field>
-        <field name="account_collected_id" ref="126"/>
+        <field name="account_collected_id" ref="218"/>
         <field name="account_paid_id" ref="218"/> 			
         <field name="base_code_id" ref="vat_code_base_due"/>
         <field name="base_sign">1</field>
diff --git a/addons/l10n_in/tax/private_vat.xml b/addons/l10n_in/tax/private_vat.xml
index a025e72310c..d717201b577 100644
--- a/addons/l10n_in/tax/private_vat.xml
+++ b/addons/l10n_in/tax/private_vat.xml
@@ -3,15 +3,6 @@
 <openerp>
 <data noupdate="1">
 
-    <record model="account.account.template" id="124">
-        <field name="name">VAT Receivable</field>
-        <field name="code">124</field>
-        <field name="type">receivable</field>
-        <field name="user_type" ref="account.data_account_type_receivable"/>
-        <field name="reconcile" eval="True"/>
-        <field name="parent_id" ref="10"/>
-    </record>
-		
     <record model="account.account.template" id="217">
         <field name="name">VAT Payable</field>
         <field name="code">217</field>
@@ -24,12 +15,12 @@
 	<record id="vat_private_main" model="account.tax.template">
 		<field name="sequence">30</field>
         <field name="description">VAT - 4%</field>
-        <field name="name">VAT resellers</field>
+        <field name="name">VAT</field>
         <field name="price_include" eval="1"/>
         <field name="amount">0.04</field>
         <field name="type">percent</field>
         <field name="type_tax_use">all</field>
-        <field name="account_collected_id" ref="124"/>
+        <field name="account_collected_id" ref="217"/>
         <field name="account_paid_id" ref="217"/> 		
         <field name="base_code_id" ref="vat_code_base_due"/>
         <field name="base_sign">1</field>
@@ -60,7 +51,7 @@
         <field name="amount">0.125</field>
         <field name="type">percent</field>
         <field name="type_tax_use">all</field>
-        <field name="account_collected_id" ref="124"/>
+        <field name="account_collected_id" ref="217"/>
         <field name="account_paid_id" ref="217"/> 		
         <field name="base_code_id" ref="vat_code_base_due"/>
         <field name="base_sign">1</field>
@@ -91,7 +82,7 @@
         <field name="amount">0.8</field>
         <field name="type">percent</field>
         <field name="type_tax_use">all</field>
-        <field name="account_collected_id" ref="124"/>
+        <field name="account_collected_id" ref="217"/>
         <field name="account_paid_id" ref="217"/> 		
         <field name="base_code_id" ref="vat_code_base_due"/>
         <field name="base_sign">1</field>
diff --git a/addons/l10n_in/tax/privete_sale_tax.xml b/addons/l10n_in/tax/privete_sale_tax.xml
index 5d741879798..dc89d3d3fee 100644
--- a/addons/l10n_in/tax/privete_sale_tax.xml
+++ b/addons/l10n_in/tax/privete_sale_tax.xml
@@ -3,15 +3,6 @@
 <openerp>
 <data noupdate="1">
 
-    <record model="account.account.template" id="122">
-        <field name="name">Sales Tax Receivable</field>
-        <field name="code">122</field>
-        <field name="type">receivable</field>
-        <field name="user_type" ref="account.data_account_type_receivable"/>
-        <field name="reconcile" eval="True"/>
-        <field name="parent_id" ref="10"/>
-    </record>
-		
     <record model="account.account.template" id="216">
         <field name="name">Sales Tax Payable</field>
         <field name="code">216</field>
@@ -28,7 +19,7 @@
         <field name="amount">0.15</field>
         <field name="type">percent</field>
         <field name="type_tax_use">sale</field>
-        <field name="account_collected_id" ref="122"/>
+        <field name="account_collected_id" ref="216"/>
         <field name="account_paid_id" ref="216"/> 		
         <field name="base_code_id" ref="vat_code_base_due"/>
         <field name="base_sign">1</field>
@@ -49,7 +40,7 @@
         <field name="amount">0.12</field>
         <field name="type">percent</field>
         <field name="type_tax_use">sale</field>
-        <field name="account_collected_id" ref="122"/>
+        <field name="account_collected_id" ref="216"/>
         <field name="account_paid_id" ref="216"/> 		
         <field name="base_code_id" ref="vat_code_base_due"/>
         <field name="base_sign">1</field>
diff --git a/addons/l10n_in/tax/public_firm_excise_duty.xml b/addons/l10n_in/tax/public_firm_excise_duty.xml
index e8f010da3ac..031c92307fd 100644
--- a/addons/l10n_in/tax/public_firm_excise_duty.xml
+++ b/addons/l10n_in/tax/public_firm_excise_duty.xml
@@ -3,15 +3,6 @@
 <openerp>
 <data noupdate="1">
 
-    <record model="account.account.template" id="a158000">
-        <field name="name">Exice Duty Receivable</field>
-        <field name="code">158000</field>
-        <field name="type">receivable</field>
-        <field name="user_type" ref="account.data_account_type_receivable"/>
-        <field name="reconcile" eval="False"/>
-        <field name="parent_id" ref="a10000"/>
-    </record>	
-
     <record model="account.account.template" id="a24900">
         <field name="name">Exice Duty Payable</field>
         <field name="code">24900</field>
@@ -24,7 +15,7 @@
 	<record id="exice_public_main" model="account.tax.template">
         <field name="description">Excise duty - 10%</field>
         <field name="name">Excise duty</field>
-        <field name="account_collected_id" ref="a158000"/>
+        <field name="account_collected_id" ref="a24900"/>
         <field name="account_paid_id" ref="a24900"/> 
         <field name="price_include" eval="1"/>
         <field name="amount">0.10</field>
diff --git a/addons/l10n_in/tax/public_firm_sales_tax.xml b/addons/l10n_in/tax/public_firm_sales_tax.xml
index d88c1370368..27d768aba7a 100644
--- a/addons/l10n_in/tax/public_firm_sales_tax.xml
+++ b/addons/l10n_in/tax/public_firm_sales_tax.xml
@@ -3,15 +3,6 @@
 <openerp>
 <data noupdate="1">
 
-    <record model="account.account.template" id="a154000">
-        <field name="name">Sales Tax Receivable</field>
-        <field name="code">154000</field>
-        <field name="type">receivable</field>
-        <field name="user_type" ref="account.data_account_type_receivable"/>
-        <field name="reconcile" eval="False"/>
-        <field name="parent_id" ref="a10000"/>
-    </record>	
-
     <record model="account.account.template" id="a24600">
         <field name="name">Sales Tax Payable</field>
         <field name="code">24600</field>
@@ -24,7 +15,7 @@
 	<record id="sales_tax_public_main" model="account.tax.template">
         <field name="description">Sale Tax - 15%</field>
         <field name="name">Sale Tax - 15% </field>
-        <field name="account_collected_id" ref="a154000"/>
+        <field name="account_collected_id" ref="a24600"/>
         <field name="account_paid_id" ref="a24600"/> 
         <field name="price_include" eval="0"/>
         <field name="amount">0.15</field>
@@ -40,7 +31,7 @@
 	<record id="sales_tax_public" model="account.tax.template">
         <field name="description">Sale Tax - 12%</field>
         <field name="name">Sale Tax - 12%</field>
-        <field name="account_collected_id" ref="a154000"/>
+        <field name="account_collected_id" ref="a24600"/>
         <field name="account_paid_id" ref="a24600"/> 
         <field name="price_include" eval="0"/>
         <field name="amount">0.12</field>
diff --git a/addons/l10n_in/tax/public_firm_service.xml b/addons/l10n_in/tax/public_firm_service.xml
index dcfc7cd343e..f57eee6796b 100644
--- a/addons/l10n_in/tax/public_firm_service.xml
+++ b/addons/l10n_in/tax/public_firm_service.xml
@@ -3,15 +3,6 @@
 <openerp>
 <data noupdate="1">
 
-    <record model="account.account.template" id="a156000">
-        <field name="name">Service Tax Receivable</field>
-        <field name="code">156000</field>
-        <field name="type">receivable</field>
-        <field name="user_type" ref="account.data_account_type_receivable"/>
-        <field name="reconcile" eval="False"/>
-        <field name="parent_id" ref="a10000"/>
-    </record>	
-
     <record model="account.account.template" id="a24700">
         <field name="name">Service Tax Payable</field>
         <field name="code">24700</field>
@@ -24,7 +15,7 @@
 	<record id="service_public_main" model="account.tax.template">
         <field name="description">Service - 12%</field>
         <field name="name">Service</field>
-        <field name="account_collected_id" ref="a156000"/>
+        <field name="account_collected_id" ref="a24700"/>
         <field name="account_paid_id" ref="a24700"/> 
         <field name="price_include" eval="1"/>
         <field name="amount">0.12</field>
diff --git a/addons/l10n_in/tax/public_firm_vat.xml b/addons/l10n_in/tax/public_firm_vat.xml
index 3fb5eea8dcc..9ffe2b9d9ca 100644
--- a/addons/l10n_in/tax/public_firm_vat.xml
+++ b/addons/l10n_in/tax/public_firm_vat.xml
@@ -3,15 +3,6 @@
 <openerp>
 <data noupdate="1">
 
-    <record model="account.account.template" id="a157000">
-        <field name="name">VAT Receivable</field>
-        <field name="code">157000</field>
-        <field name="type">receivable</field>
-        <field name="user_type" ref="account.data_account_type_receivable"/>
-        <field name="reconcile" eval="False"/>
-        <field name="parent_id" ref="a10000"/>
-    </record>	
-
     <record model="account.account.template" id="a24800">
         <field name="name">VAT Payable</field>
         <field name="code">24800</field>
@@ -24,7 +15,7 @@
 	<record id="vat_public_main" model="account.tax.template">
         <field name="description">VAT - 4%</field>
         <field name="name">VAT - 4%</field>
-        <field name="account_collected_id" ref="a157000"/>
+        <field name="account_collected_id" ref="a24800"/>
         <field name="account_paid_id" ref="a24800"/> 
         <field name="price_include" eval="1"/>
         <field name="amount">0.04</field>
@@ -55,7 +46,7 @@
 	<record id="vat_public_main_tax" model="account.tax.template">
         <field name="description">VAT - 12.5%</field>
         <field name="name">VAT - 12.5%</field>
-        <field name="account_collected_id" ref="a157000"/>
+        <field name="account_collected_id" ref="a24800"/>
         <field name="account_paid_id" ref="a24800"/> 
         <field name="price_include" eval="0"/>
         <field name="amount">0.125</field>
@@ -86,7 +77,7 @@
 	<record id="vat_public_tax" model="account.tax.template">
         <field name="description">VAT - 8%</field>
         <field name="name">VAT - 8%</field>
-        <field name="account_collected_id" ref="a157000"/>
+        <field name="account_collected_id" ref="a24800"/>
         <field name="account_paid_id" ref="a24800"/> 
         <field name="price_include" eval="0"/>
         <field name="amount">0.08</field>