changes of ITAT from new desing and sql insert update proce chnage code of v2

AppCode/AOHandler.py

@@ -36,24 +36,13 @@ class AOHandler:
            
         return None
 
-        """  variable of AO model
-        year, gross_total_income, disallowance_14a, disallowance_37,
-        deduction_80ia_business, deduction_sec37_disallowance, deduction_80g,
-        net_taxable_income, tax_30_percent, tax_book_profit_18_5,
-        surcharge_12, edu_cess_3, total_tax_payable, mat_credit,
-        interest_234c, total_tax, advance_tax, tds, tcs,
-        tax_on_assessment, refund
-        
-        """
-
-
     def add_ao(self, data):
             fields = [
                 "year","gross_total_income", "disallowance_14a", "disallowance_37",
                 "deduction_80ia_business", "deduction_sec37_disallowance", "deduction_80g",
                 "net_taxable_income", "tax_30_percent", "tax_book_profit_18_5",
                 "surcharge_12", "edu_cess_3", "total_tax_payable", "mat_credit",
-                "interest_234c", "total_tax", "advance_tax", "tds", "tcs",
+                "interest_234c", "total_tax", "advance_tax", "tds", "tcs","sat",
                 "tax_on_assessment", "refund","Remarks"
             ]
 
@@ -72,7 +61,7 @@ class AOHandler:
             "deduction_80ia_business", "deduction_sec37_disallowance", "deduction_80g",
             "net_taxable_income", "tax_30_percent", "tax_book_profit_18_5",
             "surcharge_12", "edu_cess_3", "total_tax_payable", "mat_credit",
-            "interest_234c", "total_tax", "advance_tax", "tds", "tcs",
+            "interest_234c", "total_tax", "advance_tax", "tds", "tcs","sat",
             "tax_on_assessment", "refund","Remarks"
         ]
 

AppCode/CITHandler.py

@@ -38,10 +38,12 @@ class CITHandler:
     # INSERT CIT RECORD
     def add_cit(self, data):
         columns = [
-            "year", "gross_total_income", "deduction_80ia_business", "deduction_sec37_disallowance",
-            "deduction_80g", "net_taxable_income", "tax_30_percent", "tax_book_profit_18_5",
-            "tax_payable", "surcharge_12", "edu_cess_3", "total_tax_payable", "mat_credit",
-            "interest_234c", "total_tax", "advance_tax", "tds", "tcs", "tax_on_assessment", "refund","Remarks"
+            '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',
+            'tax_30_percent', 'tax_book_profit_18_5', 'tax_payable', 'surcharge_12',
+            'edu_cess_3', 'total_tax_payable', 'mat_credit', 'interest_234c',
+            'total_tax', 'advance_tax', 'tds', 'tcs','sat', 'tax_on_assessment', 'refund', 'Remarks'
         ]
 
         values = [data.get(col, 0) for col in columns]
@@ -54,13 +56,12 @@ class CITHandler:
     # UPDATE CIT RECORD
     def update_cit(self, id, data):
         columns = [
-            "year", "gross_total_income", "deduction_80ia_business",
-            "deduction_sec37_disallowance", "deduction_80g",
-            "net_taxable_income", "tax_30_percent", "tax_book_profit_18_5",
-            "tax_payable", "surcharge_12", "edu_cess_3",
-            "total_tax_payable", "mat_credit", "interest_234c",
-            "total_tax", "advance_tax", "tds", "tcs",
-            "tax_on_assessment", "refund","Remarks"
+            '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',
+            'tax_30_percent', 'tax_book_profit_18_5', 'tax_payable', 'surcharge_12',
+            'edu_cess_3', 'total_tax_payable', 'mat_credit', 'interest_234c',
+            'total_tax', 'advance_tax', 'tds', 'tcs','sat', 'tax_on_assessment', 'refund', 'Remarks'
         ]
 
         values = [id] + [data.get(col, 0) for col in columns]

AppCode/ITATHandler.py

@@ -32,26 +32,31 @@ class ITATHandler:
 
     # INSERT ITAT (PROC)
     def add_itat(self, data):
-            values = [
-                data.get("mat_tax_credit", 0),
-                data.get("surcharge", 0),
-                data.get("cess", 0),
-                data.get("total_credit", 0),
-                data.get("year", 0)
-            ]
-            self.cursor.callproc("InsertITAT", values)
-            self.conn.commit()
+        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',
+                    'tax_30_percent', 'tax_book_profit_18_5', 'tax_payable', 'surcharge_12',
+                    'edu_cess_3', 'total_tax_payable', 'mat_credit', 'interest_234c',
+                    'total_tax', 'advance_tax', 'tds', 'tcs','sat', 'tax_on_assessment', 'refund', 'Remarks'
+                ]
+        values = [data.get(col, 0) for col in columns]
+
+        self.cursor.callproc("InsertITAT", values)
+        self.conn.commit()
 
     # UPDATE ITAT (PROC)
     def update_itat(self, id, data):
-        values = [
-            id,
-            data.get("year"),
-            data.get("mat_tax_credit"),
-            data.get("surcharge"),
-            data.get("cess"),
-            data.get("total_credit")
+        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',
+            'tax_30_percent', 'tax_book_profit_18_5', 'tax_payable', 'surcharge_12',
+            'edu_cess_3', 'total_tax_payable', 'mat_credit', 'interest_234c',
+            'total_tax', 'advance_tax', 'tds', 'tcs', 'sat','tax_on_assessment', 'refund','Remarks'
         ]
+        values = [id] + [data.get(col, 0) for col in columns]  
+
         self.cursor.callproc("UpdateITAT", values)
         self.conn.commit()
 
@@ -66,7 +71,6 @@ class ITATHandler:
             try:
                 # Call stored procedure
                 self.cursor.callproc("GetITATByYear", [selected_year])
-
                 rows = []
                 for result in self.cursor.stored_results():
                     rows = result.fetchall()

AppCode/ITRHandler.py

@@ -28,7 +28,6 @@ class ITRHandler:
 
         self.cursor.callproc("GetAllItr")
         records = []
-
         for result in self.cursor.stored_results():
             records = result.fetchall()
 
@@ -62,7 +61,7 @@ class ITRHandler:
             'deduction_sec37_disallowance', 'deduction_80g', 'net_taxable_income',
             'tax_30_percent', 'tax_book_profit_18_5', 'tax_payable', 'surcharge_12',
             'edu_cess_3', 'total_tax_payable', 'mat_credit', 'interest_234c',
-            'total_tax', 'advance_tax', 'tds', 'tcs', 'tax_on_assessment', 'refund', 'Remarks'
+            'total_tax', 'advance_tax', 'tds', 'tcs','sat', 'tax_on_assessment', 'refund', 'Remarks'
         ]
 
         values = [data.get(col, 0) for col in columns]
@@ -79,7 +78,7 @@ class ITRHandler:
             'deduction_sec37_disallowance', 'deduction_80g', 'net_taxable_income',
             'tax_30_percent', 'tax_book_profit_18_5', 'tax_payable', 'surcharge_12',
             'edu_cess_3', 'total_tax_payable', 'mat_credit', 'interest_234c',
-            'total_tax', 'advance_tax', 'tds', 'tcs', 'tax_on_assessment', 'refund','Remarks'
+            'total_tax', 'advance_tax', 'tds', 'tcs', 'sat','tax_on_assessment', 'refund','Remarks'
         ]
 
         values = [id] + [data.get(col, 0) for col in columns]  

AppCode/YearGet.py

@@ -33,7 +33,6 @@ class YearGet:
     #     return years
         
 
-
     def close(self):
         self.cursor.close()
         self.conn.close()

