From 2d4ec5c0f704c22bc4383253496c1bc8790ccc1e Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Thu, 14 Mar 2013 18:54:17 +0530 Subject: [PATCH 01/20] [IMP] l10n_in: improve dat of tax codes bzr revid: tpa@tinyerp.com-20130314132417-g02a9j5cf6s112bh --- addons/l10n_in/l10n_in_tax_code_template.xml | 269 ++++++++++++++++++- 1 file changed, 265 insertions(+), 4 deletions(-) diff --git a/addons/l10n_in/l10n_in_tax_code_template.xml b/addons/l10n_in/l10n_in_tax_code_template.xml index 94217d79c3c..a5bcfd8524a 100644 --- a/addons/l10n_in/l10n_in_tax_code_template.xml +++ b/addons/l10n_in/l10n_in_tax_code_template.xml @@ -4,7 +4,7 @@ - Tax + Your Company @@ -27,16 +27,277 @@ - - Base of Taxed Sales + Taxable Sale Bases - Base of Taxed Purchases + Taxable Purchase Bases + + Cst 5% on Purchase + + CSTP5 + + + + Purchase CST 5% + + PCST5 + + + + Education Cess 2% + + + + + Education Cess 2% - Purchase + + + + + Input Credit - Import Duty + + + + + Input Credit On Capital Goods - Edu. Cess + + + + + Input Credit on Capital Goods - Modvate + + + + + Input Credit on Capital Goods - Seco. & HEC + + + + + Input Credit - Service Tax + + + + + Input Credit - Service Tax Edu. Cess. + + + + + Input Credit - Service Tax Seco. & HEC + + + + + Seco. & Higher Edu. Cess 1% - Purchase + + + + + Seco. & Higher Edu. Cess 1% - Sales + + + + + CST 2% on Sales + + + + + CST 5% on Sales + + + + + Input Additional Vat 1% + + + + + Input Additional Vat 2.5% + + + + + Input VAT 12.5% + + + + + Input Vat 15% + + + + + Input Vat 4% + + + + + Output Adi. Vat @1% + + + + + Output Vat @4% + + + + + Cst 2% on Purchase + + + + + Excise Duty 12% - Purchase + + + + + Excise Duty - 12% - Sales + + + + + Excise Duty 5% - Purchase + + + + + Excise Duty 6% on Purchase + + + + + Input Credit - URD + + + + + Tds on Audit Fees - 94J + + + + + TDS on Commission Or Brokerage- 94H + + + + + TDS on Contractor-94C + + + + + TDS On Director's Interest + + + + + TDS on Director's Remuneration - 92B + + + + + TDS on Interest + + + + + TDS on Professional Fees - 94J + + + + + TDS on Rent-94I + + + + + TDS on Salary - 92B + + + + + Import Purchase + + + + + Purchase Vat 4% / Vat12.5% / Vat15% / Cst2% / Cst5% + + + + + Plant & Machinery + + + + + Expense Accounts + + + + + Sales Vat 4% / Sales CST2% / Sales CST5% + + + + + Sales CST2% + + + + + Sales CST5% + + + + + Purchase Vat 4% + + + + + Purchase Vat12.5% / Vat15% + + + + + Purchase Vat12.5% + + + + + Purchase Vat15% + + + + + Sales Vat 4% + + + + + Purchase Cst2% + + + + + Purchase URD + + + + + Base Expenses for TDS + + + From 96aa7aa6ea79c4927e8a7f65624cf7480d7356c9 Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Fri, 15 Mar 2013 16:28:46 +0530 Subject: [PATCH 02/20] [IMP] l10n_in:improved demo data of account tax bzr revid: tpa@tinyerp.com-20130315105846-sgdli94fp6d8i8dp --- .../l10n_in/l10n_in_public_tax_template.xml | 772 ++++++++++++------ addons/l10n_in/l10n_in_tax_code_template.xml | 7 +- 2 files changed, 513 insertions(+), 266 deletions(-) diff --git a/addons/l10n_in/l10n_in_public_tax_template.xml b/addons/l10n_in/l10n_in_public_tax_template.xml index 03dbfa7cc75..79472c3e4b9 100644 --- a/addons/l10n_in/l10n_in_public_tax_template.xml +++ b/addons/l10n_in/l10n_in_public_tax_template.xml @@ -1,295 +1,537 @@ - - - - - Sale Tax-15% - - - - 0.15 - percent - sale - - - - - - - - - Sale Tax-12% - - - - 0.12 - percent - sale - - - - - - - - - Sale Tax-4% - - - - 0.04 - percent - sale - - - - - - - - - - - Purchase Tax-15% - - - - 0.15 - percent + + + CST 5% - Purchase + CST 5% - Purchase purchase - - - - - - - - - - - - - VAT-5%(4% VAT+1% Add. Tax.) - - - - 0.05 percent - all - - 1 - - 1 - - 1 - - 1 - + 0.01 + + + + + - - VAT-15% (12.5% VAT + 2.5% Add. Tax.) - - - - 0.15 + + Input Credit - Service Tax Seco. & HEC + Input Credit - Service Tax Seco. & HEC + purchase percent - all - - 1 - - 1 - - 1 - - 1 - - - - - - VAT-8% - - - - 0.08 - percent - all - - 1 - - 1 - - 1 - - 1 - - - - - - VAT-10% - - - - 0.10 - percent - all - - 1 - - 1 - - 1 - - 1 - + 0.0100 + + + - - VAT-12.5% - - - - 12.5 + + Input Credit - URD + Input Credit - URD + purchase percent - all - - 1 - - 1 - - 1 - - 1 - + 0.0400 + + + - - - - Service Tax-12.30% - - + + Tds on Audit Fees - 94J + Tds on Audit Fees - 94J + purchase + percent + 0.1000 + + + + + + + + TDS on Commission Or Brokerage- 94H + TDS on Commission Or Brokerage- 94H + purchase + percent + 0.1000 + + + + + + + + Input Credit - Import Duty + Input Credit - Import Duty + purchase + percent + 0.0750 + 1 + + + + + + + + Additional Duty (Imports) 4% + Additional Duty (Imports) 4% + purchase + percent + 0.0400 + 1 + + + + + + + + Input Credit - Service Tax + Input Credit - Service Tax + purchase + percent + 0.1200 + 1 + + + + + + + + Input Credit - Service Tax Edu. Cess. + Input Credit - Service Tax Edu. Cess. + purchase + percent + 0.0200 + + + + + + + + TDS on Salary - 92B + TDS on Salary - 92B + purchase + percent + 0.3000 + + + + + + + + Excise Duty 6% on Purchase + Excise Duty 6% on Purchase + purchase + percent + 0.0600 + + + + + + + + Excise Duty 5% - Purchase + + purchase + percent + 0.0500 + + + + + + + + Excise Duty 12% - Purchase + Excise Duty 12% - Purchase + purchase + percent + 0.1200 + + + + + + + + Education Cess 2% - Purchase + Education Cess 2% - Purchase + all + percent + 0.0200 + 21 + + + + + + + + + Seco. & Higher Edu. Cess 1% - Purchase + Seco. & Higher Edu. Cess 1% - Purchase + all + percent + 0.0100 + 22 + + + + + + + + + Excise Duty - 12% - Sales + Excise Duty - 12% - Sales + sale + percent + 0.1200 + + + + + + + + + Education Cess 2% + Education Cess 2% + all + percent + 0.0200 + 2 + + + + + + + + + Seco. & Higher Edu. Cess 1% - Sales + Seco. & Higher Edu. Cess 1% - Sales + all + percent + 0.0100 + 3 + + + + + + + + + CST + CST + all + percent + 0.0000 + + + + + + ADV + ADV + all + percent + 0.0 + + + + + + Input Credit on Capital Goods - Seco. & HEC + Input Credit on Capital Goods - Seco. & HEC + purchase + percent + 0.01 + + + + + + + + TDS on Contractor-94C + TDS on Contractor-94C + purchase + percent + 0.0200 + + + + + + + + TDS On Director's Interest + TDS On Director's Interest + purchase + percent + 0.1 + + + + + + + + TDS on Director's Remuneration - 92B + TDS on Director's Remuneration - 92B + purchase + percent + 0.3 + + + + + + + + TDS on Interest + TDS on Interest + purchase + percent + 0.1 + + + + + + + + TDS on Professional Fees - 94J + TDS on Professional Fees - 94J + purchase + percent + 0.1 + 1 + + + + + + + + TDS on Rent-94I + TDS on Rent-94I + purchase + percent + 0.1 + + + + + + + + Input Credit On Capital Goods - Edu. Cess + Input Credit On Capital Goods - Edu. Cess + purchase + percent + 0.02 + + + + + + + + Input Credit on Capital Goods - Modvate + + purchase + percent 0.12 - percent - all - - 1 - - 1 - - 1 - - 1 - + + + - - Service Tax-%2 - - - - - 1 - - 1 - - 1 - - 1 - 0.02 - percent - all - - - - - - Service Tax-%1 - 0.01 - - - - - 1 - - 1 - - 1 - - 1 - percent - all - - - - - - - Excise Duty-10.30% - - - - 0.10 + + Input Vat 4% + Input Vat 4% + purchase percent - sale - - 1 - - 1 - - 1 - - 1 - + 0.04 + 4 + + + + - - - Excise Duty-2% - 0.02 + + + Input Additional Vat 1% + Input Additional Vat 1% + purchase percent - sale - - - - 1 - - 1 - - 1 - - 1 - - - - - - Excise Duty-1% 0.01 - percent - sale - - - - 1 - - 1 - - 1 - - 1 - + 5 + + + - + + + Input Vat 15% + Input Vat 15% + purchase + percent + 0.15 + 7 + + + + + + + + Output Vat @4% + Output Vat @4% + sale + percent + 0.04 + 11 + + + + + + + + Output Adi. Vat @1% + Output Adi. Vat @1% + sale + percent + 0.01 + 12 + + + + + + + + CST 2% on Sales + CST 2% on Sales + sale + percent + 0.02 + 13 + + + + + + + + + CST 5% on Sales + CST 5% on Sales + sale + percent + 0.05 + 14 + + + + + + + + Input VAT 12.5% + Input VAT 12.5% + purchase + percent + 0.1250 + 60 + + + + + + + + Input Additional Vat 2.5% + Input Additional Vat 2.5% + purchase + percent + 0.0250 + 80 + + + + + + + + Cst 2% on Purchase + Cst 2% on Purchase + purchase + percent + 0.02 + 9333 + + + + + + \ 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 a5bcfd8524a..ff2cd352bbf 100644 --- a/addons/l10n_in/l10n_in_tax_code_template.xml +++ b/addons/l10n_in/l10n_in_tax_code_template.xml @@ -199,7 +199,7 @@ - + TDS on Director's Remuneration - 92B @@ -299,5 +299,10 @@ + + Additional Duty (Imports) 4% + + + From 4a0e878584bff40db03c78cb8e9a4d13538261a1 Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Mon, 18 Mar 2013 12:02:24 +0530 Subject: [PATCH 03/20] [IMP] addd data of related accounts bzr revid: tpa@tinyerp.com-20130318063224-0lefhgsq3l1ddd1q --- addons/l10n_in/l10n_in_public_chart.xml | 299 +++++++++++++++++- .../l10n_in/l10n_in_public_tax_template.xml | 154 +++++---- 2 files changed, 373 insertions(+), 80 deletions(-) diff --git a/addons/l10n_in/l10n_in_public_chart.xml b/addons/l10n_in/l10n_in_public_chart.xml index 9612afddc39..49568826c4b 100644 --- a/addons/l10n_in/l10n_in_public_chart.xml +++ b/addons/l10n_in/l10n_in_public_chart.xml @@ -658,7 +658,304 @@ - + + + CST 5% on Purchase + 21000102 + other + + + + + + Input Credit - Service Tax Seco. & HEC + 121101010 + other + + + + + + Input Credit - URD + 121102012 + other + + + + + + Tds on Audit Fees - 94J + 121103001 + other + + + + + + TDS on Commission Or Brokerage- 94H + 121103002 + other + + + + + + Input Credit - Import Duty - CVD + 121101004 + other + + + + + + Input Credit Additional Duty on Imports 4% + 121101001 + other + + + + + + Input Credit - Service Tax + 121101008 + other + + + + + + Input Credit - Service Tax Edu. Cess. + 121101009 + other + + + + + + TDS on Salary - 92B + 121103009 + other + + + + + + Excise Duty 6% on Purchase + 121101015 + other + + + + + + Excise Duty 5% - Purchase + 1211010131 + other + + + + + + Excise Duty 12% - Purchase + 121101013 + other + + + + + + Education Cess 2% - Purchase + 121101003 + other + + + + + + Seco. & Higher Edu. Cess 1% - Purchase + 121101011 + other + + + + + + Excise Duty - 12% - Sales + 121101014 + other + + + + + + Education Cess 2% + 121101002 + other + + + + + + Seco. & Higher Edu. Cess 1% - Sales + 121101012 + other + + + + + + + Input Credit on Capital Goods - Seco. & HEC + 121101007 + other + + + + + + TDS on Contractor-94C + 121103003 + other + + + + + + TDS On Director's Interest + 121103004 + other + + + + + + TDS on Director's Remuneration - 92B + 121103005 + other + + + + + + TDS on Interest + 121103006 + other + + + + + + TDS on Professional Fees - 94J + 121103007 + other + + + + + + TDS on Rent-94I + 121103008 + other + + + + + + Input Credit On Capital Goods - Edu. Cess + 121101005 + other + + + + + + Input Credit on Capital Goods - Modvate + 121101006 + other + + + + + + Input Vat 4% + 121102007 + other + + + + + + Input Additional Vat 1% + 121102003 + other + + + + + + Input Vat 15% + 121102006 + other + + + + + + Output Vat @4% + 121102009 + other + + + + + + Output Adi. Vat @1% + 121102008 + other + + + + + + CST 2% on Sales + 121102001 + other + + + + + + CST 5% on Sales + 121102002 + other + + + + + + Input VAT 12.5% + 121102005 + other + + + + + + Input Additional Vat 2.5% + 121102004 + other + + + + + + Cst 2% on Purchase - New + 121102011 + other + + + + India - Chart of Accounts for Public Ltd diff --git a/addons/l10n_in/l10n_in_public_tax_template.xml b/addons/l10n_in/l10n_in_public_tax_template.xml index 79472c3e4b9..db77a63bdca 100644 --- a/addons/l10n_in/l10n_in_public_tax_template.xml +++ b/addons/l10n_in/l10n_in_public_tax_template.xml @@ -8,8 +8,8 @@ purchase percent 0.01 - + + @@ -23,8 +23,8 @@ purchase percent 0.0100 - + + @@ -36,8 +36,8 @@ purchase percent 0.0400 - + + @@ -49,8 +49,8 @@ purchase percent 0.1000 - + + @@ -62,8 +62,8 @@ purchase percent 0.1000 - + + @@ -76,8 +76,8 @@ percent 0.0750 1 - + + @@ -90,8 +90,8 @@ percent 0.0400 1 - + + @@ -104,8 +104,8 @@ percent 0.1200 1 - + + @@ -117,8 +117,8 @@ purchase percent 0.0200 - + + @@ -130,8 +130,8 @@ purchase percent 0.3000 - + + @@ -143,8 +143,8 @@ purchase percent 0.0600 - + + @@ -156,8 +156,8 @@ purchase percent 0.0500 - + + @@ -170,8 +170,8 @@ percent 0.1200 - + + @@ -184,8 +184,8 @@ percent 0.0200 21 - + + @@ -199,8 +199,8 @@ percent 0.0100 22 - + + @@ -214,8 +214,8 @@ percent 0.1200 - + + @@ -228,8 +228,8 @@ percent 0.0200 2 - + + @@ -243,8 +243,8 @@ percent 0.0100 3 - + + @@ -257,8 +257,6 @@ all percent 0.0000 - @@ -268,8 +266,6 @@ all percent 0.0 - @@ -279,8 +275,8 @@ purchase percent 0.01 - + + @@ -292,8 +288,8 @@ purchase percent 0.0200 - + + @@ -305,8 +301,8 @@ purchase percent 0.1 - + + @@ -318,8 +314,8 @@ purchase percent 0.3 - + + @@ -331,8 +327,8 @@ purchase percent 0.1 - + + @@ -345,8 +341,8 @@ percent 0.1 1 - + + @@ -358,8 +354,8 @@ purchase percent 0.1 - + + @@ -371,8 +367,8 @@ purchase percent 0.02 - + + @@ -380,12 +376,12 @@ Input Credit on Capital Goods - Modvate - + Input Credit on Capital Goods - Modvate purchase percent 0.12 - + + @@ -398,8 +394,8 @@ percent 0.04 4 - + + @@ -413,8 +409,8 @@ percent 0.01 5 - + + @@ -427,8 +423,8 @@ percent 0.15 7 - + + @@ -441,8 +437,8 @@ percent 0.04 11 - + + @@ -455,8 +451,8 @@ percent 0.01 12 - + + @@ -470,8 +466,8 @@ 0.02 13 - + + @@ -484,8 +480,8 @@ percent 0.05 14 - + + @@ -498,8 +494,8 @@ percent 0.1250 60 - + + @@ -512,8 +508,8 @@ percent 0.0250 80 - + + @@ -526,8 +522,8 @@ percent 0.02 9333 - + + From df42be7f5d873fe7003dfd6a155b5ce6cf23571b Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Mon, 18 Mar 2013 16:20:27 +0530 Subject: [PATCH 04/20] [IMP] new improved data of tax code bzr revid: tpa@tinyerp.com-20130318105027-r9vf27o3sx8lw9g7 --- .../l10n_in/l10n_in_public_tax_template.xml | 64 ++-- addons/l10n_in/l10n_in_tax_code_template.xml | 288 ++++++++++++------ 2 files changed, 221 insertions(+), 131 deletions(-) diff --git a/addons/l10n_in/l10n_in_public_tax_template.xml b/addons/l10n_in/l10n_in_public_tax_template.xml index 92b154643f2..1cfc0cf5d5a 100644 --- a/addons/l10n_in/l10n_in_public_tax_template.xml +++ b/addons/l10n_in/l10n_in_public_tax_template.xml @@ -26,7 +26,7 @@ - + @@ -39,7 +39,7 @@ - + @@ -52,7 +52,7 @@ - + @@ -65,7 +65,7 @@ - + @@ -79,7 +79,7 @@ - + @@ -93,7 +93,7 @@ - + @@ -107,7 +107,7 @@ - + @@ -120,7 +120,7 @@ - + @@ -133,7 +133,7 @@ - + @@ -146,7 +146,7 @@ - + @@ -159,7 +159,7 @@ - + @@ -173,7 +173,7 @@ - + @@ -187,7 +187,7 @@ - + @@ -202,7 +202,7 @@ - + @@ -217,7 +217,7 @@ - + @@ -246,7 +246,7 @@ - + @@ -278,7 +278,7 @@ - + @@ -291,7 +291,7 @@ - + @@ -304,7 +304,7 @@ - + @@ -317,7 +317,7 @@ - + @@ -330,7 +330,7 @@ - + @@ -344,7 +344,7 @@ - + @@ -357,7 +357,7 @@ - + @@ -370,7 +370,7 @@ - + @@ -383,7 +383,7 @@ - + @@ -426,7 +426,7 @@ - + @@ -440,7 +440,7 @@ - + @@ -469,7 +469,7 @@ - + @@ -483,7 +483,7 @@ - + @@ -497,7 +497,7 @@ - + @@ -511,7 +511,7 @@ - + @@ -525,7 +525,7 @@ - + diff --git a/addons/l10n_in/l10n_in_tax_code_template.xml b/addons/l10n_in/l10n_in_tax_code_template.xml index ff2cd352bbf..1d721c76a94 100644 --- a/addons/l10n_in/l10n_in_tax_code_template.xml +++ b/addons/l10n_in/l10n_in_tax_code_template.xml @@ -39,7 +39,7 @@ Cst 5% on Purchase - + CSTP5 @@ -49,179 +49,179 @@ PCST5 - - Education Cess 2% - - - + Education Cess 2% + + + + Education Cess 2% - Purchase - + - + Input Credit - Import Duty - + - + Input Credit On Capital Goods - Edu. Cess - + - + Input Credit on Capital Goods - Modvate - + - + Input Credit on Capital Goods - Seco. & HEC - + - + Input Credit - Service Tax - + - + Input Credit - Service Tax Edu. Cess. - + - + Input Credit - Service Tax Seco. & HEC - + - + Seco. & Higher Edu. Cess 1% - Purchase - + - + Seco. & Higher Edu. Cess 1% - Sales - - - - - CST 2% on Sales - - - - - CST 5% on Sales - - - - - Input Additional Vat 1% - - - - - Input Additional Vat 2.5% - - - - - Input VAT 12.5% - - - - - Input Vat 15% - - - - - Input Vat 4% - - - - - Output Adi. Vat @1% - - - - - Output Vat @4% - Cst 2% on Purchase + CST 2% on Sales - - Excise Duty 12% - Purchase + + CST 5% on Sales - - Excise Duty - 12% - Sales + + Input Additional Vat 1% - + + Input Additional Vat 2.5% + + + + + Input VAT 12.5% + + + + + Input Vat 15% + + + + + Input Vat 4% + + + + + Output Adi. Vat @1% + + + + + Output Vat @4% + + + + + Cst 2% on Purchase + + + + + Excise Duty 12% - Purchase + + + + + Excise Duty - 12% - Sales + + + + Excise Duty 5% - Purchase - + - + Excise Duty 6% on Purchase - + - + Input Credit - URD - + - + Tds on Audit Fees - 94J - + - + TDS on Commission Or Brokerage- 94H - + - + TDS on Contractor-94C - + - + TDS On Director's Interest - + - + TDS on Director's Remuneration - 92B - + - + TDS on Interest - + - + TDS on Professional Fees - 94J - + - + TDS on Rent-94I - + - + TDS on Salary - 92B - + @@ -299,10 +299,100 @@ - + Additional Duty (Imports) 4% + + + + + Sales Export - Form H - With Tax + + + + + CST 2% on Sales CT3 + + Sales CT3 VAT + + + + + Output VAT 4% on Sales CT3 + + + + + Output Adi. Vat 1% on Sales CT3 + + + + + Sales CT3 CST + + + + + Sales Export - Form H - With CT1 + + + + + Sales Export - SEZ - Out of Gujarat + + + + + Sales Export - SEZ - In Gujarat + + + + + No Tax SEZ OGS + + + + + No Tax SEZ Gujarat + + + + + Sales Export - Out of Country + + + + + Sales Others (Projects) + + + + + No Tax Form H with BED + + + + + No Tax Form H + + + + + No Tax Export Out of Country + + + + + No Tax Projects + + + + + Base for Input Service + + + From f5800836f29247953b67564e4a39ff5acace15b0 Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Mon, 18 Mar 2013 18:38:21 +0530 Subject: [PATCH 05/20] [IMP] improved taxes bzr revid: tpa@tinyerp.com-20130318130821-07ylst5u9iogaa3z --- addons/l10n_in/l10n_in_public_chart.xml | 28 ++- .../l10n_in/l10n_in_public_tax_template.xml | 170 ++++++++++++++---- 2 files changed, 161 insertions(+), 37 deletions(-) diff --git a/addons/l10n_in/l10n_in_public_chart.xml b/addons/l10n_in/l10n_in_public_chart.xml index 49568826c4b..67093812c63 100644 --- a/addons/l10n_in/l10n_in_public_chart.xml +++ b/addons/l10n_in/l10n_in_public_chart.xml @@ -901,7 +901,7 @@ - Output Vat @4% + Output Vat 4% 121102009 other @@ -909,7 +909,7 @@ - Output Adi. Vat @1% + Output Adi. Vat 1% 121102008 other @@ -956,6 +956,30 @@ + + CST 2% on Sales - CT3 Against Form C + 121102017 + other + + + + + + Output Vat 4% on Sales - CT3 + 121102018 + other + + + + + + Output Adi. Vat 1% Sales CT3 + 121102019 + other + + + + India - Chart of Accounts for Public Ltd diff --git a/addons/l10n_in/l10n_in_public_tax_template.xml b/addons/l10n_in/l10n_in_public_tax_template.xml index 1cfc0cf5d5a..03c2cfd2d23 100644 --- a/addons/l10n_in/l10n_in_public_tax_template.xml +++ b/addons/l10n_in/l10n_in_public_tax_template.xml @@ -3,8 +3,8 @@ - CST 5% - Purchase - CST 5% - Purchase + Input CST 5% + Input CST 5% purchase percent 0.01 @@ -18,8 +18,8 @@ - Input Credit - Service Tax Seco. & HEC - Input Credit - Service Tax Seco. & HEC + Input Sec. & HEC - Service Tax + Input Sec. & HEC - Service Tax purchase percent 0.0100 @@ -98,8 +98,8 @@ - Input Credit - Service Tax - Input Credit - Service Tax + Input Credit - Service Tax 12.36% + Input Credit - Service Tax 12.36% purchase percent 0.1200 @@ -111,9 +111,9 @@ - - Input Credit - Service Tax Edu. Cess. - Input Credit - Service Tax Edu. Cess. + + Input Edu. Cess - Service Tax + Input Edu. Cess - Service Tax purchase percent 0.0200 @@ -138,8 +138,8 @@ - Excise Duty 6% on Purchase - Excise Duty 6% on Purchase + Input Excise Duty 6% + Input Excise Duty 6% purchase percent 0.0600 @@ -151,8 +151,8 @@ - Excise Duty 5% - Purchase - + Input Excise Duty 5% + Input Excise Duty 5% purchase percent 0.0500 @@ -164,8 +164,8 @@ - Excise Duty 12% - Purchase - Excise Duty 12% - Purchase + Input Excise Duty 12% + Input Excise Duty 12% purchase percent 0.1200 @@ -208,8 +208,8 @@ - Excise Duty - 12% - Sales - Excise Duty - 12% - Sales + Excise Duty - 12.36% - Sales + Excise Duty - 12.36% - Sales sale percent 0.1200 @@ -269,9 +269,9 @@ - - Input Credit on Capital Goods - Seco. & HEC - Input Credit on Capital Goods - Seco. & HEC + + Input Sec. & HEC - Capital Goods + Input Sec. & HEC - Capital Goods purchase percent 0.01 @@ -362,8 +362,8 @@ - Input Credit On Capital Goods - Edu. Cess - Input Credit On Capital Goods - Edu. Cess + Input Edu. Cess - Capital Goods + Input Edu. Cess - Capital Goods purchase percent 0.02 @@ -374,9 +374,9 @@ - - Input Credit on Capital Goods - Modvate - Input Credit on Capital Goods - Modvate + + Input Excise Duty 12% - Capital Goods + Input Excise Duty 12% - Capital Goods purchase percent 0.12 @@ -423,16 +423,16 @@ percent 0.15 7 - - + + - Output Vat @4% - Output Vat @4% + Output Vat 4% + Output Vat 4% sale percent 0.04 @@ -445,8 +445,8 @@ - Output Adi. Vat @1% - Output Adi. Vat @1% + Output Adi. Vat 1% + Output Adi. Vat 1% sale percent 0.01 @@ -459,8 +459,8 @@ - CST 2% on Sales - CST 2% on Sales + CST 2% on Sales - Against Form - C + CST 2% on Sales - Against Form - C sale percent 0.02 @@ -516,8 +516,8 @@ - Cst 2% on Purchase - Cst 2% on Purchase + Input CST 2% + Input CST 2% purchase percent 0.02 @@ -529,5 +529,105 @@ + + No Tax Form H + No Tax Form H + purchase + percent + 0.02 + + + + + + + CST 2% on Sales - CT3 Against Form - C + CST 2% on Sales - CT3 Against Form - C + purchase + percent + 0.02 + + + + + + + + + Output Vat 4% on Sales - CT3 + Output Vat 4% on Sales - CT3 + purchase + percent + 0.04 + + + + + + + + + Output Adi. Vat 1% Sales CT3 + Output Adi. Vat 1% Sales CT3 + purchase + percent + 0.01 + + + + + + + + + No Tax SEZ OGS + No Tax SEZ OGS + purchase + fixed + + + + + + + No Tax SEZ Gujarat + No Tax SEZ Gujarat + purchase + percent + + + + + + + No Tax Form H with BED + No Tax Form H with BED + purchase + percent + + + + + + + No Tax Exports - Out of Country + No Tax Exports - Out of Country + purchase + percent + + + + + + + No Tax Projects + No Tax Projects + purchase + percent + + + + + \ No newline at end of file From 10d8c8d8fbea100fc05948a6ce8d33157c7954aa Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Wed, 20 Mar 2013 14:39:34 +0530 Subject: [PATCH 06/20] [IMP] l10n_in : improved parent_id of accounts, and improved typo bzr revid: tpa@tinyerp.com-20130320090934-0f3w2v7uq3cikmeb --- addons/l10n_in/l10n_in_public_chart.xml | 273 +++++++++--------- .../l10n_in/l10n_in_public_tax_template.xml | 236 +++++++-------- addons/l10n_in/l10n_in_tax_code_template.xml | 53 ++-- 3 files changed, 268 insertions(+), 294 deletions(-) diff --git a/addons/l10n_in/l10n_in_public_chart.xml b/addons/l10n_in/l10n_in_public_chart.xml index 67093812c63..477df493bf6 100644 --- a/addons/l10n_in/l10n_in_public_chart.xml +++ b/addons/l10n_in/l10n_in_public_chart.xml @@ -116,7 +116,7 @@ Tax Receivable 15400 - other + view @@ -659,325 +659,324 @@ - + CST 5% on Purchase - 21000102 + 154001 other - + - + Input Credit - Service Tax Seco. & HEC - 121101010 + 154002 other - + - + Input Credit - URD - 121102012 + 154003 other - + - - Tds on Audit Fees - 94J - 121103001 + + TDS on Audit Fees - 94J + 154004 other - + - - TDS on Commission Or Brokerage- 94H - 121103002 + + TDS on Commission Or Brokerage - 94H + 154005 other - + - + Input Credit - Import Duty - CVD - 121101004 + 154006 other - + - + Input Credit Additional Duty on Imports 4% - 121101001 + 154007 other - + - + Input Credit - Service Tax - 121101008 + 154008 other - + - + Input Credit - Service Tax Edu. Cess. - 121101009 + 154009 other - + - + TDS on Salary - 92B - 121103009 + 154010 other - + - + Excise Duty 6% on Purchase - 121101015 + 154011 other - + - + Excise Duty 5% - Purchase - 1211010131 + 154012 other - + - + Excise Duty 12% - Purchase - 121101013 + 154013 other - + - + Education Cess 2% - Purchase - 121101003 + 154014 other - + - + Seco. & Higher Edu. Cess 1% - Purchase - 121101011 + 154015 other - + - + Excise Duty - 12% - Sales - 121101014 + 247001 other - + - + Education Cess 2% - 121101002 + 247010 other - + - + Seco. & Higher Edu. Cess 1% - Sales - 121101012 + 247002 other - - + - + Input Credit on Capital Goods - Seco. & HEC - 121101007 + 154016 other - + - - TDS on Contractor-94C - 121103003 + + TDS on Contractor - 94C + 154017 other - + - + TDS On Director's Interest - 121103004 + 154018 other - + - + TDS on Director's Remuneration - 92B - 121103005 + 154019 other - + - + TDS on Interest - 121103006 + 154020 other - + - + TDS on Professional Fees - 94J - 121103007 + 154021 other - + - - TDS on Rent-94I - 121103008 + + TDS on Rent - 94I + 154022 other - + - + Input Credit On Capital Goods - Edu. Cess - 121101005 + 154023 other - + - - Input Credit on Capital Goods - Modvate - 121101006 + + Input Excise Duty 12% - Capital Goods + 154024 other - + - - Input Vat 4% - 121102007 + + Input VAT 4% + 154025 other - + - - Input Additional Vat 1% - 121102003 + + Input Additional VAT 1% + 154026 other - + - - Input Vat 15% - 121102006 + + Input VAT 15% + 154027 other - + - - Output Vat 4% - 121102009 + + Output VAT 4% + 247003 other - + - - Output Adi. Vat 1% - 121102008 + + Output Adi. VAT 1% + 247004 other - + - + CST 2% on Sales - 121102001 + 247005 other - + - + CST 5% on Sales - 121102002 + 247006 other - + - + Input VAT 12.5% - 121102005 + 154028 other - + - - Input Additional Vat 2.5% - 121102004 + + Input Additional VAT 2.5% + 154029 other - + - - Cst 2% on Purchase - New - 121102011 + + CST 2% on Purchase + 154030 other - - + + - + CST 2% on Sales - CT3 Against Form C - 121102017 + 247007 other - + - - Output Vat 4% on Sales - CT3 - 121102018 + + Output VAT 4% on Sales - CT3 + 247008 other - + - - Output Adi. Vat 1% Sales CT3 - 121102019 + + Output Adi. VAT 1% Sales CT3 + 247009 other - + diff --git a/addons/l10n_in/l10n_in_public_tax_template.xml b/addons/l10n_in/l10n_in_public_tax_template.xml index 03c2cfd2d23..09b2c41d7aa 100644 --- a/addons/l10n_in/l10n_in_public_tax_template.xml +++ b/addons/l10n_in/l10n_in_public_tax_template.xml @@ -8,8 +8,8 @@ purchase percent 0.01 - - + + @@ -23,8 +23,8 @@ purchase percent 0.0100 - - + + @@ -36,21 +36,21 @@ purchase percent 0.0400 - - + + - Tds on Audit Fees - 94J - Tds on Audit Fees - 94J + TDS on Audit Fees - 94J + TDS on Audit Fees - 94J purchase percent 0.1000 - - + + @@ -62,8 +62,8 @@ purchase percent 0.1000 - - + + @@ -76,8 +76,8 @@ percent 0.0750 1 - - + + @@ -90,22 +90,22 @@ percent 0.0400 1 - - + + - Input Credit - Service Tax 12.36% - Input Credit - Service Tax 12.36% + Input Credit - Service Tax 12% + Input Credit - Service Tax 12% purchase percent 0.1200 1 - - + + @@ -117,8 +117,8 @@ purchase percent 0.0200 - - + + @@ -130,8 +130,8 @@ purchase percent 0.3000 - - + + @@ -143,8 +143,8 @@ purchase percent 0.0600 - - + + @@ -156,8 +156,8 @@ purchase percent 0.0500 - - + + @@ -170,8 +170,8 @@ percent 0.1200 - - + + @@ -184,8 +184,8 @@ percent 0.0200 21 - - + + @@ -199,8 +199,8 @@ percent 0.0100 22 - - + + @@ -208,14 +208,14 @@ - Excise Duty - 12.36% - Sales - Excise Duty - 12.36% - Sales + Excise Duty - 12% - Sales + Excise Duty - 12% - Sales sale percent 0.1200 - - + + @@ -224,12 +224,12 @@ Education Cess 2% Education Cess 2% - all + sale percent 0.0200 2 - - + + @@ -239,57 +239,39 @@ Seco. & Higher Edu. Cess 1% - Sales Seco. & Higher Edu. Cess 1% - Sales - all + sale percent 0.0100 3 - - + + - + - - CST - CST - all - percent - 0.0000 - - - - - ADV - ADV - all - percent - 0.0 - - - Input Sec. & HEC - Capital Goods Input Sec. & HEC - Capital Goods purchase percent 0.01 - - + + - TDS on Contractor-94C - TDS on Contractor-94C + TDS on Contractor - 94C + TDS on Contractor - 94C purchase percent 0.0200 - - + + @@ -301,8 +283,8 @@ purchase percent 0.1 - - + + @@ -314,8 +296,8 @@ purchase percent 0.3 - - + + @@ -327,8 +309,8 @@ purchase percent 0.1 - - + + @@ -341,21 +323,21 @@ percent 0.1 1 - - + + - TDS on Rent-94I + TDS on Rent - 94I TDS on Rent-94I purchase percent 0.1 - - + + @@ -367,8 +349,8 @@ purchase percent 0.02 - - + + @@ -380,22 +362,22 @@ purchase percent 0.12 - - + + - + - Input Vat 4% - Input Vat 4% + Input VAT 4% + Input VAT 4% purchase percent 0.04 4 - - + + @@ -403,56 +385,56 @@ - Input Additional Vat 1% - Input Additional Vat 1% + Input Additional VAT 1% + Input Additional VAT 1% purchase percent 0.01 5 - - + + - Input Vat 15% - Input Vat 15% + Input VAT 15% + Input VAT 15% purchase percent 0.15 7 - - + + - Output Vat 4% - Output Vat 4% + Output VAT 4% + Output VAT 4% sale percent 0.04 11 - - + + - Output Adi. Vat 1% - Output Adi. Vat 1% + Output Adi. VAT 1% + Output Adi. VAT 1% sale percent 0.01 12 - - + + @@ -466,8 +448,8 @@ 0.02 13 - - + + @@ -480,8 +462,8 @@ percent 0.05 14 - - + + @@ -494,22 +476,22 @@ percent 0.1250 60 - - + + - Input Additional Vat 2.5% - Input Additional Vat 2.5% + Input Additional VAT 2.5% + Input Additional VAT 2.5% purchase percent 0.0250 80 - - + + @@ -522,8 +504,8 @@ percent 0.02 9333 - - + + @@ -546,34 +528,34 @@ purchase percent 0.02 - - + + - Output Vat 4% on Sales - CT3 - Output Vat 4% on Sales - CT3 + Output VAT 4% on Sales - CT3 + Output VAT 4% on Sales - CT3 purchase percent 0.04 - - + + - Output Adi. Vat 1% Sales CT3 - Output Adi. Vat 1% Sales CT3 + Output Adi. VAT 1% Sales CT3 + Output Adi. VAT 1% Sales CT3 purchase percent 0.01 - - + + diff --git a/addons/l10n_in/l10n_in_tax_code_template.xml b/addons/l10n_in/l10n_in_tax_code_template.xml index 1d721c76a94..1abccc181bb 100644 --- a/addons/l10n_in/l10n_in_tax_code_template.xml +++ b/addons/l10n_in/l10n_in_tax_code_template.xml @@ -38,15 +38,13 @@ - Cst 5% on Purchase + CST 5% on Purchase - CSTP5 Purchase CST 5% - PCST5 @@ -69,8 +67,8 @@ - - Input Credit on Capital Goods - Modvate + + Input Excise Duty 12% - Capital Goods @@ -99,9 +97,9 @@ - + Seco. & Higher Edu. Cess 1% - Sales - + @@ -115,7 +113,7 @@ - Input Additional Vat 1% + Input Additional VAT 1% @@ -130,7 +128,7 @@ - Input Vat 15% + Input VAT 15% @@ -140,17 +138,17 @@ - Output Adi. Vat @1% + Output Adi. VAT 1% - Output Vat @4% + Output VAT 4% - Cst 2% on Purchase + CST 2% on Purchase @@ -180,7 +178,7 @@ - Tds on Audit Fees - 94J + TDS on Audit Fees - 94J @@ -230,7 +228,7 @@ - Purchase Vat 4% / Vat12.5% / Vat15% / Cst2% / Cst5% + Purchase VAT 4% / VAT 12.5% / VAT 15% / CST 2% / CST 5% @@ -245,47 +243,47 @@ - Sales Vat 4% / Sales CST2% / Sales CST5% - + Sales VAT 4% / Sales CST 2% / Sales CST 5% + - Sales CST2% + Sales CST 2% - Sales CST5% + Sales CST 5% - Purchase Vat 4% + Purchase VAT 4% - Purchase Vat12.5% / Vat15% + Purchase VAT 12.5% / VAT 15% - Purchase Vat12.5% + Purchase VAT 12.5% - Purchase Vat15% + Purchase VAT 15% - Sales Vat 4% + Sales VAT 4% - Purchase Cst2% + Purchase CST 2% @@ -325,7 +323,7 @@ - Output Adi. Vat 1% on Sales CT3 + Output Adi. VAT 1% on Sales CT3 @@ -389,10 +387,5 @@ - - Base for Input Service - - - From 4822b6332ee01685fdbced96c37d54e8d615dfe6 Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Thu, 4 Apr 2013 13:02:53 +0530 Subject: [PATCH 07/20] [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 @@ - TDS On Director's Interest + TDS on Director's Interest 154018 other 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 @@ + + Education Cess 2% -Purchase + Education Cess 2% -Purchase + purchase + percent + 0.0200 + 21 + + + + + + + + + + Seco. & Higher Edu. Cess 1% -Purchase + Seco. & Higher Edu. Cess 1% -Purchase + all + percent + 0.0100 + 22 + + + + + + + + Input Excise Duty 5% Input Excise Duty 5% @@ -180,7 +210,7 @@ Education Cess 2% - Purchase Education Cess 2% - Purchase - all + purchase percent 0.0200 21 @@ -222,8 +252,8 @@ - Education Cess 2% - Education Cess 2% + Education Cess 2% - Sales + Education Cess 2% - Sales sale percent 0.0200 @@ -231,7 +261,7 @@ - + @@ -278,8 +308,8 @@ - TDS On Director's Interest - TDS On Director's Interest + TDS on Director's Interest + TDS on Director's Interest purchase percent 0.1 @@ -611,5 +641,49 @@ + + Service Tax 12% - Sales + Service Tax 12% - Sales + sale + percent + 0.12 + 1 + + + + + + + + + Service Tax 2% - Sales + Service Tax 2% - Sales + sale + percent + 0.02 + 1 + + + + + + + + + + Service Tax 1% - Sales + Service Tax 1% - Sales + sale + percent + 0.01 + 1 + + + + + + + + \ 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 @@ - - Education Cess 2% + + Excise Duty - (12% + 2% +1%) Sales + + Excise Duty - 12% - Sales + + + + + Input Credit - Service Tax (12% + 2% + 1%) purchase + + + + + Excise Duty 12% - Purchase + + + + + Education Cess 2% - Sales + + + Education Cess 2% - Purchase - + @@ -77,29 +97,34 @@ + + Input Credit - Service Tax (12% + 2% + 1%) + + + Input Credit - Service Tax - + Input Credit - Service Tax Edu. Cess. - + Input Credit - Service Tax Seco. & HEC - + Seco. & Higher Edu. Cess 1% - Purchase - + Seco. & Higher Edu. Cess 1% - Sales - + @@ -133,7 +158,7 @@ - Input Vat 4% + Input VAT 4% @@ -152,16 +177,6 @@ - - Excise Duty 12% - Purchase - - - - - Excise Duty - 12% - Sales - - - Excise Duty 5% - Purchase @@ -193,7 +208,7 @@ - TDS On Director's Interest + TDS on Director's Interest @@ -387,5 +402,25 @@ + + Service Tax (12% + 2% + 1%) Sales + + + + + Service Tax 12% - Sales + + + + + Service Tax 2% - Sales + + + + + Service Tax 1% - Sales + + + From f5ff7acbb62ba0980e368ed2d38a43b0d7c2500d Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Fri, 5 Apr 2013 12:25:19 +0530 Subject: [PATCH 08/20] [IMP] improved code bzr revid: tpa@tinyerp.com-20130405065519-jfb6rbtdts616uy7 --- addons/l10n_in/l10n_in_public_chart.xml | 30 +++++----- .../l10n_in/l10n_in_public_tax_template.xml | 60 ++++++++++--------- addons/l10n_in/l10n_in_tax_code_template.xml | 22 +++---- 3 files changed, 57 insertions(+), 55 deletions(-) diff --git a/addons/l10n_in/l10n_in_public_chart.xml b/addons/l10n_in/l10n_in_public_chart.xml index f39a42c0f53..9a743dfd080 100644 --- a/addons/l10n_in/l10n_in_public_chart.xml +++ b/addons/l10n_in/l10n_in_public_chart.xml @@ -660,7 +660,7 @@ - CST 5% on Purchase + Input CST 5% 154001 other @@ -668,7 +668,7 @@ - Input Credit - Service Tax Seco. & HEC + Input Credit - Service Tax Seco. & HEC 1% 154002 other @@ -700,7 +700,7 @@ - Input Credit - Import Duty - CVD + Input Credit - Import Duty 154006 other @@ -708,7 +708,7 @@ - Input Credit Additional Duty on Imports 4% + Additional Duty (Imports) 4% 154007 other @@ -716,7 +716,7 @@ - Input Credit - Service Tax + Input Credit - Service Tax 12% 154008 other @@ -724,7 +724,7 @@ - Input Credit - Service Tax Edu. Cess. + Input Credit - Service Tax Edu. Cess. 2% 154009 other @@ -740,7 +740,7 @@ - Excise Duty 6% on Purchase + Input Excise Duty 6% 154011 other @@ -748,7 +748,7 @@ - Excise Duty 5% - Purchase + Input Excise Duty 5% 154012 other @@ -756,7 +756,7 @@ - Excise Duty 12% - Purchase + Input Excise Duty 12% 154013 other @@ -780,7 +780,7 @@ - Excise Duty - 12% - Sales + Excise Duty 12% - Sales 247001 other @@ -788,7 +788,7 @@ - Education Cess 2% + Education Cess 2% - Sales 247010 other @@ -804,7 +804,7 @@ - Input Credit on Capital Goods - Seco. & HEC + Input Sec. & HEC - Capital Goods 154016 other @@ -860,7 +860,7 @@ - Input Credit On Capital Goods - Edu. Cess + Input Edu. Cess - Capital Goods 154023 other @@ -916,7 +916,7 @@ - CST 2% on Sales + CST 2% on Sales - Against Form - C 247005 other @@ -948,7 +948,7 @@ - CST 2% on Purchase + Input CST 2% 154030 other diff --git a/addons/l10n_in/l10n_in_public_tax_template.xml b/addons/l10n_in/l10n_in_public_tax_template.xml index 4bfe26a3e01..6c0a63f0090 100644 --- a/addons/l10n_in/l10n_in_public_tax_template.xml +++ b/addons/l10n_in/l10n_in_public_tax_template.xml @@ -17,19 +17,6 @@ - - Input Sec. & HEC - Service Tax - Input Sec. & HEC - Service Tax - purchase - percent - 0.0100 - - - - - - - Input Credit - URD Input Credit - URD @@ -104,16 +91,16 @@ percent 0.1200 1 - - + + - Input Edu. Cess - Service Tax - Input Edu. Cess - Service Tax + Input Credit - Service Tax Edu. Cess. 2% + Input Credit - Service Tax Edu. Cess. 2% purchase percent 0.0200 @@ -121,6 +108,21 @@ + + + + + + Input Credit - Service Tax Seco. & HEC 1% + Input Credit - Service Tax Seco. & HEC 1% + purchase + percent + 0.0100 + + + + + @@ -138,8 +140,8 @@ - Input Excise Duty 6% - Input Excise Duty 6% + Input Excise Duty 6% + Input Excise Duty 6% purchase percent 0.0600 @@ -151,8 +153,8 @@ - Education Cess 2% -Purchase - Education Cess 2% -Purchase + Education Cess 2% Purchase + Education Cess 2% Purchase purchase percent 0.0200 @@ -166,8 +168,8 @@ - Seco. & Higher Edu. Cess 1% -Purchase - Seco. & Higher Edu. Cess 1% -Purchase + Seco. & Higher Edu. Cess 1% Purchase + Seco. & Higher Edu. Cess 1% Purchase all percent 0.0100 @@ -181,8 +183,8 @@ - Input Excise Duty 5% - Input Excise Duty 5% + Input Excise Duty 5% + Input Excise Duty 5% purchase percent 0.0500 @@ -238,8 +240,8 @@ - Excise Duty - 12% - Sales - Excise Duty - 12% - Sales + Excise Duty 12% - Sales + Excise Duty 12% - Sales sale percent 0.1200 @@ -579,8 +581,8 @@ - Output Adi. VAT 1% Sales CT3 - Output Adi. VAT 1% Sales CT3 + Output Adi. VAT 1% on Sales - CT3 + Output Adi. VAT 1% on Sales - CT3 purchase percent 0.01 diff --git a/addons/l10n_in/l10n_in_tax_code_template.xml b/addons/l10n_in/l10n_in_tax_code_template.xml index b230600d640..e9bbcc28faa 100644 --- a/addons/l10n_in/l10n_in_tax_code_template.xml +++ b/addons/l10n_in/l10n_in_tax_code_template.xml @@ -38,7 +38,7 @@ - CST 5% on Purchase + Input CST 5% @@ -53,12 +53,12 @@ - Excise Duty - 12% - Sales + Excise Duty 12% - Sales - Input Credit - Service Tax (12% + 2% + 1%) purchase + Input Credit - Service Tax (12% + 2% + 1%) Purchase @@ -103,17 +103,17 @@ - Input Credit - Service Tax + Input Credit - Service Tax 12% - Input Credit - Service Tax Edu. Cess. + Input Credit - Service Tax Edu. Cess. 2% - Input Credit - Service Tax Seco. & HEC + Input Credit - Service Tax Seco. & HEC 1% @@ -178,12 +178,12 @@ - Excise Duty 5% - Purchase + Input Excise Duty 5% - Excise Duty 6% on Purchase + Input Excise Duty 6% @@ -228,7 +228,7 @@ - TDS on Rent-94I + TDS on Rent - 94I @@ -268,7 +268,7 @@ - Sales CST 5% + CST 5% on Sales @@ -298,7 +298,7 @@ - Purchase CST 2% + Input CST 2% From 5a5c6eeb7a9e89faae25786f59276de485c27faf Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Thu, 25 Apr 2013 16:16:33 +0530 Subject: [PATCH 09/20] [IMP] remove base tax code from childs. bzr revid: tpa@tinyerp.com-20130425104633-uiwvtx74f45p3vs0 --- addons/l10n_in/l10n_in_public_tax_template.xml | 12 +----------- addons/l10n_in/l10n_in_tax_code_template.xml | 13 +++++++++---- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/addons/l10n_in/l10n_in_public_tax_template.xml b/addons/l10n_in/l10n_in_public_tax_template.xml index 6c0a63f0090..aaf51b535ed 100644 --- a/addons/l10n_in/l10n_in_public_tax_template.xml +++ b/addons/l10n_in/l10n_in_public_tax_template.xml @@ -106,7 +106,6 @@ 0.0200 - @@ -120,7 +119,6 @@ 0.0100 - @@ -161,7 +159,6 @@ 21 - @@ -176,7 +173,6 @@ 22 - @@ -218,7 +214,6 @@ 21 - @@ -233,7 +228,6 @@ 22 - @@ -262,7 +256,6 @@ 2 - @@ -277,7 +270,6 @@ 3 - @@ -652,7 +644,7 @@ 1 - + @@ -666,7 +658,6 @@ 1 - @@ -681,7 +672,6 @@ 1 - diff --git a/addons/l10n_in/l10n_in_tax_code_template.xml b/addons/l10n_in/l10n_in_tax_code_template.xml index e9bbcc28faa..c547b84821f 100644 --- a/addons/l10n_in/l10n_in_tax_code_template.xml +++ b/addons/l10n_in/l10n_in_tax_code_template.xml @@ -48,7 +48,7 @@ - Excise Duty - (12% + 2% +1%) Sales + Excise Duty 12.36% - Sales @@ -58,7 +58,7 @@ - Input Credit - Service Tax (12% + 2% + 1%) Purchase + Input Credit - Service Tax 12.36% - Purchase @@ -98,7 +98,7 @@ - Input Credit - Service Tax (12% + 2% + 1%) + Input Credit - Service Tax 12.36% @@ -403,7 +403,7 @@ - Service Tax (12% + 2% + 1%) Sales + Service Tax 12.36% - Sales @@ -422,5 +422,10 @@ + + Service Tax 12% - Sales + + + From d490560859771a16bf99b7a992ff4fd0247e908a Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Tue, 30 Apr 2013 16:58:38 +0530 Subject: [PATCH 10/20] [IMP] improved data and sign for tax paid. bzr revid: tpa@tinyerp.com-20130430112838-ub3x3iko5pnui1yp --- .../l10n_in/l10n_in_public_tax_template.xml | 93 ++++++++++--------- addons/l10n_in/l10n_in_tax_code_template.xml | 17 ++-- 2 files changed, 57 insertions(+), 53 deletions(-) diff --git a/addons/l10n_in/l10n_in_public_tax_template.xml b/addons/l10n_in/l10n_in_public_tax_template.xml index aaf51b535ed..f848045e705 100644 --- a/addons/l10n_in/l10n_in_public_tax_template.xml +++ b/addons/l10n_in/l10n_in_public_tax_template.xml @@ -104,6 +104,7 @@ purchase percent 0.0200 + 3 @@ -117,6 +118,7 @@ purchase percent 0.0100 + 5 @@ -137,47 +139,6 @@ - - Input Excise Duty 6% - Input Excise Duty 6% - purchase - percent - 0.0600 - - - - - - - - - Education Cess 2% Purchase - Education Cess 2% Purchase - purchase - percent - 0.0200 - 21 - - - - - - - - - Seco. & Higher Edu. Cess 1% Purchase - Seco. & Higher Edu. Cess 1% Purchase - all - percent - 0.0100 - 22 - - - - - - - Input Excise Duty 5% Input Excise Duty 5% @@ -253,7 +214,7 @@ sale percent 0.0200 - 2 + 3 @@ -267,7 +228,7 @@ sale percent 0.0100 - 3 + 5 @@ -635,6 +596,48 @@ + + Input Excise Duty 6% + Input Excise Duty 6% + purchase + percent + 0.0600 + 1 + + + + + + + + + Education Cess 2% Purchase + Education Cess 2% Purchase + purchase + percent + 0.0200 + 21 + + + + + + + + + Seco. & Higher Edu. Cess 1% Purchase + Seco. & Higher Edu. Cess 1% Purchase + all + percent + 0.0100 + 22 + + + + + + + Service Tax 12% - Sales Service Tax 12% - Sales @@ -655,7 +658,7 @@ sale percent 0.02 - 1 + 3 @@ -669,7 +672,7 @@ sale percent 0.01 - 1 + 5 diff --git a/addons/l10n_in/l10n_in_tax_code_template.xml b/addons/l10n_in/l10n_in_tax_code_template.xml index c547b84821f..b067ef6a601 100644 --- a/addons/l10n_in/l10n_in_tax_code_template.xml +++ b/addons/l10n_in/l10n_in_tax_code_template.xml @@ -19,6 +19,7 @@ Tax Paid + -1 @@ -52,6 +53,11 @@ + + Sales Service Tax 12% + + + Excise Duty 12% - Sales @@ -208,7 +214,7 @@ - TDS on Director's Interest + TDS on Director's Interest @@ -268,7 +274,7 @@ - CST 5% on Sales + Sales CST 5% @@ -358,7 +364,7 @@ - Sales Export - SEZ - In Gujarat + Sales Export - SEZ - In Gujarat @@ -422,10 +428,5 @@ - - Service Tax 12% - Sales - - - From 57c9a37374697df0103b389f4f1e17de05746e78 Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Thu, 2 May 2013 11:37:37 +0530 Subject: [PATCH 11/20] [ADD] Add Refund Base Code and Refund tax code for public chart. bzr revid: tpa@tinyerp.com-20130502060737-qhyev1c1u138ho1n --- .../l10n_in/l10n_in_public_tax_template.xml | 183 +++++++++++++++++- 1 file changed, 182 insertions(+), 1 deletion(-) diff --git a/addons/l10n_in/l10n_in_public_tax_template.xml b/addons/l10n_in/l10n_in_public_tax_template.xml index f848045e705..124f0f6975e 100644 --- a/addons/l10n_in/l10n_in_public_tax_template.xml +++ b/addons/l10n_in/l10n_in_public_tax_template.xml @@ -13,7 +13,9 @@ + + @@ -27,6 +29,10 @@ + + + + @@ -40,6 +46,10 @@ + + + + @@ -53,6 +63,10 @@ + + + + @@ -67,6 +81,10 @@ + + + + @@ -81,6 +99,10 @@ + + + + @@ -95,6 +117,10 @@ + + + + @@ -108,6 +134,8 @@ + + @@ -122,6 +150,8 @@ + + @@ -136,6 +166,10 @@ + + + + @@ -149,6 +183,10 @@ + + + + @@ -163,6 +201,10 @@ + + + + @@ -176,6 +218,8 @@ + + @@ -190,6 +234,8 @@ + + @@ -205,6 +251,10 @@ + + + + @@ -218,6 +268,8 @@ + + @@ -232,6 +284,8 @@ + + @@ -246,6 +300,10 @@ + + + + @@ -259,6 +317,10 @@ + + + + @@ -272,6 +334,10 @@ + + + + @@ -285,6 +351,10 @@ + + + + @@ -298,6 +368,10 @@ + + + + @@ -312,6 +386,10 @@ + + + + @@ -325,6 +403,10 @@ + + + + @@ -338,6 +420,10 @@ + + + + @@ -351,6 +437,10 @@ + + + + @@ -365,7 +455,10 @@ - + + + + @@ -380,6 +473,10 @@ + + + + @@ -394,6 +491,10 @@ + + + + @@ -408,6 +509,10 @@ + + + + @@ -422,6 +527,10 @@ + + + + @@ -437,6 +546,10 @@ + + + + @@ -451,6 +564,10 @@ + + + + @@ -465,6 +582,10 @@ + + + + @@ -479,6 +600,10 @@ + + + + @@ -493,6 +618,10 @@ + + + + @@ -504,6 +633,10 @@ 0.02 + + + + @@ -517,6 +650,10 @@ + + + + @@ -530,6 +667,10 @@ + + + + @@ -543,6 +684,10 @@ + + + + @@ -553,6 +698,10 @@ fixed + + + + @@ -563,6 +712,10 @@ percent + + + + @@ -573,6 +726,10 @@ percent + + + + @@ -583,6 +740,10 @@ percent + + + + @@ -593,6 +754,10 @@ percent + + + + @@ -607,6 +772,10 @@ + + + + @@ -620,6 +789,8 @@ + + @@ -634,6 +805,8 @@ + + @@ -649,6 +822,10 @@ + + + + @@ -662,6 +839,8 @@ + + @@ -676,6 +855,8 @@ + + From 2aa9e4b58d96aff4a94405140b107176551acce2 Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Thu, 2 May 2013 16:59:21 +0530 Subject: [PATCH 12/20] [IMP] improved chart of account for private LTD bzr revid: tpa@tinyerp.com-20130502112921-12c0cfp4a7ix9lpw --- addons/l10n_in/l10n_in_private_chart.xml | 40 +- .../l10n_in/l10n_in_private_tax_template.xml | 530 +++++++++++------- addons/l10n_in/l10n_in_public_chart.xml | 6 +- .../l10n_in/l10n_in_public_tax_template.xml | 32 +- addons/l10n_in/l10n_in_tax_code_template.xml | 178 +++++- 5 files changed, 550 insertions(+), 236 deletions(-) diff --git a/addons/l10n_in/l10n_in_private_chart.xml b/addons/l10n_in/l10n_in_private_chart.xml index 671fdc334d9..4b8e4be55bf 100644 --- a/addons/l10n_in/l10n_in_private_chart.xml +++ b/addons/l10n_in/l10n_in_private_chart.xml @@ -135,11 +135,47 @@ Tax Receivable 189 - other + view - + + + Purchase Tax Receivable + 189100 + other + + + + + + + VAT Receivable + 189200 + other + + + + + + + Service Tax Receivable + 189300 + other + + + + + + + Exice Duty Receivable + 189400 + other + + + + + diff --git a/addons/l10n_in/l10n_in_private_tax_template.xml b/addons/l10n_in/l10n_in_private_tax_template.xml index 7aec30f0575..9516774c547 100644 --- a/addons/l10n_in/l10n_in_private_tax_template.xml +++ b/addons/l10n_in/l10n_in_private_tax_template.xml @@ -2,269 +2,417 @@ - + - Sale Tax-15% - + Sale Tax 15% 0.15 percent sale - - - - - - + + + + + + + - + - Sale Tax-12% - + Sale Tax 12% 0.12 percent sale - - - - - - + + + + + + + - + - Sale Tax-4% - + Sale Tax 4% 0.04 percent sale - - - - - + + + + + + - + - Purchase Tax-15% + Purchase Tax 15% - - + 0.15 percent purchase - - - - + + + + + + - + - - - VAT-5%(4% VAT+1% Add. Tax.) - + + + Output VAT 5% (VAT 4% + Add. VAT 1%) + Output VAT 5% + sale + percent + 0.04 + + + + + + + + + + + + + Input VAT 5% (VAT 4% + Add. VAT 1%) + Input VAT 5% 0.05 percent - all - - - - 1 - - 1 - - 1 - - 1 - + purchase + + + + + + + + - - - VAT-15%(12.5% VAT+2.5% Add. Tax.) - + + + Input VAT 15% (VAT 12.5% + Add. VAT 2.5%) + Input VAT 15% 0.15 percent - all - - - - 1 - - 1 - - 1 - - 1 - + purchase + + + + + + + + - - - VAT-8% - + + + Output VAT 15% (VAT 12.5% + Add. VAT 2.5%) + Output VAT 15% + 0.15 + percent + sale + + + + + + + + + + + + + Input VAT 8% + Input VAT 8% 0.08 percent - all - - - - - - - + purchase + + + + + + + + - - VAT-10% - + + Output VAT 8% + Output VAT 8% + 0.08 + percent + sale + + + + + + + + + + + + + Input VAT 10% + Input VAT 10% 0.10 percent - all - - - - - - - + purchase + + + + + + + + - - VAT-12.5% - - 12.5 - percent - all - - - - - - - - - - - - - - Excise Duty-10.30% - + + Output VAT 10% + Output VAT 10% 0.10 percent sale - - - - 1 - - 1 - - 1 - - 1 - + + + + + + + + - - - Excise Duty-2% - 0.02 + + + Input VAT 12.5% + Input VAT 12.5% + 0.125 + percent + purchase + + + + + + + + + + + + + Output VAT 12.5% + Output VAT 12.5% + 0.125 percent sale - - - - - 1 - - 1 - - 1 - - 1 + + + + + + + + - - - Excise Duty-1% - 0.01 - percent + + + + + Excise Duty 12% - Sales + Excise Duty 12% - Sales sale + percent + 0.1200 - - - 1 - - 1 - - 1 - - 1 - + + + + + + + - + + + Excise Duty 2% - Sales + Excise Duty 2% - Sales + sale + percent + 0.020 + + + + + + + + + + + + + Excise Duty 1% - Sales + Excise Duty 1% - Sales + sale + percent + 0.0100 + + + + + + + + + + + - - - all - Service Tax-12.30% - + + + Service Tax 12% - Sales + Service Tax 12% - Sales + sale + percent 0.12 - percent + 1 - - - - - - - + + + + + + + + - - - Service Tax-%2 + + + Service Tax 2% - Sales + Service Tax 2% - Sales + sale + percent 0.02 - percent - all + 3 - - - - - - - + + + + + + - - - Service Tax-%1 + + + Service Tax 1% - Sales + Service Tax 1% - Sales + sale + percent 0.01 - percent - all + 5 - - - - - - - + + + + + + - + + + Service Tax 12% - Sales + Service Tax 12% - Sales + sale + percent + 0.12 + 1 + + + + + + + + + + + + + Input Service Tax 12% + Input Service Tax 12% + purchase + percent + 0.1200 + 1 + + + + + + + + + + + + + Input Service Tax Edu. Cess. 2% + Input Service Tax Edu. Cess. 2% + purchase + percent + 0.0200 + 3 + + + + + + + + + + + Input Service Tax Seco. & HEC 1% + Input Service Tax Seco. & HEC 1% + purchase + percent + 0.0100 + 5 + + + + + + + + + \ No newline at end of file diff --git a/addons/l10n_in/l10n_in_public_chart.xml b/addons/l10n_in/l10n_in_public_chart.xml index 9a743dfd080..91d285408d5 100644 --- a/addons/l10n_in/l10n_in_public_chart.xml +++ b/addons/l10n_in/l10n_in_public_chart.xml @@ -668,7 +668,7 @@ - Input Credit - Service Tax Seco. & HEC 1% + Input Service Tax Seco. & HEC 1% 154002 other @@ -716,7 +716,7 @@ - Input Credit - Service Tax 12% + Input Service Tax 12% 154008 other @@ -724,7 +724,7 @@ - Input Credit - Service Tax Edu. Cess. 2% + Input Service Tax Edu. Cess. 2% 154009 other diff --git a/addons/l10n_in/l10n_in_public_tax_template.xml b/addons/l10n_in/l10n_in_public_tax_template.xml index 124f0f6975e..c97167f0b43 100644 --- a/addons/l10n_in/l10n_in_public_tax_template.xml +++ b/addons/l10n_in/l10n_in_public_tax_template.xml @@ -107,8 +107,8 @@ - Input Credit - Service Tax 12% - Input Credit - Service Tax 12% + Input Service Tax 12% + Input Service Tax 12% purchase percent 0.1200 @@ -125,8 +125,8 @@ - Input Credit - Service Tax Edu. Cess. 2% - Input Credit - Service Tax Edu. Cess. 2% + Input Service Tax Edu. Cess. 2% + Input Service Tax Edu. Cess. 2% purchase percent 0.0200 @@ -141,8 +141,8 @@ - Input Credit - Service Tax Seco. & HEC 1% - Input Credit - Service Tax Seco. & HEC 1% + Input Service Tax Seco. & HEC 1% + Input Service Tax Seco. & HEC 1% purchase percent 0.0100 @@ -249,9 +249,9 @@ - + - + @@ -454,10 +454,10 @@ - + - + @@ -544,9 +544,9 @@ - + - + @@ -580,9 +580,9 @@ 60 - + - + @@ -598,9 +598,9 @@ 80 - + - + diff --git a/addons/l10n_in/l10n_in_tax_code_template.xml b/addons/l10n_in/l10n_in_tax_code_template.xml index b067ef6a601..7d5e5a11736 100644 --- a/addons/l10n_in/l10n_in_tax_code_template.xml +++ b/addons/l10n_in/l10n_in_tax_code_template.xml @@ -48,23 +48,33 @@ - - Excise Duty 12.36% - Sales - - - Sales Service Tax 12% + + Excise Duty 12.36% - Sales + + + Excise Duty 12% - Sales + + Excise Duty 2% - Sales + + + + + Excise Duty 1% - Sales + + + - Input Credit - Service Tax 12.36% - Purchase + Input Service Tax 12.36% - Purchase @@ -104,22 +114,22 @@ - Input Credit - Service Tax 12.36% + Input Service Tax 12.36% - Input Credit - Service Tax 12% + Input Service Tax 12% - Input Credit - Service Tax Edu. Cess. 2% + Input Service Tax Edu. Cess. 2% - Input Credit - Service Tax Seco. & HEC 1% + Input Service Tax Seco. & HEC 1% @@ -163,13 +173,48 @@ + + Input VAT 10% + + + + + Input VAT 8% + + + + + Input VAT 5% + + + Input VAT 4% - - Output Adi. VAT 1% + + Output VAT 15% + + + + + Output VAT 12.5% + + + + + Output VAT 10% + + + + + Output VAT 8% + + + + + Output VAT 5% @@ -178,6 +223,11 @@ + + Output Adi. VAT 1% + + + CST 2% on Purchase @@ -263,12 +313,12 @@ - - Sales VAT 4% / Sales CST 2% / Sales CST 5% + + Sales Excise - + Sales CST 2% @@ -278,13 +328,8 @@ - - Purchase VAT 4% - - - - - Purchase VAT 12.5% / VAT 15% + + Purchase VAT 15% @@ -293,11 +338,56 @@ - - Purchase VAT 15% + + Purchase VAT 10% + + Purchase VAT 8% + + + + + Purchase VAT 5% + + + + + Purchase VAT 4% + + + + + Purchase VAT 2.5% + + + + + Sales VAT 15% + + + + + Sales VAT 12.5% + + + + + Sales VAT 10% + + + + + Sales VAT 8% + + + + + Sales VAT 5% + + + Sales VAT 4% @@ -428,5 +518,45 @@ + + Sale Tax 15% + + + + + Sale Tax - 15% + + + + + Sale Tax 12% + + + + + Sale Tax - 12% + + + + + Sale Tax 4% + + + + + Sale Tax - 4% + + + + + Purchase Tax 15% + + + + + Purchase Tax - 15% + + + From 3946ab9daea8ba8c9f6cdddc116c365fbc62be0d Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Fri, 3 May 2013 15:26:52 +0530 Subject: [PATCH 13/20] [IMP] improved code. bzr revid: tpa@tinyerp.com-20130503095652-6tjtg1hy08d43ssv --- .../l10n_in/l10n_in_private_tax_template.xml | 76 ++++++++----------- .../l10n_in/l10n_in_public_tax_template.xml | 44 +++++------ addons/l10n_in/l10n_in_tax_code_template.xml | 19 +++-- 3 files changed, 65 insertions(+), 74 deletions(-) diff --git a/addons/l10n_in/l10n_in_private_tax_template.xml b/addons/l10n_in/l10n_in_private_tax_template.xml index 9516774c547..ede6f5c998e 100644 --- a/addons/l10n_in/l10n_in_private_tax_template.xml +++ b/addons/l10n_in/l10n_in_private_tax_template.xml @@ -4,7 +4,8 @@ - Sale Tax 15% + Sales Tax 15% + Sales Tax 15% 0.15 percent sale @@ -20,7 +21,8 @@ - Sale Tax 12% + Sales Tax 12% + Sales Tax 12% 0.12 percent sale @@ -36,7 +38,8 @@ - Sale Tax 4% + Sales Tax 4% + Sales Tax 4% 0.04 percent sale @@ -55,6 +58,7 @@ Purchase Tax 15% + Purchase Tax 15% 0.15 @@ -165,10 +169,10 @@ - + - + @@ -199,10 +203,10 @@ - + - + @@ -233,10 +237,10 @@ - + - + @@ -278,8 +282,8 @@ - Excise Duty 1% - Sales - Excise Duty 1% - Sales + Output Excise Duty 1% + Output Excise Duty 1% sale percent 0.0100 @@ -297,8 +301,8 @@ - Service Tax 12% - Sales - Service Tax 12% - Sales + Output Service Tax 12% + Output Service Tax 12% sale percent 0.12 @@ -311,12 +315,12 @@ - + - Service Tax 2% - Sales - Service Tax 2% - Sales + Output Sales Service Tax 2% + Output Sales Service Tax 2% sale percent 0.02 @@ -327,12 +331,12 @@ - + - Service Tax 1% - Sales - Service Tax 1% - Sales + Output Service Tax 1% + Output Service Tax 1% sale percent 0.01 @@ -343,25 +347,7 @@ - - - - - Service Tax 12% - Sales - Service Tax 12% - Sales - sale - percent - 0.12 - 1 - - - - - - - - - + @@ -373,13 +359,13 @@ 1 - + - + - + @@ -394,8 +380,8 @@ - - + + @@ -410,8 +396,8 @@ - - + + diff --git a/addons/l10n_in/l10n_in_public_tax_template.xml b/addons/l10n_in/l10n_in_public_tax_template.xml index c97167f0b43..77b897ccbd8 100644 --- a/addons/l10n_in/l10n_in_public_tax_template.xml +++ b/addons/l10n_in/l10n_in_public_tax_template.xml @@ -107,17 +107,17 @@ - Input Service Tax 12% - Input Service Tax 12% + Service Tax 12% - Purchase + Service Tax 12% - Purchase purchase percent 0.1200 1 - + - + @@ -125,8 +125,8 @@ - Input Service Tax Edu. Cess. 2% - Input Service Tax Edu. Cess. 2% + Service Tax Edu. Cess. 2% - Purchase + Service Tax Edu. Cess. 2% - Purchase purchase percent 0.0200 @@ -141,8 +141,8 @@ - Input Service Tax Seco. & HEC 1% - Input Service Tax Seco. & HEC 1% + Service Tax Seco. & HEC 1% - Purchase + Service Tax Seco. & HEC 1% - Purchase purchase percent 0.0100 @@ -472,10 +472,10 @@ - + - + @@ -526,10 +526,10 @@ - + - + @@ -628,7 +628,7 @@ No Tax Form H No Tax Form H - purchase + sale percent 0.02 @@ -643,7 +643,7 @@ CST 2% on Sales - CT3 Against Form - C CST 2% on Sales - CT3 Against Form - C - purchase + sale percent 0.02 @@ -660,7 +660,7 @@ Output VAT 4% on Sales - CT3 Output VAT 4% on Sales - CT3 - purchase + sale percent 0.04 @@ -677,7 +677,7 @@ Output Adi. VAT 1% on Sales - CT3 Output Adi. VAT 1% on Sales - CT3 - purchase + sale percent 0.01 @@ -694,7 +694,7 @@ No Tax SEZ OGS No Tax SEZ OGS - purchase + sale fixed @@ -708,7 +708,7 @@ No Tax SEZ Gujarat No Tax SEZ Gujarat - purchase + sale percent @@ -722,7 +722,7 @@ No Tax Form H with BED No Tax Form H with BED - purchase + sale percent @@ -736,7 +736,7 @@ No Tax Exports - Out of Country No Tax Exports - Out of Country - purchase + sale percent @@ -750,7 +750,7 @@ No Tax Projects No Tax Projects - purchase + sale percent @@ -798,7 +798,7 @@ Seco. & Higher Edu. Cess 1% Purchase Seco. & Higher Edu. Cess 1% Purchase - all + purchase percent 0.0100 22 diff --git a/addons/l10n_in/l10n_in_tax_code_template.xml b/addons/l10n_in/l10n_in_tax_code_template.xml index 7d5e5a11736..1b6f0732ba1 100644 --- a/addons/l10n_in/l10n_in_tax_code_template.xml +++ b/addons/l10n_in/l10n_in_tax_code_template.xml @@ -48,6 +48,11 @@ + + Purchase Service Tax 12% + + + Sales Service Tax 12% @@ -74,7 +79,7 @@ - Input Service Tax 12.36% - Purchase + Excise Duty 12.36% - Purchase @@ -519,32 +524,32 @@ - Sale Tax 15% + Sales Tax 15% - Sale Tax - 15% + Sales Tax - 15% - Sale Tax 12% + Sales Tax 12% - Sale Tax - 12% + Sales Tax - 12% - Sale Tax 4% + Sales Tax 4% - Sale Tax - 4% + Sales Tax - 4% From 1cc8485b27cda35ed55b8af4c2354a3c0a778dc4 Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Fri, 3 May 2013 15:48:16 +0530 Subject: [PATCH 14/20] [IMP] improved code bzr revid: tpa@tinyerp.com-20130503101816-yspfiqfkps6q49pn --- addons/l10n_in/l10n_in_public_tax_template.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/l10n_in/l10n_in_public_tax_template.xml b/addons/l10n_in/l10n_in_public_tax_template.xml index 77b897ccbd8..887e051121a 100644 --- a/addons/l10n_in/l10n_in_public_tax_template.xml +++ b/addons/l10n_in/l10n_in_public_tax_template.xml @@ -134,7 +134,7 @@ - + From 88dd2644d5cfc5f3282767fe26da67994bbd4853 Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Mon, 6 May 2013 14:26:45 +0530 Subject: [PATCH 15/20] [IMP] improved tax code for vat 15% bzr revid: tpa@tinyerp.com-20130506085645-z2h2hnl485xoxwap --- addons/l10n_in/l10n_in_private_tax_template.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/l10n_in/l10n_in_private_tax_template.xml b/addons/l10n_in/l10n_in_private_tax_template.xml index ede6f5c998e..5cb835d950c 100644 --- a/addons/l10n_in/l10n_in_private_tax_template.xml +++ b/addons/l10n_in/l10n_in_private_tax_template.xml @@ -135,10 +135,10 @@ - + - + From edc65569e4114b0eb4f12e063e32a077ea07c5dd Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Fri, 12 Jul 2013 14:20:19 +0530 Subject: [PATCH 16/20] [IMP] revert change of rename tax code to 'Your Company' from 'Tax'. bzr revid: tpa@tinyerp.com-20130712085019-oq5ar8jtm2n5s7ae --- addons/l10n_in/l10n_in_tax_code_template.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/l10n_in/l10n_in_tax_code_template.xml b/addons/l10n_in/l10n_in_tax_code_template.xml index 1b6f0732ba1..983d2fa4910 100644 --- a/addons/l10n_in/l10n_in_tax_code_template.xml +++ b/addons/l10n_in/l10n_in_tax_code_template.xml @@ -4,7 +4,7 @@ - Your Company + Tax From 7743f13c0409195a3270ff516ccfc27db20dd2a9 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Mon, 15 Jul 2013 14:16:11 +0200 Subject: [PATCH 17/20] [FIX] small bug that made the reports crash when we try to print them bzr revid: nicolas.vanhoren@openerp.com-20130715121611-q68m7w62h8ngnb2i --- addons/web/static/src/js/coresetup.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js index 3ba5855533f..c9c6f82a98d 100644 --- a/addons/web/static/src/js/coresetup.js +++ b/addons/web/static/src/js/coresetup.js @@ -334,9 +334,10 @@ instance.web.Session = instance.web.JsonRPC.extend( /** @lends instance.web.Sess }).appendTo(document.body); } - _(_.extend({}, options.data || {}, - {session_id: this.override_session ? this.session_id : undefined, token: token})) - .each(function (value, key) { + var hparams = _.extend({}, options.data || {}, {token: token}); + if (this.override_session) + hparams.session_id = this.session_id; + _.each(hparams, function (value, key) { var $input = $form.find('[name=' + key +']'); if (!$input.length) { $input = $('') From d42d50df57d2ab376816bf77bcd9370d4b740887 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Mon, 15 Jul 2013 14:26:48 +0200 Subject: [PATCH 18/20] [FIX] problem with werkzeug 0.9.1 that crashes when we generate a report bzr revid: nicolas.vanhoren@openerp.com-20130715122648-a926d3tov4efbyrk --- addons/web/controllers/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index d485d58443d..1b2490b9ae8 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -1719,6 +1719,6 @@ class Reports(http.Controller): ('Content-Disposition', content_disposition(file_name)), ('Content-Type', report_mimetype), ('Content-Length', len(report))], - cookies={'fileToken': int(token)}) + cookies={'fileToken': token}) # vim:expandtab:tabstop=4:softtabstop=4:shiftwidth=4: From 2fb48c695cb6ae1b152111369873e6154cd93289 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Mon, 15 Jul 2013 15:29:00 +0200 Subject: [PATCH 19/20] [IMP] modified mono_db to refuse db= in the url if the db does not appear in the db_filter bzr revid: nicolas.vanhoren@openerp.com-20130715132900-xwbve100mn8nyzo9 --- addons/web/http.py | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/addons/web/http.py b/addons/web/http.py index f3ae2f34d6a..d99f2982ec3 100644 --- a/addons/web/http.py +++ b/addons/web/http.py @@ -118,7 +118,7 @@ class WebRequest(object): # set db/uid trackers - they're cleaned up at the WSGI # dispatching phase in openerp.service.wsgi_server.application if self.db: - threading.current_thread().dbname = self.session.db + threading.current_thread().dbname = self.db if self.session.uid: threading.current_thread().uid = self.session.uid self.context = self.session.context @@ -597,12 +597,7 @@ class OpenERPSession(werkzeug.contrib.sessions.Session): self.modified = False super(OpenERPSession, self).__init__(*args, **kwargs) self.inited = True - self.setdefault("db", None) - self.setdefault("uid", None) - self.setdefault("login", None) - self.setdefault("password", None) - self.setdefault("context", {'tz': "UTC", "uid": None}) - self.setdefault("jsonp_requests", {}) + self._default_values() self.modified = False def __getattr__(self, attr): @@ -650,6 +645,15 @@ class OpenERPSession(werkzeug.contrib.sessions.Session): def logout(self): for k in self.keys(): del self[k] + self._default_values() + + def _default_values(self): + self.setdefault("db", None) + self.setdefault("uid", None) + self.setdefault("login", None) + self.setdefault("password", None) + self.setdefault("context", {'tz': "UTC", "uid": None}) + self.setdefault("jsonp_requests", {}) def get_context(self): """ @@ -1059,13 +1063,13 @@ def db_redirect(match_first_only_if_unique): db = None redirect = None + dbs = db_list(True) + # 1 try the db in the url db_url = request.httprequest.args.get('db') - if db_url: + if db_url in dbs: return (db_url, None) - dbs = db_list(True) - # 2 use the database from the cookie if it's listable and still listed cookie_db = request.httprequest.cookies.get('last_used_database') if cookie_db in dbs: From df8d972057079794e5a62e0f7dd7f0164c226a0a Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Mon, 15 Jul 2013 18:25:04 +0200 Subject: [PATCH 20/20] [IMP] */static/description/index.html: link to /start include app name bzr revid: chs@openerp.com-20130715162504-9ntu1dj222rgv9ek --- addons/account/static/description/index.html | 2 +- addons/account_voucher/static/description/index.html | 2 +- addons/crm/static/description/index.html | 2 +- addons/hr/static/description/index.html | 2 +- addons/mail/static/description/index.html | 2 +- addons/mrp/static/description/index.html | 2 +- addons/note/static/description/index.html | 2 +- addons/point_of_sale/static/description/index.html | 2 +- addons/project/static/description/index.html | 2 +- addons/purchase/static/description/index.html | 2 +- addons/sale/static/description/index.html | 2 +- addons/stock/static/description/index.html | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/addons/account/static/description/index.html b/addons/account/static/description/index.html index 09a58fb3246..d9b26f11d16 100644 --- a/addons/account/static/description/index.html +++ b/addons/account/static/description/index.html @@ -17,7 +17,7 @@ By far the most beautiful and full featured accounting software. OpenERP Account Activate features on demand, from integrated analytic accounting to budget, assets and multiple companies consolidation.

