From 9ee1727eb7c65267726a82337be81cc10b73d0a9 Mon Sep 17 00:00:00 2001
From: "Jagdish Panchal (Open ERP)" <jap@tinyerp.com>
Date: Fri, 18 May 2012 10:29:17 +0530
Subject: [PATCH] [IMP] l10n_in: improve code for tax account

bzr revid: jap@tinyerp.com-20120518045917-rv2mgpo2tlel5fm2
---
 addons/l10n_in/account_multi_chart_wizard.py  | 79 +++++++++----------
 addons/l10n_in/tax/private_exice_duty.xml     | 28 ++++++-
 addons/l10n_in/tax/private_service.xml        | 21 ++++-
 addons/l10n_in/tax/private_vat.xml            | 20 +++++
 addons/l10n_in/tax/privete_sale_tax.xml       | 20 +++++
 .../l10n_in/tax/public_firm_excise_duty.xml   | 22 +++++-
 addons/l10n_in/tax/public_firm_sales_tax.xml  | 22 +++++-
 addons/l10n_in/tax/public_firm_service.xml    | 22 +++++-
 addons/l10n_in/tax/public_firm_vat.xml        | 22 +++++-
 9 files changed, 203 insertions(+), 53 deletions(-)

diff --git a/addons/l10n_in/account_multi_chart_wizard.py b/addons/l10n_in/account_multi_chart_wizard.py
index c19997e3f98..ae2b48055d2 100644
--- a/addons/l10n_in/account_multi_chart_wizard.py
+++ b/addons/l10n_in/account_multi_chart_wizard.py
@@ -26,49 +26,48 @@ from lxml import etree
 class account_multi_charts_wizard(osv.osv_memory):
     _inherit ='wizard.multi.charts.accounts'
     _columns = {
-        'sales_tax': fields.boolean('Sales tax central'),     
-        'vat': fields.boolean('VAT resellers'),
-        'service_tax': fields.boolean('Service tax'),
-        'excise_duty': fields.boolean('Excise duty'),
+        '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'),
     }    
 
     def execute(self, cr, uid, ids, context=None):
         obj_multi = self.browse(cr, uid, ids[0])
-        acc_template_id= self.pool.get('account.chart.template').search(cr, uid, [('name','=',obj_multi.chart_template_id.name)], context=context)
-        for chart_name in self.pool.get('account.chart.template').browse(cr, uid, acc_template_id,context=context):
-            if obj_multi.chart_template_id.name == chart_name.name:
-                if obj_multi.sales_tax == True:
-                    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:
-                    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:
-                    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:
-                    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 == chart_name.name:
-                if obj_multi.sales_tax == True:
-                    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:
-                    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:
-                    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:
-                    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()                        
+        if obj_multi.chart_template_id.name == 'Public Firm Chart of Account':
+            if obj_multi.sales_tax == True:
+                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:
+                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:
+                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:
+                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:
+                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:
+                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:
+                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:
+                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()                        
         return super(account_multi_charts_wizard, self).execute(cr, uid, ids, context)
+    
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_in/tax/private_exice_duty.xml b/addons/l10n_in/tax/private_exice_duty.xml
index 5e8f531c0e1..8ea3a972fdf 100644
--- a/addons/l10n_in/tax/private_exice_duty.xml
+++ b/addons/l10n_in/tax/private_exice_duty.xml
@@ -3,14 +3,34 @@
 <openerp>
 <data noupdate="1">
 
-	<record id="exice_private_main" model="account.tax.template">
+    <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>
+        <field name="type">payable</field>
+        <field name="user_type" ref="account.data_account_type_payable"/>
+        <field name="reconcile" eval="True"/>
+        <field name="parent_id" ref="20"/>
+    </record>
+				
+	<record id="exice_duty_private_main" model="account.tax.template">
         <field name="sequence">10</field>
         <field name="description">Exice Duty(10.30%)</field>
         <field name="name">Exice Duty</field>
         <field name="price_include" eval="0"/>
         <field name="amount">0.10</field>
         <field name="type">percent</field>
