From 4822b6332ee01685fdbced96c37d54e8d615dfe6 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 4 Apr 2013 13:02:53 +0530
Subject: [PATCH] [IMP] improved code

bzr revid: tpa@tinyerp.com-20130404073253-6bxc9rnc94q80cd5
---
 addons/l10n_in/l10n_in_public_chart.xml       |  2 +-
 .../l10n_in/l10n_in_public_tax_template.xml   | 86 +++++++++++++++++--
 addons/l10n_in/l10n_in_tax_code_template.xml  | 75 +++++++++++-----
 3 files changed, 136 insertions(+), 27 deletions(-)

diff --git a/addons/l10n_in/l10n_in_public_chart.xml b/addons/l10n_in/l10n_in_public_chart.xml
index 477df493bf6..f39a42c0f53 100644
--- a/addons/l10n_in/l10n_in_public_chart.xml
+++ b/addons/l10n_in/l10n_in_public_chart.xml
@@ -820,7 +820,7 @@
         </record>
 
         <record model="account.account.template" id="p154018">
-            <field name="name">TDS On Director's Interest</field>
+            <field name="name">TDS on Director's Interest</field>
             <field name="code">154018</field>
             <field name="type">other</field>
             <field name="user_type" ref="account.data_account_type_liability"/>
diff --git a/addons/l10n_in/l10n_in_public_tax_template.xml b/addons/l10n_in/l10n_in_public_tax_template.xml
index 09b2c41d7aa..4bfe26a3e01 100644
--- a/addons/l10n_in/l10n_in_public_tax_template.xml
+++ b/addons/l10n_in/l10n_in_public_tax_template.xml
@@ -150,6 +150,36 @@
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
+    <record id="account_tax_exice6_edu_cess2_pur" model="account.tax.template">
+        <field name="name">Education Cess 2% -Purchase</field>
+        <field name="description">Education Cess 2% -Purchase</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.0200</field>
+        <field name="sequence">21</field>
+        <field name="account_collected_id" ref="p154014"/>
+        <field name="account_paid_id" ref="p154014"/>
+        <field name="base_code_id" ref="vat_code_tax_pur_vat"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_cess2"/>
+        <field name="parent_id" ref="account_tax_exic6_pur"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_exice6_seco_high_cess_pur" model="account.tax.template">
+        <field name="name">Seco. &amp; Higher Edu. Cess 1% -Purchase</field>
+        <field name="description">Seco. &amp; Higher Edu. Cess 1% -Purchase</field>
+        <field name="type_tax_use">all</field>
+        <field name="type">percent</field>
+        <field name="amount">0.0100</field>
+        <field name="sequence">22</field>
+        <field name="account_collected_id" ref="p154015"/>
+        <field name="account_paid_id" ref="p154015"/>
+        <field name="base_code_id" ref="vat_code_tax_pur_vat"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_sec_hig_edu"/>
+        <field name="parent_id" ref="account_tax_exic6_pur"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
     <record id="account_tax_exic5_pur" model="account.tax.template">
         <field name="name">Input Excise Duty 5% </field>
         <field name="description">Input Excise Duty 5% </field>
@@ -180,7 +210,7 @@
     <record id="account_tax_edu_cess2_pur" model="account.tax.template">
         <field name="name">Education Cess 2% - Purchase</field>
         <field name="description">Education Cess 2% - Purchase</field>
-        <field name="type_tax_use">all</field>
+        <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.0200</field>
         <field name="sequence">21</field>
@@ -222,8 +252,8 @@
     </record>
 
     <record id="account_tax_edu_cess2" model="account.tax.template">
-        <field name="name">Education Cess 2%</field>
-        <field name="description">Education Cess 2%</field>
+        <field name="name">Education Cess 2% - Sales</field>
+        <field name="description">Education Cess 2% - Sales</field>
         <field name="type_tax_use">sale</field>
         <field name="type">percent</field>
         <field name="amount">0.0200</field>
@@ -231,7 +261,7 @@
         <field name="account_collected_id" ref="p247010"/>
         <field name="account_paid_id" ref="p247010"/>
         <field name="base_code_id" ref="vat_code_tax_pur_sales_vat"/>
