pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] improved code.

Browse Source 
bzr revid: tpa@tinyerp.com-20130503095652-6tjtg1hy08d43ssv
This commit is contained in:
Turkesh Patel (Open ERP)
2013-05-03 15:26:52 +05:30
parent 2aa9e4b58d
commit 3946ab9dae
3 changed files with 65 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/l10n_in/l10n_in_private_tax_template.xml
+31 -45
View File
@@ -4,7 +4,8 @@
<!-- Taxes Sale Tax -->
<record id="sales_private" model="account.tax.template">
<field name="name">Sale Tax 15%</field>
<field name="name">Sales Tax 15%</field>
<field name="description">Sales Tax 15%</field>
<field name="amount">0.15</field>
<field name="type">percent</field>
<field name="type_tax_use">sale</field>
@@ -20,7 +21,8 @@
</record>
<record id="sales_private_main" model="account.tax.template">
<field name="name">Sale Tax 12%</field>
<field name="name">Sales Tax 12%</field>
<field name="description">Sales Tax 12%</field>
<field name="amount">0.12</field>
<field name="type">percent</field>
<field name="type_tax_use">sale</field>
@@ -36,7 +38,8 @@
</record>
<record id="sales_private_main_4" model="account.tax.template">
<field name="name">Sale Tax 4%</field>
<field name="name">Sales Tax 4%</field>
<field name="description">Sales Tax 4%</field>
<field name="amount">0.04</field>
<field name="type">percent</field>
<field name="type_tax_use">sale</field>
@@ -55,6 +58,7 @@
<record id="purchase_tax_private" model="account.tax.template">
<field name="name">Purchase Tax 15%</field>
<field name="description">Purchase Tax 15%</field>
<field name="account_collected_id" ref="a189"/>
<field name="account_paid_id" ref="a189"/>
<field name="amount">0.15</field>
@@ -165,10 +169,10 @@
<field name="account_collected_id" ref="a2162"/>
<field name="account_paid_id" ref="a2162"/>
<field name="base_code_id" ref="vat_code_tax_sal_vat8"/>
<field name="tax_code_id" ref="vat_code_tax_pay_vat8"/>
<field name="tax_code_id" ref="vat_code_tax_rec_vat8"/>
<field name="ref_base_code_id" ref="vat_code_tax_sal_vat8"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_tax_code_id" ref="vat_code_tax_pay_vat8"/>
<field name="ref_tax_code_id" ref="vat_code_tax_rec_vat8"/>
<field name="ref_tax_sign" eval="-1"/>
<field name="chart_template_id" ref="indian_chart_template_private"/>
</record>
@@ -199,10 +203,10 @@
<field name="account_collected_id" ref="a2162"/>
<field name="account_paid_id" ref="a2162"/>
<field name="base_code_id" ref="vat_code_tax_sal_vat10"/>
<field name="tax_code_id" ref="vat_code_tax_pay_vat10"/>
<field name="tax_code_id" ref="vat_code_tax_rec_vat10"/>
<field name="ref_base_code_id" ref="vat_code_tax_sal_vat10"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_tax_code_id" ref="vat_code_tax_pay_vat10"/>
<field name="ref_tax_code_id" ref="vat_code_tax_rec_vat10"/>
<field name="ref_tax_sign" eval="-1"/>
<field name="chart_template_id" ref="indian_chart_template_private"/>
</record>
@@ -233,10 +237,10 @@
<field name="account_collected_id" ref="a2162"/>
<field name="account_paid_id" ref="a2162"/>
<field name="base_code_id" ref="vat_code_tax_sal_vat12"/>
<field name="tax_code_id" ref="vat_code_tax_pay_vat12"/>
<field name="tax_code_id" ref="vat_code_tax_rec_vat12"/>
<field name="ref_base_code_id" ref="vat_code_tax_sal_vat12"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_tax_code_id" ref="vat_code_tax_pay_vat12"/>
<field name="ref_tax_code_id" ref="vat_code_tax_rec_vat12"/>
<field name="ref_tax_sign" eval="-1"/>
<field name="chart_template_id" ref="indian_chart_template_private"/>
</record>
@@ -278,8 +282,8 @@
</record>
<record id="exice_duty_private_sale1" model="account.tax.template">
<field name="name">Excise Duty 1% - Sales</field>
<field name="description">Excise Duty 1% - Sales</field>
<field name="name">Output Excise Duty 1%</field>
<field name="description">Output Excise Duty 1%</field>
<field name="type_tax_use">sale</field>
<field name="type">percent</field>
<field name="amount">0.0100</field>
@@ -297,8 +301,8 @@
<!-- Service Tax -->
<record id="service_private_ser12_sale" model="account.tax.template">
<field name="name">Service Tax 12% - Sales</field>
<field name="description">Service Tax 12% - Sales</field>
<field name="name">Output Service Tax 12%</field>
<field name="description">Output Service Tax 12%</field>
<field name="type_tax_use">sale</field>
<field name="type">percent</field>
<field name="amount">0.12</field>
@@ -311,12 +315,12 @@
<field name="ref_base_sign" eval="-1"/>
<field name="ref_tax_code_id" ref="vat_code_tax_rec_st12"/>
<field name="ref_tax_sign" eval="-1"/>
<field name="chart_template_id" ref="indian_chart_template_public"/>
<field name="chart_template_id" ref="indian_chart_template_private"/>
</record>
<record id="service_private_ser2_sale" model="account.tax.template">
<field name="name">Service Tax 2% - Sales</field>
<field name="description">Service Tax 2% - Sales</field>
<field name="name">Output Sales Service Tax 2%</field>
<field name="description">Output Sales Service Tax 2%</field>
<field name="type_tax_use">sale</field>
<field name="type">percent</field>
<field name="amount">0.02</field>
@@ -327,12 +331,12 @@
<field name="ref_tax_code_id" ref="vat_code_tax_rec_st2"/>
<field name="ref_tax_sign" eval="-1"/>
<field name="parent_id" ref="service_private_ser12_sale"/>
<field name="chart_template_id" ref="indian_chart_template_public"/>
<field name="chart_template_id" ref="indian_chart_template_private"/>
</record>
<record id="service_private_ser1_sale" model="account.tax.template">
<field name="name">Service Tax 1% - Sales</field>
<field name="description">Service Tax 1% - Sales</field>
<field name="name">Output Service Tax 1%</field>
<field name="description">Output Service Tax 1%</field>
<field name="type_tax_use">sale</field>
<field name="type">percent</field>
<field name="amount">0.01</field>
@@ -343,25 +347,7 @@
<field name="ref_tax_code_id" ref="vat_code_tax_rec_st1"/>
<field name="ref_tax_sign" eval="-1"/>
<field name="parent_id" ref="service_private_ser12_sale"/>
<field name="chart_template_id" ref="indian_chart_template_public"/>
</record>
<record id="service_private_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="a2163"/>
<field name="account_paid_id" ref="a2163"/>
<field name="base_code_id" ref="vat_code_tax_sale_ser12"/>
<field name="tax_code_id" ref="vat_code_tax_rec_st12"/>
<field name="ref_base_code_id" ref="vat_code_tax_sale_ser12"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_tax_code_id" ref="vat_code_tax_rec_st12"/>
<field name="ref_tax_sign" eval="-1"/>
<field name="chart_template_id" ref="indian_chart_template_public"/>
<field name="chart_template_id" ref="indian_chart_template_private"/>
</record>
<record id="service_private_ser12_purchase" model="account.tax.template">
@@ -373,13 +359,13 @@
<field name="sequence">1</field>
<field name="account_collected_id" ref="a189300"/>
<field name="account_paid_id" ref="a189300"/>
<field name="base_code_id" ref="vat_code_tax_pur_exp_act"/>
<field name="base_code_id" ref="vat_code_tax_pur_ser12"/>
<field name="tax_code_id" ref="vat_code_tax_pay_ic_st"/>
<field name="ref_base_code_id" ref="vat_code_tax_pur_exp_act"/>
<field name="ref_base_code_id" ref="vat_code_tax_pur_ser12"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_tax_code_id" ref="vat_code_tax_pay_ic_st"/>
<field name="ref_tax_sign" eval="-1"/>
<field name="chart_template_id" ref="indian_chart_template_public"/>
<field name="chart_template_id" ref="indian_chart_template_private"/>
</record>
<record id="service_private_ser2_purchase" model="account.tax.template">
@@ -394,8 +380,8 @@
<field name="tax_code_id" ref="vat_code_tax_pay_ic_edu_cess"/>
<field name="ref_tax_code_id" ref="vat_code_tax_pur_PCST5"/>
<field name="ref_tax_sign" eval="-1"/>
<field name="parent_id" ref="account_tax_ic_st"/>
<field name="chart_template_id" ref="indian_chart_template_public"/>
<field name="parent_id" ref="service_private_ser12_purchase"/>
<field name="chart_template_id" ref="indian_chart_template_private"/>
</record>
<record id="service_private_ser1_purchase" model="account.tax.template">
@@ -410,8 +396,8 @@
<field name="tax_code_id" ref="vat_code_tax_pay_ic_seco_hec"/>
<field name="ref_tax_code_id" ref="vat_code_tax_pay_ic_seco_hec"/>
<field name="ref_tax_sign" eval="-1"/>
<field name="parent_id" ref="account_tax_ic_st"/>
<field name="chart_template_id" ref="indian_chart_template_public"/>
<field name="parent_id" ref="service_private_ser12_purchase"/>
<field name="chart_template_id" ref="indian_chart_template_private"/>
</record>
</data>
addons/l10n_in/l10n_in_public_tax_template.xml
+22 -22
View File
@@ -107,17 +107,17 @@
</record>
<record id="account_tax_ic_st" model="account.tax.template">
<field name="name">Input Service Tax 12%</field>
<field name="description">Input Service Tax 12%</field>
<field name="name">Service Tax 12% - Purchase</field>
<field name="description">Service Tax 12% - Purchase</field>
<field name="type_tax_use">purchase</field>
<field name="type">percent</field>
<field name="amount">0.1200</field>
<field name="sequence">1</field>
<field name="account_collected_id" ref="p154008"/>
<field name="account_paid_id" ref="p154008"/>
<field name="base_code_id" ref="vat_code_tax_pur_exp_act"/>
<field name="base_code_id" ref="vat_code_tax_pur_ser12"/>
<field name="tax_code_id" ref="vat_code_tax_pay_ic_st"/>
<field name="ref_base_code_id" ref="vat_code_tax_pur_exp_act"/>
<field name="ref_base_code_id" ref="vat_code_tax_pur_ser12"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_tax_code_id" ref="vat_code_tax_pay_ic_st"/>
<field name="ref_tax_sign" eval="-1"/>
@@ -125,8 +125,8 @@
</record>
<record id="account_tax_in_edu_cess_st" model="account.tax.template">
<field name="name">Input Service Tax Edu. Cess. 2%</field>
<field name="description">Input Service Tax Edu. Cess. 2%</field>
<field name="name">Service Tax Edu. Cess. 2% - Purchase</field>
<field name="description">Service Tax Edu. Cess. 2% - Purchase</field>
<field name="type_tax_use">purchase</field>
<field name="type">percent</field>
<field name="amount">0.0200</field>
@@ -141,8 +141,8 @@
</record>
<record id="account_tax_in_credit_ser_tax_seco_hec" model="account.tax.template">
<field name="name">Input Service Tax Seco. &amp; HEC 1%</field>
<field name="description">Input Service Tax Seco. &amp; HEC 1%</field>
<field name="name">Service Tax Seco. &amp; HEC 1% - Purchase</field>
<field name="description">Service Tax Seco. &amp; HEC 1% - Purchase</field>
<field name="type_tax_use">purchase</field>
<field name="type">percent</field>
<field name="amount">0.0100</field>
@@ -472,10 +472,10 @@
<field name="account_collected_id" ref="p154026"/>
<field name="account_paid_id" ref="p154026"/>
<field name="base_code_id" ref="vat_code_tax_pur_vat4"/>
<field name="tax_code_id" ref="vat_code_tax_rec_add_vat1"/>
<field name="tax_code_id" ref="vat_code_tax_pay_add_vat1"/>
<field name="ref_base_code_id" ref="vat_code_tax_pur_vat4"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_tax_code_id" ref="vat_code_tax_rec_add_vat1"/>
<field name="ref_tax_code_id" ref="vat_code_tax_pay_add_vat1"/>
<field name="ref_tax_sign" eval="-1"/>
<field name="chart_template_id" ref="indian_chart_template_public"/>
</record>
@@ -526,10 +526,10 @@
<field name="account_collected_id" ref="p247004"/>
<field name="account_paid_id" ref="p247004"/>
<field name="base_code_id" ref="vat_code_tax_sal_vat4"/>
<field name="tax_code_id" ref="vat_code_tax_pay_add_vat1"/>
<field name="tax_code_id" ref="vat_code_tax_rec_add_vat1"/>
<field name="ref_base_code_id" ref="vat_code_tax_sal_vat4"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_tax_code_id" ref="vat_code_tax_pay_add_vat1"/>
<field name="ref_tax_code_id" ref="vat_code_tax_rec_add_vat1"/>
<field name="ref_tax_sign" eval="-1"/>
<field name="chart_template_id" ref="indian_chart_template_public"/>
</record>
@@ -628,7 +628,7 @@
<record id="account_tax_no_form_h" model="account.tax.template">
<field name="name">No Tax Form H</field>
<field name="description">No Tax Form H</field>
<field name="type_tax_use">purchase</field>
<field name="type_tax_use">sale</field>
<field name="type">percent</field>
<field name="amount">0.02</field>
<field name="base_code_id" ref="vat_code_tax_sal_exp_ct1"/>
@@ -643,7 +643,7 @@
<record id="account_tax_cst2_sale_cst3_against_c" model="account.tax.template">
<field name="name">CST 2% on Sales - CT3 Against Form - C</field>
<field name="description">CST 2% on Sales - CT3 Against Form - C</field>
<field name="type_tax_use">purchase</field>
<field name="type_tax_use">sale</field>
<field name="type">percent</field>
<field name="amount">0.02</field>
<field name="account_collected_id" ref="p247007"/>
@@ -660,7 +660,7 @@
<record id="account_tax_out_vat4_sal_ct3" model="account.tax.template">
<field name="name">Output VAT 4% on Sales - CT3</field>
<field name="description">Output VAT 4% on Sales - CT3</field>
<field name="type_tax_use">purchase</field>
<field name="type_tax_use">sale</field>
<field name="type">percent</field>
<field name="amount">0.04</field>
<field name="account_collected_id" ref="p247008"/>
@@ -677,7 +677,7 @@
<record id="account_tax_out_add1_sal_ct3" model="account.tax.template">
<field name="name">Output Adi. VAT 1% on Sales - CT3</field>
<field name="description">Output Adi. VAT 1% on Sales - CT3</field>
<field name="type_tax_use">purchase</field>
<field name="type_tax_use">sale</field>
<field name="type">percent</field>
<field name="amount">0.01</field>
<field name="account_collected_id" ref="p247009"/>
@@ -694,7 +694,7 @@
<record id="account_no_tax_sez_ogs" model="account.tax.template">
<field name="name">No Tax SEZ OGS</field>
<field name="description">No Tax SEZ OGS</field>
<field name="type_tax_use">purchase</field>
<field name="type_tax_use">sale</field>
<field name="type">fixed</field>
<field name="base_code_id" ref="vat_code_tax_sal_sez_out_guj"/>
<field name="tax_code_id" ref="vat_code_tax_no_saz_ogs"/>
@@ -708,7 +708,7 @@
<record id="account_no_tax_sez_guj" model="account.tax.template">
<field name="name">No Tax SEZ Gujarat</field>
<field name="description">No Tax SEZ Gujarat</field>
<field name="type_tax_use">purchase</field>
<field name="type_tax_use">sale</field>
<field name="type">percent</field>
<field name="base_code_id" ref="vat_code_tax_sal_sez_in_guj"/>
<field name="tax_code_id" ref="vat_code_tax_no_sez_guj"/>
@@ -722,7 +722,7 @@
<record id="account_no_tax_h_with_bed" model="account.tax.template">
<field name="name">No Tax Form H with BED</field>
<field name="description">No Tax Form H with BED</field>
<field name="type_tax_use">purchase</field>
<field name="type_tax_use">sale</field>
<field name="type">percent</field>
<field name="base_code_id" ref="vat_code_tax_sal_formh_tax"/>
<field name="tax_code_id" ref="vat_code_tax_rec_formh_bed"/>
@@ -736,7 +736,7 @@
<record id="account_no_tax_export_out_country" model="account.tax.template">
<field name="name">No Tax Exports - Out of Country</field>
<field name="description">No Tax Exports - Out of Country</field>
<field name="type_tax_use">purchase</field>
<field name="type_tax_use">sale</field>
<field name="type">percent</field>
<field name="base_code_id" ref="vat_code_tax_sal_out_country"/>
<field name="tax_code_id" ref="vat_code_tax_rec_no_out_country"/>
@@ -750,7 +750,7 @@
<record id="account_no_tax_proj" model="account.tax.template">
<field name="name">No Tax Projects</field>
<field name="description">No Tax Projects</field>
<field name="type_tax_use">purchase</field>
<field name="type_tax_use">sale</field>
<field name="type">percent</field>
<field name="base_code_id" ref="vat_code_tax_sal_proj"/>
<field name="tax_code_id" ref="vat_code_tax_rec_no_proj"/>
@@ -798,7 +798,7 @@
<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_tax_use">purchase</field>
<field name="type">percent</field>
<field name="amount">0.0100</field>
<field name="sequence">22</field>
addons/l10n_in/l10n_in_tax_code_template.xml
+12 -7
View File
@@ -48,6 +48,11 @@
<field name="parent_id" ref="vat_code_base_tax_purchase"/>
</record>
<record model="account.tax.code.template" id="vat_code_tax_pur_ser12">
<field name="name">Purchase Service Tax 12%</field>
<field name="parent_id" ref="vat_code_base_tax_purchase"/>
</record>
<record model="account.tax.code.template" id="vat_code_tax_sale_ser12">
<field name="name">Sales Service Tax 12%</field>
<field name="parent_id" ref="vat_code_base_tax_sale"/>
@@ -74,7 +79,7 @@
</record>
<record model="account.tax.code.template" id="vat_code_tax_pay_ic_st_purbase">
<field name="name">Input Service Tax 12.36% - Purchase</field>
<field name="name">Excise Duty 12.36% - Purchase</field>
<field name="parent_id" ref="vat_code_payable"/>
</record>
@@ -519,32 +524,32 @@
</record>
<record model="account.tax.code.template" id="vat_code_base_tax_sale15">
<field name="name">Sale Tax 15%</field>
<field name="name">Sales Tax 15%</field>
<field name="parent_id" ref="vat_code_base_tax_sale"/>
</record>
<record model="account.tax.code.template" id="vat_code_rec_sale15">
<field name="name">Sale Tax - 15%</field>
<field name="name">Sales Tax - 15%</field>
<field name="parent_id" ref="vat_code_tax_rec"/>
</record>
<record model="account.tax.code.template" id="vat_code_base_tax_sale12">
<field name="name">Sale Tax 12%</field>
<field name="name">Sales Tax 12%</field>
<field name="parent_id" ref="vat_code_base_tax_sale"/>
</record>
<record model="account.tax.code.template" id="vat_code_rec_sale12">
<field name="name">Sale Tax - 12%</field>
<field name="name">Sales Tax - 12%</field>
<field name="parent_id" ref="vat_code_tax_rec"/>
</record>
<record model="account.tax.code.template" id="vat_code_base_tax_sale4">
<field name="name">Sale Tax 4%</field>
<field name="name">Sales Tax 4%</field>
<field name="parent_id" ref="vat_code_base_tax_sale"/>
</record>
<record model="account.tax.code.template" id="vat_code_rec_sale4">
<field name="name">Sale Tax - 4%</field>
<field name="name">Sales Tax - 4%</field>
<field name="parent_id" ref="vat_code_tax_rec"/>
</record>