- Start your free trial + Start your free trial
diff --git a/addons/account_voucher/static/description/index.html b/addons/account_voucher/static/description/index.html index d59c110dde5..a363291f12e 100644 --- a/addons/account_voucher/static/description/index.html +++ b/addons/account_voucher/static/description/index.html @@ -17,7 +17,7 @@ automatically based on your activities.

- Start your free trial + Start your free trial
diff --git a/addons/crm/static/description/index.html b/addons/crm/static/description/index.html index 5ae542f5c91..70f52d0ca87 100644 --- a/addons/crm/static/description/index.html +++ b/addons/crm/static/description/index.html @@ -17,7 +17,7 @@ Manage your sales funnel with no effort. Attract leads, follow-up on phone calls and meetings. Analyse the quality of your leads to make informed decisions and save time by integrating emails directly into the application.

- Start your free trial + Start your free trial
diff --git a/addons/hr/static/description/index.html b/addons/hr/static/description/index.html index 0bc3db084a4..f97cb462fe3 100644 --- a/addons/hr/static/description/index.html +++ b/addons/hr/static/description/index.html @@ -17,7 +17,7 @@ Get all your HR operations managed easily: knowledge sharing, recruitments, appr Each need is provided by a specific app that you activate on demand.

- Start your free trial + Start your free trial
diff --git a/addons/mail/static/description/index.html b/addons/mail/static/description/index.html index b564cf3ab1e..aa55e63008d 100644 --- a/addons/mail/static/description/index.html +++ b/addons/mail/static/description/index.html @@ -21,7 +21,7 @@ email overload.

