changes of cess cal

AppCode/AOHandler.py

@@ -34,12 +34,14 @@ class AOHandler:
     # Add AO record 
     def add_ao(self, data):
             fields = [
-                "year","gross_total_income", "disallowance_14a", "disallowance_37",
+                'year', 'gross_total_income', 'disallowance_14a', 'disallowance_37',
-                "deduction_80ia_business", "deduction_80ia_misc", "deduction_80ia_other", "deduction_sec37_disallowance", "deduction_80g",
+                'deduction_80ia_business', 'deduction_80ia_misc', 'deduction_80ia_other',
-                "net_taxable_income", "tax_30_percent", "tax_book_profit_18_5", "tax_payable",
+                'deduction_sec37_disallowance', 'deduction_80g',
-                "surcharge_12", "edu_cess_3", "total_tax_payable", "mat_credit",
+                'net_taxable_income', 'tax_30_percent', 'tax_book_profit_18_5',
-                "interest_234c", "total_tax", "advance_tax", "tds", "tcs","sat",
+                'tax_payable', 'surcharge', 'edu_cess',
-                "tax_on_assessment", "refund","Remarks"
+                'total_tax_payable', 'mat_credit_created', 'mat_credit_utilized',
+                'interest_234c', 'total_tax', 'advance_tax', 'tds', 'tcs',
+                'sat', 'tax_on_assessment', 'refund', 'Remarks'
             ]
 
             values = [data.get(f, 0) for f in fields]
@@ -50,14 +52,15 @@ class AOHandler:
     
     # UPDATE AO RECORD by AO id
     def update_ao(self, id, data):
-
         fields = [
-            "year","gross_total_income", "disallowance_14a", "disallowance_37",
+                'year', 'gross_total_income', 'disallowance_14a', 'disallowance_37',
-            "deduction_80ia_business", "deduction_80ia_misc", "deduction_80ia_other", "deduction_sec37_disallowance", "deduction_80g",
+                'deduction_80ia_business', 'deduction_80ia_misc', 'deduction_80ia_other',
-            "net_taxable_income", "tax_30_percent", "tax_book_profit_18_5", "tax_payable",
+                'deduction_sec37_disallowance', 'deduction_80g',
-            "surcharge_12", "edu_cess_3", "total_tax_payable", "mat_credit",
+                'net_taxable_income', 'tax_30_percent', 'tax_book_profit_18_5',
-            "interest_234c", "total_tax", "advance_tax", "tds", "tcs","sat",
+                'tax_payable', 'surcharge', 'edu_cess',
-            "tax_on_assessment", "refund","Remarks"
+                'total_tax_payable', 'mat_credit_created', 'mat_credit_utilized',
+                'interest_234c', 'total_tax', 'advance_tax', 'tds', 'tcs',
+                'sat', 'tax_on_assessment', 'refund', 'Remarks'
             ]
 
         values = [id] + [data.get(f, 0) for f in fields]
@@ -107,10 +110,11 @@ class AOHandler:
                 "tax_30_percent": "Tax @ 30%",
                 "tax_book_profit_18_5": "Tax @ 18.5% on Book Profit",
                 "tax_payable": "Tax Payable",
-                "surcharge_12": "Surcharge @ 12%",
+                "surcharge": "Surcharge",
-                "edu_cess_3": "Education Cess @ 3%",
+                "edu_cess": "Education Cess",
                 "total_tax_payable": "Total Tax Payable",
-                "mat_credit": "Less: MAT Credit Utilized",
+                "mat_credit_created": "Add: MAT Credit Created",
+                "mat_credit_utilized": "Less: MAT Credit Utilized",
                 "interest_234c": "Add: Interest u/s 234C",
                 "total_tax": "Total Tax",
                 "advance_tax": "Advance Tax",

AppCode/CITHandler.py

@@ -39,10 +39,12 @@ class CITHandler:
         columns = [
                 'year', 'gross_total_income', 'disallowance_14a', 'disallowance_37',
                 'deduction_80ia_business', 'deduction_80ia_misc', 'deduction_80ia_other',
-            'deduction_sec37_disallowance', 'deduction_80g', 'net_taxable_income',
+                'deduction_sec37_disallowance', 'deduction_80g',
-            'tax_30_percent', 'tax_book_profit_18_5', 'tax_payable', 'surcharge_12',
+                'net_taxable_income', 'tax_30_percent', 'tax_book_profit_18_5',
-            'edu_cess_3', 'total_tax_payable', 'mat_credit', 'interest_234c',
+                'tax_payable', 'surcharge', 'edu_cess',
-            'total_tax', 'advance_tax', 'tds', 'tcs','sat', 'tax_on_assessment', 'refund', 'Remarks'
+                'total_tax_payable', 'mat_credit_created', 'mat_credit_utilized',
+                'interest_234c', 'total_tax', 'advance_tax', 'tds', 'tcs',
+                'sat', 'tax_on_assessment', 'refund', 'Remarks'
             ]
 
         values = [data.get(col, 0) for col in columns]
@@ -55,10 +57,12 @@ class CITHandler:
         columns = [
                 'year', 'gross_total_income', 'disallowance_14a', 'disallowance_37',
                 'deduction_80ia_business', 'deduction_80ia_misc', 'deduction_80ia_other',
-            'deduction_sec37_disallowance', 'deduction_80g', 'net_taxable_income',
+                'deduction_sec37_disallowance', 'deduction_80g',
-            'tax_30_percent', 'tax_book_profit_18_5', 'tax_payable', 'surcharge_12',
+                'net_taxable_income', 'tax_30_percent', 'tax_book_profit_18_5',
-            'edu_cess_3', 'total_tax_payable', 'mat_credit', 'interest_234c',
+                'tax_payable', 'surcharge', 'edu_cess',
-            'total_tax', 'advance_tax', 'tds', 'tcs','sat', 'tax_on_assessment', 'refund', 'Remarks'
+                'total_tax_payable', 'mat_credit_created', 'mat_credit_utilized',
+                'interest_234c', 'total_tax', 'advance_tax', 'tds', 'tcs',
+                'sat', 'tax_on_assessment', 'refund', 'Remarks'
             ]
 
         values = [id] + [data.get(col, 0) for col in columns]
@@ -106,10 +110,11 @@ class CITHandler:
                 "tax_30_percent": "Tax @ 30%",
                 "tax_book_profit_18_5": "Tax @ 18.5% on Book Profit",
                 "tax_payable": "Tax Payable",
-                "surcharge_12": "Surcharge @ 12%",
+                "surcharge": "Surcharge @ %",
-                "edu_cess_3": "Education Cess @ 3%",
+                "edu_cess": "Education Cess @ %",
                 "total_tax_payable": "Total Tax Payable",
-                "mat_credit": "Less: MAT Credit Utilized",
+                "mat_credit_created": "Add: MAT Credit Created",
+                "mat_credit_utilized": "Less: MAT Credit Utilized",
                 "interest_234c": "Add: Interest u/s 234C",
                 "total_tax": "Total Tax",
                 "advance_tax": "Advance Tax",

AppCode/ITATHandler.py

@@ -34,10 +34,12 @@ class ITATHandler:
         columns = [
             'year', 'gross_total_income', 'disallowance_14a', 'disallowance_37',
             'deduction_80ia_business', 'deduction_80ia_misc', 'deduction_80ia_other',
-                    'deduction_sec37_disallowance', 'deduction_80g', 'net_taxable_income',
+            'deduction_sec37_disallowance', 'deduction_80g',
-                    'tax_30_percent', 'tax_book_profit_18_5', 'tax_payable', 'surcharge_12',
+            'net_taxable_income', 'tax_30_percent', 'tax_book_profit_18_5',
-                    'edu_cess_3', 'total_tax_payable', 'mat_credit', 'interest_234c',
+            'tax_payable', 'surcharge', 'edu_cess',
-                    'total_tax', 'advance_tax', 'tds', 'tcs','sat', 'tax_on_assessment', 'refund', 'Remarks'
+            'total_tax_payable', 'mat_credit_created', 'mat_credit_utilized',
+            'interest_234c', 'total_tax', 'advance_tax', 'tds', 'tcs',
+            'sat', 'tax_on_assessment', 'refund', 'Remarks'
         ]
         values = [data.get(col, 0) for col in columns]
 