-        <field name="type_tax_use">sale</field>
+        <field name="type_tax_use">all</field>
+        <field name="account_collected_id" ref="128"/>
+        <field name="account_paid_id" ref="219"/> 		
         <field name="base_code_id" ref="vat_code_base_due"/>
         <field name="base_sign">1</field>
         <field name="tax_code_id" ref="vat_code_due_tva"/>
@@ -29,7 +49,7 @@
         <field name="amount">0.02</field>
         <field name="type">percent</field>
         <field name="type_tax_use">sale</field>
-        <field name="parent_id" ref="exice_private_main"/>
+        <field name="parent_id" ref="exice_duty_private_main"/>
         <field name="chart_template_id" ref="indian_chart_template_private"/>
     </record>	
 	
@@ -39,7 +59,7 @@
         <field name="amount">0.01</field>
         <field name="type">percent</field>
         <field name="type_tax_use">sale</field>
-        <field name="parent_id" ref="exice_private_main"/>
+        <field name="parent_id" ref="exice_duty_private_main"/>
         <field name="chart_template_id" ref="indian_chart_template_private"/>
     </record>		
 	
diff --git a/addons/l10n_in/tax/private_service.xml b/addons/l10n_in/tax/private_service.xml
index 49d5bc3542e..0bb8352096d 100644
--- a/addons/l10n_in/tax/private_service.xml
+++ b/addons/l10n_in/tax/private_service.xml
@@ -3,13 +3,32 @@
 <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>
+        <field name="type">payable</field>
+        <field name="user_type" ref="account.data_account_type_payable"/>
+        <field name="reconcile" eval="True"/>
+        <field name="parent_id" ref="20"/>
+    </record>
+	
 	<record id="service_private_main" model="account.tax.template">
         <field name="description">Service(12%)</field>
         <field name="name">Service</field>
         <field name="price_include" eval="1"/>
         <field name="amount">0.12</field>
         <field name="type">percent</field>
-        <field name="type_tax_use">sale</field>
+        <field name="account_collected_id" ref="126"/>
+        <field name="account_paid_id" ref="218"/> 			
         <field name="base_code_id" ref="vat_code_base_due"/>
         <field name="base_sign">1</field>
         <field name="tax_code_id" ref="vat_code_due_tva"/>
diff --git a/addons/l10n_in/tax/private_vat.xml b/addons/l10n_in/tax/private_vat.xml
index 860a499ccde..559115ccc78 100644
--- a/addons/l10n_in/tax/private_vat.xml
+++ b/addons/l10n_in/tax/private_vat.xml
@@ -3,6 +3,24 @@
 <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>
+        <field name="type">payable</field>
+        <field name="user_type" ref="account.data_account_type_payable"/>
+        <field name="reconcile" eval="True"/>
+        <field name="parent_id" ref="20"/>
+    </record>
+	
 	<record id="vat_private_main" model="account.tax.template">
         <field name="sequence">10</field>
         <field name="description">VAT(12%)</field>
@@ -11,6 +29,8 @@
         <field name="amount">0.15</field>
         <field name="type">percent</field>
         <field name="type_tax_use">sale</field>
+        <field name="account_collected_id" ref="124"/>
+        <field name="account_paid_id" ref="217"/> 		
         <field name="base_code_id" ref="vat_code_base_due"/>
         <field name="base_sign">1</field>
         <field name="tax_code_id" ref="vat_code_due_tva"/>
diff --git a/addons/l10n_in/tax/privete_sale_tax.xml b/addons/l10n_in/tax/privete_sale_tax.xml
index 6421180506d..2565f2a9e83 100644
--- a/addons/l10n_in/tax/privete_sale_tax.xml
+++ b/addons/l10n_in/tax/privete_sale_tax.xml
@@ -3,6 +3,24 @@
 <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>
+        <field name="type">payable</field>
+        <field name="user_type" ref="account.data_account_type_payable"/>
+        <field name="reconcile" eval="True"/>
+        <field name="parent_id" ref="20"/>
+    </record>
+	
 	<record id="sales_private_main" model="account.tax.template">
         <field name="sequence">10</field>
         <field name="description">Sale Central (12%)</field>
@@ -11,6 +29,8 @@
         <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_paid_id" ref="216"/> 		
         <field name="base_code_id" ref="vat_code_base_due"/>
         <field name="base_sign">1</field>
         <field name="tax_code_id" ref="vat_code_due_tva"/>