main.py

@@ -261,16 +261,14 @@ def display_itat():
 # 2.Add new ITAT records
 @app.route('/itat/add', methods=['GET', 'POST'])
 def add_itat():
-    itat = ITATHandler()
-
     if request.method == 'POST':
-        data = {k: request.form.get(k, 0) for k in request.form}
-        itat.add_itat(data)
+        itat = ITATHandler()
+        # data = {k: request.form.get(k, 0) for k in request.form}
+        itat.add_itat(request.form)
         itat.close()
         flash("ITAT record added successfully!", "success")
         return redirect(url_for('display_itat'))
 
-    itat.close()
     return render_template('add_itat.html')
 
 # 3.Update ITAT records by id
@@ -284,15 +282,7 @@ def update_itat(id):
         return redirect(url_for('display_itat'))
 
     if request.method == 'POST':
-        data = {
-            "year": request.form.get("year"),
-            "mat_tax_credit": request.form.get("mat_tax_credit"),
-            "surcharge": request.form.get("surcharge"),
-            "cess": request.form.get("cess"),
-            "total_credit": request.form.get("total_credit")
-        }
-
-        itat.update_itat(id, data)
+        itat.update_itat(id, request.form)
         itat.close()
         flash("ITAT Record Updated!", "success")
         return redirect(url_for('display_itat'))
@@ -310,8 +300,6 @@ def delete_itat(id):
     return redirect(url_for('display_itat'))
 
 
-
-
 ## =======================================================
 ## All Report Routes
 ## =======================================================
@@ -458,4 +446,3 @@ def check_year():
 # run 
 if __name__ == '__main__':
       app.run(host='0.0.0.0', port=5003, debug=True)
- 

static/js/ao_calc.js