@@ -49,10 +51,12 @@ class ITATHandler:
         columns = [
             'year', 'gross_total_income', 'disallowance_14a', 'disallowance_37',
             'deduction_80ia_business', 'deduction_80ia_misc', 'deduction_80ia_other',
-            'deduction_sec37_disallowance', 'deduction_80g', 'net_taxable_income',
+            'deduction_sec37_disallowance', 'deduction_80g',
-            'tax_30_percent', 'tax_book_profit_18_5', 'tax_payable', 'surcharge_12',
+            'net_taxable_income', 'tax_30_percent', 'tax_book_profit_18_5',
-            'edu_cess_3', 'total_tax_payable', 'mat_credit', 'interest_234c',
+            'tax_payable', 'surcharge', 'edu_cess',
-            'total_tax', 'advance_tax', 'tds', 'tcs', 'sat','tax_on_assessment', 'refund','Remarks'
+            'total_tax_payable', 'mat_credit_created', 'mat_credit_utilized',
+            'interest_234c', 'total_tax', 'advance_tax', 'tds', 'tcs',
+            'sat', 'tax_on_assessment', 'refund', 'Remarks'
         ]
         values = [id] + [data.get(col, 0) for col in columns]  
 
@@ -99,8 +103,8 @@ class ITATHandler:
                 "tax_30_percent": "Tax @ 30%",
                 "tax_book_profit_18_5": "Tax @ 18.5% on Book Profit",
                 "tax_payable": "Tax Payable",
-                "surcharge_12": "Surcharge @ 12%",
+                "surcharge": "Surcharge @ %",
-                "edu_cess_3": "Education Cess @ 3%",
+                "edu_cess": "Education Cess @ %",
                 "total_tax_payable": "Total Tax Payable",
                 "mat_credit": "Less: MAT Credit Utilized",
                 "interest_234c": "Add: Interest u/s 234C",

AppCode/ITRHandler.py

@@ -47,12 +47,13 @@ class ITRHandler:
         columns = [
             'year', 'gross_total_income', 'disallowance_14a', 'disallowance_37',
             'deduction_80ia_business', 'deduction_80ia_misc', 'deduction_80ia_other',
-            'deduction_sec37_disallowance', 'deduction_80g', 'net_taxable_income',
+            'deduction_sec37_disallowance', 'deduction_80g',
-            'tax_30_percent', 'tax_book_profit_18_5', 'tax_payable', 'surcharge_12',
+            'net_taxable_income', 'tax_30_percent', 'tax_book_profit_18_5',
-            'edu_cess_3', 'total_tax_payable', 'mat_credit', 'interest_234c',
+            'tax_payable', 'surcharge', 'edu_cess',
-            'total_tax', 'advance_tax', 'tds', 'tcs','sat', 'tax_on_assessment', 'refund', 'Remarks'
+            'total_tax_payable', 'mat_credit_created', 'mat_credit_utilized',
+            'interest_234c', 'total_tax', 'advance_tax', 'tds', 'tcs',
+            'sat', 'tax_on_assessment', 'refund', 'Remarks'
         ]
-
         values = [data.get(col, 0) for col in columns]
 
         # Call your stored procedure
@@ -64,10 +65,12 @@ class ITRHandler:
         columns = [
             'year', 'gross_total_income', 'disallowance_14a', 'disallowance_37',
             'deduction_80ia_business', 'deduction_80ia_misc', 'deduction_80ia_other',
-            'deduction_sec37_disallowance', 'deduction_80g', 'net_taxable_income',
+            'deduction_sec37_disallowance', 'deduction_80g',
-            'tax_30_percent', 'tax_book_profit_18_5', 'tax_payable', 'surcharge_12',
+            'net_taxable_income', 'tax_30_percent', 'tax_book_profit_18_5',
-            'edu_cess_3', 'total_tax_payable', 'mat_credit', 'interest_234c',
+            'tax_payable', 'surcharge', 'edu_cess',
-            'total_tax', 'advance_tax', 'tds', 'tcs', 'sat','tax_on_assessment', 'refund','Remarks'
+            'total_tax_payable', 'mat_credit_created', 'mat_credit_utilized',
+            'interest_234c', 'total_tax', 'advance_tax', 'tds', 'tcs',
+            'sat', 'tax_on_assessment', 'refund', 'Remarks'
         ]
 
         values = [id] + [data.get(col, 0) for col in columns]  
@@ -110,10 +113,11 @@ class ITRHandler:
                 "tax_30_percent": "Tax @ 30%",
                 "tax_book_profit_18_5": "Tax @ 18.5% on Book Profit",
                 "tax_payable": "Tax Payable",
-                "surcharge_12": "Surcharge @ 12%",
+                "surcharge": "Surcharge @ %",
-                "edu_cess_3": "Education Cess @ 3%",
+                "edu_cess": "Education Cess @ %",
                 "total_tax_payable": "Total Tax Payable",
-                "mat_credit": "Less: MAT Credit Utilized",
+                "mat_credit_created": "Add: MAT Credit Created",
+                "mat_credit_utilized": "Less: MAT Credit Utilized",
                 "interest_234c": "Add: Interest u/s 234C",
                 "total_tax": "Total Tax",
                 "advance_tax": "Advance Tax",

static/js/ao_calc.js

