changes of report and models

AppCode/AOHandler.py

@@ -34,17 +34,14 @@ class AOHandler:
     def add_ao(self, data):
         
         try:
-            fields = [
+            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', 'per_tax_a', 'tax_a_cal', 'per_surcharge_a', 'surcharge_a_cal', 'per_cess_a', 'edu_cess_a_cal', 'sum_of_a', 
-                'deduction_sec37_disallowance', 'deduction_80g',
+                            'per_tax_b', 'tax_b_cal', 'per_surcharge_b', 'surcharge_b_cal', 'per_cess_b', 'edu_cess_b_cal', 'sum_of_b',
-                'net_taxable_income', 'tax_30_percent', 'tax_book_profit_18_5',
+                            'tax_payable','total_tax_payable', 'opening_balance', 'mat_credit_created', 'mat_credit_utilized', 'closing_balance', 
-                'tax_payable', 'surcharge', 'edu_cess',
+                            'interest_234c', 'total_tax', 'advance_tax', 'tds', 'tcs', 'sat', 'tax_on_assessment', 'refund', 
-                'total_tax_payable', 'mat_credit_created', 'mat_credit_utilized',
+                            'interest_244a_per143', 'refund_received', 'balance_receivable', 'remarks', 'created_at'
-                'interest_234c', 'total_tax', 'advance_tax', 'tds', 'tcs',
+                        ]
-                'sat', 'tax_on_assessment', 'refund', 'Remarks','created_at'
-            ]
-
             values = [data.get(f, 0) for f in fields]
             self.cursor.callproc("InsertAO", values)    
             self.conn.commit()
@@ -57,15 +54,13 @@ class AOHandler:
 
     # UPDATE AO RECORD by AO id
     def update_ao(self, id, data):
-        fields = [
+        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', 'per_tax_a', 'tax_a_cal', 'per_surcharge_a', 'surcharge_a_cal', 'per_cess_a', 'edu_cess_a_cal', 'sum_of_a', 
-                'deduction_sec37_disallowance', 'deduction_80g',
+                'per_tax_b', 'tax_b_cal', 'per_surcharge_b', 'surcharge_b_cal', 'per_cess_b', 'edu_cess_b_cal', 'sum_of_b',
-                'net_taxable_income', 'tax_30_percent', 'tax_book_profit_18_5',
+                'tax_payable','total_tax_payable', 'opening_balance', 'mat_credit_created', 'mat_credit_utilized', 'closing_balance', 
-                'tax_payable', 'surcharge', 'edu_cess',
+                'interest_234c', 'total_tax', 'advance_tax', 'tds', 'tcs', 'sat', 'tax_on_assessment', 'refund', 
-                'total_tax_payable', 'mat_credit_created', 'mat_credit_utilized',
+                'interest_244a_per143', 'refund_received', 'balance_receivable', 'remarks', 'updated_at'
-                'interest_234c', 'total_tax', 'advance_tax', 'tds', 'tcs',
-                'sat', 'tax_on_assessment', 'refund', 'Remarks'
             ]
 
         values = [id] + [data.get(f, 0) for f in fields]
@@ -106,20 +101,35 @@ class AOHandler:
                 "gross_total_income": "Gross Total Income",
                 "disallowance_14a": "Add: Disallowance u/s 14A",
                 "disallowance_37": "Add: Disallowance u/s 37",
+                "-" : "-",
                 "deduction_80ia_business": "Less: Deduction u/s 80IA - On Business Income",
                 "deduction_80ia_misc": "On Misc Receipts",
                 "deduction_80ia_other": "On Other",
                 "deduction_sec37_disallowance": "On Sec 37 Disallowance",
                 "deduction_80g": "Less: Deduction u/s 80G",
                 "net_taxable_income": "Net Taxable Income",
-                "tax_30_percent": "Tax @ 30%",
+                "-" : "-",
-                "tax_book_profit_18_5": "Tax @ 18.5% on Book Profit",
+                "per_tax_a" : "Per% Tax @(A)",
+                "tax_a_cal" : "Tax cal(A)",
+                "per_surcharge_a" : "Per% surcharge @(A)",
+                "surcharge_a_cal" : "Surcharge cal (A)",
+                "per_cess_a" : "Per% cess(A)",
+                "edu_cess_a_cal" : "Edu cess cal(A)",
+                "sum_of_a" : "Sum of tax_cal(A)",
+                "-" : "-",
+                "per_tax_b" : "Per% Tax @(B)",
+                "tax_b_cal" : "Tax cal(B)",
+                "per_surcharge_b" : "Per% surcharge @(B)",
+                "surcharge_b_cal" : "Surcharge cal (B)",
+                "per_cess_b" : "Per% cess(B)",
+                "edu_cess_b_cal" : "Edu cess cal(B)",
+                "sum_of_b" : "Sum of tax_cal(B)",
                 "tax_payable": "Tax Payable",
-                "surcharge": "Surcharge",
-                "edu_cess": "Education Cess",
                 "total_tax_payable": "Total Tax Payable",
+                "opening_balance": "Opening Balance",
                 "mat_credit_created": "Add: MAT Credit Created",
                 "mat_credit_utilized": "Less: MAT Credit Utilized",
+                "closing_balance": "Closing Balance",
                 "interest_234c": "Add: Interest u/s 234C",
                 "total_tax": "Total Tax",
                 "advance_tax": "Advance Tax",
@@ -127,8 +137,11 @@ class AOHandler:
                 "tcs": "TCS",
                 "sat": "SAT",
                 "tax_on_assessment": "Tax on Regular Assessment",
-                "refund": "Refund",
+                "refund" : "Refund",
-                "Remarks": "Remarks"
+                "interest_244a_per143" : "Add : Interest u/s 244A as per 143",
+                "refund_received" : "Less : Refund Received on",
+                "balance_receivable" : "Balance Receivable",
+                "Remarks" : "Remarks"
             }
 
             # Vertical AO structure

AppCode/CITHandler.py

@@ -35,15 +35,13 @@ class CITHandler:
 
     # INSERT CIT RECORD
     def add_cit(self, data):