-        <field name="tax_code_id" ref="vat_code_tax_pay_cess2"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_cess2"/>
         <field name="parent_id" ref="account_tax_exice12_sale"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
@@ -278,8 +308,8 @@
     </record>
 
     <record id="account_tax_tds_dir_intrest" model="account.tax.template">
-        <field name="name">TDS On Director's Interest</field>
-        <field name="description">TDS On Director's Interest</field>
+        <field name="name">TDS on Director's Interest</field>
+        <field name="description">TDS on Director's Interest</field>
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.1</field>
@@ -611,5 +641,49 @@
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
+    <record id="account_tax_ser12_sale" model="account.tax.template">
+        <field name="name">Service Tax 12% - Sales</field>
+        <field name="description">Service Tax 12% - Sales</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.12</field>
+        <field name="sequence">1</field>
+        <field name="account_collected_id" ref="p24740"/>
+        <field name="account_paid_id" ref="p24740"/>
+        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_st12"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_ser2_sale" model="account.tax.template">
+        <field name="name">Service Tax 2% - Sales</field>
+        <field name="description">Service Tax 2% - Sales</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.02</field>
+        <field name="sequence">1</field>
+        <field name="account_collected_id" ref="p24740"/>
+        <field name="account_paid_id" ref="p24740"/>
+        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_st2"/>
+        <field name="parent_id" ref="account_tax_ser12_sale"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_ser1_sale" model="account.tax.template">
+        <field name="name">Service Tax 1% - Sales</field>
+        <field name="description">Service Tax 1% - Sales</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.01</field>
+        <field name="sequence">1</field>
+        <field name="account_collected_id" ref="p24740"/>
+        <field name="account_paid_id" ref="p24740"/>
+        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_st1"/>
+        <field name="parent_id" ref="account_tax_ser12_sale"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
     </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/l10n_in/l10n_in_tax_code_template.xml b/addons/l10n_in/l10n_in_tax_code_template.xml
index 1abccc181bb..b230600d640 100644
--- a/addons/l10n_in/l10n_in_tax_code_template.xml
+++ b/addons/l10n_in/l10n_in_tax_code_template.xml
@@ -47,14 +47,34 @@
             <field name="parent_id" ref="vat_code_base_tax_purchase"/>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_rec_cess2">
-            <field name="name">Education Cess 2%</field>
+        <record model="account.tax.code.template" id="vat_code_tax_rec_exice_salebase">
+            <field name="name">Excise Duty - (12% + 2% +1%) Sales</field>
             <field name="parent_id" ref="vat_code_tax_rec"/>
         </record>
 
+        <record model="account.tax.code.template" id="vat_code_tax_rec_exice12">
+            <field name="name">Excise Duty - 12% - Sales</field>
+            <field name="parent_id" ref="vat_code_tax_rec_exice_salebase"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pay_ic_st_purbase">
+            <field name="name">Input Credit - Service Tax (12% + 2% + 1%) purchase</field>
+            <field name="parent_id" ref="vat_code_payable"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pay_exice12">
+            <field name="name">Excise Duty 12% - Purchase</field>
+            <field name="parent_id" ref="vat_code_tax_pay_ic_st_purbase"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_cess2">
+            <field name="name">Education Cess 2% - Sales</field>
+            <field name="parent_id" ref="vat_code_tax_rec_exice_salebase"/>
+        </record>
+
         <record model="account.tax.code.template" id="vat_code_tax_pay_cess2">
             <field name="name">Education Cess 2% - Purchase</field>
-            <field name="parent_id" ref="vat_code_payable"/>
+            <field name="parent_id" ref="vat_code_tax_pay_ic_st_purbase"/>
         </record>
 
         <record model="account.tax.code.template" id="vat_code_tax_pay_import_duty">
@@ -77,29 +97,34 @@
             <field name="parent_id" ref="vat_code_payable"/>
         </record>
 