@@ -17,22 +17,22 @@ document.addEventListener("DOMContentLoaded", function () {
         var disallowance_14a = getValue("disallowance_14a");
         var disallowance_37 = getValue("disallowance_37");
 
-        // -- total gross income ---
+        // -- total gross income --
         var gross_total = gross_total_income + disallowance_37 + disallowance_14a
-        console.log("gross_total income:: " + gross_total)
+        // console.log("gross_total income:: " + gross_total)
 
         // --- DEDUCTIONS ---
         var d80_business = getValue("deduction_80ia_business");
         var d80_misc = getValue("deduction_80ia_misc");
         var d80_other = getValue("deduction_80ia_other");
+        var d80_sec37 = getValue("deduction_sec37_disallowance");
 
-        var deduction_sec37 = d80_business + d80_misc + d80_other;
+        var deduction = d80_business + d80_misc + d80_other + d80_sec37 - 1.35;
-        setValue("deduction_sec37_disallowance", deduction_sec37);
 
         var deduction_80g = getValue("deduction_80g");
 
         // --- NET TAXABLE INCOME ---
-        var net_taxable_income = gross_total - deduction_sec37 - deduction_80g;
+        var net_taxable_income = gross_total - deduction - deduction_80g;
         setValue("net_taxable_income", net_taxable_income);
 
         // --- TAX 30% ---
@@ -42,24 +42,36 @@ document.addEventListener("DOMContentLoaded", function () {
         // --- TAX PAYABLE (18.5%) ---
         var tax185 = getValue("tax_book_profit_18_5");
 
+        // --- Education Cess 3% ---
         var tax_payable = (tax30 > tax185) ? tax30 : tax185;
         setValue("tax_payable", tax_payable);
 
+        // // --- SURCHARGE ---
+        // var percent = getValue("persentage");
+        // var surcharge = tax_payable * (percent / 100);
+        // setValue("surcharge", surcharge);
+
+        // // --- edu_cess ---
+        // var per_cess = getValue("persentage_cess")
+        // var edu_cess = (tax_payable + surcharge) * (per_cess / 100);
+        // setValue("edu_cess", edu_cess);
+
         // --- SURCHARGE ---
         var percent = getValue("persentage");
         var surcharge = tax_payable * (percent / 100);
-        setValue("surcharge_12", surcharge);
+        setValue("surcharge", surcharge);
 
-        // --- Education Cess 3% ---
+        // --- EDUCATION CESS ---
-        var edu_cess = (tax_payable + surcharge) * 0.03;
+        var per_cess = getValue("persentage_cess");
-        setValue("edu_cess_3", edu_cess);
+        var edu_cess = (tax_payable + surcharge) * (per_cess / 100);
+        setValue("edu_cess", edu_cess);
 
         // --- total tax payable ---
         var total_tax_payable = tax_payable + surcharge + edu_cess;
         setValue("total_tax_payable", total_tax_payable);
 
         // --- FINAL TAX ---
-        var mat_credit = getValue("mat_credit");
+        var mat_credit = getValue("mat_credit_utilized");
         var interest_234c = getValue("interest_234c");
 
         var total_tax = total_tax_payable + mat_credit + interest_234c;

static/js/cit_calc.js

@@ -45,21 +45,31 @@ document.addEventListener("DOMContentLoaded", function () {
         var tax_payable = (tax30 > tax185) ? tax30 : tax185;
         setValue("tax_payable", tax_payable);
 
+        // // --- SURCHARGE ---
+        // var percent = getValue("persentage");
+        // var surcharge = tax_payable * (percent / 100);
+        // setValue("surcharge_12", surcharge);
+
+        // // --- Education Cess 3% ---
+        // var edu_cess = (tax_payable + surcharge) * 0.03;
+        // setValue("edu_cess_3", edu_cess);
+
         // --- SURCHARGE ---
         var percent = getValue("persentage");
         var surcharge = tax_payable * (percent / 100);
-        setValue("surcharge_12", surcharge);
+        setValue("surcharge", surcharge);
 
-        // --- Education Cess 3% ---
+        // --- EDUCATION CESS ---
-        var edu_cess = (tax_payable + surcharge) * 0.03;
+        var per_cess = getValue("persentage_cess");
-        setValue("edu_cess_3", edu_cess);
+        var edu_cess = (tax_payable + surcharge) * (per_cess / 100);
+        setValue("edu_cess", edu_cess);
 
         // --- total tax payable ---
         var total_tax_payable = tax_payable + surcharge + edu_cess;
         setValue("total_tax_payable", total_tax_payable);
 
         // --- FINAL TAX ---
-        var mat_credit = getValue("mat_credit");
+        var mat_credit = getValue("mat_credit_utilized");
         var interest_234c = getValue("interest_234c");
 
         var total_tax = total_tax_payable + mat_credit + interest_234c;

static/js/itr_calc.js

@@ -19,7 +19,7 @@ document.addEventListener("DOMContentLoaded", function () {
 
         // -- total gross income --
         var gross_total = gross_total_income + disallowance_37 + disallowance_14a
-        console.log("gross_total income:: " + gross_total)
+        // console.log("gross_total income:: " + gross_total)
 
         // --- DEDUCTIONS ---
         var d80_business = getValue("deduction_80ia_business");
@@ -46,20 +46,32 @@ document.addEventListener("DOMContentLoaded", function () {
         var tax_payable = (tax30 > tax185) ? tax30 : tax185;
         setValue("tax_payable", tax_payable);
 
+        // // --- SURCHARGE ---
+        // var percent = getValue("persentage");
+        // var surcharge = tax_payable * (percent / 100);
+        // setValue("surcharge", surcharge);
+
+        // // --- edu_cess ---
+        // var per_cess = getValue("persentage_cess")
+        // var edu_cess = (tax_payable + surcharge) * (per_cess / 100);
+        // setValue("edu_cess", edu_cess);
+
         // --- SURCHARGE ---
         var percent = getValue("persentage");
         var surcharge = tax_payable * (percent / 100);
-        setValue("surcharge_12", surcharge);
+        setValue("surcharge", surcharge);
 
-        var edu_cess = (tax_payable + surcharge) * 0.03;
+        // --- EDUCATION CESS ---
-        setValue("edu_cess_3", edu_cess);
+        var per_cess = getValue("persentage_cess");
+        var edu_cess = (tax_payable + surcharge) * (per_cess / 100);
+        setValue("edu_cess", edu_cess);
 
         // --- total tax payable ---
         var total_tax_payable = tax_payable + surcharge + edu_cess;
         setValue("total_tax_payable", total_tax_payable);
 
         // --- FINAL TAX ---
-        var mat_credit = getValue("mat_credit");
+        var mat_credit = getValue("mat_credit_utilized");
         var interest_234c = getValue("interest_234c");
 
         var total_tax = total_tax_payable + mat_credit + interest_234c;

templates/add_ao.html

@@ -92,11 +92,15 @@
             </div>
             <div>
                 <label>Surcharge:</label>
-                <input type="number" name="surcharge_12" class="auto" value="0.00" readonly>
+                <input type="number" name="surcharge" class="auto" value="0.00" readonly>
             </div>
             <div>
-                <label>Education Cess @ 3%:</label>
+                <label>Enter Percentage (%) Cess:</label>
-                <input type="number" name="edu_cess_3" class="auto" step="any" value="0.00" readonly>
+                <input type="number" name="persentage_cess" step="any" value="0.00" oninput="calculate()">
+            </div>
+            <div>
+                <label>Education Cess:</label>
+                <input type="number" name="edu_cess" class="auto" step="any" value="0.00" readonly>
             </div>
         </div>
 
@@ -106,9 +110,15 @@
                 <label>Total tax Payable:</label>
                 <input type="number" name="total_tax_payable" class="auto" step="any" value="0.00" readonly>
             </div>
+        </div>
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>Less :Mat Credit Created:</label>
+                <input type="number" name="mat_credit_created" step="any" value="0.00" oninput="calculate()" required>
+            </div>
             <div>
                 <label>Less :Mat Credit Utilized:</label>
-                <input type="number" name="mat_credit" step="any" value="0.00" oninput="calculate()" required>
+                <input type="number" name="mat_credit_utilized" step="any" value="0.00" oninput="calculate()" required>
             </div>
             <div>
                 <label>Add :Interest 234c:</label>
@@ -163,16 +173,9 @@
     </form>
 </div>
 
+{% endblock %}
+
 {% block extra_js %}
 <script src="{{ url_for('static', filename='js/ao_calc.js') }}"></script>
 <script src="{{ url_for('static', filename='js/year_dropdown.js') }}"></script>
 {% endblock %}
-
-
-<script>
-    function showSuccessMessage() {
-        alert("Form submitted successfully!");
-        return true;
-    }
-</script>
-{% endblock %}

templates/add_cit.html

@@ -8,7 +8,6 @@
 {% endblock %}
 {% block content %}
 <div class="container">
-
     <h2 style="text-align:center;">New CIT Form </h2>
     <form id="cit" method="POST">
         <div class="form-group full-width inline-2">
@@ -17,13 +16,13 @@
                 <select id="year" name="year" required></select>
                 <div id="yearError" style="color:red; display:none; margin-bottom:10px;"></div>
             </div>
+        </div>
+
+        <div class="form-group full-width inline-2">
             <div>
                 <label>Gross Total Income:</label>
                 <input type="number" name="gross_total_income" step="any" value="0.00" oninput="calculate()" required>
             </div>
-        </div>
-
-        <div class="form-group full-width inline-2">
             <div>
                 <label>Add :Disallowance u/s 14A:</label>
                 <input type="number" name="disallowance_14a" step="any" value="0.00" oninput="calculate()" required>
@@ -44,25 +43,25 @@
                 <label>Deduction 80IA Misc:</label>
                 <input type="number" name="deduction_80ia_misc" step="any" value="0.00" oninput="calculate()" required>
             </div>
-        </div>
-
-        <div class="form-group full-width inline-2">
             <div>
                 <label>Deduction 80IA Other Operating Revenue:</label>
                 <input type="number" name="deduction_80ia_other" step="any" value="0.00" oninput="calculate()" required>
             </div>
+        </div>
+
+        <div class="form-group full-width inline-2">
             <div>
                 <label>Deduction Sec 37 Disallowance:</label>
                 <input type="number" name="deduction_sec37_disallowance" step="any" value="0.00" oninput="calculate()"
                     required>
             </div>
-        </div>
-
-        <div class="form-group full-width inline-2">
             <div>
                 <label>Less: Deduction 80G: </label>
                 <input type="number" name="deduction_80g" step="any" value="0.00" oninput="calculate()" required>
             </div>
+        </div>
+
+        <div class="form-group full-width inline-2">
             <div>
                 <label>Net Taxable Income:</label>
                 <input type="number" name="net_taxable_income" class="auto" step="any" value="0.00" readonly>
@@ -78,12 +77,11 @@
                 <label>Tax @ 18.5% on Book Profit (B):</label>
                 <input type="number" name="tax_book_profit_18_5" step="any" value="0.00" oninput="calculate()" required>
             </div>
-        </div>
+            <div>
-
-        <div class="form-group">
                 <label>Tax Payable (Higher of A or B):</label>
                 <input type="number" name="tax_payable" class="auto" step="any" value="0.00" readonly>
             </div>
+        </div>
 
         <div class="form-group full-width inline-2">
             <div>
@@ -92,15 +90,20 @@
             </div>
             <div>
                 <label>Surcharge:</label>
-                <input type="number" name="surcharge_12" class="auto" value="0.00" readonly>
+                <input type="number" name="surcharge" class="auto" value="0.00" readonly>
             </div>
+            <div>
+                <label>Enter Percentage (%) Cess:</label>
+                <input type="number" name="persentage_cess" step="any" value="0.00" oninput="calculate()">
+            </div>
+            <div>
+                <label>Education Cess:</label>
+                <input type="number" name="edu_cess" class="auto" step="any" value="0.00" readonly>
+            </div>
+
         </div>
 
         <div class="form-group full-width inline-2">
-            <div>
-                <label>Education Cess @ 3%:</label>
-                <input type="number" name="edu_cess_3" class="auto" step="any" value="0.00" readonly>
-            </div>
             <div>
                 <label>Total tax Payable:</label>
                 <input type="number" name="total_tax_payable" class="auto" step="any" value="0.00" readonly>
@@ -109,8 +112,12 @@
 
         <div class="form-group full-width inline-2">
             <div>
-                <label>Mat Credit Utilized:</label>
+                <label>Less :Mat Credit Created:</label>
-                <input type="number" name="mat_credit" step="any" value="0.00" oninput="calculate()" required>
+                <input type="number" name="mat_credit_created" step="any" value="0.00" oninput="calculate()" required>
+            </div>
+            <div>
+                <label>Less :Mat Credit Utilized:</label>
+                <input type="number" name="mat_credit_utilized" step="any" value="0.00" oninput="calculate()" required>
             </div>
             <div>
                 <label>Add :Interest 234c:</label>
@@ -123,13 +130,13 @@
                 <label>Total Tax:</label>
                 <input type="number" name="total_tax" step="any" class="auto" value="0.00" readonly>
             </div>
+        </div>
+
+        <div class="form-group full-width inline-2">
             <div>
                 <label>Advance Tax:</label>
                 <input type="number" name="advance_tax" step="any" value="0.00" oninput="calculate()" required>
             </div>
-        </div>
-
-        <div class="form-group full-width inline-2">
             <div>
                 <label>TDS :</label>
                 <input type="number" name="tds" step="any" value="0.00" oninput="calculate()" required>
@@ -138,7 +145,6 @@
                 <label>TCS :</label>
                 <input type="number" name="tcs" step="any" value="0.00" oninput="calculate()" required>
             </div>
-
         </div>
 
         <div class="form-group full-width inline-2">
@@ -150,7 +156,6 @@
                 <label>Tax on Regular Assessment:</label>
                 <input type="number" name="tax_on_assessment" step="any" value="0.00" oninput="calculate()">
             </div>
-
         </div>
         <div class="form-group">
             <label>Refund:</label>

templates/add_itat.html

@@ -9,9 +9,7 @@
 
 {% block content %}
 <div class="container">
-
     <h2 style="text-align:center;">New Income Tax Appellate Tribunal Form</h2>
-
     <form id="itat" method="POST" onsubmit="return showSuccessMessage()">
 
         <div class="form-group full-width inline-2">
@@ -20,13 +18,13 @@
                 <select id="year" name="year" required></select>
                 <div id="yearError" style="color:red; display:none; margin-bottom:10px;"></div>
             </div>
+        </div>
+
+        <div class="form-group full-width inline-2">
             <div>
                 <label>Gross Total Income:</label>
                 <input type="number" name="gross_total_income" step="any" value="0.00" oninput="calculate()" required>
             </div>
-        </div>
-
-        <div class="form-group full-width inline-2">
             <div>
                 <label>Add :Disallowance u/s 14A:</label>
                 <input type="number" name="disallowance_14a" step="any" value="0.00" oninput="calculate()" required>
@@ -39,33 +37,35 @@
 
         <div class="form-group full-width inline-2">
             <div>
-                <label>Deduction 80IA Business Income:</label>
+                <label>Less :Deduction 80IA Business Income:</label>
                 <input type="number" name="deduction_80ia_business" step="any" value="0.00" oninput="calculate()"
                     required>
             </div>
             <div>
-                <label>Deduction 80IA Misc:</label>
+                <label>Less :Deduction 80IA Misc:</label>
                 <input type="number" name="deduction_80ia_misc" step="any" value="0.00" oninput="calculate()" required>
             </div>
+            <div>
+                <label>Less :Deduction 80IA Other Operating Revenue:</label>
+                <input type="number" name="deduction_80ia_other" step="any" value="0.00" oninput="calculate()" required>
+            </div>
         </div>
 
+
+
         <div class="form-group full-width inline-2">
             <div>
-                <label>Deduction 80IA Other Operating Revenue:</label>
+                <label>Less :Deduction Sec 37 Disallowance:</label>
-                <input type="number" name="deduction_80ia_other" step="any" value="0.00" oninput="calculate()" required>
-            </div>
-            <div>
-                <label>Deduction Sec 37 Disallowance:</label>
                 <input type="number" name="deduction_sec37_disallowance" step="any" value="0.00" oninput="calculate()"
                     required>
             </div>
-        </div>
-
-        <div class="form-group full-width inline-2">
             <div>
                 <label>Less: Deduction 80G: </label>
                 <input type="number" name="deduction_80g" step="any" value="0.00" oninput="calculate()" required>
             </div>
+        </div>
+
+        <div class="form-group full-width inline-2">
             <div>
                 <label>Net Taxable Income:</label>
                 <input type="number" name="net_taxable_income" class="auto" step="any" value="0.00" readonly>
@@ -81,12 +81,11 @@
                 <label>Tax @ 18.5% on Book Profit (B):</label>
                 <input type="number" name="tax_book_profit_18_5" step="any" value="0.00" oninput="calculate()" required>
             </div>
-        </div>
+            <div>
-
-        <div class="form-group">
                 <label>Tax Payable (Higher of A or B):</label>
                 <input type="number" name="tax_payable" class="auto" step="any" value="0.00" readonly>
             </div>
+        </div>
 
         <div class="form-group full-width inline-2">
             <div>
@@ -95,15 +94,20 @@
             </div>
             <div>
                 <label>Surcharge:</label>
-                <input type="number" name="surcharge_12" class="auto" value="0.00" readonly>
+                <input type="number" name="surcharge" class="auto" value="0.00" readonly>
+            </div>
+
+            <div>
+                <label>Enter Percentage (%) Cess:</label>
+                <input type="number" name="persentage_cess" step="any" value="0.00" oninput="calculate()">
+            </div>
+            <div>
+                <label>Education Cess:</label>
+                <input type="number" name="edu_cess" class="auto" step="any" value="0.00" readonly>
             </div>
         </div>
 
         <div class="form-group full-width inline-2">
-            <div>
-                <label>Education Cess @ 3%:</label>
-                <input type="number" name="edu_cess_3" class="auto" step="any" value="0.00" readonly>
-            </div>
             <div>
                 <label>Total tax Payable:</label>
                 <input type="number" name="total_tax_payable" class="auto" step="any" value="0.00" readonly>
@@ -112,8 +116,12 @@
 
         <div class="form-group full-width inline-2">
             <div>
-                <label>Mat Credit Utilized:</label>
+                <label>Less :Mat Credit Created:</label>
-                <input type="number" name="mat_credit" step="any" value="0.00" oninput="calculate()" required>
+                <input type="number" name="mat_credit_created" step="any" value="0.00" oninput="calculate()" required>
+            </div>
+            <div>
+                <label>Less :Mat Credit Utilized:</label>
+                <input type="number" name="mat_credit_utilized" step="any" value="0.00" oninput="calculate()" required>
             </div>
             <div>
                 <label>Add :Interest 234c:</label>
@@ -126,13 +134,13 @@
                 <label>Total Tax:</label>
                 <input type="number" name="total_tax" step="any" class="auto" value="0.00" readonly>
             </div>
+        </div>
+
+        <div class="form-group full-width inline-2">
             <div>
                 <label>Advance Tax:</label>
                 <input type="number" name="advance_tax" step="any" value="0.00" oninput="calculate()" required>
             </div>
-        </div>
-
-        <div class="form-group full-width inline-2">
             <div>
                 <label>TDS :</label>
                 <input type="number" name="tds" step="any" value="0.00" oninput="calculate()" required>
@@ -174,10 +182,3 @@
 <script src="{{ url_for('static', filename='js/itr_calc.js') }}"></script>
 <script src="{{ url_for('static', filename='js/year_dropdown.js') }}"></script>
 {% endblock %}
-
-<script>
-    function showSuccessMessage() {
-        alert("Form submitted successfully!");
-        return true;
-    }
-</script>

templates/add_itr.html

@@ -10,7 +10,6 @@
 {% block content %}
 <div class="container">
     <h2 style="text-align:center;">New Income Tax Return Form</h2>
-
     <form id="itr" method="POST">
         <div class="form-group full-width inline-2">
             <div>
@@ -91,21 +90,32 @@
             </div>
             <div>
                 <label>Surcharge:</label>
-                <input type="number" name="surcharge_12" class="auto" value="0.00" readonly>
+                <input type="number" name="surcharge" class="auto" value="0.00" readonly>
             </div>
             <div>
-                <label>Education Cess @ 3%:</label>
+                <label>Enter Percentage (%) Cess:</label>
-                <input type="number" name="edu_cess_3" class="auto" step="any" value="0.00" readonly>
+                <input type="number" name="persentage_cess" step="any" value="0.00" oninput="calculate()">
+            </div>
+            <div>
+                <label>Education Cess: </label>
+                <input type="number" name="edu_cess" class="auto" step="any" value="0.00" readonly>
             </div>
         </div>
+
         <div class="form-group full-width inline-2">
             <div>
                 <label>Total tax Payable:</label>
                 <input type="number" name="total_tax_payable" class="auto" step="any" value="0.00" readonly>
             </div>
+        </div>
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>Less :Mat Credit Created:</label>
+                <input type="number" name="mat_credit_created" step="any" value="0.00" oninput="calculate()" required>
+            </div>
             <div>
                 <label>Less :Mat Credit Utilized:</label>
-                <input type="number" name="mat_credit" step="any" value="0.00" oninput="calculate()" required>
+                <input type="number" name="mat_credit_utilized" step="any" value="0.00" oninput="calculate()" required>
             </div>
             <div>
                 <label>Add :Interest 234c:</label>

templates/ao_reports.html

@@ -7,29 +7,18 @@
 {% endblock %}
 
 {% block content %}
-<div class="main">
 <div class="container">
-
     <h2>Download AO Report</h2>
-
     <form method="GET" action="{{ url_for('ao_report') }}" target="_blank">
-
         <label for="year">Select Year:</label><br>
-
         <select name="year" id="year" required>
             <option value="">-- Select Year --</option>
             {% for y in years %}
             <option value="{{ y }}">AY {{ y }} - {{ y + 1 }}</option>
             {% endfor %}
         </select>
-
         <br>
-
         <button type="submit">Download Excel</button>
-
     </form>
-
 </div>
-</div>
-
 {% endblock %}

templates/cit_reports.html

@@ -7,28 +7,18 @@
 {% endblock %}
 
 {% block content %}
-<div class="main">
 <div class="container">
-
     <h2>Download CIT Report</h2>
-
     <form method="GET" action="{{ url_for('cit_report') }}" target="_blank">
-
         <label for="year">Select Year:</label><br>
-
         <select name="year" id="year" required>
             <option value="">-- Select Year --</option>
             {% for y in years %}
             <option value="{{ y }}">AY {{ y }} - {{ y + 1 }}</option>
             {% endfor %}
         </select>
-
         <br>
         <button type="submit">Download Excel</button>
-
     </form>
-
 </div>
-</div>
-
 {% endblock %}

templates/display_ao.html

@@ -1,15 +1,13 @@
 {% extends "base.html" %}
-
 {% block title %}AO Records{% endblock %}
 
-{% block content %}
+{% block extra_css %}
-
-<!-- Load only display_itr CSS -->
 <link rel="stylesheet" href="{{ url_for('static', filename='css/display_model.css') }}">
+{% endblock %}
+
+{% block content %}
 <div class="container">
-
     <h2 style="text-align: center;">Assessing Officer Records 👨‍💼</h2>
-
     <!-- Add AO Record Button -->
     <div style="text-align: right; margin-bottom: 10px;">
         <a href="{{ url_for('add_ao') }}" class="btn btn-add">➕ Add AO Record</a>

templates/display_cit.html

@@ -1,14 +1,13 @@
 {% extends "base.html" %}
-
 {% block title %}CIT Records{% endblock %}
 
+{% block extra_css %}
+<link rel="stylesheet" href="{{ url_for('static', filename='css/display_model.css') }}">
+{% endblock %}
 
 {% block content %}
-<!-- Load only display_itr CSS -->
-<link rel="stylesheet" href="{{ url_for('static', filename='css/display_model.css') }}">
-<div class="main">
-    <div class="container">
 
+<div class="container">
     <h2 style="text-align: center;">CIT Records🧾</h2>
     <div style="text-align: right; margin-bottom: 10px;">
         <a href="{{ url_for('add_cit') }}" class="btn btn-add">➕ Add New Record</a>
@@ -53,5 +52,5 @@
     </p>
     {% endif %}
 </div>
-</div>
+
 {% endblock %}

templates/display_itat.html

@@ -2,15 +2,12 @@
 
 {% block title %}ITAT Records{% endblock %}
 
-<!-- Load page-specific CSS -->
 {% block extra_css %}
 <link rel="stylesheet" href="{{ url_for('static', filename='css/display_model.css') }}">
 {% endblock %}
 
 {% block content %}
-<div class="main">
 <div class="container">
-
     <h2 style="text-align: center;">Income Tax Appellate Tribunal Records 📄</h2>
     <div style="text-align: right; margin-bottom: 10px;">
 
@@ -59,5 +56,4 @@
 
     </div>
 </div>
-</div>
 {% endblock %}

templates/display_itr.html

@@ -1,14 +1,12 @@
 {% extends "base.html" %}
-
 {% block title %}ITR Records{% endblock %}
 
-{% block content %}
+{% block extra_css %}
-<!-- Load only display_itr CSS -->
 <link rel="stylesheet" href="{{ url_for('static', filename='css/display_model.css') }}">
+{% endblock %}
 
-
+{% block content %}
 <div class="container">
-
     <h2>Income Tax Return Records 🧾</h2>
     <div style="text-align: right; margin-bottom: 10px;">
         <a href="{{ url_for('add_itr') }}" class="btn btn-add">➕ Add New Record</a>

templates/itat_reports.html

@@ -7,12 +7,9 @@
 {% endblock %}
 
 {% block content %}
-<div class="main">
 <div class="container">
-
     <h2>Download ITAT Report</h2>
     <form method="GET" action="{{ url_for('itat_report') }}" target="_blank">
-
         <label for="year">Select Year:</label><br>
         <select name="year" id="year" required>
             <option value="">-- Select Year --</option>
@@ -22,10 +19,6 @@
         </select>
         <br>
         <button type="submit">Download Excel</button>
-
     </form>
 </div>
-</div>
-
-
 {% endblock %}

templates/itr_reports.html

@@ -7,12 +7,9 @@
 {% endblock %}
 
 {% block content %}
-<div class="main">
 <div class="container">
-
     <h2>Download ITR Report</h2>
     <form method="GET" action="{{ url_for('itr_report') }}" target="_blank">
-
         <label for="year">Select Year:</label><br>
         <select name="year" id="year" required>
             <option value="">-- Select Year --</option>
@@ -20,14 +17,8 @@
             <option value="{{ y }}">AY {{ y }} - {{ y + 1 }}</option>
             {% endfor %}
         </select>
-
         <br>
-            <button type="submit">
+        <button type="submit">Download Excel</button>
-                Download Excel
-            </button>
-
     </form>
 </div>
-</div>
-
 {% endblock %}

templates/mat_credit.html

@@ -9,7 +9,7 @@
 {% block content %}
 <div class="container">
     <div class="container">
-
+        <h2 style="text-align:center;">MAT Credit and Utilization Records</h2>
         <!-- YEAR ADD CONTROLS -->
         <div class="year-controls">
             <select id="yearSelect">

templates/reports.html

@@ -5,7 +5,6 @@
 <link rel="stylesheet" href="{{ url_for('static', filename='css/report.css') }}">
 {% endblock %}
 {% block content %}
-<div class="main">
 <div class="container">
     <h2>Reports</h2>
     <ul>
@@ -15,5 +14,4 @@
         <li><a href="{{ url_for('itat_report') }}">→ View ITAT Reports</a></li>
     </ul>
 </div>
-</div>
 {% endblock %}

templates/summary_reports.html

@@ -8,7 +8,6 @@
 {% endblock %}
 
 {% block content %}
-<div class="main">
 <div class="container">
     <h2>Download Year-wise Summary Report</h2>
 
@@ -29,7 +28,5 @@
     </form>
 
 </div>
-</div>
-
 
 {% endblock %}

templates/update_ao.html

@@ -8,11 +8,8 @@
 
 {% block content %}
 <div class="container">
-
     <h2>Update AO Record for Year {{ record.year }}--{{ record.year + 1 }}</h2>
-
     <form method="POST" action="{{ url_for('update_ao', id=record.id) }}">
-
         <div class="form-group full-width inline-2">
             <div>
                 <label>Year:</label>
@@ -57,7 +54,6 @@
         </div>
 
         <div class="form-group full-width inline-2">
-
             <div>
                 <label>Less :Deduction Sec 37 Disallowance:</label>
                 <input type="number" name="deduction_sec37_disallowance" step="any"
@@ -76,7 +72,6 @@
                 value="{{ record.net_taxable_income}}" readonly>
         </div>
 
-
         <div class=" form-group full-width inline-2">
             <div>
                 <label>Tax @ 30% (A):</label>
@@ -95,36 +90,32 @@
             </div>
         </div>
 
-
-
         <div class="form-group full-width inline-2">
-            <div>
-                <label>Enter Percentage (%) Surcharge:</label>
-                <input type="number" name="persentage" step="any" value="{{ record.persentage}}" oninput="calculate()">
-            </div>
             <div>
                 <label>Surcharge:</label>
-                <input type="number" name="surcharge_12" class="auto" value="{{ record.surcharge_12}}" readonly>
+                <input type="number" name="surcharge" class="auto" value="{{ record.surcharge}}" readonly>
             </div>
-
             <div>
-                <label>Education Cess @ 3%:</label>
+                <label>Education Cess:</label>
-                <input type="number" name="edu_cess_3" class="auto" step="any" value="{{ record.edu_cess_3}}" readonly>
+                <input type="number" name="edu_cess" class="auto" step="any" value="{{ record.edu_cess}}" readonly>
             </div>
         </div>
 
         <div class="form-group full-width inline-2">
-
             <div>
                 <label>Total tax Payable:</label>
                 <input type="number" name="total_tax_payable" class="auto" step="any"
                     value="{{ record.total_tax_payable}}" readonly>
             </div>
-
+            <div>
+                <label>Less :Mat Credit Created:</label>
+                <input type="number" name="mat_credit_created" step="any" value="{{ record.mat_credit_created }}"
+                    oninput="calculate()" required>
+            </div>
             <div>
                 <label>Less :Mat Credit Utilized:</label>
-                <input type="number" name="mat_credit" step="any" value="{{ record.mat_credit}}" oninput="calculate()"
+                <input type="number" name="mat_credit_utilized" step="any" value="{{ record.mat_credit_utilized }}"
-                    required>
+                    oninput="calculate()" required>
             </div>
             <div>
                 <label>Add :Interest 234c:</label>
@@ -154,7 +145,6 @@
                 <label>TCS :</label>
                 <input type="number" name="tcs" step="any" value="{{ record.tcs}}" oninput="calculate()" required>
             </div>
-
         </div>
 
         <div class="form-group full-width inline-2">
@@ -167,7 +157,6 @@
                 <input type="number" name="tax_on_assessment" step="any" value="{{ record.tax_on_assessment}}"
                     oninput="calculate()" required>
             </div>
-
         </div>
 
         <div class="form-group">

templates/update_cit.html

@@ -9,25 +9,171 @@
 {% block content %}
 
 <div class="container">
-
     <h2>Update CIT Record for AY {{ record.year }}</h2>
-
     <form method="POST" action="{{ url_for('update_cit', id=record.id) }}">
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>Year:</label>
+                <input type="tex" name="year" value="{{record.year}}" class="auto" readonly>
+            </div>
+        </div>
 
-        <label for="year">Year:</label>
+        <div class="form-group full-width inline-2">
-        <input type="text" id="year" name="year" value="{{ record.year }}" readonly class="readonly-field">
+            <div>
+                <label>Gross Total Income:</label>
+                <input type="number" name="gross_total_income" step="any" value="{{ record.gross_total_income}}"
+                    oninput="calculate()" required>
+            </div>
+            <div>
+                <label>Add :Disallowance u/s 14A:</label>
+                <input type="number" name="disallowance_14a" step="any" value="{{ record.disallowance_14a}}"
+                    oninput="calculate()" required>
+            </div>
+            <div>
+                <label>Add :Disallowance u/s 37:</label>
+                <input type="number" name="disallowance_37" step="any" value="{{ record.disallowance_37}}"
+                    oninput="calculate()" required>
+            </div>
+        </div>
 
-        {% for field in record.keys() if field not in ['id', 'year','Remarks'] %}
+        <div class="form-group full-width inline-2">
-        <label for="{{ field }}">{{ field.replace("_", " ").title() }}:</label>
+            <div>
-        <input type="number" id="{{ field }}" name="{{ field }}" step="any" value="{{ record[field] }}" required>
+                <label>Less :Deduction 80IA Business Income:</label>
-        {% endfor %}
+                <input type="number" name="deduction_80ia_business" step="any"
-        <label for="Remarks">Remarks:</label>
+                    value="{{ record.deduction_80ia_business}}" oninput="calculate()" required>
-        <input type="text" id="Remarks" name="Remarks" value="{{ record.Remarks }}">
+            </div>
+            <div>
+                <label>Less :Deduction 80IA Misc:</label>
+                <input type="number" name="deduction_80ia_misc" step="any" value="{{ record.deduction_80ia_misc}}"
+                    oninput="calculate()" required>
+            </div>
+            <div>
+                <label>Less :Deduction 80IA Other Operating Revenue:</label>
+                <input type="number" name="deduction_80ia_other" step="any" value="{{ record.deduction_80ia_other}}"
+                    oninput="calculate()" required>
+            </div>
+        </div>
+
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>Less :Deduction Sec 37 Disallowance:</label>
+                <input type="number" name="deduction_sec37_disallowance" step="any"
+                    value="{{ record.deduction_sec37_disallowance}}" oninput="calculate()" required>
+            </div>
+            <div>
+                <label>Less: Deduction 80G: </label>
+                <input type="number" name="deduction_80g" step="any" value="{{ record.deduction_80g}}"
+                    oninput="calculate()" required>
+            </div>
+
+        </div>
+        <div class=" form-group">
+            <label>Net Taxable Income:</label>
+            <input type="number" name="net_taxable_income" class="auto" step="any"
+                value="{{ record.net_taxable_income}}" readonly>
+        </div>
+
+
+        <div class=" form-group full-width inline-2">
+            <div>
+                <label>Tax @ 30% (A):</label>
+                <input type="number" name="tax_30_percent" step="any" value="{{ record.tax_30_percent}}"
+                    oninput="calculate()" required>
+            </div>
+            <div>
+                <label>Tax @ 18.5% on Book Profit (B):</label>
+                <input type="number" name="tax_book_profit_18_5" step="any" value="{{ record.tax_book_profit_18_5}}"
+                    oninput="calculate()" required>
+            </div>
+            <div>
+                <label>Tax Payable (Higher of A or B):</label>
+                <input type="number" name="tax_payable" class="auto" step="any" value="{{ record.tax_payable}}"
+                    readonly>
+            </div>
+        </div>
+
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>Surcharge:</label>
+                <input type="number" name="surcharge" class="auto" value="{{ record.surcharge}}" readonly>
+            </div>
+            <div>
+                <label>Education Cess:</label>
+                <input type="number" name="edu_cess" class="auto" step="any" value="{{ record.edu_cess}}" readonly>
+            </div>
+        </div>
+
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>Total tax Payable:</label>
+                <input type="number" name="total_tax_payable" class="auto" step="any"
+                    value="{{ record.total_tax_payable}}" readonly>
+            </div>
+            <div>
+                <label>Less :Mat Credit Created:</label>
+                <input type="number" name="mat_credit_created" step="any" value="{{ record.mat_credit_created }}"
+                    oninput="calculate()" required>
+            </div>
+            <div>
+                <label>Less :Mat Credit Utilized:</label>
+                <input type="number" name="mat_credit_utilized" step="any" value="{{ record.mat_credit_utilized }}"
+                    oninput="calculate()" required>
+            </div>
+            <div>
+                <label>Add :Interest 234c:</label>
+                <input type="number" name="interest_234c" step="any" value="{{ record.interest_234c}}"
+                    oninput="calculate()" required>
+            </div>
+        </div>
+
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>Total Tax:</label>
+                <input type="number" name="total_tax" step="any" class="auto" value="{{ record.total_tax}}" readonly>
+            </div>
+        </div>
+
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>Advance Tax:</label>
+                <input type="number" name="advance_tax" step="any" value="{{ record.advance_tax}}" oninput="calculate()"
+                    required>
+            </div>
+            <div>
+                <label>TDS :</label>
+                <input type="number" name="tds" step="any" value="{{ record.tds}}" oninput="calculate()" required>
+            </div>
+            <div>
+                <label>TCS :</label>
+                <input type="number" name="tcs" step="any" value="{{ record.tcs}}" oninput="calculate()" required>
+            </div>
+        </div>
+
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>SAT :</label>
+                <input type="number" name="sat" step="any" value="{{ record.sat}}" oninput="calculate()" required>
+            </div>
+            <div>
+                <label>Tax on Regular Assessment:</label>
+                <input type="number" name="tax_on_assessment" step="any" value="{{ record.tax_on_assessment}}"
+                    oninput="calculate()" required>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Refund:</label>
+            <input type="number" name="refund" class="auto" step="any" value="{{ record.refund}}" readonly>
+        </div>
+
+        <div class="form-group">
+            <label>Remarks:</label>
+            <input type="text" name="Remarks" value="{{ record.Remarks}}">
+        </div>
 
         <button type="submit">Update Record</button>
 
     </form>
-
 </div>
 
 {% endblock %}

templates/update_itat.html

@@ -7,25 +7,169 @@
 {% block content %}
 
 <div class="container">
-
     <h2>Update ITAT Record for Year {{ record.year }}</h2>
-
     <form method="POST" action="{{ url_for('update_itat', id=record.id) }}">
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>Year:</label>
+                <input type="tex" name="year" value="{{record.year}}" class="auto" readonly>
+            </div>
+        </div>
 
-        <label for="year">Year:</label>
+        <div class="form-group full-width inline-2">
-        <input type="text" id="year" name="year" value="{{ record.year }}" readonly class="readonly-field">
+            <div>
+                <label>Gross Total Income:</label>
+                <input type="number" name="gross_total_income" step="any" value="{{ record.gross_total_income}}"
+                    oninput="calculate()" required>
+            </div>
+            <div>
+                <label>Add :Disallowance u/s 14A:</label>
+                <input type="number" name="disallowance_14a" step="any" value="{{ record.disallowance_14a}}"
+                    oninput="calculate()" required>
+            </div>
+            <div>
+                <label>Add :Disallowance u/s 37:</label>
+                <input type="number" name="disallowance_37" step="any" value="{{ record.disallowance_37}}"
+                    oninput="calculate()" required>
+            </div>
+        </div>
 
-        {% for field in record.keys() if field not in ['id', 'year', 'Remarks'] %}
+        <div class="form-group full-width inline-2">
-        <label for="{{ field }}">{{ field.replace("_", " ").title() }}:</label>
+            <div>
-        <input type="number" id="{{ field }}" name="{{ field }}" step="any" value="{{ record[field] }}" required>
+                <label>Less :Deduction 80IA Business Income:</label>
-        {% endfor %}
+                <input type="number" name="deduction_80ia_business" step="any"
+                    value="{{ record.deduction_80ia_business}}" oninput="calculate()" required>
+            </div>
+            <div>
+                <label>Less :Deduction 80IA Misc:</label>
+                <input type="number" name="deduction_80ia_misc" step="any" value="{{ record.deduction_80ia_misc}}"
+                    oninput="calculate()" required>
+            </div>
+            <div>
+                <label>Less :Deduction 80IA Other Operating Revenue:</label>
+                <input type="number" name="deduction_80ia_other" step="any" value="{{ record.deduction_80ia_other}}"
+                    oninput="calculate()" required>
+            </div>
+        </div>
 
-        <label for="Remarks">Remarks:</label>
+        <div class="form-group full-width inline-2">
-        <input type="text" id="Remarks" name="Remarks" value="{{ record.Remarks }}">
+            <div>
+                <label>Less :Deduction Sec 37 Disallowance:</label>
+                <input type="number" name="deduction_sec37_disallowance" step="any"
+                    value="{{ record.deduction_sec37_disallowance}}" oninput="calculate()" required>
+            </div>
+            <div>
+                <label>Less: Deduction 80G: </label>
+                <input type="number" name="deduction_80g" step="any" value="{{ record.deduction_80g}}"
+                    oninput="calculate()" required>
+            </div>
+        </div>
+        <div class=" form-group">
+            <label>Net Taxable Income:</label>
+            <input type="number" name="net_taxable_income" class="auto" step="any"
+                value="{{ record.net_taxable_income}}" readonly>
+        </div>
+
+
+        <div class=" form-group full-width inline-2">
+            <div>
+                <label>Tax @ 30% (A):</label>
+                <input type="number" name="tax_30_percent" step="any" value="{{ record.tax_30_percent}}"
+                    oninput="calculate()" required>
+            </div>
+            <div>
+                <label>Tax @ 18.5% on Book Profit (B):</label>
+                <input type="number" name="tax_book_profit_18_5" step="any" value="{{ record.tax_book_profit_18_5}}"
+                    oninput="calculate()" required>
+            </div>
+            <div>
+                <label>Tax Payable (Higher of A or B):</label>
+                <input type="number" name="tax_payable" class="auto" step="any" value="{{ record.tax_payable}}"
+                    readonly>
+            </div>
+        </div>
+
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>Surcharge:</label>
+                <input type="number" name="surcharge" class="auto" value="{{ record.surcharge}}" readonly>
+            </div>
+            <div>
+                <label>Education Cess:</label>
+                <input type="number" name="edu_cess" class="auto" step="any" value="{{ record.edu_cess}}" readonly>
+            </div>
+        </div>
+
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>Total tax Payable:</label>
+                <input type="number" name="total_tax_payable" class="auto" step="any"
+                    value="{{ record.total_tax_payable}}" readonly>
+            </div>
+            <div>
+                <label>Less :Mat Credit Created:</label>
+                <input type="number" name="mat_credit_created" step="any" value="{{ record.mat_credit_created }}"
+                    oninput="calculate()" required>
+            </div>
+            <div>
+                <label>Less :Mat Credit Utilized:</label>
+                <input type="number" name="mat_credit_utilized" step="any" value="{{ record.mat_credit_utilized }}"
+                    oninput="calculate()" required>
+            </div>
+            <div>
+                <label>Add :Interest 234c:</label>
+                <input type="number" name="interest_234c" step="any" value="{{ record.interest_234c}}"
+                    oninput="calculate()" required>
+            </div>
+        </div>
+
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>Total Tax:</label>
+                <input type="number" name="total_tax" step="any" class="auto" value="{{ record.total_tax}}" readonly>
+            </div>
+        </div>
+
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>Advance Tax:</label>
+                <input type="number" name="advance_tax" step="any" value="{{ record.advance_tax}}" oninput="calculate()"
+                    required>
+            </div>
+            <div>
+                <label>TDS :</label>
+                <input type="number" name="tds" step="any" value="{{ record.tds}}" oninput="calculate()" required>
+            </div>
+            <div>
+                <label>TCS :</label>
+                <input type="number" name="tcs" step="any" value="{{ record.tcs}}" oninput="calculate()" required>
+            </div>
+        </div>
+
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>SAT :</label>
+                <input type="number" name="sat" step="any" value="{{ record.sat}}" oninput="calculate()" required>
+            </div>
+            <div>
+                <label>Tax on Regular Assessment:</label>
+                <input type="number" name="tax_on_assessment" step="any" value="{{ record.tax_on_assessment}}"
+                    oninput="calculate()" required>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Refund:</label>
+            <input type="number" name="refund" class="auto" step="any" value="{{ record.refund}}" readonly>
+        </div>
+
+        <div class="form-group">
+            <label>Remarks:</label>
+            <input type="text" name="Remarks" value="{{ record.remarks}}">
+        </div>
 
         <button type="submit">Update Record</button>
     </form>
-
 </div>
 
 {% endblock %}

templates/update_itr.html

@@ -8,11 +8,8 @@
 
 {% block content %}
 <div class="container">
-
     <h2>Update ITR Record for Year {{record.year}} - {{record.year+1}}</h2>
-
     <form method="POST" action="{{ url_for('update_itr', id=record.id) }}">
-
         <div class="form-group full-width inline-2">
             <div>
                 <label>Year:</label>
@@ -56,8 +53,6 @@
             </div>
         </div>
 
-
-
         <div class="form-group full-width inline-2">
             <div>
                 <label>Less :Deduction Sec 37 Disallowance:</label>
@@ -97,20 +92,14 @@
             </div>
         </div>
 
-
-
         <div class="form-group full-width inline-2">
-            <div>
-                <label>Enter Percentage (%) Surcharge:</label>
-                <input type="number" name="persentage" step="any" value="{{ record.persentage }}" oninput="calculate()">
-            </div>
             <div>
                 <label>Surcharge:</label>
-                <input type="number" name="surcharge_12" class="auto" value="{{ record.surcharge_12 }}" readonly>
+                <input type="number" name="surcharge" class="auto" value="{{ record.surcharge }}" readonly>
             </div>
             <div>
-                <label>Education Cess @ 3%:</label>
+                <label>Education Cess :</label>
-                <input type="number" name="edu_cess_3" class="auto" step="any" value="{{ record.edu_cess_3 }}" readonly>
+                <input type="number" name="edu_cess" class="auto" step="any" value="{{ record.edu_cess }}" readonly>
             </div>
         </div>
 
@@ -120,10 +109,15 @@
                 <input type="number" name="total_tax_payable" class="auto" step="any"
                     value="{{ record.total_tax_payable }}" readonly>
             </div>
+            <div>
+                <label>Less :Mat Credit Created:</label>
+                <input type="number" name="mat_credit_created" step="any" value="{{ record.mat_credit_created }}"
+                    oninput="calculate()" required>
+            </div>
             <div>
                 <label>Less :Mat Credit Utilized:</label>
-                <input type="number" name="mat_credit" step="any" value="{{ record.mat_credit }}" oninput="calculate()"
+                <input type="number" name="mat_credit_utilized" step="any" value="{{ record.mat_credit_utilized }}"
-                    required>
+                    oninput="calculate()" required>
             </div>
             <div>
                 <label>Add :Interest 234c:</label>
@@ -153,7 +147,6 @@
                 <label>TCS :</label>
                 <input type="number" name="tcs" step="any" value="{{ record.tcs }}" oninput="calculate()" required>
             </div>
-
         </div>
 
         <div class="form-group full-width inline-2">
@@ -177,10 +170,9 @@
             <input type="text" name="Remarks" value="{{ record.Remarks }}">
         </div>
         <button type="submit">Update Record</button>
-
     </form>
-
 </div>
+
 {% endblock %}
 {% block extra_js %}
 <script src="{{ url_for('static', filename='js/itr_calc.js') }}"></script>

templates/upload.html

@@ -7,18 +7,12 @@
 {% endblock %}
 
 {% block content %}
-<div class="main">
 <div class="container">
-
     <h2>Upload Income Tax Documents</h2>
-
     <form id="income_tax_documents" method="POST" enctype="multipart/form-data">
-
         <label>Year:</label>
         <select id="year" name="year" required></select>
-
         <div id="yearError" style="color: red; display: none; margin-bottom: 10px;"></div>
-
         <label>Stage:</label>
         <select name="stage" required>
             <option value="ITR">ITR</option>
@@ -26,14 +20,11 @@
             <option value="CIT">CIT</option>
             <option value="ITAT">ITAT</option>
         </select>
-
         <label>Select Documents:</label>
         <input type="file" name="documents" multiple required>
 
         <button type="submit">Upload</button>
     </form>
-
-    </div>
 </div>
 {% endblock %}
 

templates/view_docs.html

@@ -1,16 +1,11 @@
 {% extends "base.html" %}
-
 {% block title %}Document Records{% endblock %}
-
 {% block extra_css %}
 <link rel="stylesheet" href="{{ url_for('static', filename='css/documents.css') }}">
 {% endblock %}
-
 {% block content %}
 
-<div class="main">
 <div class="container">
-
     <h2>Document Records</h2>
     <!-- FILTER FORM -->
     <form method="GET">
@@ -23,14 +18,6 @@
         </select>
 
         <label for="stage">Filter by Stage:</label>
-            <!-- <select name="stage">
-                <option value="">All</option>
-                <option value="ITR">ITR</option>
-                <option value="AO">AO</option>
-                <option value="CIT">CIT</option>
-                <option value="ITAT">ITAT</option>
-            </select> -->
-
         <select name="stage">
             <option value="">All</option>
             {% set stages = ['ITR','AO','CIT','ITAT'] %}
@@ -38,7 +25,6 @@
             <option value="{{stage}}">{{stage}}</option>
             {% endfor %}
         </select>
-
         <button type="submit">Apply</button>
     </form>
 
@@ -66,7 +52,7 @@
                     <td>AY {{ doc.year }}-{{ doc.year +1 }}</td>
                     <td>{{ doc.uploaded_at }}</td>
 
-                        <td> <a href="{{ url_for('uploaded_file', filename=doc.filename) }}?mode=download">Download/a>
+                    <td> <a href="{{ url_for('uploaded_file', filename=doc.filename) }}?mode=download">Download</a>
                     </td>
 
                     <td><a href="{{ url_for('uploaded_file', filename=doc.filename) }}?mode=view"
@@ -76,8 +62,5 @@
             </tbody>
         </table>
     </div>
-
 </div>
-</div>
-
 {% endblock %}