-        columns = [
+        columns= [ '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', 'per_tax_a', 'tax_a_cal', 'per_surcharge_a', 'surcharge_a_cal', 'per_cess_a', 'edu_cess_a_cal', 'sum_of_a', 
-                'deduction_sec37_disallowance', 'deduction_80g',
+                'per_tax_b', 'tax_b_cal', 'per_surcharge_b', 'surcharge_b_cal', 'per_cess_b', 'edu_cess_b_cal', 'sum_of_b',
-                'net_taxable_income', 'tax_30_percent', 'tax_book_profit_18_5',
+                'tax_payable','total_tax_payable', 'opening_balance', 'mat_credit_created', 'mat_credit_utilized', 'closing_balance', 
-                'tax_payable', 'surcharge', 'edu_cess',
+                'interest_234c', 'total_tax', 'advance_tax', 'tds', 'tcs', 'sat', 'tax_on_assessment', 'refund', 
-                'total_tax_payable', 'mat_credit_created', 'mat_credit_utilized',
+                'interest_244a_per143', 'refund_received', 'balance_receivable', 'remarks', 'created_at'
-                'interest_234c', 'total_tax', 'advance_tax', 'tds', 'tcs',
-                'sat', 'tax_on_assessment', 'refund', 'Remarks','created_at'
             ]
 
         values = [data.get(col, 0) for col in columns]
@@ -53,15 +51,13 @@ class CITHandler:
 
     # UPDATE CIT RECORD
     def update_cit(self, id, data):
-        columns = [
+        columns= [ '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', 'per_tax_a', 'tax_a_cal', 'per_surcharge_a', 'surcharge_a_cal', 'per_cess_a', 'edu_cess_a_cal', 'sum_of_a', 
-                'deduction_sec37_disallowance', 'deduction_80g',
+                'per_tax_b', 'tax_b_cal', 'per_surcharge_b', 'surcharge_b_cal', 'per_cess_b', 'edu_cess_b_cal', 'sum_of_b',
-                'net_taxable_income', 'tax_30_percent', 'tax_book_profit_18_5',
+                'tax_payable','total_tax_payable', 'opening_balance', 'mat_credit_created', 'mat_credit_utilized', 'closing_balance', 
-                'tax_payable', 'surcharge', 'edu_cess',
+                'interest_234c', 'total_tax', 'advance_tax', 'tds', 'tcs', 'sat', 'tax_on_assessment', 'refund', 
-                'total_tax_payable', 'mat_credit_created', 'mat_credit_utilized',
+                'interest_244a_per143', 'refund_received', 'balance_receivable', 'remarks', 'updated_at'
-                'interest_234c', 'total_tax', 'advance_tax', 'tds', 'tcs',
-                'sat', 'tax_on_assessment', 'refund', 'Remarks'
             ]
 
         values = [id] + [data.get(col, 0) for col in columns]
@@ -100,20 +96,35 @@ class CITHandler:
                 "gross_total_income": "Gross Total Income",
                 "disallowance_14a": "Add: Disallowance u/s 14A",
                 "disallowance_37": "Add: Disallowance u/s 37",
+                "-" : "-",
                 "deduction_80ia_business": "Less: Deduction u/s 80IA - On Business Income",
                 "deduction_80ia_misc": "On Misc Receipts",
                 "deduction_80ia_other": "On Other",
                 "deduction_sec37_disallowance": "On Sec 37 Disallowance",
                 "deduction_80g": "Less: Deduction u/s 80G",
                 "net_taxable_income": "Net Taxable Income",
-                "tax_30_percent": "Tax @ 30%",
+                "-" : "-",
-                "tax_book_profit_18_5": "Tax @ 18.5% on Book Profit",
+                "per_tax_a" : "Per% Tax @(A)",
+                "tax_a_cal" : "Tax cal(A)",
+                "per_surcharge_a" : "Per% surcharge @(A)",
+                "surcharge_a_cal" : "Surcharge cal (A)",
+                "per_cess_a" : "Per% cess(A)",
+                "edu_cess_a_cal" : "Edu cess cal(A)",
+                "sum_of_a" : "Sum of tax_cal(A)",
+                "-" : "-",
+                "per_tax_b" : "Per% Tax @(B)",
+                "tax_b_cal" : "Tax cal(B)",
+                "per_surcharge_b" : "Per% surcharge @(B)",
+                "surcharge_b_cal" : "Surcharge cal (B)",
+                "per_cess_b" : "Per% cess(B)",
+                "edu_cess_b_cal" : "Edu cess cal(B)",
+                "sum_of_b" : "Sum of tax_cal(B)",
                 "tax_payable": "Tax Payable",
-                "surcharge": "Surcharge @ %",
-                "edu_cess": "Education Cess @ %",
                 "total_tax_payable": "Total Tax Payable",
+                "opening_balance": "Opening Balance",
                 "mat_credit_created": "Add: MAT Credit Created",
                 "mat_credit_utilized": "Less: MAT Credit Utilized",
+                "closing_balance": "Closing Balance",
                 "interest_234c": "Add: Interest u/s 234C",
                 "total_tax": "Total Tax",
                 "advance_tax": "Advance Tax",
@@ -121,8 +132,11 @@ class CITHandler:
                 "tcs": "TCS",
                 "sat": "SAT",
                 "tax_on_assessment": "Tax on Regular Assessment",
-                "refund": "Refund",
+                "refund" : "Refund",
-                "Remarks": "Remarks"
+                "interest_244a_per143" : "Add : Interest u/s 244A as per 143",
+                "refund_received" : "Less : Refund Received on",
+                "balance_receivable" : "Balance Receivable",
+                "Remarks" : "Remarks"
             }
 
             # Vertical CIT structure (single record per year)

AppCode/DocumentHandler.py

@@ -23,13 +23,6 @@ class DocumentHandler:
     # Utility: Parse Year
     # =========================
     def parse_year(self, year_value):
-        """
-        Accepts:
-        - '2026'
-        - 'AY 2026-2027'
-        Returns:
-        - 2026 (int)
-        """
         if not year_value:
             return None
 
@@ -166,24 +159,46 @@ class DocumentHandler:
 
             columns = [
                 'gross_total_income', 'disallowance_14a',
-                'disallowance_37', '-',
+                'disallowance_37', 
+                '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',
+                'per_tax_a',
-                'tax_payable', 'surcharge',
+                'tax_a_cal',
-                'edu_cess', 'total_tax_payable',
+                'per_surcharge_a',
+                'surcharge_a_cal',
+                'per_cess_a',
+                'edu_cess_a_cal',
+                'sum_of_a',
+                '-',
+                'per_tax_b',
+                'tax_b_cal',
+                'per_surcharge_b',
+                'surcharge_b_cal',
+                'per_cess_b',
+                'edu_cess_b_cal',
+                'sum_of_b',
+                '-',
+                'tax_payable',
+                'total_tax_payable',
+                'opening_balance',
                 'mat_credit_created',
                 'mat_credit_utilized',
+                'closing_balance',
                 'interest_234c', 'total_tax',
                 '-', 'advance_tax', 'tds',
                 'tcs', 'sat',
                 'tax_on_assessment',
-                'refund', 'Remarks'
+                'refund', 
+                'interest_244a_per143',
+                'refund_received',
+                'balance_receivable',
+                'Remarks'
             ]
 
             particulars = [
@@ -192,18 +207,36 @@ class DocumentHandler:
                 "Less: Deduction u/s 80IA - On Business Income",
                 "- On Misc Receipts", "- On Other",
                 "- On Sec 37 Disallowance",
-                "Less: Deduction u/s 80G", " ",
+                "Less: Deduction u/s 80G", "-",
-                "Net Taxable Income", "Tax @ 30%",
+                "Net Taxable Income", "-",
-                "Tax @ 18.5% on Book Profit",
+                "Per% Tax @(A)",
-                "Tax Payable", "Surcharge @ %",
+                "Tax cal(A)",
-                "Education Cess @ %", "Total Tax Payable",
+                "Per% surcharge @(A)",
+                "Surcharge cal (A)",
+                "Per% cess(A)",
+                "Edu cess cal(A)",
+                "Sum of tax_cal(A)",
+                "-",
+                "Per% Tax @(B)",
+                "Tax cal(B)",
+                "Per% surcharge @(B)",
+                "Surcharge cal (B)",
+                "Per% cess(B)",
+                "Edu cess cal(B)",
+                "Sum of tax_cal(B)",
+                "-",
+                "Tax Payable",
+                "Total Tax Payable",
+                "Opening Balance:",
                 "Add: MAT Credit Created",
                 "Less: MAT Credit Utilized",
+                "Closing Balance",
                 "Add: Interest u/s 234C",
-                "Total Tax", " ",
+                "Total Tax", "-",
                 "Advance Tax", "TDS", "TCS", "SAT",
                 "Tax on Regular Assessment",
-                "Refund", "Remarks"
+                "Refund", "Add : Interest u/s 244A as per 143",
+                "Less : Refund Received on:","Balance Receivable","Remarks"
             ]
 
             def safe_get(df, col):
@@ -275,40 +308,80 @@ class DocumentHandler:
                 "Less: Deduction u/s 80IA - On Business Income",
                 "- On Misc Receipts", "- On Other",
                 "- On Sec 37 Disallowance",
-                "Less: Deduction u/s 80G", " ",
+                "Less: Deduction u/s 80G", "-",
-                "Net Taxable Income", "Tax @ 30%",
+                "Net Taxable Income", "-",
-                "Tax @ 18.5% on Book Profit",
+                "Per% Tax @(A)",
-                "Tax Payable", "Surcharge @ %",
+                "Tax cal(A)",
-                "Education Cess @ %", "Total Tax Payable",
+                "Per% surcharge @(A)",
+                "Surcharge cal (A)",
+                "Per% cess(A)",
+                "Edu cess cal(A)",
+                "Sum of tax_cal(A)",
+                "-",
+                "Per% Tax @(B)",
+                "Tax cal(B)",
+                "Per% surcharge @(B)",
+                "Surcharge cal (B)",
+                "Per% cess(B)",
+                "Edu cess cal(B)",
+                "Sum of tax_cal(B)",
+                "-",
+                "Tax Payable",
+                "Total Tax Payable",
+                "Opening Balance",
                 "Add: MAT Credit Created",
                 "Less: MAT Credit Utilized",
+                "Closing Balance",
                 "Add: Interest u/s 234C",
-                "Total Tax", " ",
+                "Total Tax", "-",
                 "Advance Tax", "TDS", "TCS", "SAT",
                 "Tax on Regular Assessment",
-                "Refund", "Remarks"
+                "Refund", "Add : Interest u/s 244A as per 143",
+                "Less : Refund Received on","Balance Receivable","Remarks"
             ]
 
             columns = [
                 'gross_total_income', 'disallowance_14a',
-                'disallowance_37', '-',
+                'disallowance_37', 
+                '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',
+                'per_tax_a',
-                'tax_payable', 'surcharge',
+                'tax_a_cal',
-                'edu_cess', 'total_tax_payable',
+                'per_surcharge_a',
+                'surcharge_a_cal',
+                'per_cess_a',
+                'edu_cess_a_cal',
+                'sum_of_a',
+                '-',
+                'per_tax_b',
+                'tax_b_cal',
+                'per_surcharge_b',
+                'surcharge_b_cal',
+                'per_cess_b',
+                'edu_cess_b_cal',
+                'sum_of_b',
+                '-',
+                'tax_payable',
+                'total_tax_payable',
+                'opening_balance',
                 'mat_credit_created',
                 'mat_credit_utilized',
+                'closing_balance',
                 'interest_234c', 'total_tax',
                 '-', 'advance_tax', 'tds',
                 'tcs', 'sat',
                 'tax_on_assessment',
-                'refund', 'Remarks'
+                'refund', 
+                'interest_244a_per143',
+                'refund_received',
+                'balance_receivable',
+                'Remarks'
             ]
 
             data = {
@@ -372,5 +445,4 @@ class DocumentHandler:
             )
 
         finally:
-            connection.close()
+            connection.close()
-

AppCode/ITATHandler.py

@@ -31,16 +31,15 @@ class ITATHandler:
 
     # INSERT ITAT (PROC)
     def add_itat(self, data):