- Start your free trial + Start your free trial
diff --git a/addons/mrp/static/description/index.html b/addons/mrp/static/description/index.html index 5777eb5f147..d44da3f37b1 100644 --- a/addons/mrp/static/description/index.html +++ b/addons/mrp/static/description/index.html @@ -20,7 +20,7 @@ planning with the smart kanban and gantt views. Use the advanced analytics features to detect bottleneck in resources capacities and inventory locations.

- Start your free trial + Start your free trial
diff --git a/addons/note/static/description/index.html b/addons/note/static/description/index.html index 7ef37c646e9..dc688859334 100644 --- a/addons/note/static/description/index.html +++ b/addons/note/static/description/index.html @@ -15,7 +15,7 @@ Organize yourself with efficient todo lists and notes. From personnal tasks to collaborative meeting minutes, increase your user's productivity by giving them the tools to prioritize their work, share their ideas and collaborate on documents.

- Start your free trial + Start your free trial
diff --git a/addons/point_of_sale/static/description/index.html b/addons/point_of_sale/static/description/index.html index 130806ddb11..7f1b7a5c097 100644 --- a/addons/point_of_sale/static/description/index.html +++ b/addons/point_of_sale/static/description/index.html @@ -22,7 +22,7 @@ consolidations amongst all shops without the hassle of integrating several applications.

