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/23] [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/23] [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/23] [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/23] [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/23] [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/23] [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/23] [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/23] [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 9d2cf73253089464ec06c23e029ea74be5655a35 Mon Sep 17 00:00:00 2001 From: "dle@openerp.com" <> Date: Wed, 17 Apr 2013 18:17:03 +0200 Subject: [PATCH 09/23] [FIX]crm: lead/opp convert/opp wizard: Add salesperson and salesteam in wizard form bzr revid: dle@openerp.com-20130417161703-z3id6hb20c9pceho --- addons/crm/crm_lead.py | 7 +++- addons/crm/wizard/crm_lead_to_opportunity.py | 28 +++++++++++++--- .../wizard/crm_lead_to_opportunity_view.xml | 14 ++++---- addons/crm/wizard/crm_merge_opportunities.py | 19 ++++++++++- .../wizard/crm_merge_opportunities_view.xml | 33 +++++++++++-------- 5 files changed, 75 insertions(+), 26 deletions(-) diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index 2361f12d61b..b8e8b58aaf4 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -628,7 +628,7 @@ class crm_lead(base_stage, format_address, osv.osv): attachment.write(values) return True - def merge_opportunity(self, cr, uid, ids, context=None): + def merge_opportunity(self, cr, uid, ids, user_id=False, section_id=False, context=None): """ Different cases of merge: - merge leads together = 1 new lead @@ -662,6 +662,11 @@ class crm_lead(base_stage, format_address, osv.osv): fields = list(CRM_LEAD_FIELDS_TO_MERGE) merged_data = self._merge_data(cr, uid, ids, highest, fields, context=context) + if user_id: + merged_data['user_id'] = user_id + if section_id: + merged_data['section_id'] = section_id + # Merge messages and attachements into the first opportunity self._merge_opportunity_history(cr, uid, highest.id, tail_opportunities, context=context) self._merge_opportunity_attachments(cr, uid, highest.id, tail_opportunities, context=context) diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py index e67b7c0c7be..ca99de80779 100644 --- a/addons/crm/wizard/crm_lead_to_opportunity.py +++ b/addons/crm/wizard/crm_lead_to_opportunity.py @@ -35,6 +35,8 @@ class crm_lead2opportunity_partner(osv.osv_memory): ('merge', 'Merge with existing opportunities') ], 'Conversion Action', required=True), 'opportunity_ids': fields.many2many('crm.lead', string='Opportunities'), + 'user_id': fields.many2one('res.users', 'Salesperson', select=True), + 'section_id': fields.many2one('crm.case.section', 'Sales Team', select=True), } def default_get(self, cr, uid, fields, context=None): @@ -74,9 +76,27 @@ class crm_lead2opportunity_partner(osv.osv_memory): res.update({'name' : len(tomerge) >= 2 and 'merge' or 'convert'}) if 'opportunity_ids' in fields and len(tomerge) >= 2: res.update({'opportunity_ids': list(tomerge)}) - + if lead.user_id: + res.update({'user_id': lead.user_id.id}) + if lead.section_id: + res.update({'section_id': lead.section_id.id}) return res + def on_change_user(self, cr, uid, ids, user_id, section_id, context=None): + """ When changing the user, also set a section_id or restrict section id + to the ones user_id is member of. """ + if user_id: + if section_id: + user_in_section = self.pool.get('crm.case.section').search(cr, uid, [('id', '=', section_id), '|', ('user_id', '=', user_id), ('member_ids', '=', user_id)], context=context, count=True) + else: + user_in_section = False + if not user_in_section: + section_id = False + section_ids = self.pool.get('crm.case.section').search(cr, uid, ['|', ('user_id', '=', user_id), ('member_ids', '=', user_id)], context=context) + if section_ids: + section_id = section_ids[0] + return {'value': {'section_id': section_id}} + def view_init(self, cr, uid, fields, context=None): """ Check some preconditions before the wizard executes. @@ -118,15 +138,15 @@ class crm_lead2opportunity_partner(osv.osv_memory): w = self.browse(cr, uid, ids, context=context)[0] opp_ids = [o.id for o in w.opportunity_ids] if w.name == 'merge': - lead_id = self.pool.get('crm.lead').merge_opportunity(cr, uid, opp_ids, context=context) + lead_id = self.pool.get('crm.lead').merge_opportunity(cr, uid, opp_ids, w.user_id.id, w.section_id.id, context=context) lead_ids = [lead_id] lead = self.pool.get('crm.lead').read(cr, uid, lead_id, ['type'], context=context) if lead['type'] == "lead": context.update({'active_ids': lead_ids}) - self._convert_opportunity(cr, uid, ids, {'lead_ids': lead_ids}, context=context) + self._convert_opportunity(cr, uid, ids, {'lead_ids': lead_ids, 'user_ids': [w.user_id.id], 'section_id': w.section_id.id}, context=context) else: lead_ids = context.get('active_ids', []) - self._convert_opportunity(cr, uid, ids, {'lead_ids': lead_ids}, context=context) + self._convert_opportunity(cr, uid, ids, {'lead_ids': lead_ids, 'user_ids': [w.user_id.id], 'section_id': w.section_id.id}, context=context) return self.pool.get('crm.lead').redirect_opportunity_view(cr, uid, lead_ids[0], context=context) diff --git a/addons/crm/wizard/crm_lead_to_opportunity_view.xml b/addons/crm/wizard/crm_lead_to_opportunity_view.xml index 4093df910d0..e06ff091960 100644 --- a/addons/crm/wizard/crm_lead_to_opportunity_view.xml +++ b/addons/crm/wizard/crm_lead_to_opportunity_view.xml @@ -10,6 +10,10 @@ + + + + @@ -56,6 +60,10 @@ attrs="{'required': [('action', '=', 'exist')], 'invisible':[('action','!=','exist')]}" class="oe_inline"/> + + + + @@ -72,12 +80,6 @@ - - - - - -