@@ -17,10 +17,7 @@ document.addEventListener("DOMContentLoaded", function () {
         var disallowance_14a = getValue("disallowance_14a");
         var disallowance_37 = getValue("disallowance_37");
 
-        // // Auto-calculations (your logic)
-        // setValue("gross_total_income", disallowance_37 + gross_total_income);
-        // setValue("disallowance_37", disallowance_14a + disallowance_37);
-
+        // -- total gross income ---
         var gross_total = gross_total_income + disallowance_37 + disallowance_14a
         console.log("gross_total income:: " + gross_total)
 
@@ -71,11 +68,11 @@ document.addEventListener("DOMContentLoaded", function () {
         var adv_tax = getValue("advance_tax");
         var tds = getValue("tds");
         var tcs = getValue("tcs");
+        var tax_on_regular_assessment = getValue("tax_on_assessment");
 
-        var tax_on_assessment = adv_tax + tds + tcs;
-        setValue("tax_on_assessment", tax_on_assessment);
+        var all_tax = adv_tax + tds + tcs + tax_on_regular_assessment;
 
-        var refund = total_tax - tax_on_assessment;
+        var refund = total_tax - all_tax;
         setValue("refund", refund);
     };
 });

static/js/cit_calc.js

@@ -1,89 +1,78 @@
 document.addEventListener("DOMContentLoaded", function () {
 
-    const fields = [
-        "gross_total_income", "disallowance_14a", "disallowance_37",
-        "deduction_80ia_business", "deduction_sec37_disallowance", "deduction_80g",
-        "net_taxable_income", "tax_30_percent", "tax_book_profit_18_5",
-        "tax_payable", "surcharge_12", "edu_cess_3", "total_tax_payable",
-        "mat_credit", "interest_234c", "total_tax",
-        "advance_tax", "tds", "tcs", "tax_on_assessment", "refund"
-    ];
-
-    function getVal(id) {
-        let el = document.getElementsByName(id)[0];
+    function getValue(id) {
+        var el = document.getElementsByName(id)[0];
         return el ? parseFloat(el.value) || 0 : 0;
     }
 
-    function setVal(id, value) {
-        let el = document.getElementsByName(id)[0];
-        if (el) el.value = Number(value).toFixed(2);
+    function setValue(id, val) {
+        var el = document.getElementsByName(id)[0];
+        if (el) el.value = Number(val).toFixed(2);
     }
 
-    function calculate() {
+    window.calculate = function () {
 
-        // Base values
-        let gross_total_income = getVal("gross_total_income");
-        let disallowance_14a = getVal("disallowance_14a");
-        let disallowance_37 = getVal("disallowance_37");
+        // --- BASIC INPUTS ---
+        var gross_total_income = getValue("gross_total_income");
+        var disallowance_14a = getValue("disallowance_14a");
+        var disallowance_37 = getValue("disallowance_37");
 
-        // Deductions
-        let d80_business = getVal("deduction_80ia_business");
-        let deduction_sec37 = getVal("deduction_sec37_disallowance");
-        let deduction_80g = getVal("deduction_80g");
+        // -- total gross income --
+        var gross_total = gross_total_income + disallowance_37 + disallowance_14a
+        console.log("gross_total income:: " + gross_total)
 
-        // Net Taxable Income
-        let net_taxable_income =
-            (gross_total_income + disallowance_14a + disallowance_37)
-            - (d80_business + deduction_sec37)
-            - deduction_80g;
+        // --- 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");
 
-        setVal("net_taxable_income", net_taxable_income);
+        var deduction = d80_business + d80_misc + d80_other + d80_sec37;
 
-        // 30% tax
-        let tax_30_percent = net_taxable_income * 0.30;
-        setVal("tax_30_percent", tax_30_percent);
+        var deduction_80g = getValue("deduction_80g");
 
-        // Book profit tax (user input)
-        let tax_payable = getVal("tax_book_profit_18_5");
-        setVal("tax_payable", tax_payable);
+        // --- NET TAXABLE INCOME ---
+        var net_taxable_income = gross_total - deduction - deduction_80g;
+        setValue("net_taxable_income", net_taxable_income);
 
-        // Surcharge 12%
-        let surcharge_12 = tax_payable * 0.12;
-        setVal("surcharge_12", surcharge_12);
+        // --- TAX 30% ---
+        var tax30 = net_taxable_income * 0.30;
+        setValue("tax_30_percent", tax30);
 
-        // Education Cess 3%
-        let edu_cess_3 = (tax_payable + surcharge_12) * 0.03;
-        setVal("edu_cess_3", edu_cess_3);
+        // --- TAX PAYABLE (18.5%) ---
+        var tax185 = getValue("tax_book_profit_18_5");
 
-        // Total Tax Payable
-        let total_tax_payable = tax_payable + surcharge_12 + edu_cess_3;
-        setVal("total_tax_payable", total_tax_payable);
+        var tax_payable = (tax30 > tax185) ? tax30 : tax185;
+        setValue("tax_payable", tax_payable);
 
-        // MAT + Interest
-        let mat_credit = getVal("mat_credit");
-        let interest_234c = getVal("interest_234c");
+        // --- SURCHARGE ---
+        var percent = getValue("persentage");
+        var surcharge = tax_payable * (percent / 100);
+        setValue("surcharge_12", surcharge);
 
-        // Total Tax
-        let total_tax = total_tax_payable + mat_credit + interest_234c;
-        setVal("total_tax", total_tax);
+        var edu_cess = (tax_payable + surcharge) * 0.03;
+        setValue("edu_cess_3", edu_cess);
 
-        // Assessment → Advance Tax + TDS + TCS
-        let advance_tax = getVal("advance_tax");
-        let tds = getVal("tds");
-        let tcs = getVal("tcs");
+        // --- total tax payable ---
+        var total_tax_payable = tax_payable + surcharge + edu_cess;
+        setValue("total_tax_payable", total_tax_payable);
 
-        let tax_on_assessment = advance_tax + tds + tcs;
-        setVal("tax_on_assessment", tax_on_assessment);
+        // --- FINAL TAX ---
+        var mat_credit = getValue("mat_credit");
+        var interest_234c = getValue("interest_234c");
 
-        // Refund (or payable)
-        let refund = total_tax - tax_on_assessment;
-        setVal("refund", refund);
-    }
+        var total_tax = total_tax_payable + mat_credit + interest_234c;
+        setValue("total_tax", total_tax);
 
-    // Attach listeners
-    fields.forEach(id => {
-        let el = document.getElementsByName(id)[0];
-        if (el) el.addEventListener("input", calculate);
-    });
+        // --- ASSESSMENT ---
+        var adv_tax = getValue("advance_tax");
+        var tds = getValue("tds");
+        var tcs = getValue("tcs");
+        var tax_on_regular_assessment = getValue("tax_on_assessment");
 
+        var all_tax = adv_tax + tds + tcs + tax_on_regular_assessment;
+
+        var refund = total_tax - all_tax;
+        setValue("refund", refund);
+    };
 });

static/js/itr_calc.js

@@ -17,10 +17,7 @@ document.addEventListener("DOMContentLoaded", function () {
         var disallowance_14a = getValue("disallowance_14a");
         var disallowance_37 = getValue("disallowance_37");
 
-        // // Auto-calculations (your logic)
-        // setValue("gross_total_income", disallowance_37 + gross_total_income);
-        // setValue("disallowance_37", disallowance_14a + disallowance_37);
-
+        // -- total gross income --
         var gross_total = gross_total_income + disallowance_37 + disallowance_14a
         console.log("gross_total income:: " + gross_total)
 
@@ -28,14 +25,14 @@ document.addEventListener("DOMContentLoaded", function () {
         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 - 1.35;
-        setValue("deduction_sec37_disallowance", deduction_sec37);
+        var deduction = d80_business + d80_misc + d80_other + d80_sec37 - 1.35;
 
         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% ---
@@ -71,11 +68,11 @@ document.addEventListener("DOMContentLoaded", function () {
         var adv_tax = getValue("advance_tax");
         var tds = getValue("tds");
         var tcs = getValue("tcs");
+        var tax_on_regular_assessment = getValue("tax_on_assessment");
 
-        var tax_on_assessment = adv_tax + tds + tcs;
-        setValue("tax_on_assessment", tax_on_assessment);
+        var all_tax = adv_tax + tds + tcs + tax_on_regular_assessment;
 
-        var refund = total_tax - tax_on_assessment;
+        var refund = total_tax - all_tax;
         setValue("refund", refund);
     };
 });

templates/add_ao.html

@@ -11,15 +11,16 @@
 
     <h2 style="text-align:center;">New Assessing Officer Form</h2>
     <form id="ao" method="POST">
-        <div class="form-group">
-            <label>Year:</label>
-            <select id="year" name="year" required></select>
-        </div>
-        <div id="yearError" style="color:red; display:none; margin-bottom:10px;"></div>
-
-        <div class="form-group">
-            <label>Gross Total Income:</label>
-            <input type="number" name="gross_total_income" step="any" value="0.00" oninput="calculate()" required>
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>Year:</label>
+                <select id="year" name="year" required></select>
+                <div id="yearError" style="color:red; display:none; margin-bottom:10px;"></div>
+            </div>
+            <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">
@@ -33,35 +34,39 @@
             </div>
         </div>
 
-        <div class="form-group">
-            <label>Deduction 80IA Business Income:</label>
-            <input type="number" name="deduction_80ia_business" step="any" value="0.00" oninput="calculate()" required>
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>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>
+                <input type="number" name="deduction_80ia_misc" step="any" value="0.00" oninput="calculate()" required>
+            </div>
         </div>
 
-        <div class="form-group">
-            <label>Deduction 80IA Misc:</label>
-            <input type="number" name="deduction_80ia_misc" step="any" value="0.00" oninput="calculate()" required>
+        <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>
+                <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">
-            <label>Deduction 80IA Other Operating Revenue:</label>
-            <input type="number" name="deduction_80ia_other" step="any" value="0.00" oninput="calculate()" required>
-        </div>
-
-        <div class="form-group">
-            <label>Deduction Sec 37 Disallowance:</label>
-            <input type="number" name="deduction_sec37_disallowance" step="any" value="0.00" oninput="calculate()"
-                required>
-        </div>
-
-        <div class="form-group">
-            <label>Less: Deduction 80G: </label>
-            <input type="number" name="deduction_80g" step="any" value="0.00" oninput="calculate()" required>
-        </div>
-
-        <div class="form-group">
-            <label>Net Taxable Income:</label>
-            <input type="number" name="net_taxable_income" class="auto" step="any" value="0.00" readonly>
+        <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>
+                <label>Net Taxable Income:</label>
+                <input type="number" name="net_taxable_income" class="auto" step="any" value="0.00" readonly>
+            </div>
         </div>
 
         <div class="form-group full-width inline-2">
@@ -77,7 +82,7 @@
 
         <div class="form-group">
             <label>Tax Payable (Higher of A or B):</label>
-            <input type="number" name="tax_payable" step="any" class="auto" value="0.00" readonly>
+            <input type="number" name="tax_payable" class="auto" step="any" value="0.00" readonly>
         </div>
 
         <div class="form-group full-width inline-2">
@@ -91,34 +96,37 @@
             </div>
         </div>
 
-        <div class="form-group">
-            <label>Education Cess @ 3%:</label>
-            <input type="number" name="edu_cess_3" step="any" value="0.00" oninput="calculate()" required>
+        <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>
+            </div>
         </div>
 
-        <div class="form-group">
-            <label>Total tax Payable:</label>
-            <input type="number" name="total_tax_payable" step="any" value="0.00" oninput="calculate()" required>
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>Mat Credit Utilized:</label>
+                <input type="number" name="mat_credit" step="any" value="0.00" oninput="calculate()" required>
+            </div>
+            <div>
+                <label>Add :Interest 234c:</label>
+                <input type="number" name="interest_234c" step="any" value="0.00" oninput="calculate()" required>
+            </div>
         </div>
 
-        <div class="form-group">
-            <label>Mat Credit:</label>
-            <input type="number" name="mat_credit" step="any" value="0.00" oninput="calculate()" required>
-        </div>
-
-        <div class="form-group">
-            <label>Add :Interest 234c:</label>
-            <input type="number" name="interest_234c" step="any" value="0.00" oninput="calculate()" required>
-        </div>
-
-        <div class="form-group">
-            <label>Total Tax:</label>
-            <input type="number" name="total_tax" class="auto" step="any" value="0.00" readonly>
-        </div>
-
-        <div class="form-group">
-            <label>Advance Tax:</label>
-            <input type="number" name="advance_tax" step="any" value="0.00" oninput="calculate()" required>
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>Total Tax:</label>
+                <input type="number" name="total_tax" step="any" class="auto" value="0.00" readonly>
+            </div>
+            <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">
@@ -130,22 +138,32 @@
                 <label>TCS :</label>
                 <input type="number" name="tcs" step="any" value="0.00" oninput="calculate()" required>
             </div>
+
         </div>
 
-        <div class="form-group">
-            <label>Tax on Regular Assessment:</label>
-            <input type="number" name="tax_on_assessment" class="auto" step="any" value="0.00" readonly>
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>SAT :</label>
+                <input type="number" name="sat" step="any" value="0.00" oninput="calculate()" required>
+            </div>
+            <div>
+                <label>Tax on Regular Assessment:</label>
+                <input type="number" name="tax_on_assessment" step="any" value="0.00" oninput="calculate()" required>
+            </div>
+
         </div>
 
         <div class="form-group">
             <label>Refund:</label>
             <input type="number" name="refund" class="auto" step="any" value="0.00" readonly>
         </div>
+
         <div class="form-group">
             <label>Remarks:</label>
             <input type="text" name="Remarks">
         </div>
 
+
         <button type="submit">Submit</button>
     </form>
 </div>

templates/add_cit.html

@@ -11,16 +11,18 @@
 
     <h2 style="text-align:center;">New CIT Form </h2>
     <form id="cit" method="POST">
-        <div class="form-group">
-            <label>Year:</label>
-            <select id="year" name="year" required></select>
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>Year:</label>
+                <select id="year" name="year" required></select>
+                <div id="yearError" style="color:red; display:none; margin-bottom:10px;"></div>
+            </div>
+            <div>
+                <label>Gross Total Income:</label>
+                <input type="number" name="gross_total_income" step="any" value="0.00" oninput="calculate()" required>
+            </div>
         </div>
-        <div id="yearError" style="color:red; display:none; margin-bottom:10px;"></div>
 
-        <div class="form-group">
-            <label>Gross Total Income:</label>
-            <input type="number" name="gross_total_income" step="any" value="0.00" oninput="calculate()" required>
-        </div>
         <div class="form-group full-width inline-2">
             <div>
                 <label>Add :Disallowance u/s 14A:</label>
@@ -32,35 +34,39 @@
             </div>
         </div>
 
-        <div class="form-group">
-            <label>Deduction 80IA Business Income:</label>
-            <input type="number" name="deduction_80ia_business" step="any" value="0.00" oninput="calculate()" required>
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>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>
+                <input type="number" name="deduction_80ia_misc" step="any" value="0.00" oninput="calculate()" required>
+            </div>
         </div>
 
-        <div class="form-group">
-            <label>Deduction 80IA Misc:</label>
-            <input type="number" name="deduction_80ia_misc" step="any" value="0.00" oninput="calculate()" required>
+        <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>
+                <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">
-            <label>Deduction 80IA Other Operating Revenue:</label>
-            <input type="number" name="deduction_80ia_other" step="any" value="0.00" oninput="calculate()" required>
-        </div>
-
-        <div class="form-group">
-            <label>Deduction Sec 37 Disallowance:</label>
-            <input type="number" name="deduction_sec37_disallowance" step="any" value="0.00" oninput="calculate()"
-                required>
-        </div>
-
-        <div class="form-group">
-            <label>Less: Deduction 80G: </label>
-            <input type="number" name="deduction_80g" step="any" value="0.00" oninput="calculate()" required>
-        </div>
-
-        <div class="form-group">
-            <label>Net Taxable Income:</label>
-            <input type="number" name="net_taxable_income" class="auto" step="any" value="0.00" readonly>
+        <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>
+                <label>Net Taxable Income:</label>
+                <input type="number" name="net_taxable_income" class="auto" step="any" value="0.00" readonly>
+            </div>
         </div>
 
         <div class="form-group full-width inline-2">
@@ -90,35 +96,37 @@
             </div>
         </div>
 
-
-        <div class="form-group">
-            <label>Education Cess @ 3%:</label>
-            <input type="number" name="edu_cess_3" step="any" value="0.00" oninput="calculate()" required>
+        <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>
+            </div>
         </div>
 
-        <div class="form-group">
-            <label>Total tax Payable:</label>
-            <input type="number" name="total_tax_payable" class="auto" step="any" value="0.00" readonly>
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>Mat Credit Utilized:</label>
+                <input type="number" name="mat_credit" step="any" value="0.00" oninput="calculate()" required>
+            </div>
+            <div>
+                <label>Add :Interest 234c:</label>
+                <input type="number" name="interest_234c" step="any" value="0.00" oninput="calculate()" required>
+            </div>
         </div>
 
-        <div class="form-group">
-            <label>Mat Credit:</label>
-            <input type="number" name="mat_credit" step="any" value="0.00" oninput="calculate()" required>
-        </div>
-
-        <div class="form-group">
-            <label>Add :Interest 234c:</label>
-            <input type="number" name="interest_234c" step="any" value="0.00" oninput="calculate()" required>
-        </div>
-
-        <div class="form-group">
-            <label>Total Tax:</label>
-            <input type="number" name="total_tax" step="any" value="0.00" readonly>
-        </div>
-
-        <div class="form-group">
-            <label>Advance Tax:</label>
-            <input type="number" name="advance_tax" step="any" value="0.00" oninput="calculate()" required>
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>Total Tax:</label>
+                <input type="number" name="total_tax" step="any" class="auto" value="0.00" readonly>
+            </div>
+            <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">
@@ -130,13 +138,20 @@
                 <label>TCS :</label>
                 <input type="number" name="tcs" step="any" value="0.00" oninput="calculate()" required>
             </div>
+
         </div>
 
-        <div class="form-group">
-            <label>Tax on Regular Assessment:</label>
-            <input type="number" name="tax_on_assessment" class="auto" step="any" value="0.00" readonly>
-        </div>
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>SAT :</label>
+                <input type="number" name="sat" step="any" value="0.00" oninput="calculate()" required>
+            </div>
+            <div>
+                <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>
             <input type="number" name="refund" class="auto" step="any" value="0.00" readonly>
@@ -147,7 +162,7 @@
             <input type="text" name="Remarks">
         </div>
 
-        <button type="submit">{{ 'Update' if record else 'Submit' }}</button>
+        <button type="submit">Submit</button>
     </form>
 </div>
 {% endblock %}

templates/add_itat.html

@@ -4,7 +4,7 @@
 
 {% block extra_css %}
 <!-- Child page CSS -->
-<link rel="stylesheet" href="{{ url_for('static', filename='css/add_itat.css') }}">
+<link rel="stylesheet" href="{{ url_for('static', filename='css/add_itr.css') }}">
 {% endblock %}
 
 {% block content %}
@@ -14,21 +14,156 @@
 
     <form id="itat" method="POST" onsubmit="return showSuccessMessage()">
 
-        <label>Year:</label>
-        <select id="year" name="year" required></select>
-        <div id="yearError" style="color:red; display:none; margin-bottom:10px;"></div>
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>Year:</label>
+                <select id="year" name="year" required></select>
+                <div id="yearError" style="color:red; display:none; margin-bottom:10px;"></div>
+            </div>
+            <div>
+                <label>Gross Total Income:</label>
+                <input type="number" name="gross_total_income" step="any" value="0.00" oninput="calculate()" required>
+            </div>
+        </div>
 
-        <label>MAT Tax Credit:</label>
-        <input type="number" name="mat_tax_credit" step="0.01" required />
+        <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>
+            </div>
+            <div>
+                <label>Add :Disallowance u/s 37:</label>
+                <input type="number" name="disallowance_37" step="any" value="0.00" oninput="calculate()" required>
+            </div>
+        </div>
 
-        <label>Surcharge:</label>
-        <input type="number" name="surcharge" step="0.01" required />
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>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>
+                <input type="number" name="deduction_80ia_misc" step="any" value="0.00" oninput="calculate()" required>
+            </div>
+        </div>
 
-        <label>Cess:</label>
-        <input type="number" name="cess" step="0.01" required />
+        <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>
+                <label>Deduction Sec 37 Disallowance:</label>
+                <input type="number" name="deduction_sec37_disallowance" step="any" value="0.00" oninput="calculate()"
+                    required>
+            </div>
+        </div>
 
-        <label>Total Credit:</label>
-        <input type="number" name="total_credit" step="0.01" required />
+        <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>
+                <label>Net Taxable Income:</label>
+                <input type="number" name="net_taxable_income" class="auto" step="any" value="0.00" readonly>
+            </div>
+        </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="0.00" 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="0.00" oninput="calculate()" required>
+            </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 class="form-group full-width inline-2">
+            <div>
+                <label>Enter Percentage (%) Surcharge:</label>
+                <input type="number" name="persentage" step="any" value="0.00" oninput="calculate()">
+            </div>
+            <div>
+                <label>Surcharge:</label>
+                <input type="number" name="surcharge_12" class="auto" 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>
+            </div>
+        </div>
+
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>Mat Credit Utilized:</label>
+                <input type="number" name="mat_credit" step="any" value="0.00" oninput="calculate()" required>
+            </div>
+            <div>
+                <label>Add :Interest 234c:</label>
+                <input type="number" name="interest_234c" step="any" value="0.00" 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="0.00" readonly>
+            </div>
+            <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>
+            </div>
+            <div>
+                <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">
+            <div>
+                <label>SAT :</label>
+                <input type="number" name="sat" step="any" value="0.00" oninput="calculate()" required>
+            </div>
+            <div>
+                <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>
+            <input type="number" name="refund" class="auto" step="any" value="0.00" readonly>
+        </div>
+
+        <div class="form-group">
+            <label>Remarks:</label>
+            <input type="text" name="Remarks">
+        </div>
 
         <button type="submit">Submit</button>
     </form>
@@ -37,7 +172,7 @@
 
 {% block extra_js %}
 <script src="{{ url_for('static', filename='js/toggle.js') }}"></script>
-<script src="{{ url_for('static', filename='js/cit_calc.js') }}"></script>
+<script src="{{ url_for('static', filename='js/itr_calc.js') }}"></script>
 <script src="{{ url_for('static', filename='js/year_dropdown.js') }}"></script>
 {% endblock %}
 

templates/add_itr.html

@@ -12,16 +12,18 @@
     <h2 style="text-align:center;">New Income Tax Return Form</h2>
 
     <form id="itr" method="POST">
-        <div class="form-group">
-            <label>Year:</label>
-            <select id="year" name="year" required></select>
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>Year:</label>
+                <select id="year" name="year" required></select>
+                <div id="yearError" style="color:red; display:none; margin-bottom:10px;"></div>
+            </div>
+            <div>
+                <label>Gross Total Income:</label>
+                <input type="number" name="gross_total_income" step="any" value="0.00" oninput="calculate()" required>
+            </div>
         </div>
-        <div id="yearError" style="color:red; display:none; margin-bottom:10px;"></div>
 
-        <div class="form-group">
-            <label>Gross Total Income:</label>
-            <input type="number" name="gross_total_income" step="any" value="0.00" oninput="calculate()" required>
-        </div>
         <div class="form-group full-width inline-2">
             <div>
                 <label>Add :Disallowance u/s 14A:</label>
@@ -33,35 +35,39 @@
             </div>
         </div>
 
-        <div class="form-group">
-            <label>Deduction 80IA Business Income:</label>
-            <input type="number" name="deduction_80ia_business" step="any" value="0.00" oninput="calculate()" required>
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>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>
+                <input type="number" name="deduction_80ia_misc" step="any" value="0.00" oninput="calculate()" required>
+            </div>
         </div>
 
-        <div class="form-group">
-            <label>Deduction 80IA Misc:</label>
-            <input type="number" name="deduction_80ia_misc" step="any" value="0.00" oninput="calculate()" required>
+        <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>
+                <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">
-            <label>Deduction 80IA Other Operating Revenue:</label>
-            <input type="number" name="deduction_80ia_other" step="any" value="0.00" oninput="calculate()" required>
-        </div>
-
-        <div class="form-group">
-            <label>Deduction Sec 37 Disallowance:</label>
-            <input type="number" name="deduction_sec37_disallowance" step="any" value="0.00" oninput="calculate()"
-                required>
-        </div>
-
-        <div class="form-group">
-            <label>Less: Deduction 80G: </label>
-            <input type="number" name="deduction_80g" step="any" value="0.00" oninput="calculate()" required>
-        </div>
-
-        <div class="form-group">
-            <label>Net Taxable Income:</label>
-            <input type="number" name="net_taxable_income" class="auto" step="any" value="0.00" readonly>
+        <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>
+                <label>Net Taxable Income:</label>
+                <input type="number" name="net_taxable_income" class="auto" step="any" value="0.00" readonly>
+            </div>
         </div>
 
         <div class="form-group full-width inline-2">
@@ -91,35 +97,37 @@
             </div>
         </div>
 
-
-        <div class="form-group">
-            <label>Education Cess @ 3%:</label>
-            <input type="number" name="edu_cess_3" step="any" value="0.00" oninput="calculate()" required>
+        <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>
+            </div>
         </div>
 
-        <div class="form-group">
-            <label>Total tax Payable:</label>
-            <input type="number" name="total_tax_payable" class="auto" step="any" value="0.00" readonly>
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>Mat Credit Utilized:</label>
+                <input type="number" name="mat_credit" step="any" value="0.00" oninput="calculate()" required>
+            </div>
+            <div>
+                <label>Add :Interest 234c:</label>
+                <input type="number" name="interest_234c" step="any" value="0.00" oninput="calculate()" required>
+            </div>
         </div>
 
-        <div class="form-group">
-            <label>Mat Credit:</label>
-            <input type="number" name="mat_credit" step="any" value="0.00" oninput="calculate()" required>
-        </div>
-
-        <div class="form-group">
-            <label>Add :Interest 234c:</label>
-            <input type="number" name="interest_234c" step="any" value="0.00" oninput="calculate()" required>
-        </div>
-
-        <div class="form-group">
-            <label>Total Tax:</label>
-            <input type="number" name="total_tax" step="any" value="0.00" readonly>
-        </div>
-
-        <div class="form-group">
-            <label>Advance Tax:</label>
-            <input type="number" name="advance_tax" step="any" value="0.00" oninput="calculate()" required>
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>Total Tax:</label>
+                <input type="number" name="total_tax" step="any" class="auto" value="0.00" readonly>
+            </div>
+            <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">
@@ -131,12 +139,20 @@
                 <label>TCS :</label>
                 <input type="number" name="tcs" step="any" value="0.00" oninput="calculate()" required>
             </div>
-        </div>
-        <div class="form-group">
-            <label>Tax on Regular Assessment:</label>
-            <input type="number" name="tax_on_assessment" class="auto" step="any" value="0.00" readonly>
+
         </div>
 
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>SAT :</label>
+                <input type="number" name="sat" step="any" value="0.00" oninput="calculate()" required>
+            </div>
+            <div>
+                <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>
             <input type="number" name="refund" class="auto" step="any" value="0.00" readonly>

templates/ao_form.html

@@ -1,152 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <title>AO Form Entry</title>
-    <link rel="stylesheet" href="{{ url_for('static', filename='index.css') }}">
-    <style>
-        /* Reset and base styles */
-        * {
-            margin: 0;
-            padding: 0;
-            box-sizing: border-box;
-        }
-
-        body {
-            font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
-            background-color: #f5f7fa;
-            color: #333;
-            padding: 30px 0;
-        }
-
-        .container {
-            width: 90%;
-            max-width: 700px;
-            margin: auto;
-            background-color: #fff;
-            padding: 40px;
-            border-radius: 12px;
-            box-shadow: 0 8px 20px rgba(0, 0, 0, 0.08);
-        }
-
-        h2 {
-            text-align: center;
-            margin-bottom: 30px;
-            font-size: 28px;
-            color: #2c3e50;
-        }
-
-        form {
-            display: flex;
-            flex-direction: column;
-        }
-
-        label {
-            margin-top: 15px;
-            margin-bottom: 6px;
-            font-weight: 600;
-            color: #333;
-        }
-
-        input[type="number"] {
-            padding: 10px 12px;
-            border: 1px solid #ccc;
-            border-radius: 6px;
-            font-size: 16px;
-            transition: border-color 0.3s ease;
-        }
-
-        input[type="number"]:focus {
-            border-color: #007BFF;
-            outline: none;
-        }
-
-        button[type="submit"] {
-            margin-top: 30px;
-            padding: 12px;
-            background-color: #007BFF;
-            border: none;
-            border-radius: 6px;
-            color: white;
-            font-size: 18px;
-            cursor: pointer;
-            transition: background-color 0.3s ease;
-        }
-
-        button[type="submit"]:hover {
-            background-color: #0056b3;
-        }
-
-        /* Back button styling */
-        .back-btn {
-            display: inline-block;
-            margin-bottom: 20px;
-            padding: 10px 18px;
-            background: #6c757d;
-            color: white;
-            font-size: 15px;
-            font-weight: 600;
-            border-radius: 6px;
-            text-decoration: none;
-            transition: background 0.3s ease;
-        }
-
-        .back-btn:hover {
-            background: #5a6268;
-        }
-
-
-        @media (max-width: 600px) {
-            .container {
-                padding: 20px;
-            }
-
-            h2 {
-                font-size: 22px;
-            }
-
-            input[type="number"] {
-                font-size: 15px;
-            }
-
-            button[type="submit"] {
-                font-size: 16px;
-            }
-        }
-    </style>
-</head>
-
-<body>
-    <div class="container">
-        <!-- Back to Dashboard Button -->
-        <a href="{{ url_for('index') }}" class="back-btn">← Back to Dashboard</a>
-
-        <h2>AO Form Entry</h2>
-        <form method="POST" onsubmit="return showSuccessMessage()">
-            <label>Year:</label>
-            <input type="number" name="year" required>
-            {% for field in [
-            "gross_total_income", "disallowance_14a", "disallowance_37",
-            "deduction_80ia_business", "deduction_sec37_disallowance", "deduction_80g",
-            "net_taxable_income", "tax_30_percent", "tax_book_profit_18_5",
-            "surcharge_12", "edu_cess_3", "total_tax_payable", "mat_credit",
-            "interest_234c", "total_tax", "advance_tax", "tds", "tcs",
-            "tax_on_assessment", "refund"
-            ] %}
-            <label for="{{ field }}">{{ field.replace("_", " ").title() }}:</label>
-            <input type="number" name="{{ field }}" step="0.01" required>
-            {% endfor %}
-            <button type="submit">Submit</button>
-        </form>
-    </div>
-
-    <!-- JavaScript Alert -->
-    <script>
-        function showSuccessMessage() {
-            alert("Form submitted successfully!");
-            return true; // allow form to submit after showing alert
-        }
-    </script>
-</body>
-
-</html>

templates/cit_form.html

@@ -1,147 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <title>CIT Form Entry</title>
-    <link rel="stylesheet" href="{{ url_for('static', filename='index.css') }}">
-    <style>
-        /* ...existing styles... (no changes needed) */
-        * {
-            margin: 0;
-            padding: 0;
-            box-sizing: border-box;
-        }
-
-        body {
-            font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
-            background-color: #f5f7fa;
-            color: #333;
-            padding: 30px 0;
-        }
-
-        .container {
-            width: 90%;
-            max-width: 700px;
-            margin: auto;
-            background-color: #fff;
-            padding: 40px;
-            border-radius: 12px;
-            box-shadow: 0 8px 20px rgba(0, 0, 0, 0.08);
-        }
-
-        h2 {
-            text-align: center;
-            margin-bottom: 30px;
-            font-size: 28px;
-            color: #2c3e50;
-        }
-
-        form {
-            display: flex;
-            flex-direction: column;
-        }
-
-        label {
-            margin-top: 15px;
-            margin-bottom: 6px;
-            font-weight: 600;
-            color: #333;
-        }
-
-        input[type="number"] {
-            padding: 10px 12px;
-            border: 1px solid #ccc;
-            border-radius: 6px;
-            font-size: 16px;
-        }
-
-        input[type="number"]:focus {
-            border-color: #007BFF;
-            outline: none;
-        }
-
-        button[type="submit"] {
-            margin-top: 30px;
-            padding: 12px;
-            background-color: #007BFF;
-            border: none;
-            border-radius: 6px;
-            color: white;
-            font-size: 18px;
-            cursor: pointer;
-        }
-
-        button[type="submit"]:hover {
-            background-color: #0056b3;
-        }
-
-        /* Back button styling */
-        .back-btn {
-            display: inline-block;
-            margin-bottom: 20px;
-            padding: 10px 18px;
-            background: #6c757d;
-            color: white;
-            font-size: 15px;
-            font-weight: 600;
-            border-radius: 6px;
-            text-decoration: none;
-            transition: background 0.3s ease;
-        }
-
-        .back-btn:hover {
-            background: #5a6268;
-        }
-
-        @media (max-width: 600px) {
-            .container {
-                padding: 20px;
-            }
-
-            h2 {
-                font-size: 22px;
-            }
-
-            input[type="number"] {
-                font-size: 15px;
-            }
-
-            button[type="submit"] {
-                font-size: 16px;
-            }
-        }
-    </style>
-</head>
-
-<body>
-    <div class="container">
-        <!-- Back to Dashboard Button -->
-        <a href="{{ url_for('index') }}" class="back-btn">← Back to Dashboard</a>
-
-        <h2>CIT Form Entry</h2>
-        <form method="POST" onsubmit="return showSuccessMessage()">
-            <label>Year:</label>
-            <input type="number" name="year" required>
-
-            {% for field in [
-            "gross_total_income", "deduction_80ia_business", "deduction_sec37_disallowance",
-            "deduction_80g", "net_taxable_income", "tax_30_percent", "tax_book_profit_18_5",
-            "tax_payable", "surcharge_12", "edu_cess_3", "total_tax_payable", "mat_credit",
-            "interest_234c", "total_tax", "advance_tax", "tds", "tcs", "tax_on_assessment", "refund"
-            ] %}
-            <label for="{{ field }}">{{ field.replace("_", " ").title() }}:</label>
-            <input type="number" name="{{ field }}" step="0.01" required>
-            {% endfor %}
-            <button type="submit">Submit</button>
-        </form>
-    </div>
-
-    <script>
-        function showSuccessMessage() {
-            alert("Form submitted successfully!");
-            return true; // continue with form submission
-        }
-    </script>
-</body>
-
-</html>

templates/display_itat.html

@@ -43,10 +43,10 @@
                         {% for record in records %}
                         <tr>
                             <td>AY {{ record.year }}-{{ record.year+1 }}</td>
-                            <td>{{ "{:,.2f}".format(record.mat_tax_credit) }}</td>
-                            <td>{{ "{:,.2f}".format(record.surcharge) }}</td>
-                            <td>{{ "{:,.2f}".format(record.cess) }}</td>
-                            <td>{{ "{:,.2f}".format(record.total_credit) }}</td>
+                            <td>{{ "{:,.2f}".format(record.gross_total_income) }}</td>
+                            <td>{{ "{:,.2f}".format(record.net_taxable_income) }}</td>
+                            <td>{{ "{:,.2f}".format(record.total_tax_payable) }}</td>
+                            <td>{{ "{:,.2f}".format(record.refund) }}</td>>
 
                             <td class="action-cell">
                                 <a href="{{ url_for('update_itat', id=record.id) }}" class="btn btn-update">Edit</a>

templates/itat_form.html

@@ -1,150 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <title>ITAT Form Entry</title>
-    <link rel="stylesheet" href="{{ url_for('static', filename='index.css') }}">
-    <style>
-        /* Same styling for layout */
-        * {
-            margin: 0;
-            padding: 0;
-            box-sizing: border-box;
-        }
-
-        body {
-            font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
-            background-color: #f5f7fa;
-            color: #333;
-            padding: 30px 0;
-        }
-
-        .container {
-            width: 90%;
-            max-width: 700px;
-            margin: auto;
-            background-color: #fff;
-            padding: 40px;
-            border-radius: 12px;
-            box-shadow: 0 8px 20px rgba(0, 0, 0, 0.08);
-        }
-
-        h2 {
-            text-align: center;
-            margin-bottom: 30px;
-            font-size: 28px;
-            color: #2c3e50;
-        }
-
-        form {
-            display: flex;
-            flex-direction: column;
-        }
-
-        label {
-            margin-top: 15px;
-            margin-bottom: 6px;
-            font-weight: 600;
-            color: #333;
-        }
-
-        input[type="number"] {
-            padding: 10px 12px;
-            border: 1px solid #ccc;
-            border-radius: 6px;
-            font-size: 16px;
-        }
-
-        input[type="number"]:focus {
-            border-color: #007BFF;
-            outline: none;
-        }
-
-        button[type="submit"] {
-            margin-top: 30px;
-            padding: 12px;
-            background-color: #007BFF;
-            border: none;
-            border-radius: 6px;
-            color: white;
-            font-size: 18px;
-            cursor: pointer;
-        }
-
-        button[type="submit"]:hover {
-            background-color: #0056b3;
-        }
-
-        /* Back button styling */
-        .back-btn {
-            display: inline-block;
-            margin-bottom: 20px;
-            padding: 10px 18px;
-            background: #6c757d;
-            color: white;
-            font-size: 15px;
-            font-weight: 600;
-            border-radius: 6px;
-            text-decoration: none;
-            transition: background 0.3s ease;
-        }
-
-        .back-btn:hover {
-            background: #5a6268;
-        }
-
-        @media (max-width: 600px) {
-            .container {
-                padding: 20px;
-            }
-
-            h2 {
-                font-size: 22px;
-            }
-
-            input[type="number"] {
-                font-size: 15px;
-            }
-
-            button[type="submit"] {
-                font-size: 16px;
-            }
-        }
-    </style>
-</head>
-
-<body>
-    <div class="container">
-        <!-- Back to Dashboard Button -->
-        <a href="{{ url_for('index') }}" class="back-btn">← Back to Dashboard</a>
-
-        <h2>ITAT Form Entry</h2>
-        <form method="POST" onsubmit="return showSuccessMessage()">
-            <label>Year:</label>
-            <input type="number" name="year" step="0.01" required>
-
-            <label>MAT Tax Credit:</label>
-            <input type="number" name="mat_tax_credit" step="0.01" required>
-
-            <label>Surcharge:</label>
-            <input type="number" name="surcharge" step="0.01" required>
-
-            <label>Cess:</label>
-            <input type="number" name="cess" step="0.01" required>
-
-            <label>Total Credit:</label>
-            <input type="number" name="total_credit" step="0.01" required>
-
-            <button type="submit">Submit</button>
-        </form>
-    </div>
-
-    <script>
-        function showSuccessMessage() {
-            alert("Form submitted successfully!");
-            return true;
-        }
-    </script>
-</body>
-
-</html>

templates/itr_form.html

@@ -1,270 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-
-<head>
-
-    <title>ITR Form Entry</title>
-
-    <link rel="stylesheet" href="{{ url_for('static', filename='index.css') }}">
-
-    <style>
-        /* Existing CSS here... */
-
-        * {
-
-            margin: 0;
-
-            padding: 0;
-
-            box-sizing: border-box;
-
-        }
-
-
-
-        body {
-
-            font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
-
-            background-color: #f5f7fa;
-
-            color: #333;
-
-            padding: 30px 0;
-
-        }
-
-
-
-        .container {
-
-            width: 90%;
-
-            max-width: 700px;
-
-            margin: auto;
-
-            background-color: #fff;
-
-            padding: 40px;
-
-            border-radius: 12px;
-
-            box-shadow: 0 8px 20px rgba(0, 0, 0, 0.08);
-
-        }
-
-
-
-        h2 {
-
-            text-align: center;
-
-            margin-bottom: 30px;
-
-            font-size: 28px;
-
-            color: #2c3e50;
-
-        }
-
-
-
-        form {
-
-            display: flex;
-
-            flex-direction: column;
-
-        }
-
-
-
-        label {
-
-            margin-top: 15px;
-
-            margin-bottom: 6px;
-
-            font-weight: 600;
-
-        }
-
-
-
-        input[type="number"] {
-
-            padding: 10px 12px;
-
-            border: 1px solid #ccc;
-
-            border-radius: 6px;
-
-            font-size: 16px;
-
-            transition: border-color 0.3s ease;
-
-        }
-
-
-
-        input[type="number"]:focus {
-
-            border-color: #007BFF;
-
-            outline: none;
-
-        }
-
-
-
-        button[type="submit"] {
-
-            margin-top: 30px;
-
-            padding: 12px;
-
-            background-color: #007BFF;
-
-            border: none;
-
-            border-radius: 6px;
-
-            color: white;
-
-            font-size: 18px;
-
-            cursor: pointer;
-
-            transition: background-color 0.3s ease;
-
-        }
-
-
-
-        button[type="submit"]:hover {
-
-            background-color: #0056b3;
-
-        }
-
-        /* Back button styling */
-        .back-btn {
-            display: inline-block;
-            margin-bottom: 20px;
-            padding: 10px 18px;
-            background: #6c757d;
-            color: white;
-            font-size: 15px;
-            font-weight: 600;
-            border-radius: 6px;
-            text-decoration: none;
-            transition: background 0.3s ease;
-        }
-
-        .back-btn:hover {
-            background: #5a6268;
-        }
-
-
-        @media (max-width: 600px) {
-
-            .container {
-
-                padding: 20px;
-
-            }
-
-
-
-            h2 {
-
-                font-size: 22px;
-
-            }
-
-
-
-            input[type="number"] {
-
-                font-size: 15px;
-
-            }
-
-
-
-            button[type="submit"] {
-
-                font-size: 16px;
-
-            }
-
-        }
-    </style>
-
-</head>
-
-<body>
-
-    <div class="container">
-        <!-- Back to Dashboard Button -->
-        <a href="{{ url_for('index') }}" class="back-btn">← Back to Dashboard</a>
-
-
-
-        <h2>Income Tax Return Form</h2>
-
-        <form method="POST" onsubmit="showSuccessMessage()">
-
-            <label>Year:</label>
-
-            <input type="number" name="year" required>
-
-
-
-            {% for field in [
-
-            "gross_total_income", "disallowance_14a", "disallowance_37",
-
-            "deduction_80ia_business", "deduction_80ia_misc", "deduction_80ia_other",
-
-            "deduction_sec37_disallowance", "deduction_80g", "net_taxable_income",
-
-            "tax_30_percent", "tax_book_profit_18_5", "tax_payable", "surcharge_12",
-
-            "edu_cess_3", "total_tax_payable", "mat_credit", "interest_234c",
-
-            "total_tax", "advance_tax", "tds", "tcs", "tax_on_assessment", "refund"
-
-            ] %}
-
-            <label>{{ field.replace("_", " ").title() }}:</label>
-
-            <input type="number" name="{{ field }}" step="0.01" required>
-
-            {% endfor %}
-
-            <button type="submit">Submit</button>
-
-        </form>
-
-    </div>
-
-
-
-    <!-- JavaScript to show popup -->
-
-    <script>
-
-        function showSuccessMessage() {
-
-            alert("Form submitted successfully!");
-
-        }
-
-    </script>
-
-</body>
-
-</html>

templates/update_ao.html

@@ -17,21 +17,13 @@
             <label for="year">Year:</label>
             <input type="text" id="year" name="year" value="{{ record.year }}" readonly class="readonly-field">
 
-            {% for field in record.keys() if field not in ['id', 'year'] %}
+            {% for field in record.keys() if field not in ['id', 'year', 'remarks'] %}
             <label for="{{ field }}">{{ field.replace("_", " ").title() }}:</label>
             <input type="number" id="{{ field }}" name="{{ field }}" step="any" value="{{ record[field] }}" required>
             {% endfor %}
 
-            <!--            {% for field in record.keys() if field != 'id' %}-->
-            <!--            <label for="{{ field }}">{{ field.replace("_", " ").title() }}:</label>-->
-            <!--            <input -->
-            <!--                type="number" -->
-            <!--                id="{{ field }}" -->
-            <!--                name="{{ field }}" -->
-            <!--                step="any" -->
-            <!--                value="{{ record[field] }}" -->
-            <!--                required>-->
-            <!--            {% endfor %}-->
+            <label for="Remarks">Remarks:</label>
+            <input type="text" id="Remarks" name="Remarks" value="{{ record.remarks}}">
 
             <button type="submit">Update Record</button>
 
@@ -43,6 +35,6 @@
 
 {% block extra_js %}
 <script src="{{ url_for('static', filename='js/toggle.js') }}"></script>
-<script src="{{ url_for('static', filename='js/cit_calc.js') }}"></script>
+<!-- <script src="{{ url_for('static', filename='js/cit_calc.js') }}"></script> -->
 <script src="{{ url_for('static', filename='js/year_dropdown.js') }}"></script>
 {% endblock %}

templates/update_cit.html

@@ -17,22 +17,12 @@
         <label for="year">Year:</label>
         <input type="text" id="year" name="year" value="{{ record.year }}" readonly class="readonly-field">
 
-        {% for field in record.keys() if field not in ['id', 'year'] %}
+        {% for field in record.keys() if field not in ['id', 'year','Remarks'] %}
         <label for="{{ field }}">{{ field.replace("_", " ").title() }}:</label>
         <input type="number" id="{{ field }}" name="{{ field }}" step="any" value="{{ record[field] }}" required>
         {% endfor %}
-
-        <!--        {% for field in record.keys() if field != 'id' %}-->
-        <!--        <label for="{{ field }}">{{ field.replace('_', ' ').title() }}:</label>-->
-        <!--        <input -->
-        <!--            type="number" -->
-        <!--            step="0.01" -->
-        <!--            id="{{ field }}" -->
-        <!--            name="{{ field }}" -->
-        <!--            value="{{ record[field] }}" -->
-        <!--            required -->
-        <!--        />-->
-        <!--        {% endfor %}-->
+        <label for="Remarks">Remarks:</label>
+        <input type="text" id="Remarks" name="Remarks" value="{{ record.Remarks }}">
 
         <button type="submit">Update Record</button>
 
@@ -44,6 +34,6 @@
 
 {% block extra_js %}
 <script src="{{ url_for('static', filename='js/toggle.js') }}"></script>
-<script src="{{ url_for('static', filename='js/cit_calc.js') }}"></script>
+<!-- <script src="{{ url_for('static', filename='js/cit_calc.js') }}"></script> -->
 <script src="{{ url_for('static', filename='js/year_dropdown.js') }}"></script>
 {% endblock %}

templates/update_itat.html

@@ -12,20 +12,16 @@
 
     <form method="POST" action="{{ url_for('update_itat', id=record.id) }}">
 
-        <label>Year:</label>
-        <input type="number" name="year" step="1" value="{{ record.year }}" readonly>
+        <label for="year">Year:</label>
+        <input type="text" id="year" name="year" value="{{ record.year }}" readonly class="readonly-field">
 
-        <label>MAT Tax Credit:</label>
-        <input type="number" name="mat_tax_credit" step="0.01" value="{{ record.mat_tax_credit }}" required>
+        {% for field in record.keys() if field not in ['id', 'year', 'Remarks'] %}
+        <label for="{{ field }}">{{ field.replace("_", " ").title() }}:</label>
+        <input type="number" id="{{ field }}" name="{{ field }}" step="any" value="{{ record[field] }}" required>
+        {% endfor %}
 
-        <label>Surcharge:</label>
-        <input type="number" name="surcharge" step="0.01" value="{{ record.surcharge }}" required>
-
-        <label>Cess:</label>
-        <input type="number" name="cess" step="0.01" value="{{ record.cess }}" required>
-
-        <label>Total Credit:</label>
-        <input type="number" name="total_credit" step="0.01" value="{{ record.total_credit }}" required>
+        <label for="Remarks">Remarks:</label>
+        <input type="text" id="Remarks" name="Remarks" value="{{ record.Remarks }}">
 
         <button type="submit">Update Record</button>
     </form>
@@ -36,6 +32,6 @@
 
 {% block extra_js %}
 <script src="{{ url_for('static', filename='js/toggle.js') }}"></script>
-<script src="{{ url_for('static', filename='js/cit_calc.js') }}"></script>
+<!-- <script src="{{ url_for('static', filename='js/cit_calc.js') }}"></script> -->
 <script src="{{ url_for('static', filename='js/year_dropdown.js') }}"></script>
 {% endblock %}

templates/update_itr.html

@@ -17,21 +17,13 @@
             <label for="year">Year:</label>
             <input type="text" id="year" name="year" value="{{ record.year }}" readonly class="readonly-field">
 
-            {% for field in record.keys() if field not in ['id', 'year'] %}
+            {% for field in record.keys() if field not in ['id', 'year', 'Remarks'] %}
             <label for="{{ field }}">{{ field.replace("_", " ").title() }}:</label>
             <input type="number" id="{{ field }}" name="{{ field }}" step="any" value="{{ record[field] }}" required>
             {% endfor %}
 
-            <!--            {% for field in record.keys() if field != 'id' %}-->
-            <!--            <label for="{{ field }}">{{ field.replace("_", " ").title() }}:</label>-->
-            <!--            <input -->
-            <!--                type="number" -->
-            <!--                id="{{ field }}" -->
-            <!--                name="{{ field }}" -->
-            <!--                step="any" -->
-            <!--                value="{{ record[field] }}" -->
-            <!--                required>-->
-            <!--            {% endfor %}-->
+            <label for="Remarks">Remarks:</label>
+            <input type="text" id="Remarks" name="Remarks" value="{{ record.Remarks }}">
 
             <button type="submit">Update Record</button>
 
@@ -43,6 +35,6 @@
 
 {% block extra_js %}
 <script src="{{ url_for('static', filename='js/toggle.js') }}"></script>
-<script src="{{ url_for('static', filename='js/cit_calc.js') }}"></script>
+<!-- <script src="{{ url_for('static', filename='js/cit_calc.js') }}"></script> -->
 <script src="{{ url_for('static', filename='js/year_dropdown.js') }}"></script>
 {% endblock %}