- Start your free trial + Start your free trial
diff --git a/addons/project/static/description/index.html b/addons/project/static/description/index.html index 93f1be8a41d..2a1574c5d68 100644 --- a/addons/project/static/description/index.html +++ b/addons/project/static/description/index.html @@ -17,7 +17,7 @@ work done. Keep track of everything, from the big picture to the minute details, from the customer contract to the billing.

- Start your free trial + Start your free trial
diff --git a/addons/purchase/static/description/index.html b/addons/purchase/static/description/index.html index 67b122ac557..ecf9028ce33 100644 --- a/addons/purchase/static/description/index.html +++ b/addons/purchase/static/description/index.html @@ -17,7 +17,7 @@ Automate procurement propositions, launch request for quotations, track purchase orders, manage suppliers' information, control products reception and check suppliers' invoices.

- Start your free trial + Start your free trial
diff --git a/addons/sale/static/description/index.html b/addons/sale/static/description/index.html index 1eb6215db2f..52c84b82f12 100644 --- a/addons/sale/static/description/index.html +++ b/addons/sale/static/description/index.html @@ -17,7 +17,7 @@ you need, easily accessible. Keep track of long term contracts, automate invoici and notify sales when they have things to do.

- Start your free trial + Start your free trial
diff --git a/addons/stock/static/description/index.html b/addons/stock/static/description/index.html index aac71e529ae..dd7fbe568f7 100644 --- a/addons/stock/static/description/index.html +++ b/addons/stock/static/description/index.html @@ -17,7 +17,7 @@ Decrease your process times, automate transactions, reduce your stock levels and get complete traceability on all operations with the OpenERP double entry inventory system.

- Start your free trial + Start your free trial