-        columns = [
+        columns= [ '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', 'per_tax_a', 'tax_a_cal', 'per_surcharge_a', 'surcharge_a_cal', 'per_cess_a', 'edu_cess_a_cal', 'sum_of_a', 
-            'deduction_sec37_disallowance', 'deduction_80g',
+                        'per_tax_b', 'tax_b_cal', 'per_surcharge_b', 'surcharge_b_cal', 'per_cess_b', 'edu_cess_b_cal', 'sum_of_b',
-            'net_taxable_income', 'tax_30_percent', 'tax_book_profit_18_5',
+                        'tax_payable','total_tax_payable', 'opening_balance', 'mat_credit_created', 'mat_credit_utilized', 'closing_balance', 
-            'tax_payable', 'surcharge', 'edu_cess',
+                        'interest_234c', 'total_tax', 'advance_tax', 'tds', 'tcs', 'sat', 'tax_on_assessment', 'refund', 
-            'total_tax_payable', 'mat_credit_created', 'mat_credit_utilized',
+                        'interest_244a_per143', 'refund_received', 'balance_receivable', 'remarks', 'created_at'
-            '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)
@@ -48,16 +47,14 @@ class ITATHandler:
 
     # UPDATE ITAT (PROC)
     def update_itat(self, id, data):
-        columns = [
+        columns= [ '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', 'per_tax_a', 'tax_a_cal', 'per_surcharge_a', 'surcharge_a_cal', 'per_cess_a', 'edu_cess_a_cal', 'sum_of_a', 
-            'deduction_sec37_disallowance', 'deduction_80g',
+                'per_tax_b', 'tax_b_cal', 'per_surcharge_b', 'surcharge_b_cal', 'per_cess_b', 'edu_cess_b_cal', 'sum_of_b',
-            'net_taxable_income', 'tax_30_percent', 'tax_book_profit_18_5',
+                'tax_payable','total_tax_payable', 'opening_balance', 'mat_credit_created', 'mat_credit_utilized', 'closing_balance', 
-            'tax_payable', 'surcharge', 'edu_cess',
+                'interest_234c', 'total_tax', 'advance_tax', 'tds', 'tcs', 'sat', 'tax_on_assessment', 'refund', 
-            'total_tax_payable', 'mat_credit_created', 'mat_credit_utilized',
+                'interest_244a_per143', 'refund_received', 'balance_receivable', 'remarks', 'updated_at'
-            '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)
@@ -94,20 +91,35 @@ class ITATHandler:
                 "gross_total_income": "Gross Total Income",
                 "disallowance_14a": "Add: Disallowance u/s 14A",
                 "disallowance_37": "Add: Disallowance u/s 37",
+                "-" : "-",
                 "deduction_80ia_business": "Less: Deduction u/s 80IA - On Business Income",
                 "deduction_80ia_misc": "On Misc Receipts",
                 "deduction_80ia_other": "On Other",
                 "deduction_sec37_disallowance": "On Sec 37 Disallowance",
                 "deduction_80g": "Less: Deduction u/s 80G",
                 "net_taxable_income": "Net Taxable Income",
-                "tax_30_percent": "Tax @ 30%",
+                "-" : "-",
-                "tax_book_profit_18_5": "Tax @ 18.5% on Book Profit",
+                "per_tax_a" : "Per% Tax @(A)",
+                "tax_a_cal" : "Tax cal(A)",
+                "per_surcharge_a" : "Per% surcharge @(A)",
+                "surcharge_a_cal" : "Surcharge cal (A)",
+                "per_cess_a" : "Per% cess(A)",
+                "edu_cess_a_cal" : "Edu cess cal(A)",
+                "sum_of_a" : "Sum of tax_cal(A)",
+                "-" : "-",
+                "per_tax_b" : "Per% Tax @(B)",
+                "tax_b_cal" : "Tax cal(B)",
+                "per_surcharge_b" : "Per% surcharge @(B)",
+                "surcharge_b_cal" : "Surcharge cal (B)",
+                "per_cess_b" : "Per% cess(B)",
+                "edu_cess_b_cal" : "Edu cess cal(B)",
+                "sum_of_b" : "Sum of tax_cal(B)",
                 "tax_payable": "Tax Payable",
-                "surcharge": "Surcharge @ %",
-                "edu_cess": "Education Cess @ %",
                 "total_tax_payable": "Total Tax Payable",
-                "mat_credit_created": "Add: MAT Credit created",
+                "opening_balance": "Opening Balance",
+                "mat_credit_created": "Add: MAT Credit Created",
                 "mat_credit_utilized": "Less: MAT Credit Utilized",
+                "closing_balance": "Closing Balance",
                 "interest_234c": "Add: Interest u/s 234C",
                 "total_tax": "Total Tax",
                 "advance_tax": "Advance Tax",
@@ -115,10 +127,13 @@ class ITATHandler:
                 "tcs": "TCS",
                 "sat": "SAT",
                 "tax_on_assessment": "Tax on Regular Assessment",
-                "refund": "Refund",
+                "refund" : "Refund",
-                "Remarks": "Remarks"
+                "interest_244a_per143" : "Add : Interest u/s 244A as per 143",
+                "refund_received" : "Less : Refund Received on",
+                "balance_receivable" : "Balance Receivable",
+                "Remarks" : "Remarks"
             }
-
+            
             # Vertical ITAT structure
             data = []
             for key, label in field_mapping.items():

AppCode/ITRHandler.py

@@ -40,18 +40,16 @@ class ITRHandler:
 
     # INSERT ITR RECORD using procedure "add_itr"
     def add_itr(self, data):
-
         try:
-            columns = [
+            columns= [ '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', 'per_tax_a', 'tax_a_cal', 'per_surcharge_a', 'surcharge_a_cal', 'per_cess_a', 'edu_cess_a_cal', 'sum_of_a', 
-                'deduction_sec37_disallowance', 'deduction_80g',
+                'per_tax_b', 'tax_b_cal', 'per_surcharge_b', 'surcharge_b_cal', 'per_cess_b', 'edu_cess_b_cal', 'sum_of_b',
-                'net_taxable_income', 'tax_30_percent', 'tax_book_profit_18_5',
+                'tax_payable','total_tax_payable', 'opening_balance', 'mat_credit_created', 'mat_credit_utilized', 'closing_balance', 
-                'tax_payable', 'surcharge', 'edu_cess',
+                'interest_234c', 'total_tax', 'advance_tax', 'tds', 'tcs', 'sat', 'tax_on_assessment', 'refund', 
-                'total_tax_payable', 'mat_credit_created', 'mat_credit_utilized',
+                'interest_244a_per143', 'refund_received', 'balance_receivable', 'remarks', 'created_at'
-                'interest_234c', 'total_tax', 'advance_tax', 'tds', 'tcs',
-                'sat', 'tax_on_assessment', 'refund', 'Remarks','created_at'
             ]
+
             values = [data.get(col, 0) for col in columns]
 
             # Call your stored procedure
@@ -67,23 +65,21 @@ class ITRHandler:
 
     # update itr by id
     def update(self, id, data):
-        columns = [
+        columns= [ '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', 'per_tax_a', 'tax_a_cal', 'per_surcharge_a', 'surcharge_a_cal', 'per_cess_a', 'edu_cess_a_cal', 'sum_of_a', 
-            'deduction_sec37_disallowance', 'deduction_80g',
+                'per_tax_b', 'tax_b_cal', 'per_surcharge_b', 'surcharge_b_cal', 'per_cess_b', 'edu_cess_b_cal', 'sum_of_b',
-            'net_taxable_income', 'tax_30_percent', 'tax_book_profit_18_5',
+                'tax_payable','total_tax_payable', 'opening_balance', 'mat_credit_created', 'mat_credit_utilized', 'closing_balance', 
-            'tax_payable', 'surcharge', 'edu_cess',
+                'interest_234c', 'total_tax', 'advance_tax', 'tds', 'tcs', 'sat', 'tax_on_assessment', 'refund', 
-            'total_tax_payable', 'mat_credit_created', 'mat_credit_utilized',
+                'interest_244a_per143', 'refund_received', 'balance_receivable', 'remarks', 'updated_at'
-            '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("UpdateITR", values)
         self.conn.commit()
 
 
-    # DELETE RECORD by ITR id
+    # DELETE RECORD by ITR id  
     def delete_itr_by_id(self, id):
         self.cursor.callproc('DeleteITRById', [id])
         self.conn.commit()
@@ -109,20 +105,35 @@ class ITRHandler:
                 "gross_total_income": "Gross Total Income",
                 "disallowance_14a": "Add: Disallowance u/s 14A",
                 "disallowance_37": "Add: Disallowance u/s 37",
+                "-" : "-",
                 "deduction_80ia_business": "Less: Deduction u/s 80IA - On Business Income",
                 "deduction_80ia_misc": "On Misc Receipts",
                 "deduction_80ia_other": "On Other",
                 "deduction_sec37_disallowance": "On Sec 37 Disallowance",
                 "deduction_80g": "Less: Deduction u/s 80G",
                 "net_taxable_income": "Net Taxable Income",
-                "tax_30_percent": "Tax @ 30%",
+                "-" : "-",
-                "tax_book_profit_18_5": "Tax @ 18.5% on Book Profit",
+                "per_tax_a" : "Per% Tax @(A)",
+                "tax_a_cal" : "Tax cal(A)",
+                "per_surcharge_a" : "Per% surcharge @(A)",
+                "surcharge_a_cal" : "Surcharge cal (A)",
+                "per_cess_a" : "Per% cess(A)",
+                "edu_cess_a_cal" : "Edu cess cal(A)",
+                "sum_of_a" : "Sum of tax_cal(A)",
+                "-" : "-",
+                "per_tax_b" : "Per% Tax @(B)",
+                "tax_b_cal" : "Tax cal(B)",
+                "per_surcharge_b" : "Per% surcharge @(B)",
+                "surcharge_b_cal" : "Surcharge cal (B)",
+                "per_cess_b" : "Per% cess(B)",
+                "edu_cess_b_cal" : "Edu cess cal(B)",
+                "sum_of_b" : "Sum of tax_cal(B)",
                 "tax_payable": "Tax Payable",
-                "surcharge": "Surcharge @ %",
-                "edu_cess": "Education Cess @ %",
                 "total_tax_payable": "Total Tax Payable",
+                "opening_balance": "Opening Balance",
                 "mat_credit_created": "Add: MAT Credit Created",
                 "mat_credit_utilized": "Less: MAT Credit Utilized",
+                "closing_balance": "Closing Balance",
                 "interest_234c": "Add: Interest u/s 234C",
                 "total_tax": "Total Tax",
                 "advance_tax": "Advance Tax",
@@ -130,10 +141,14 @@ class ITRHandler:
                 "tcs": "TCS",
                 "sat": "SAT",
                 "tax_on_assessment": "Tax on Regular Assessment",
-                "refund": "Refund"
+                "refund" : "Refund",
+                "interest_244a_per143" : "Add : Interest u/s 244A as per 143",
+                "refund_received" : "Less : Refund Received on",
+                "balance_receivable" : "Balance Receivable",
+                "Remarks" : "Remarks"
             }
 
-            # Convert to vertical structure
+            # Convert to vertical structures
             data = []
             for key, label in field_mapping.items():
                 value = rows[0].get(key, 0)

AppCode/LoginAuth.py

@@ -1,40 +1,71 @@
 from flask import Blueprint, render_template, request, redirect, url_for, flash, session
-from flask import flash,redirect,url_for
 from functools import wraps
-from flask import session
+from ldap3 import Server, Connection, ALL
+from ldap3.core.exceptions import LDAPException
+
 
 class LoginAuth:
     def __init__(self):
+        # Create Blueprint
         self.bp = Blueprint("auth", __name__)
 
+        # -------------------------------
+        # LDAP CONFIGURATION
+        # -------------------------------
+        self.LDAP_SERVER = "ldap://localhost:389"
+ 
+        self.BASE_DN = "ou=users,dc=lcepl,dc=org"        # LDAP Users DN
+
+        # -------------------------------
         # LOGIN ROUTE
+        # -------------------------------
         @self.bp.route('/login', methods=['GET', 'POST'])
         def login():
             if request.method == 'POST':
                 username = request.form.get("username")
                 password = request.form.get("password")
 
-                # Dummy validation — REPLACE with DB check later
+                if not username or not password:
-                if username == "admin" and password == "admin123":
+                    flash("Username and password are required!", "danger")
-                    session['user'] = username
+                    return render_template("login.html")
-                    flash("Login successful!", "success")
-                    return redirect(url_for('welcome'))
-                else:
-                    flash("Invalid username or password!", "danger")
 
+                user_dn = f"uid={username},{self.BASE_DN}"
+                server = Server(self.LDAP_SERVER, get_info=ALL)
+
+                try:
+                    # Attempt LDAP bind
+                    conn = Connection(server, user=user_dn, password=password, auto_bind=True)
+                    if conn.bound:
+                        session['user'] = username
+                        flash(f"Login successful! Welcome {username}", "success")
+                        return redirect(url_for('welcome'))
+                    else:
+                        flash("Invalid username or password!", "danger")
+                except LDAPException as e:
+                    flash(f"LDAP login failed: {str(e)}", "danger")
+                finally:
+                    if 'conn' in locals():
+                        conn.unbind()
+
+            # GET request: show login form
             return render_template("login.html")
 
+        # -------------------------------
         # LOGOUT ROUTE
+        # -------------------------------
         @self.bp.route('/logout')
         def logout():
             session.clear()
             flash("Logged out successfully!", "success")
             return redirect(url_for('auth.login'))
-        
+
-        # ===================================================
+    # ===================================================
-    #       LOGIN REQUIRED DECORATOR INSIDE CLASS
+    # LOGIN REQUIRED DECORATOR INSIDE CLASS
     # ===================================================
     def login_required(self, f):
+        """
+        Protect routes: redirect to login if user not authenticated.
+        """
         @wraps(f)
         def wrapper(*args, **kwargs):
             if "user" not in session:

static/js/ao_calc.js

@@ -18,7 +18,6 @@ document.addEventListener("DOMContentLoaded", function () {
         // -- total gross income --
         var gross_total = gross_total_income + disallowance_37 + disallowance_14a;
         setValue("gti_as_per_ao", gross_total);
-        // console.log("gross_total income:: " + gross_total)
 
         // --- DEDUCTIONS ---
         var d80_business = getValue("deduction_80ia_business");

static/js/itr_calc.js

@@ -13,11 +13,11 @@ document.addEventListener("DOMContentLoaded", function () {
     // ---- Track last edited field for Tax(A) ----
     let lastEditedTaxA = null;
 
-    document.getElementsByName("per_a")[0].addEventListener("input", () => {
+    document.getElementsByName("per_tax_a")[0].addEventListener("input", () => {
         lastEditedTaxA = "percentage";
     });
 
-    document.getElementsByName("tax_30_percent")[0].addEventListener("input", () => {
+    document.getElementsByName("tax_a_cal")[0].addEventListener("input", () => {
         lastEditedTaxA = "amount";
     });
 
@@ -44,47 +44,47 @@ document.addEventListener("DOMContentLoaded", function () {
         setValue("net_taxable_income", net_taxable_income);
 
         // ================= TAX (A) – TWO WAY =================
-        var per_a = getValue("per_a");
+        var per_tax_a = getValue("per_tax_a");
-        var tax30 = getValue("tax_30_percent");
+        var tax_a_cal = getValue("tax_a_cal");
 
         if (net_taxable_income > 0) {
             if (lastEditedTaxA === "percentage") {
-                tax30 = net_taxable_income * (per_a / 100);
+                tax_a_cal = net_taxable_income * (per_tax_a / 100);
-                setValue("tax_30_percent", tax30);
+                setValue("tax_a_cal", tax_a_cal);
             }
             else if (lastEditedTaxA === "amount") {
-                per_a = (tax30 / net_taxable_income) * 100;
+                per_tax_a = (tax_a_cal / net_taxable_income) * 100;
-                setValue("per_a", per_a);
+                setValue("per_tax_a", per_tax_a);
             }
         }
 
         var per_surcharge_a = getValue("per_surcharge_a");
-        var surcharge_a = tax30 * (per_surcharge_a / 100);
+        var surcharge_a_cal = tax_a_cal * (per_surcharge_a / 100);
-        setValue("surcharge_a", surcharge_a);
+        setValue("surcharge_a_cal", surcharge_a_cal);
 
         var per_cess_a = getValue("per_cess_a");
-        var edu_cess_a = (tax30 + surcharge_a) * (per_cess_a / 100);
+        var edu_cess_a_cal = (tax_a_cal + surcharge_a_cal) * (per_cess_a / 100);
-        setValue("edu_cess_a", edu_cess_a);
+        setValue("edu_cess_a_cal", edu_cess_a_cal);
 
-        var sum_of_a = tax30 + surcharge_a + edu_cess_a;
+        var sum_of_a = tax_a_cal + surcharge_a_cal + edu_cess_a_cal;
         setValue("sum_of_a", sum_of_a);
 
         // ================= TAX (B) =================
-        var tax185 = getValue("tax_book_profit_18_5");
+        var tax_b_cal = getValue("tax_b_cal");
 
         var per_surcharge_b = getValue("per_surcharge_b");
-        var surcharge_b = tax185 * (per_surcharge_b / 100);
+        var surcharge_b_cal = tax_b_cal * (per_surcharge_b / 100);
-        setValue("surcharge_b", surcharge_b);
+        setValue("surcharge_b_cal", surcharge_b_cal);
 
         var per_cess_b = getValue("per_cess_b");
-        var edu_cess_b = (tax185 + surcharge_b) * (per_cess_b / 100);
+        var edu_cess_b_cal = (tax_b_cal + surcharge_b_cal) * (per_cess_b / 100);
-        setValue("edu_cess_b", edu_cess_b);
+        setValue("edu_cess_b_cal", edu_cess_b_cal);
 
-        var sum_of_b = tax185 + surcharge_b + edu_cess_b;
+        var sum_of_b = tax_b_cal + surcharge_b_cal + edu_cess_b_cal;
         setValue("sum_of_b", sum_of_b);
 
         // ================= TAX PAYABLE =================
-        var tax_payable = (sum_of_a > sum_of_b) ? tax30 : tax185;
+        var tax_payable = (sum_of_a > sum_of_b) ? tax_a_cal : tax_b_cal;
         setValue("tax_payable", tax_payable);
 
         var total_tax_payable = (sum_of_a > sum_of_b) ? sum_of_a : sum_of_b;

templates/add_ao.html

@@ -86,22 +86,20 @@
         <div class="form-group full-width inline-2">
             <div>
                 <label>Enter Percentage(%) calculate: Tax(A):</label>
-                <input type="number" name="per_a" step="any" value="0.00" oninput="calculate()">
+                <input type="number" name="per_tax_a" step="any" value="0.00" oninput="calculate()">
             </div>
             <div>
                 <label>Tax @(A):</label>
-                <input type="number" name="tax_a" class="auto" step="any" value="0.00" oninput="calculate()" readonly>
+                <input type="number" name="tax_a_cal" step="any" value="0.00" oninput="calculate()">
             </div>
             <div>
                 <label>Enter Percentage(%) calculate: Tax(B):</label>
-                <input type="number" name="per_b" step="any" value="0.00" placeholder="Field Currently Unavailable"
+                <input type="number" name="per_tax_b" step="any" value="0.00" oninput="calculate()">
-                    oninput="calculate()">
             </div>
             <div>
-                <label>Tax @ on Book Profit(B):</label>
+                <label>Tax @ 18.5% on Book Profit (B):</label>
-                <input type="number" name="tax_book_profit" step="any" value="0.00" oninput="calculate()" required>
+                <input type="number" name="tax_b_cal" step="any" value="0.00" oninput="calculate()" required>
             </div>
-
         </div>
 
         <div class="form-group full-width inline-2">
@@ -111,7 +109,7 @@
             </div>
             <div>
                 <label>Surcharge on Tax(A):</label>
-                <input type="number" name="surcharge_a" class="auto" value="0.00" readonly>
+                <input type="number" name="surcharge_a_cal" class="auto" value="0.00" readonly>
             </div>
 
             <div>
@@ -120,7 +118,7 @@
             </div>
             <div>
                 <label>Surcharge on Tax(B):</label>
-                <input type="number" name="surcharge_b" class="auto" value="0.00" readonly>
+                <input type="number" name="surcharge_b_cal" class="auto" value="0.00" readonly>
             </div>
         </div>
 
@@ -131,7 +129,7 @@
             </div>
             <div>
                 <label>Education Cess:Tax(A): </label>
-                <input type="number" name="edu_cess_a" class="auto" step="any" value="0.00" readonly>
+                <input type="number" name="edu_cess_a_cal" class="auto" step="any" value="0.00" readonly>
             </div>
             <div>
                 <label>Enter Percentage(%) Cess:Tax(B):</label>
@@ -139,7 +137,7 @@
             </div>
             <div>
                 <label>Education Cess:Tax(B): </label>
-                <input type="number" name="edu_cess_b" class="auto" step="any" value="0.00" readonly>
+                <input type="number" name="edu_cess_b_cal" class="auto" step="any" value="0.00" readonly>
             </div>
         </div>
         <div class="form-group full-width inline-2">
@@ -231,6 +229,7 @@
             <label>Refund:</label>
             <input type="number" name="refund" class="auto" step="any" value="0.00" readonly>
         </div>
+
         <div class="form-group full-width inline-2">
             <div class="form-group">
                 <label>Add : Interest u/s 244A as per 143:</label>
@@ -264,6 +263,6 @@
 {% endblock %}
 
 {% block extra_js %}
-<script src="{{ url_for('static', filename='js/ao_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_cit.html

@@ -45,7 +45,7 @@
         <div class="form-group full-width inline-2">
             <div>
                 <label>GTI as per CIT</label>
-                <input type="number" name="gti_as_per_cit" class="auto" step="any" value="0.00" readonly>
+                <input type="number" name="gti_as_per_ao" class="auto" step="any" value="0.00" readonly>
             </div>
         </div>
 
@@ -87,20 +87,19 @@
         <div class="form-group full-width inline-2">
             <div>
                 <label>Enter Percentage(%) calculate: Tax(A):</label>
-                <input type="number" name="per_a" step="any" value="0.00" oninput="calculate()">
+                <input type="number" name="per_tax_a" step="any" value="0.00" oninput="calculate()">
             </div>
             <div>
                 <label>Tax @(A):</label>
-                <input type="number" name="tax_30_percent" class="auto" step="any" value="0.00" oninput="calculate()"
+                <input type="number" name="tax_a_cal" step="any" value="0.00" oninput="calculate()">
-                    readonly>
             </div>
             <div>
                 <label>Enter Percentage(%) calculate: Tax(B):</label>
-                <input type="number" name="per_b" step="any" value="0.00" oninput="calculate()">
+                <input type="number" name="per_tax_b" step="any" value="0.00" oninput="calculate()">
             </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>
+                <input type="number" name="tax_b_cal" step="any" value="0.00" oninput="calculate()" required>
             </div>
         </div>
 
@@ -111,7 +110,7 @@
             </div>
             <div>
                 <label>Surcharge on Tax(A):</label>
-                <input type="number" name="surcharge_a" class="auto" value="0.00" readonly>
+                <input type="number" name="surcharge_a_cal" class="auto" value="0.00" readonly>
             </div>
 
             <div>
@@ -120,7 +119,7 @@
             </div>
             <div>
                 <label>Surcharge on Tax(B):</label>
-                <input type="number" name="surcharge_b" class="auto" value="0.00" readonly>
+                <input type="number" name="surcharge_b_cal" class="auto" value="0.00" readonly>
             </div>
         </div>
 
@@ -131,7 +130,7 @@
             </div>
             <div>
                 <label>Education Cess:Tax(A): </label>
-                <input type="number" name="edu_cess_a" class="auto" step="any" value="0.00" readonly>
+                <input type="number" name="edu_cess_a_cal" class="auto" step="any" value="0.00" readonly>
             </div>
             <div>
                 <label>Enter Percentage(%) Cess:Tax(B):</label>
@@ -139,7 +138,7 @@
             </div>
             <div>
                 <label>Education Cess:Tax(B): </label>
-                <input type="number" name="edu_cess_b" class="auto" step="any" value="0.00" readonly>
+                <input type="number" name="edu_cess_b_cal" class="auto" step="any" value="0.00" readonly>
             </div>
         </div>
 

templates/add_itat.html

@@ -88,20 +88,19 @@
         <div class="form-group full-width inline-2">
             <div>
                 <label>Enter Percentage(%) calculate: Tax(A):</label>
-                <input type="number" name="per_a" step="any" value="0.00" oninput="calculate()">
+                <input type="number" name="per_tax_a" step="any" value="0.00" oninput="calculate()">
             </div>
             <div>
                 <label>Tax @(A):</label>
-                <input type="number" name="tax_30_percent" class="auto" step="any" value="0.00" oninput="calculate()"
+                <input type="number" name="tax_a_cal" step="any" value="0.00" oninput="calculate()">
-                    readonly>
             </div>
             <div>
                 <label>Enter Percentage(%) calculate: Tax(B):</label>
-                <input type="number" name="per_b" step="any" value="0.00" oninput="calculate()">
+                <input type="number" name="per_tax_b" step="any" value="0.00" oninput="calculate()">
             </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>
+                <input type="number" name="tax_b_cal" step="any" value="0.00" oninput="calculate()" required>
             </div>
         </div>
 
@@ -112,17 +111,19 @@
             </div>
             <div>
                 <label>Surcharge on Tax(A):</label>
-                <input type="number" name="surcharge_a" class="auto" value="0.00" readonly>
+                <input type="number" name="surcharge_a_cal" class="auto" value="0.00" readonly>
             </div>
+
             <div>
                 <label>Enter Percentage(%) Surcharge:Tax(B)</label>
                 <input type="number" name="per_surcharge_b" step="any" value="0.00" oninput="calculate()">
             </div>
             <div>
                 <label>Surcharge on Tax(B):</label>
-                <input type="number" name="surcharge_b" class="auto" value="0.00" readonly>
+                <input type="number" name="surcharge_b_cal" class="auto" value="0.00" readonly>
             </div>
         </div>
+
         <div class="form-group full-width inline-2">
             <div>
                 <label>Enter Percentage(%) Cess:Tax(A):</label>
@@ -130,7 +131,7 @@
             </div>
             <div>
                 <label>Education Cess:Tax(A): </label>
-                <input type="number" name="edu_cess_a" class="auto" step="any" value="0.00" readonly>
+                <input type="number" name="edu_cess_a_cal" class="auto" step="any" value="0.00" readonly>
             </div>
             <div>
                 <label>Enter Percentage(%) Cess:Tax(B):</label>
@@ -138,9 +139,10 @@
             </div>
             <div>
                 <label>Education Cess:Tax(B): </label>
-                <input type="number" name="edu_cess_b" class="auto" step="any" value="0.00" readonly>
+                <input type="number" name="edu_cess_b_cal" class="auto" step="any" value="0.00" readonly>
             </div>
         </div>
+
         <div class="form-group full-width inline-2">
             <div>
                 <label>Total cal Tax(A): </label>

templates/add_itr.html

@@ -86,19 +86,19 @@
         <div class="form-group full-width inline-2">
             <div>
                 <label>Enter Percentage(%) calculate: Tax(A):</label>
-                <input type="number" name="per_a" step="any" value="0.00" oninput="calculate()">
+                <input type="number" name="per_tax_a" step="any" value="0.00" oninput="calculate()">
             </div>
             <div>
                 <label>Tax @(A):</label>
-                <input type="number" name="tax_30_percent" step="any" value="0.00" oninput="calculate()">
+                <input type="number" name="tax_a_cal" step="any" value="0.00" oninput="calculate()">
             </div>
             <div>
                 <label>Enter Percentage(%) calculate: Tax(B):</label>
-                <input type="number" name="per_b" step="any" value="0.00" oninput="calculate()">
+                <input type="number" name="per_tax_b" step="any" value="0.00" oninput="calculate()">
             </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>
+                <input type="number" name="tax_b_cal" step="any" value="0.00" oninput="calculate()" required>
             </div>
         </div>
 
@@ -109,7 +109,7 @@
             </div>
             <div>
                 <label>Surcharge on Tax(A):</label>
-                <input type="number" name="surcharge_a" class="auto" value="0.00" readonly>
+                <input type="number" name="surcharge_a_cal" class="auto" value="0.00" readonly>
             </div>
 
             <div>
@@ -118,7 +118,7 @@
             </div>
             <div>
                 <label>Surcharge on Tax(B):</label>
-                <input type="number" name="surcharge_b" class="auto" value="0.00" readonly>
+                <input type="number" name="surcharge_b_cal" class="auto" value="0.00" readonly>
             </div>
         </div>
 
@@ -129,7 +129,7 @@
             </div>
             <div>
                 <label>Education Cess:Tax(A): </label>
-                <input type="number" name="edu_cess_a" class="auto" step="any" value="0.00" readonly>
+                <input type="number" name="edu_cess_a_cal" class="auto" step="any" value="0.00" readonly>
             </div>
             <div>
                 <label>Enter Percentage(%) Cess:Tax(B):</label>
@@ -137,9 +137,10 @@
             </div>
             <div>
                 <label>Education Cess:Tax(B): </label>
-                <input type="number" name="edu_cess_b" class="auto" step="any" value="0.00" readonly>
+                <input type="number" name="edu_cess_b_cal" class="auto" step="any" value="0.00" readonly>
             </div>
         </div>
+
         <div class="form-group full-width inline-2">
             <div>
                 <label>Total cal Tax(A): </label>

templates/display_ao.html

@@ -22,6 +22,7 @@
                     <th>Gross Total Income</th>
                     <th>Net Taxable Income</th>
                     <th>Total Tax</th>
+                    <th>Refund</th>
                     <th>Created Record Date</th>
                     <th>Actions</th>
                 </tr>
@@ -32,7 +33,8 @@
                     <td>AY {{ ao.year }}-{{ ao.year+1 }}</td>
                     <td>{{ ao.gross_total_income }}</td>
                     <td>{{ ao.net_taxable_income }}</td>
-                    <td>{{ ao.total_tax }}</td>
+                    <td>{{ ao.total_tax_payable }}</td>
+                    <td>{{ "{:,.2f}".format(ao.refund) }}</td>
                     <td>{{ ao.created_at.strftime('%Y-%m-%d') }}</td>
                     <td>
                         <a href="{{ url_for('update_ao', id=ao.id) }}" class="btn btn-update">Edit</a>

templates/display_cit.html

@@ -22,6 +22,7 @@
                     <th>Net Taxable Income</th>
                     <th>Total Tax Payable</th>
                     <th>Refund</th>
+                    <th>Created Record Date</th>
                     <th>Actions</th>
                 </tr>
             </thead>
@@ -33,6 +34,7 @@
                     <td>{{ "{:,.2f}".format(record.net_taxable_income) }}</td>
                     <td>{{ "{:,.2f}".format(record.total_tax_payable) }}</td>
                     <td>{{ "{:,.2f}".format(record.refund) }}</td>
+                    <td>{{ record.created_at.strftime('%Y-%m-%d') }}</td>
                     <td class="action-cell">
                         <a href="{{ url_for('update_cit', id=record.id) }}" class="btn btn-update">Edit</a>
                         <form action="{{ url_for('delete_cit', id=record.id) }}" method="post"

templates/display_itat.html

@@ -20,10 +20,11 @@
                 <thead>
                     <tr>
                         <th>Year</th>
-                        <th>MAT Tax Credit</th>
+                        <th>Gross Total Income</th>
-                        <th>Surcharge</th>
+                        <th>Net Taxable Income</th>
-                        <th>Cess</th>
+                        <th>Total Tax Payable</th>
-                        <th>Total Credit</th>
+                        <th>Refund</th>
+                        <th>Created Record Date</th>
                         <th>Actions</th>
                     </tr>
                 </thead>
@@ -35,7 +36,7 @@
                         <td>{{ "{:,.2f}".format(record.net_taxable_income) }}</td>
                         <td>{{ "{:,.2f}".format(record.total_tax_payable) }}</td>
                         <td>{{ "{:,.2f}".format(record.refund) }}</td>
-
+                        <td>{{ record.created_at.strftime('%Y-%m-%d') }}</td>
                         <td class="action-cell">
                             <a href="{{ url_for('update_itat', id=record.id) }}" class="btn btn-update">Edit</a>
 

templates/update_ao.html

@@ -15,40 +15,60 @@
                 <label>Year:</label>
                 <input type="tex" name="year" value="{{record.year}}" class="auto" readonly>
             </div>
+            <div>
+                <label>Created Date:</label>
+                <input type="date" name="created_at"
+                    value="{{ record.created_at.strftime('%Y-%m-%d') if record.created_at else current_date }}"
+                    readonly>
+            </div>
+            <div>
+                <label>Last Updated:</label>
+                <input type="date" name="updated_at"
+                    value="{{ record.updated_at.strftime('%Y-%m-%d') if record.updated_at else current_date }}">
+            </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="{{ record.gross_total_income}}"
+                <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}}"
+                <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}}"
+                <input type="number" name="disallowance_37" step="any" value="{{ record.disallowance_37 }}"
                     oninput="calculate()" required>
             </div>
         </div>
 
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>GTI as per AO</label>
+                <input type="number" name="gti_as_per_ao" class="auto" step="any"
+                    value="{{ record.gross_total_income + record.disallowance_37 +  record.disallowance_14a }}"
+                    readonly>
+            </div>
+        </div>
+
         <div class="form-group full-width inline-2">
             <div>
                 <label>Less :Deduction 80IA Business Income:</label>
                 <input type="number" name="deduction_80ia_business" step="any"
-                    value="{{ record.deduction_80ia_business}}" oninput="calculate()" required>
+                    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}}"
+                <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}}"
+                <input type="number" name="deduction_80ia_other" step="any" value="{{ record.deduction_80ia_other }}"
                     oninput="calculate()" required>
             </div>
         </div>
@@ -57,56 +77,117 @@
             <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>
+                    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}}"
+                <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 class="form-group full-width inline-2">
             <div>
-                <label>Tax @ 30% (A):</label>
+                <label>Net Taxable Income:</label>
-                <input type="number" name="tax_30_percent" step="any" value="{{ record.tax_30_percent}}"
+                <input type="number" name="net_taxable_income" class="auto" step="any"
-                    oninput="calculate()" required>
+                    value="{{ record.net_taxable_income }}" readonly>
+            </div>
+        </div>
+
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>Enter Percentage(%) calculate: Tax(A):</label>
+                <input type="number" name="per_tax_a" step="any" value="{{ record.per_tax_a }}" oninput="calculate()">
+            </div>
+            <div>
+                <label>Tax @(A):</label>
+                <input type="number" name="tax_a_cal" step="any" value="{{ record.tax_a_cal }}" oninput="calculate()">
+            </div>
+            <div>
+                <label>Enter Percentage(%) calculate: Tax(B):</label>
+                <input type="number" name="per_tax_b" step="any" value="{{ record.per_tax_b }}" oninput="calculate()">
             </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}}"
+                <input type="number" name="tax_b_cal" step="any" value="{{ record.tax_b_cal }}" oninput="calculate()"
-                    oninput="calculate()" required>
+                    required>
+            </div>
+        </div>
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>Enter Percentage(%) Surcharge:Tax(A):</label>
+                <input type="number" name="per_surcharge_a" step="any" value="{{ record.per_surcharge_a }}"
+                    oninput="calculate()">
             </div>
             <div>
-                <label>Tax Payable (Higher of A or B):</label>
+                <label>Surcharge on Tax(A):</label>
-                <input type="number" name="tax_payable" class="auto" step="any" value="{{ record.tax_payable}}"
+                <input type="number" name="surcharge_a_cal" class="auto" value="{{ record.surcharge_a_cal }}" readonly>
+            </div>
+
+            <div>
+                <label>Enter Percentage(%) Surcharge:Tax(B)</label>
+                <input type="number" name="per_surcharge_b" step="any" value="{{ record.per_surcharge_b}}"
+                    oninput="calculate()">
+            </div>
+            <div>
+                <label>Surcharge on Tax(B):</label>
+                <input type="number" name="surcharge_b_cal" class="auto" value="{{ record.surcharge_b_cal }}" readonly>
+            </div>
+        </div>
+
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>Enter Percentage(%) Cess:Tax(A):</label>
+                <input type="number" name="per_cess_a" step="any" value="{{ record.per_cess_a }}" oninput="calculate()">
+            </div>
+            <div>
+                <label>Education Cess:Tax(A): </label>
+                <input type="number" name="edu_cess_a_cal" class="auto" step="any" value="{{ record.edu_cess_a_cal }}"
+                    readonly>
+            </div>
+            <div>
+                <label>Enter Percentage(%) Cess:Tax(B):</label>
+                <input type="number" name="per_cess_b" step="any" value="{{ record.per_cess_b }}" oninput="calculate()">
+            </div>
+            <div>
+                <label>Education Cess:Tax(B): </label>
+                <input type="number" name="edu_cess_b_cal" class="auto" step="any" value="{{ record.edu_cess_b_cal }}"
                     readonly>
             </div>
         </div>
-
         <div class="form-group full-width inline-2">
             <div>
-                <label>Surcharge:</label>
+                <label>Total cal Tax(A): </label>
-                <input type="number" name="surcharge" class="auto" value="{{ record.surcharge}}" readonly>
+                <input type="number" name="sum_of_a" class="auto" step="any" value="{{ record.sum_of_a }}" readonly>
             </div>
             <div>
-                <label>Education Cess:</label>
+                <label>Total cal Tax(B): </label>
-                <input type="number" name="edu_cess" class="auto" step="any" value="{{ record.edu_cess}}" readonly>
+                <input type="number" name="sum_of_b" class="auto" step="any" value="{{ record.sum_of_b }}" readonly>
             </div>
         </div>
 
         <div class="form-group full-width inline-2">
+            <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>
                 <label>Total tax Payable:</label>
                 <input type="number" name="total_tax_payable" class="auto" step="any"
-                    value="{{ record.total_tax_payable}}" readonly>
+                    value="{{ record.total_tax_payable }}" readonly>
             </div>
+        </div>
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>Opening Balance:</label>
+                <input type="number" name="opening_balance" step="any" value="{{ record.opening_balance }}"
+                    oninput="calculate()">
+            </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="{{ record.mat_credit_created }}"
@@ -117,9 +198,17 @@
                 <input type="number" name="mat_credit_utilized" step="any" value="{{ record.mat_credit_utilized }}"
                     oninput="calculate()" required>
             </div>
+        </div>
+
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>Closing Balance:</label>
+                <input type="number" name="closing_balance" step="any" value="{{ record.closing_balance }}"
+                    oninput="calculate()">
+            </div>
             <div>
                 <label>Add :Interest 234c:</label>
-                <input type="number" name="interest_234c" step="any" value="{{ record.interest_234c}}"
+                <input type="number" name="interest_234c" step="any" value="{{ record.interest_234c }}"
                     oninput="calculate()" required>
             </div>
         </div>
@@ -127,62 +216,64 @@
         <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>
+                <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()"
+                <input type="number" name="advance_tax" step="any" value="{{ record.advance_tax }}"
-                    required>
+                    oninput="calculate()" required>
             </div>
             <div>
                 <label>TDS :</label>
-                <input type="number" name="tds" step="any" value="{{ record.tds}}" oninput="calculate()" required>
+                <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>
+                <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>
+                <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}}"
+                <input type="number" name="tax_on_assessment" step="any" value="{{ record.tax_on_assessment }}"
-                    oninput="calculate()" required>
+                    oninput="calculate()">
             </div>
         </div>
-
         <div class="form-group">
             <label>Refund:</label>
-            <input type="number" name="refund" class="auto" step="any" value="{{ record.refund}}" readonly>
+            <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>
-
-
         <div class="form-group full-width inline-2">
-            <div>
+            <div class="form-group">
-                <label>Created Date:</label>
+                <label>Add : Interest u/s 244A as per 143:</label>
-                <input type="date" name="created_at"
+                <input type="number" name="interest_244a_per143" step="any" value="{{ record.interest_244a_per143 }}"
-                    value="{{ record.created_at.strftime('%Y-%m-%d') if record.created_at else current_date }}"
+                    oninput="calculate()">
-                    readonly>
             </div>
+            <div class="form-group">
+                <label>Less : Refund Received on:</label>
+                <input type="number" name="refund_received" step="any" value="{{ record.refund_received }}"
+                    oninput="calculate()">
+            </div>
+            <div class="form-group">
+                <label>Balance Receivable:</label>
+                <input type="number" name="balance_receivable" class="auto" step="any"
+                    value="{{ record.balance_receivable }}" oninput="calculate()">
+            </div>
+        </div>
 
-            <div>
+        <div class="form-group full-width inline-2">
-                <label>Last Updated:</label>
+            <div class="form-group">
-                <input type="date" name="updated_at"
+                <label>Remarks:</label>
-                    value="{{ record.updated_at.strftime('%Y-%m-%d') if record.updated_at else current_date }}"
+                <input type="text" name="Remarks" value="{{ record.Remarks }}">
-                    readonly>
             </div>
         </div>
 

templates/update_cit.html

@@ -16,6 +16,17 @@
                 <label>Year:</label>
                 <input type="tex" name="year" value="{{record.year}}" class="auto" readonly>
             </div>
+            <div>
+                <label>Created Date:</label>
+                <input type="date" name="created_at"
+                    value="{{ record.created_at.strftime('%Y-%m-%d') if record.created_at else current_date }}"
+                    readonly>
+            </div>
+            <div>
+                <label>Last Updated:</label>
+                <input type="date" name="updated_at"
+                    value="{{ record.updated_at.strftime('%Y-%m-%d') if record.updated_at else current_date }}">
+            </div>
         </div>
 
         <div class="form-group full-width inline-2">
@@ -35,6 +46,14 @@
                     oninput="calculate()" required>
             </div>
         </div>
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>GTI as per AO</label>
+                <input type="number" name="gti_as_per_ao" class="auto" step="any"
+                    value="{{ record.gross_total_income + record.disallowance_37 +  record.disallowance_14a }}"
+                    readonly>
+            </div>
+        </div>
 
         <div class="form-group full-width inline-2">
             <div>
@@ -65,7 +84,6 @@
                 <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>
@@ -73,42 +91,99 @@
                 value="{{ record.net_taxable_income}}" readonly>
         </div>
 
-
+        <div class="form-group full-width inline-2">
-        <div class=" form-group full-width inline-2">
             <div>
-                <label>Tax @ 30% (A):</label>
+                <label>Enter Percentage(%) calculate: Tax(A):</label>
-                <input type="number" name="tax_30_percent" step="any" value="{{ record.tax_30_percent}}"
+                <input type="number" name="per_tax_a" step="any" value="{{ record.per_tax_a }}" oninput="calculate()">
-                    oninput="calculate()" required>
+            </div>
+            <div>
+                <label>Tax @(A):</label>
+                <input type="number" name="tax_a_cal" step="any" value="{{ record.tax_a_cal }}" oninput="calculate()">
+            </div>
+            <div>
+                <label>Enter Percentage(%) calculate: Tax(B):</label>
+                <input type="number" name="per_tax_b" step="any" value="{{ record.per_tax_b }}" oninput="calculate()">
             </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}}"