diff --git a/addons/l10n_in/tax/public_firm_excise_duty.xml b/addons/l10n_in/tax/public_firm_excise_duty.xml
index 6c5185ed560..7a78037bcaa 100644
--- a/addons/l10n_in/tax/public_firm_excise_duty.xml
+++ b/addons/l10n_in/tax/public_firm_excise_duty.xml
@@ -3,11 +3,29 @@
 <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>
+        <field name="type">payable</field>
+        <field name="user_type" ref="account.data_account_type_payable"/>
+        <field name="reconcile" eval="False"/>
+        <field name="parent_id" ref="a20000"/>
+    </record>
+	
 	<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="a10100"/>
-        <field name="account_paid_id" ref="a21000"/> 
+        <field name="account_collected_id" ref="a158000"/>
+        <field name="account_paid_id" ref="a24900"/> 
         <field name="price_include" eval="1"/>
         <field name="amount">0.10</field>
         <field name="type">percent</field>
diff --git a/addons/l10n_in/tax/public_firm_sales_tax.xml b/addons/l10n_in/tax/public_firm_sales_tax.xml
index 05fbd4db5b9..f0240de33fe 100644
--- a/addons/l10n_in/tax/public_firm_sales_tax.xml
+++ b/addons/l10n_in/tax/public_firm_sales_tax.xml
@@ -3,11 +3,29 @@
 <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>
+		<field name="type">payable</field>
+        <field name="user_type" ref="account.data_account_type_payable"/>
+        <field name="reconcile" eval="False"/>
+        <field name="parent_id" ref="a20000"/>
+    </record>
+		
 	<record id="sales_tax_public_main" model="account.tax.template">
         <field name="description">Sale Central (12%)</field>
         <field name="name">Sale Central</field>
-        <field name="account_collected_id" ref="a10100"/>
-        <field name="account_paid_id" ref="a21000"/> 
+        <field name="account_collected_id" ref="a154000"/>
+        <field name="account_paid_id" ref="a24600"/> 
         <field name="price_include" eval="0"/>
         <field name="amount">0.12</field>
         <field name="type">percent</field>
diff --git a/addons/l10n_in/tax/public_firm_service.xml b/addons/l10n_in/tax/public_firm_service.xml
index 58c85cb3f74..f4ef12defa2 100644
--- a/addons/l10n_in/tax/public_firm_service.xml
+++ b/addons/l10n_in/tax/public_firm_service.xml
@@ -3,11 +3,29 @@
 <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>
+        <field name="type">payable</field>
+        <field name="user_type" ref="account.data_account_type_payable"/>
+        <field name="reconcile" eval="False"/>
+        <field name="parent_id" ref="a20000"/>
+    </record>
+	
 	<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="a10100"/>
-        <field name="account_paid_id" ref="a21000"/> 
+        <field name="account_collected_id" ref="a156000"/>
+        <field name="account_paid_id" ref="a24700"/> 
         <field name="price_include" eval="1"/>
         <field name="amount">0.12</field>
         <field name="type">percent</field>
diff --git a/addons/l10n_in/tax/public_firm_vat.xml b/addons/l10n_in/tax/public_firm_vat.xml
index 02fe9cf56f4..29fd2f3f9ca 100644
--- a/addons/l10n_in/tax/public_firm_vat.xml
+++ b/addons/l10n_in/tax/public_firm_vat.xml
@@ -3,11 +3,29 @@
 <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>
+        <field name="type">payable</field>
+        <field name="user_type" ref="account.data_account_type_payable"/>
+        <field name="reconcile" eval="False"/>
+        <field name="parent_id" ref="a20000"/>
+    </record>
+	
 	<record id="vat_public_main" model="account.tax.template">
         <field name="description">VAT(12%)</field>
         <field name="name">VAT</field>
-        <field name="account_collected_id" ref="a10100"/>
-        <field name="account_paid_id" ref="a21000"/> 
+        <field name="account_collected_id" ref="a157000"/>
+        <field name="account_paid_id" ref="a24800"/> 
         <field name="price_include" eval="0"/>
         <field name="amount">0.15</field>
         <field name="type">percent</field>