+        <record model="account.tax.code.template" id="vat_code_tax_pay_ic_st_base">
+            <field name="name">Input Credit - Service Tax (12% + 2% + 1%)</field>
+            <field name="parent_id" ref="vat_code_payable"/>
+        </record>
+
         <record model="account.tax.code.template" id="vat_code_tax_pay_ic_st">
             <field name="name">Input Credit - Service Tax</field>
-            <field name="parent_id" ref="vat_code_payable"/>
+            <field name="parent_id" ref="vat_code_tax_pay_ic_st_base"/>
         </record>
 
         <record model="account.tax.code.template" id="vat_code_tax_pay_ic_edu_cess">
             <field name="name">Input Credit - Service Tax Edu. Cess.</field>
-            <field name="parent_id" ref="vat_code_payable"/>
+            <field name="parent_id" ref="vat_code_tax_pay_ic_st_base"/>
         </record>
 
         <record model="account.tax.code.template" id="vat_code_tax_pay_ic_seco_hec">
             <field name="name">Input Credit - Service Tax Seco. &amp; HEC</field>
-            <field name="parent_id" ref="vat_code_payable"/>
+            <field name="parent_id" ref="vat_code_tax_pay_ic_st_base"/>
         </record>
 
         <record model="account.tax.code.template" id="vat_code_tax_pay_sec_hig_edu">
             <field name="name">Seco. &amp; Higher Edu. Cess 1% - Purchase</field>
-            <field name="parent_id" ref="vat_code_payable"/>
+            <field name="parent_id" ref="vat_code_tax_pay_ic_st_purbase"/>
         </record>
 
         <record model="account.tax.code.template" id="vat_code_tax_rec_sec_hig_cess">
             <field name="name">Seco. &amp; Higher Edu. Cess 1% - Sales</field>
-            <field name="parent_id" ref="vat_code_tax_rec"/>
+            <field name="parent_id" ref="vat_code_tax_rec_exice_salebase"/>
         </record>
 
         <record model="account.tax.code.template" id="vat_code_tax_rec_cst2">
@@ -133,7 +158,7 @@
         </record>
 
         <record model="account.tax.code.template" id="vat_code_tax_pay_vat4">
-            <field name="name">Input Vat 4%</field>
+            <field name="name">Input VAT 4%</field>
             <field name="parent_id" ref="vat_code_payable"/>
         </record>
 
@@ -152,16 +177,6 @@
             <field name="parent_id" ref="vat_code_payable"/>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_pay_exice12">
-            <field name="name">Excise Duty 12% - Purchase</field>
-            <field name="parent_id" ref="vat_code_payable"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_rec_exice12">
-            <field name="name">Excise Duty - 12% - Sales</field>
-            <field name="parent_id" ref="vat_code_tax_rec"/>
-        </record>
-
         <record model="account.tax.code.template" id="vat_code_tax_pay_exice5">
             <field name="name">Excise Duty 5% - Purchase</field>
             <field name="parent_id" ref="vat_code_payable"/>
@@ -193,7 +208,7 @@
         </record>
 
         <record model="account.tax.code.template" id="vat_code_tax_pay_tds_dir_intrest">
-            <field name="name"> TDS On Director's Interest</field>
+            <field name="name"> TDS on Director's Interest</field>
             <field name="parent_id" ref="vat_code_payable"/>
         </record>
 
@@ -387,5 +402,25 @@
             <field name="parent_id" ref="vat_code_tax_rec"/>
         </record>
 
+        <record model="account.tax.code.template" id="vat_code_tax_rec_st_salebase">
+            <field name="name">Service Tax (12% + 2% + 1%) Sales</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_st12">
+            <field name="name">Service Tax 12% - Sales</field>
+            <field name="parent_id" ref="vat_code_tax_rec_st_salebase"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_st2">
+            <field name="name">Service Tax 2% - Sales</field>
+            <field name="parent_id" ref="vat_code_tax_rec_st_salebase"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_st1">
+            <field name="name">Service Tax 1% - Sales</field>
+            <field name="parent_id" ref="vat_code_tax_rec_st_salebase"/>
+        </record>
+
     </data>
 </openerp>