+                <input type="number" name="tax_b_cal" step="any" value="{{ record.tax_b_cal }}" oninput="calculate()"
-                    oninput="calculate()" required>
+                    required>
+            </div>
+        </div>
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>Enter Percentage(%) Surcharge:Tax(A):</label>
+                <input type="number" name="per_surcharge_a" step="any" value="{{ record.per_surcharge_a }}"
+                    oninput="calculate()">
             </div>
             <div>
-                <label>Tax Payable (Higher of A or B):</label>
+                <label>Surcharge on Tax(A):</label>
-                <input type="number" name="tax_payable" class="auto" step="any" value="{{ record.tax_payable}}"
+                <input type="number" name="surcharge_a_cal" class="auto" value="{{ record.surcharge_a_cal }}" readonly>
+            </div>
+            <div>
+                <label>Enter Percentage(%) Surcharge:Tax(B)</label>
+                <input type="number" name="per_surcharge_b" step="any" value="{{ record.per_surcharge_b}}"
+                    oninput="calculate()">
+            </div>
+            <div>
+                <label>Surcharge on Tax(B):</label>
+                <input type="number" name="surcharge_b_cal" class="auto" value="{{ record.surcharge_b_cal }}" readonly>
+            </div>
+        </div>
+
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>Enter Percentage(%) Cess:Tax(A):</label>
+                <input type="number" name="per_cess_a" step="any" value="{{ record.per_cess_a }}" oninput="calculate()">
+            </div>
+            <div>
+                <label>Education Cess:Tax(A): </label>
+                <input type="number" name="edu_cess_a_cal" class="auto" step="any" value="{{ record.edu_cess_a_cal }}"
+                    readonly>
+            </div>
+            <div>
+                <label>Enter Percentage(%) Cess:Tax(B):</label>
+                <input type="number" name="per_cess_b" step="any" value="{{ record.per_cess_b }}" oninput="calculate()">
+            </div>
+            <div>
+                <label>Education Cess:Tax(B): </label>
+                <input type="number" name="edu_cess_b_cal" class="auto" step="any" value="{{ record.edu_cess_b_cal }}"
                     readonly>
             </div>
         </div>
 
         <div class="form-group full-width inline-2">
             <div>
-                <label>Surcharge:</label>
+                <label>Total cal Tax(A): </label>
-                <input type="number" name="surcharge" class="auto" value="{{ record.surcharge}}" readonly>
+                <input type="number" name="sum_of_a" class="auto" step="any" value="{{ record.sum_of_a }}" readonly>
             </div>
             <div>
-                <label>Education Cess:</label>
+                <label>Total cal Tax(B): </label>
-                <input type="number" name="edu_cess" class="auto" step="any" value="{{ record.edu_cess}}" readonly>
+                <input type="number" name="sum_of_b" class="auto" step="any" value="{{ record.sum_of_b }}" readonly>
             </div>
         </div>
 
-        <div class="form-group full-width inline-2">
+        <div class=" form-group full-width inline-2">
+            <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>
                 <label>Total tax Payable:</label>
                 <input type="number" name="total_tax_payable" class="auto" step="any"
                     value="{{ record.total_tax_payable}}" readonly>
             </div>
+        </div>
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>Opening Balance:</label>
+                <input type="number" name="opening_balance" step="any" value="{{ record.opening_balance }}"
+                    oninput="calculate()">
+            </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="{{ record.mat_credit_created }}"
@@ -119,6 +194,14 @@
                 <input type="number" name="mat_credit_utilized" step="any" value="{{ record.mat_credit_utilized }}"
                     oninput="calculate()" required>
             </div>
+        </div>
+
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>Closing Balance:</label>
+                <input type="number" name="closing_balance" step="any" value="{{ record.closing_balance }}"
+                    oninput="calculate()">
+            </div>
             <div>
                 <label>Add :Interest 234c:</label>
                 <input type="number" name="interest_234c" step="any" value="{{ record.interest_234c}}"
@@ -166,6 +249,24 @@
             <input type="number" name="refund" class="auto" step="any" value="{{ record.refund}}" readonly>
         </div>
 
+        <div class="form-group full-width inline-2">
+            <div class="form-group">
+                <label>Add : Interest u/s 244A as per 143:</label>
+                <input type="number" name="interest_244a_per143" step="any" value="{{ record.interest_244a_per143 }}"
+                    oninput="calculate()">
+            </div>
+            <div class="form-group">
+                <label>Less : Refund Received on:</label>
+                <input type="number" name="refund_received" step="any" value="{{ record.refund_received }}"
+                    oninput="calculate()">
+            </div>
+            <div class="form-group">
+                <label>Balance Receivable:</label>
+                <input type="number" name="balance_receivable" class="auto" step="any"
+                    value="{{ record.balance_receivable }}" oninput="calculate()">
+            </div>
+        </div>
+
         <div class="form-group">
             <label>Remarks:</label>
             <input type="text" name="Remarks" value="{{ record.Remarks}}">

templates/update_itat.html

@@ -14,6 +14,17 @@
                 <label>Year:</label>
                 <input type="tex" name="year" value="{{record.year}}" class="auto" readonly>
             </div>
+            <div>
+                <label>Created Date:</label>
+                <input type="date" name="created_at"
+                    value="{{ record.created_at.strftime('%Y-%m-%d') if record.created_at else current_date }}"
+                    readonly>
+            </div>
+            <div>
+                <label>Last Updated:</label>
+                <input type="date" name="updated_at"
+                    value="{{ record.updated_at.strftime('%Y-%m-%d') if record.updated_at else current_date }}">
+            </div>
         </div>
 
         <div class="form-group full-width inline-2">
@@ -34,6 +45,15 @@
             </div>
         </div>
 
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>GTI as per AO</label>
+                <input type="number" name="gti_as_per_ao" class="auto" step="any"
+                    value="{{ record.gross_total_income + record.disallowance_37 +  record.disallowance_14a }}"
+                    readonly>
+            </div>
+        </div>
+
         <div class="form-group full-width inline-2">
             <div>
                 <label>Less :Deduction 80IA Business Income:</label>
@@ -64,6 +84,7 @@
                     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"
@@ -71,41 +92,101 @@
         </div>
 
 
-        <div class=" form-group full-width inline-2">
+        <div class="form-group full-width inline-2">
             <div>
-                <label>Tax @ 30% (A):</label>
+                <label>Enter Percentage(%) calculate: Tax(A):</label>
-                <input type="number" name="tax_30_percent" step="any" value="{{ record.tax_30_percent}}"
+                <input type="number" name="per_tax_a" step="any" value="{{ record.per_tax_a }}" oninput="calculate()">
-                    oninput="calculate()" required>
+            </div>
+            <div>
+                <label>Tax @(A):</label>
+                <input type="number" name="tax_a_cal" step="any" value="{{ record.tax_a_cal }}" oninput="calculate()">
+            </div>
+            <div>
+                <label>Enter Percentage(%) calculate: Tax(B):</label>
+                <input type="number" name="per_tax_b" step="any" value="{{ record.per_tax_b }}" oninput="calculate()">
             </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}}"
+                <input type="number" name="tax_b_cal" step="any" value="{{ record.tax_b_cal }}" oninput="calculate()"
-                    oninput="calculate()" required>
+                    required>
+            </div>
+        </div>
+
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>Enter Percentage(%) Surcharge:Tax(A):</label>
+                <input type="number" name="per_surcharge_a" step="any" value="{{ record.per_surcharge_a }}"
+                    oninput="calculate()">
             </div>
             <div>
-                <label>Tax Payable (Higher of A or B):</label>
+                <label>Surcharge on Tax(A):</label>
-                <input type="number" name="tax_payable" class="auto" step="any" value="{{ record.tax_payable}}"
+                <input type="number" name="surcharge_a_cal" class="auto" value="{{ record.surcharge_a_cal }}" readonly>
+            </div>
+
+            <div>
+                <label>Enter Percentage(%) Surcharge:Tax(B)</label>
+                <input type="number" name="per_surcharge_b" step="any" value="{{ record.per_surcharge_b}}"
+                    oninput="calculate()">
+            </div>
+            <div>
+                <label>Surcharge on Tax(B):</label>
+                <input type="number" name="surcharge_b_cal" class="auto" value="{{ record.surcharge_b_cal }}" readonly>
+            </div>
+        </div>
+
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>Enter Percentage(%) Cess:Tax(A):</label>
+                <input type="number" name="per_cess_a" step="any" value="{{ record.per_cess_a }}" oninput="calculate()">
+            </div>
+            <div>
+                <label>Education Cess:Tax(A): </label>
+                <input type="number" name="edu_cess_a_cal" class="auto" step="any" value="{{ record.edu_cess_a_cal }}"
+                    readonly>
+            </div>
+            <div>
+                <label>Enter Percentage(%) Cess:Tax(B):</label>
+                <input type="number" name="per_cess_b" step="any" value="{{ record.per_cess_b }}" oninput="calculate()">
+            </div>
+            <div>
+                <label>Education Cess:Tax(B): </label>
+                <input type="number" name="edu_cess_b_cal" class="auto" step="any" value="{{ record.edu_cess_b_cal }}"
                     readonly>
             </div>
         </div>
-
         <div class="form-group full-width inline-2">
             <div>
-                <label>Surcharge:</label>
+                <label>Total cal Tax(A): </label>
-                <input type="number" name="surcharge" class="auto" value="{{ record.surcharge}}" readonly>
+                <input type="number" name="sum_of_a" class="auto" step="any" value="{{ record.sum_of_a }}" readonly>
             </div>
             <div>
-                <label>Education Cess:</label>
+                <label>Total cal Tax(B): </label>
-                <input type="number" name="edu_cess" class="auto" step="any" value="{{ record.edu_cess}}" readonly>
+                <input type="number" name="sum_of_b" class="auto" step="any" value="{{ record.sum_of_b }}" readonly>
             </div>
         </div>
 
         <div class="form-group full-width inline-2">
+            <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>
                 <label>Total tax Payable:</label>
                 <input type="number" name="total_tax_payable" class="auto" step="any"
-                    value="{{ record.total_tax_payable}}" readonly>
+                    value="{{ record.total_tax_payable }}" readonly>
             </div>
+        </div>
+
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>Opening Balance:</label>
+                <input type="number" name="opening_balance" step="any" value="{{ record.opening_balance }}"
+                    oninput="calculate()">
+            </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="{{ record.mat_credit_created }}"
@@ -116,6 +197,14 @@
                 <input type="number" name="mat_credit_utilized" step="any" value="{{ record.mat_credit_utilized }}"
                     oninput="calculate()" required>
             </div>
+        </div>
+
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>Closing Balance:</label>
+                <input type="number" name="closing_balance" step="any" value="{{ record.closing_balance }}"
+                    oninput="calculate()">
+            </div>
             <div>
                 <label>Add :Interest 234c:</label>
                 <input type="number" name="interest_234c" step="any" value="{{ record.interest_234c}}"
@@ -163,9 +252,29 @@
             <input type="number" name="refund" class="auto" step="any" value="{{ record.refund}}" readonly>
         </div>
 
-        <div class="form-group">
+        <div class="form-group full-width inline-2">
-            <label>Remarks:</label>
+            <div class="form-group">
-            <input type="text" name="Remarks" value="{{ record.remarks}}">
+                <label>Add : Interest u/s 244A as per 143:</label>
+                <input type="number" name="interest_244a_per143" step="any" value="{{ record.interest_244a_per143 }}"
+                    oninput="calculate()">
+            </div>
+            <div class="form-group">
+                <label>Less : Refund Received on:</label>
+                <input type="number" name="refund_received" step="any" value="{{ record.refund_received }}"
+                    oninput="calculate()">
+            </div>
+            <div class="form-group">
+                <label>Balance Receivable:</label>
+                <input type="number" name="balance_receivable" class="auto" step="any"
+                    value="{{ record.balance_receivable }}" oninput="calculate()">
+            </div>
+        </div>
+
+        <div class="form-group full-width inline-2">
+            <div class="form-group">
+                <label>Remarks:</label>
+                <input type="text" name="Remarks" value="{{ record.Remarks }}">
+            </div>
         </div>
 
         <button type="submit">Update Record</button>

templates/update_itr.html

@@ -15,6 +15,17 @@
                 <label>Year:</label>
                 <input type="tex" name="year" value="{{record.year}}" class="auto" readonly>
             </div>
+            <div>
+                <label>Created Date:</label>
+                <input type="date" name="created_at"
+                    value="{{ record.created_at.strftime('%Y-%m-%d') if record.created_at else current_date }}"
+                    readonly>
+            </div>
+            <div>
+                <label>Last Updated:</label>
+                <input type="date" name="updated_at"
+                    value="{{ record.updated_at.strftime('%Y-%m-%d') if record.updated_at else current_date }}">
+            </div>
         </div>
 
         <div class="form-group full-width inline-2">
@@ -35,6 +46,15 @@
             </div>
         </div>
 
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>GTI as per AO</label>
+                <input type="number" name="gti_as_per_ao" class="auto" step="any"
+                    value="{{ record.gross_total_income + record.disallowance_37 +  record.disallowance_14a }}"
+                    readonly>
+            </div>
+        </div>
+
         <div class="form-group full-width inline-2">
             <div>
                 <label>Less :Deduction 80IA Business Income:</label>
@@ -76,39 +96,99 @@
 
         <div class="form-group full-width inline-2">
             <div>
-                <label>Tax @ 30% (A):</label>
+                <label>Enter Percentage(%) calculate: Tax(A):</label>
-                <input type="number" name="tax_30_percent" class="auto" step="any" value="{{ record.tax_30_percent }}"
+                <input type="number" name="per_tax_a" step="any" value="{{ record.per_tax_a }}" oninput="calculate()">
-                    readonly>
+            </div>
+            <div>
+                <label>Tax @(A):</label>
+                <input type="number" name="tax_a_cal" step="any" value="{{ record.tax_a_cal }}" oninput="calculate()">
+            </div>
+            <div>
+                <label>Enter Percentage(%) calculate: Tax(B):</label>
+                <input type="number" name="per_tax_b" step="any" value="{{ record.per_tax_b }}" oninput="calculate()">
             </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 }}"
+                <input type="number" name="tax_b_cal" step="any" value="{{ record.tax_b_cal }}" oninput="calculate()"
-                    oninput="calculate()" required>
+                    required>
             </div>
+        </div>
+
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>Enter Percentage(%) Surcharge:Tax(A):</label>
+                <input type="number" name="per_surcharge_a" step="any" value="{{ record.per_surcharge_a }}"
+                    oninput="calculate()">
+            </div>
+            <div>
+                <label>Surcharge on Tax(A):</label>
+                <input type="number" name="surcharge_a_cal" class="auto" value="{{ record.surcharge_a_cal }}" readonly>
+            </div>
+
+            <div>
+                <label>Enter Percentage(%) Surcharge:Tax(B)</label>
+                <input type="number" name="per_surcharge_b" step="any" value="{{ record.per_surcharge_b}}"
+                    oninput="calculate()">
+            </div>
+            <div>
+                <label>Surcharge on Tax(B):</label>
+                <input type="number" name="surcharge_b_cal" class="auto" value="{{ record.surcharge_b_cal }}" readonly>
+            </div>
+        </div>
+
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>Enter Percentage(%) Cess:Tax(A):</label>
+                <input type="number" name="per_cess_a" step="any" value="{{ record.per_cess_a }}" oninput="calculate()">
+            </div>
+            <div>
+                <label>Education Cess:Tax(A): </label>
+                <input type="number" name="edu_cess_a_cal" class="auto" step="any" value="{{ record.edu_cess_a_cal }}"
+                    readonly>
+            </div>
+            <div>
+                <label>Enter Percentage(%) Cess:Tax(B):</label>
+                <input type="number" name="per_cess_b" step="any" value="{{ record.per_cess_b }}" oninput="calculate()">
+            </div>
+            <div>
+                <label>Education Cess:Tax(B): </label>
+                <input type="number" name="edu_cess_b_cal" class="auto" step="any" value="{{ record.edu_cess_b_cal }}"
+                    readonly>
+            </div>
+        </div>
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>Total cal Tax(A): </label>
+                <input type="number" name="sum_of_a" class="auto" step="any" value="{{ record.sum_of_a }}" readonly>
+            </div>
+            <div>
+                <label>Total cal Tax(B): </label>
+                <input type="number" name="sum_of_b" class="auto" step="any" value="{{ record.sum_of_b }}" readonly>
+            </div>
+        </div>
+
+        <div class="form-group full-width inline-2">
             <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>
+
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>Opening Balance:</label>
+                <input type="number" name="opening_balance" step="any" value="{{ record.opening_balance }}"
+                    oninput="calculate()">
+            </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="{{ record.mat_credit_created }}"
@@ -119,6 +199,14 @@
                 <input type="number" name="mat_credit_utilized" step="any" value="{{ record.mat_credit_utilized }}"
                     oninput="calculate()" required>
             </div>
+        </div>
+
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>Closing Balance:</label>
+                <input type="number" name="closing_balance" step="any" value="{{ record.closing_balance }}"
+                    oninput="calculate()">
+            </div>
             <div>
                 <label>Add :Interest 234c:</label>
                 <input type="number" name="interest_234c" step="any" value="{{ record.interest_234c }}"
@@ -165,23 +253,28 @@
             <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>
         <div class="form-group full-width inline-2">
-            <div>
+            <div class="form-group">
-                <label>Created Date:</label>
+                <label>Add : Interest u/s 244A as per 143:</label>
-                <input type="date" name="created_at"
+                <input type="number" name="interest_244a_per143" step="any" value="{{ record.interest_244a_per143 }}"
-                    value="{{ record.created_at.strftime('%Y-%m-%d') if record.created_at else current_date }}"
+                    oninput="calculate()">
-                    readonly>
             </div>
+            <div class="form-group">
+                <label>Less : Refund Received on:</label>
+                <input type="number" name="refund_received" step="any" value="{{ record.refund_received }}"
+                    oninput="calculate()">
+            </div>
+            <div class="form-group">
+                <label>Balance Receivable:</label>
+                <input type="number" name="balance_receivable" class="auto" step="any"
+                    value="{{ record.balance_receivable }}" oninput="calculate()">
+            </div>
+        </div>
 
-            <div>
+        <div class="form-group full-width inline-2">
-                <label>Last Updated:</label>
+            <div class="form-group">
-                <input type="date" name="updated_at"
+                <label>Remarks:</label>
-                    value="{{ record.updated_at.strftime('%Y-%m-%d') if record.updated_at else current_date }}"
+                <input type="text" name="Remarks" value="{{ record.Remarks }}">
-                    readonly>
             </div>
         </div>