Merge pull request 'Summary report UI improvements and JS preview logic' (#1) from swapnil-dev into main

Reviewed-on: #1

.dockerignore

@@ -1,5 +0,0 @@
-__pycache__/
-*.pyc
-.git
-.idea
-venv

.env

@@ -1,26 +0,0 @@
-# -----------------------------
-# Flask App Configuration
-# -----------------------------
-FLASK_ENV=development
-FLASK_DEBUG=true
-FLASK_HOST=0.0.0.0
-FLASK_PORT=5010
-
-# -----------------------------
-# Security
-# -----------------------------
-SECRET_KEY=secret1234
-
-# -----------------------------
-# Database Configuration
-# -----------------------------
-DB_DIALECT=mysql
-# DB_DRIVER=pymysql
-DB_HOST=127.0.0.1
-# DB_HOST=db   # this is production for use docker 
-DB_NAME=income_tax_db
-DB_PORT=3306
-# DB_NAME=test_income_taxdb
-DB_USER=root
-DB_PASSWORD=root
-

.gitignore

@@ -3,7 +3,6 @@
 *.pyc
 *.pyo
 *.pyd
-__pycache__
 
 # Ingnor upload files
 static/uploads/

AppCode/AOHandler.py

@@ -3,6 +3,7 @@ import mysql.connector
 import pandas as pd
 import io
 
+
 class AOHandler:
 
     def __init__(self):
@@ -32,35 +33,34 @@ class AOHandler:
 
     # Add AO record 
     def add_ao(self, data):
-        
+            fields = [
-        try:
+                'year', 'gross_total_income', 'disallowance_14a', 'disallowance_37',
-            fields= [ 'year', 'gross_total_income', 'disallowance_14a', 'disallowance_37',
+                'deduction_80ia_business', 'deduction_80ia_misc', 'deduction_80ia_other',
-                            'deduction_80ia_business', 'deduction_80ia_misc', 'deduction_80ia_other', 'deduction_sec37_disallowance', 'deduction_80g',
+                'deduction_sec37_disallowance', 'deduction_80g',
-                            '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', 
+                'net_taxable_income', 'tax_30_percent', 'tax_book_profit_18_5',
-                            'per_tax_b', 'tax_b_cal', 'per_surcharge_b', 'surcharge_b_cal', 'per_cess_b', 'edu_cess_b_cal', 'sum_of_b',
+                'tax_payable', 'surcharge', 'edu_cess',
-                            'tax_payable','total_tax_payable', 'opening_balance', 'mat_credit_created', 'mat_credit_utilized', 'closing_balance', 
+                'total_tax_payable', 'mat_credit_created', 'mat_credit_utilized',
-                            'interest_234c', 'total_tax', 'advance_tax', 'tds', 'tcs', 'sat', 'tax_on_assessment', 'refund', 
+                'interest_234c', 'total_tax', 'advance_tax', 'tds', 'tcs',
-                            'interest_244a_per143', 'refund_received', 'balance_receivable', 'remarks', 'created_at'
+                'sat', 'tax_on_assessment', 'refund', 'Remarks'
-                        ]
+            ]
+
             values = [data.get(f, 0) for f in fields]
+           
             self.cursor.callproc("InsertAO", values)    
             self.conn.commit()
-        except Exception as e:
-            self.conn.rollback()
-            raise e
-        finally:
-            self.cursor.close()
-            self.conn.close()
 
+    
     # UPDATE AO RECORD by AO id
     def update_ao(self, id, data):
-        fields= [ 'year', 'gross_total_income', 'disallowance_14a', 'disallowance_37',
+        fields = [
-                'deduction_80ia_business', 'deduction_80ia_misc', 'deduction_80ia_other', 'deduction_sec37_disallowance', 'deduction_80g',
+                'year', 'gross_total_income', 'disallowance_14a', 'disallowance_37',
-                '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_80ia_business', 'deduction_80ia_misc', 'deduction_80ia_other',
-                'per_tax_b', 'tax_b_cal', 'per_surcharge_b', 'surcharge_b_cal', 'per_cess_b', 'edu_cess_b_cal', 'sum_of_b',
+                'deduction_sec37_disallowance', 'deduction_80g',
-                'tax_payable','total_tax_payable', 'opening_balance', 'mat_credit_created', 'mat_credit_utilized', 'closing_balance', 
+                'net_taxable_income', 'tax_30_percent', 'tax_book_profit_18_5',
-                'interest_234c', 'total_tax', 'advance_tax', 'tds', 'tcs', 'sat', 'tax_on_assessment', 'refund', 
+                'tax_payable', 'surcharge', 'edu_cess',
-                'interest_244a_per143', 'refund_received', 'balance_receivable', 'remarks', 'updated_at'
+                'total_tax_payable', 'mat_credit_created', 'mat_credit_utilized',
+                'interest_234c', 'total_tax', 'advance_tax', 'tds', 'tcs',
+                'sat', 'tax_on_assessment', 'refund', 'Remarks'
             ]
 
         values = [id] + [data.get(f, 0) for f in fields]
@@ -101,35 +101,20 @@ 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%",
-                "per_tax_a" : "Per% Tax @(A)",
+                "tax_book_profit_18_5": "Tax @ 18.5% on Book Profit",
-                "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",
@@ -137,11 +122,8 @@ class AOHandler:
                 "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",
+                "Remarks": "Remarks"
-                "refund_received" : "Less : Refund Received on",
-                "balance_receivable" : "Balance Receivable",
-                "Remarks" : "Remarks"
             }
 
             # Vertical AO structure
@@ -211,6 +193,8 @@ class AOHandler:
             print("MySQL Error →", e)
             return None
 
+
+
     # CLOSE CONNECTION
     def close(self):
         self.cursor.close()

AppCode/CITHandler.py

@@ -3,6 +3,7 @@ import mysql.connector
 import pandas as pd
 import io
 
+
 class CITHandler:
 
     def __init__(self):
@@ -35,13 +36,15 @@ class CITHandler:
 
     # INSERT CIT RECORD
     def add_cit(self, data):
-        columns= [ 'year', 'gross_total_income', 'disallowance_14a', 'disallowance_37',
+        columns = [
-                'deduction_80ia_business', 'deduction_80ia_misc', 'deduction_80ia_other', 'deduction_sec37_disallowance', 'deduction_80g',
+                'year', 'gross_total_income', 'disallowance_14a', 'disallowance_37',
-                '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_80ia_business', 'deduction_80ia_misc', 'deduction_80ia_other',
-                'per_tax_b', 'tax_b_cal', 'per_surcharge_b', 'surcharge_b_cal', 'per_cess_b', 'edu_cess_b_cal', 'sum_of_b',
+                'deduction_sec37_disallowance', 'deduction_80g',
-                'tax_payable','total_tax_payable', 'opening_balance', 'mat_credit_created', 'mat_credit_utilized', 'closing_balance', 
+                'net_taxable_income', 'tax_30_percent', 'tax_book_profit_18_5',
-                'interest_234c', 'total_tax', 'advance_tax', 'tds', 'tcs', 'sat', 'tax_on_assessment', 'refund', 
+                'tax_payable', 'surcharge', 'edu_cess',
-                'interest_244a_per143', 'refund_received', 'balance_receivable', 'remarks', 'created_at'
+                'total_tax_payable', 'mat_credit_created', 'mat_credit_utilized',
+                'interest_234c', 'total_tax', 'advance_tax', 'tds', 'tcs',
+                'sat', 'tax_on_assessment', 'refund', 'Remarks'
             ]
 
         values = [data.get(col, 0) for col in columns]
@@ -51,13 +54,15 @@ class CITHandler:
 
     # UPDATE CIT RECORD
     def update_cit(self, id, data):
-        columns= [ 'year', 'gross_total_income', 'disallowance_14a', 'disallowance_37',
+        columns = [
-                'deduction_80ia_business', 'deduction_80ia_misc', 'deduction_80ia_other', 'deduction_sec37_disallowance', 'deduction_80g',
+                'year', 'gross_total_income', 'disallowance_14a', 'disallowance_37',
-                '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_80ia_business', 'deduction_80ia_misc', 'deduction_80ia_other',
-                'per_tax_b', 'tax_b_cal', 'per_surcharge_b', 'surcharge_b_cal', 'per_cess_b', 'edu_cess_b_cal', 'sum_of_b',
+                'deduction_sec37_disallowance', 'deduction_80g',
-                'tax_payable','total_tax_payable', 'opening_balance', 'mat_credit_created', 'mat_credit_utilized', 'closing_balance', 
+                'net_taxable_income', 'tax_30_percent', 'tax_book_profit_18_5',
-                'interest_234c', 'total_tax', 'advance_tax', 'tds', 'tcs', 'sat', 'tax_on_assessment', 'refund', 
+                'tax_payable', 'surcharge', 'edu_cess',
-                'interest_244a_per143', 'refund_received', 'balance_receivable', 'remarks', 'updated_at'
+                'total_tax_payable', 'mat_credit_created', 'mat_credit_utilized',
+                'interest_234c', 'total_tax', 'advance_tax', 'tds', 'tcs',
+                'sat', 'tax_on_assessment', 'refund', 'Remarks'
             ]
 
         values = [id] + [data.get(col, 0) for col in columns]
@@ -96,35 +101,20 @@ 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%",
-                "per_tax_a" : "Per% Tax @(A)",
+                "tax_book_profit_18_5": "Tax @ 18.5% on Book Profit",
-                "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",
@@ -132,11 +122,8 @@ class CITHandler:
                 "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",
+                "Remarks": "Remarks"
-                "refund_received" : "Less : Refund Received on",
-                "balance_receivable" : "Balance Receivable",
-                "Remarks" : "Remarks"
             }
 
             # Vertical CIT structure (single record per year)

AppCode/Config.py

@@ -1,43 +1,21 @@
-# import mysql.connector
-# import os
-
-# # Database Config 
-# class DBConfig:
-#     MYSQL_HOST = os.getenv("DB_HOST")
-#     MYSQL_USER = os.getenv("DB_USER")
-#     MYSQL_PASSWORD = os.getenv("DB_PASSWORD")
-#     MYSQL_DB = os.getenv("DB_NAME")
-
-#     @staticmethod
-#     def get_db_connection():
-#         """
-#         Returns a MySQL connection object.
-#         """
-#         return mysql.connector.connect(
-#             host=DBConfig.MYSQL_HOST,
-#             user=DBConfig.MYSQL_USER,
-#             password=DBConfig.MYSQL_PASSWORD,
-#             database=DBConfig.MYSQL_DB
-#         )
-
-
 import mysql.connector
 import os
 
-
+# Database Config 
 class DBConfig:
+    MYSQL_HOST = os.getenv("DB_HOST")
+    MYSQL_USER = os.getenv("DB_USER")
+    MYSQL_PASSWORD = os.getenv("DB_PASSWORD")
+    MYSQL_DB = os.getenv("DB_NAME")
+
     @staticmethod
     def get_db_connection():
         """
-        Create and return a MySQL database connection
+        Returns a MySQL connection object.
-        using environment variables.
         """
-
         return mysql.connector.connect(
-            host=os.getenv("DB_HOST", "db"),        # Docker service name
+            host=DBConfig.MYSQL_HOST,
-            port=int(os.getenv("DB_PORT", 3306)),
+            user=DBConfig.MYSQL_USER,
-            user=os.getenv("DB_USER", "root"),
+            password=DBConfig.MYSQL_PASSWORD,
-            password=os.getenv("DB_PASSWORD", "root"),
+            database=DBConfig.MYSQL_DB
-            database=os.getenv("DB_NAME", "test_income_taxdb"),
-            autocommit=False
         )

AppCode/DocumentHandler.py

@@ -23,6 +23,13 @@ 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
 
@@ -159,46 +166,24 @@ 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',
-                'per_tax_a',
+                'tax_book_profit_18_5',
-                'tax_a_cal',
+                'tax_payable', 'surcharge',
-                'per_surcharge_a',
+                'edu_cess', 'total_tax_payable',
-                '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', 
+                'refund', 'Remarks'
-                'interest_244a_per143',
-                'refund_received',
-                'balance_receivable',
-                'Remarks'
             ]
 
             particulars = [
@@ -207,36 +192,18 @@ 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", "-",
+                "Net Taxable Income", "Tax @ 30%",
-                "Per% Tax @(A)",
+                "Tax @ 18.5% on Book Profit",
-                "Tax cal(A)",
+                "Tax Payable", "Surcharge @ %",
-                "Per% surcharge @(A)",
+                "Education Cess @ %", "Total Tax Payable",
-                "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", "Add : Interest u/s 244A as per 143",
+                "Refund", "Remarks"
-                "Less : Refund Received on:","Balance Receivable","Remarks"
             ]
 
             def safe_get(df, col):
@@ -308,80 +275,40 @@ 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", "-",
+                "Net Taxable Income", "Tax @ 30%",
-                "Per% Tax @(A)",
+                "Tax @ 18.5% on Book Profit",
-                "Tax cal(A)",
+                "Tax Payable", "Surcharge @ %",
-                "Per% surcharge @(A)",
+                "Education Cess @ %", "Total Tax Payable",
-                "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", "Add : Interest u/s 244A as per 143",
+                "Refund", "Remarks"
-                "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',
-                'per_tax_a',
+                'tax_book_profit_18_5',
-                'tax_a_cal',
+                'tax_payable', 'surcharge',
-                'per_surcharge_a',
+                'edu_cess', 'total_tax_payable',
-                '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', 
+                'refund', 'Remarks'
-                'interest_244a_per143',
-                'refund_received',
-                'balance_receivable',
-                'Remarks'
             ]
 
             data = {
@@ -445,4 +372,5 @@ class DocumentHandler:
             )
 
         finally:
-            connection.close()
+            connection.close()
+

AppCode/ITATHandler.py

@@ -31,15 +31,16 @@ class ITATHandler:
 
     # INSERT ITAT (PROC)
     def add_itat(self, data):
-        columns= [ 'year', 'gross_total_income', 'disallowance_14a', 'disallowance_37',
+        columns = [
-                        'deduction_80ia_business', 'deduction_80ia_misc', 'deduction_80ia_other', 'deduction_sec37_disallowance', 'deduction_80g',
+            'year', 'gross_total_income', 'disallowance_14a', 'disallowance_37',
-                        '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_80ia_business', 'deduction_80ia_misc', 'deduction_80ia_other',
-                        'per_tax_b', 'tax_b_cal', 'per_surcharge_b', 'surcharge_b_cal', 'per_cess_b', 'edu_cess_b_cal', 'sum_of_b',
+            'deduction_sec37_disallowance', 'deduction_80g',
-                        'tax_payable','total_tax_payable', 'opening_balance', 'mat_credit_created', 'mat_credit_utilized', 'closing_balance', 
+            'net_taxable_income', 'tax_30_percent', 'tax_book_profit_18_5',
-                        'interest_234c', 'total_tax', 'advance_tax', 'tds', 'tcs', 'sat', 'tax_on_assessment', 'refund', 
+            'tax_payable', 'surcharge', 'edu_cess',
-                        'interest_244a_per143', 'refund_received', 'balance_receivable', 'remarks', 'created_at'
+            'total_tax_payable', 'mat_credit_created', 'mat_credit_utilized',
-                    ]
+            'interest_234c', 'total_tax', 'advance_tax', 'tds', 'tcs',
-
+            'sat', 'tax_on_assessment', 'refund', 'Remarks'
+        ]
         values = [data.get(col, 0) for col in columns]
 
         self.cursor.callproc("InsertITAT", values)
@@ -47,14 +48,16 @@ class ITATHandler:
 
     # UPDATE ITAT (PROC)
     def update_itat(self, id, data):
-        columns= [ 'year', 'gross_total_income', 'disallowance_14a', 'disallowance_37',
+        columns = [
-                'deduction_80ia_business', 'deduction_80ia_misc', 'deduction_80ia_other', 'deduction_sec37_disallowance', 'deduction_80g',
+            'year', 'gross_total_income', 'disallowance_14a', 'disallowance_37',
-                '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_80ia_business', 'deduction_80ia_misc', 'deduction_80ia_other',
-                'per_tax_b', 'tax_b_cal', 'per_surcharge_b', 'surcharge_b_cal', 'per_cess_b', 'edu_cess_b_cal', 'sum_of_b',
+            'deduction_sec37_disallowance', 'deduction_80g',
-                'tax_payable','total_tax_payable', 'opening_balance', 'mat_credit_created', 'mat_credit_utilized', 'closing_balance', 
+            'net_taxable_income', 'tax_30_percent', 'tax_book_profit_18_5',
-                'interest_234c', 'total_tax', 'advance_tax', 'tds', 'tcs', 'sat', 'tax_on_assessment', 'refund', 
+            'tax_payable', 'surcharge', 'edu_cess',
-                'interest_244a_per143', 'refund_received', 'balance_receivable', 'remarks', 'updated_at'
+            'total_tax_payable', 'mat_credit_created', 'mat_credit_utilized',
-            ]
+            'interest_234c', 'total_tax', 'advance_tax', 'tds', 'tcs',
+            'sat', 'tax_on_assessment', 'refund', 'Remarks'
+        ]
         values = [id] + [data.get(col, 0) for col in columns]  
 
         self.cursor.callproc("UpdateITAT", values)
@@ -91,35 +94,20 @@ 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%",
-                "per_tax_a" : "Per% Tax @(A)",
+                "tax_book_profit_18_5": "Tax @ 18.5% on Book Profit",
-                "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_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,13 +115,10 @@ class ITATHandler:
                 "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",
+                "Remarks": "Remarks"
-                "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

@@ -1,9 +1,11 @@
 import mysql.connector
 import pandas as pd
+import pymysql
 import io
 from flask import send_file, render_template, request
 
 from AppCode.Config import DBConfig
+from AppCode.YearGet import YearGet
 
 
 class ITRHandler:
@@ -12,6 +14,7 @@ class ITRHandler:
         self.conn = DBConfig.get_db_connection()
         self.cursor = self.conn.cursor(dictionary=True)
         
+
     # GET ALL ITR RECORDS using stored procedure "GetAllItr"
     def get_all_itr(self):
         self.cursor.callproc("GetAllItr")
@@ -40,46 +43,42 @@ class ITRHandler:
 
     # INSERT ITR RECORD using procedure "add_itr"
     def add_itr(self, data):
-        try:
-            columns= [ 'year', 'gross_total_income', 'disallowance_14a', 'disallowance_37',
-                'deduction_80ia_business', 'deduction_80ia_misc', 'deduction_80ia_other', 'deduction_sec37_disallowance', 'deduction_80g',
-                'net_taxable_income', 'per_tax_a', 'tax_a_cal', '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', 
-                'interest_244a_per143', 'refund_received', 'balance_receivable', 'remarks', 'created_at'
-            ]
 
-            values = [data.get(col, 0) for col in columns]
+        columns = [
-
+            'year', 'gross_total_income', 'disallowance_14a', 'disallowance_37',
-            # Call your stored procedure
+            'deduction_80ia_business', 'deduction_80ia_misc', 'deduction_80ia_other',
-            self.cursor.callproc("InsertITR", values)
+            'deduction_sec37_disallowance', 'deduction_80g',
-            self.conn.commit()
+            'net_taxable_income', 'tax_30_percent', 'tax_book_profit_18_5',
-        except Exception as e:
+            'tax_payable', 'surcharge', 'edu_cess',
-            self.conn.rollback()
+            'total_tax_payable', 'mat_credit_created', 'mat_credit_utilized',
-            raise e
+            'interest_234c', 'total_tax', 'advance_tax', 'tds', 'tcs',
-        finally:
+            'sat', 'tax_on_assessment', 'refund', 'Remarks'
-            self.cursor.close()
+        ]
-            self.conn.close()
+        values = [data.get(col, 0) for col in columns]
 
+        # Call your stored procedure
+        self.cursor.callproc("InsertITR", values)
+        self.conn.commit()
 
     # update itr by id
     def update(self, id, data):
-        columns= [ 'year', 'gross_total_income', 'disallowance_14a', 'disallowance_37',
+        columns = [
-                'deduction_80ia_business', 'deduction_80ia_misc', 'deduction_80ia_other', 'deduction_sec37_disallowance', 'deduction_80g',
+            'year', 'gross_total_income', 'disallowance_14a', 'disallowance_37',
-                '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_80ia_business', 'deduction_80ia_misc', 'deduction_80ia_other',
-                'per_tax_b', 'tax_b_cal', 'per_surcharge_b', 'surcharge_b_cal', 'per_cess_b', 'edu_cess_b_cal', 'sum_of_b',
+            'deduction_sec37_disallowance', 'deduction_80g',
-                'tax_payable','total_tax_payable', 'opening_balance', 'mat_credit_created', 'mat_credit_utilized', 'closing_balance', 
+            'net_taxable_income', 'tax_30_percent', 'tax_book_profit_18_5',
-                'interest_234c', 'total_tax', 'advance_tax', 'tds', 'tcs', 'sat', 'tax_on_assessment', 'refund', 
+            'tax_payable', 'surcharge', 'edu_cess',
-                'interest_244a_per143', 'refund_received', 'balance_receivable', 'remarks', 'updated_at'
+            'total_tax_payable', 'mat_credit_created', 'mat_credit_utilized',
-            ]
+            'interest_234c', 'total_tax', 'advance_tax', 'tds', 'tcs',
+            'sat', 'tax_on_assessment', 'refund', 'Remarks'
+        ]
 
         values = [id] + [data.get(col, 0) for col in columns]  
         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()
@@ -105,35 +104,20 @@ 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%",
-                "per_tax_a" : "Per% Tax @(A)",
+                "tax_book_profit_18_5": "Tax @ 18.5% on Book Profit",
-                "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",
@@ -141,14 +125,10 @@ 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 structures
+            # Convert to vertical structure
             data = []
             for key, label in field_mapping.items():
                 value = rows[0].get(key, 0)

AppCode/LoginAuth.py

@@ -1,71 +1,40 @@
 from flask import Blueprint, render_template, request, redirect, url_for, flash, session
+from flask import flash,redirect,url_for
 from functools import wraps
-from ldap3 import Server, Connection, ALL
+from flask import session
-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")
 
-                if not username or not password:
+                # Dummy validation — REPLACE with DB check later
-                    flash("Username and password are required!", "danger")
+                if username == "admin" and password == "admin123":
-                    return render_template("login.html")
+                    session['user'] = username
+                    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:

AppCode/MatCreditHandler.py

@@ -1,18 +1,16 @@
 from AppCode.Config import DBConfig
-
+import mysql.connector
 
 class MatCreditHandler:
 
     def __init__(self):
+        # db = DBConfig()
         self.conn = DBConfig.get_db_connection()
         self.cursor = self.conn.cursor(dictionary=True)
 
-    # --------------------------------------------------
+    # get all Mat credit data
-    # FETCH ALL MAT CREDIT + UTILIZATION (For UI Display)
-    # --------------------------------------------------
     def fetch_all(self):
         try:
-           
            self.cursor.callproc("GetMatCedit")
            result_sets = self.cursor.stored_results()
            mat_rows = next(result_sets).fetchall()
@@ -21,78 +19,30 @@ class MatCreditHandler:
            return mat_rows, utilization_rows
         finally:
             self.cursor.close()
-            self.conn.close()
 
-    # --------------------------------------------------
+    # Save Mat credit data single row
-    # SAVE / UPDATE SINGLE MAT ROW (FROM MANUAL UI)
-    # --------------------------------------------------
     @staticmethod
     def save_single(data):
         conn = DBConfig.get_db_connection()
         cur = conn.cursor(dictionary=True)
-
         try:
-            # Save / Update MAT Credit
-            cur.callproc(
-                "SaveOrUpdateMatCredit",
-                (
-                    data["financial_year"],
-                    data["mat_credit"],
-                    data["balance"],
-                    data.get("remarks", "")
-                )
-            )
 
-            mat_id = None
+            cur.callproc("SaveOrUpdateMatCredit",(
-            for result in cur.stored_results():
+            data["financial_year"],
-                mat_id = result.fetchone()["mat_id"]
+            data["mat_credit"],
+            data["balance"]
+            ))
+
+            result = next(cur.stored_results()).fetchone()
+            mat_id = result["mat_id"]
+
+            if not mat_id:
+                raise Exception("mat_id not returned from procedure")
 
-            # Save utilization rows
             for u in data.get("utilization", []):
-                if float(u["amount"]) > 0:
-                    cur.callproc(
-                        "InsertMatUtilization",
-                        (mat_id, u["year"], u["amount"])
-                    )
-
-            conn.commit()
-
-        except Exception as e:
-            conn.rollback()
-            raise e
-        finally:
-            cur.close()
-            conn.close()
-
-    # --------------------------------------------------
-    # AUTO SAVE MAT FROM ITR (MAIN LOGIC)
-    # --------------------------------------------------
-    @staticmethod
-    def save_from_itr(year, mat_created, mat_utilized, remarks="Auto from"):
-        conn = DBConfig.get_db_connection()
-        cur = conn.cursor(dictionary=True)
-
-        try:
-            mat_created = float(mat_created or 0)
-            mat_utilized = float(mat_utilized or 0)
-
-            balance = mat_created - mat_utilized
-
-            # Save / Update MAT Credit
-            cur.callproc(
-                "SaveOrUpdateMatCredit",
-                (year, mat_created, balance, remarks)
-            )
-
-            mat_id = None
-            for result in cur.stored_results():
-                mat_id = result.fetchone()["mat_id"]
-
-            # Save utilization only if used
-            if mat_utilized > 0:
                 cur.callproc(
                     "InsertMatUtilization",
-                    (mat_id, year, mat_utilized)
+                    (mat_id, u["year"], u["amount"])
                 )
 
             conn.commit()
@@ -100,29 +50,56 @@ class MatCreditHandler:
         except Exception as e:
             conn.rollback()
             raise e
+
         finally:
             cur.close()
             conn.close()
+    
+    # save all Mat credit data 
+    # @staticmethod
+    # def save_bulk(rows):
+    #     conn = DBConfig.get_db_connection()
+    #     cur = conn.cursor()
+    #     skipped = []
 
-    # --------------------------------------------------
+    #     try:
-    # DELETE MAT CREDIT SAFELY (OPTIONAL)
+    #         for row in rows:
-    # --------------------------------------------------
+    #             cur.execute(
-    def delete_by_year(self, financial_year):
+    #                 "SELECT id FROM mat_credit WHERE financial_year=%s",
-        try:
+    #                 (row["financial_year"],)
-            self.cursor.execute(
+    #             )
-                "DELETE FROM mat_credit WHERE financial_year=%s",
+    #             if cur.fetchone():
-                (financial_year,)
+    #                 skipped.append(row["financial_year"])
-            )
+    #                 continue
-            self.conn.commit()
-        finally:
-            self.cursor.close()
-            self.conn.close()
 
-    # --------------------------------------------------
+    #             cur.execute("""
-    # CLOSE CONNECTION (MANUAL USE)
+    #                 INSERT INTO mat_credit (financial_year, mat_credit, balance)
-    # --------------------------------------------------
+    #                 VALUES (%s,%s,%s)
+    #             """, (row["financial_year"], row["mat_credit"], row["balance"]))
+
+    #             mat_id = cur.lastrowid
+
+    #             for u in row["utilization"]:
+    #                 cur.execute("""
+    #                     INSERT INTO mat_utilization
+    #                     (mat_credit_id, utilized_year, utilized_amount)
+    #                     VALUES (%s,%s,%s)
+    #                 """, (mat_id, u["year"], u["amount"]))
+
+    #         conn.commit()
+    #         return skipped
+
+    #     except Exception:
+    #         conn.rollback()
+    #         raise
+
+    #     finally:
+    #         cur.close()
+    #         conn.close()
+
+    # CLOSE CONNECTION
     def close(self):
-        if self.cursor:
+        self.cursor.close()
-            self.cursor.close()
+        self.conn.close()
-        if self.conn:
+
-            self.conn.close()
+  

Dockerfile

@@ -1,22 +0,0 @@
-FROM python:3.11-slim
-
-# Prevent Python buffering
-ENV PYTHONDONTWRITEBYTECODE=1
-ENV PYTHONUNBUFFERED=1
-
-WORKDIR /app
-
-# Install system deps (if needed later)
-RUN apt-get update && apt-get install -y \
-    build-essential \
-    && rm -rf /var/lib/apt/lists/*
-
-COPY requirements.txt .
-RUN pip install --no-cache-dir -r requirements.txt
-
-COPY . .
-
-EXPOSE 5000
-
-CMD ["python", "main.py"]
-

docker-compose.yml

@@ -1,29 +0,0 @@
-version: "3.9"
-
-services:
-  db:
-    image: mysql:8.0
-    container_name: income_tax_db
-    restart: always
-    environment:
-      MYSQL_ROOT_PASSWORD: root
-      MYSQL_DATABASE: test_income_taxdb
-    ports:
-      - "3307:3306"
-    volumes:
-      - mysql_data:/var/lib/mysql
-      - ./db/income_tax.sql:/docker-entrypoint-initdb.d/income_tax.sql
-
-  web:
-    build: .
-    container_name: income_tax_web
-    restart: always
-    ports:
-      - "5010:5010"
-    env_file:
-      - .env
-    depends_on:
-      - db
-
-volumes:
-  mysql_data:

main.py

@@ -4,7 +4,7 @@ from dotenv import load_dotenv
 load_dotenv()
 import pandas as pd
 from werkzeug.utils import secure_filename
-from datetime import date
+
 from AppCode.Config import DBConfig
 from AppCode.LoginAuth import LoginAuth
 from AppCode.FileHandler import FileHandler
@@ -15,7 +15,6 @@ from AppCode.AOHandler import AOHandler
 from AppCode.CITHandler import CITHandler
 from AppCode.ITATHandler import ITATHandler
 from AppCode.MatCreditHandler import MatCreditHandler
-import subprocess
 
 
 
@@ -60,6 +59,7 @@ def view_documents():
     docHandler.View(request=request)
     return render_template('view_docs.html', documents=docHandler.documents, years=docHandler.years)
 
+
 # Upload file documents
 @app.route('/uploads/<filename>')
 @auth.login_required
@@ -68,26 +68,20 @@ def uploaded_file(filename):
     filepath = os.path.join(FileHandler.UPLOAD_FOLDER, secure_filename(filename))
 
     if not os.path.exists(filepath):
-        flash("Unsupported file type for viewing", "warning")
+        abort(404)
-        return redirect(url_for('view_documents'))
 
     file_ext = filename.rsplit('.', 1)[-1].lower()
     # --- View Mode ---
     if mode == 'view':
-        #  pdf
         if file_ext == 'pdf':
             return send_file(filepath, mimetype='application/pdf')
-        # Word
-        elif file_ext in ['doc', 'docx']:
-            return send_file(filepath, as_attachment=True)
-        # Excel
         elif file_ext in ['xls', 'xlsx']:
+            # Excel cannot be rendered in-browser by Flask; trigger download instead
             return send_file(filepath, as_attachment=False, download_name=filename, mimetype='application/vnd.openxmlformats-officedocument.spreadsheetml.sheet')
         else:
-            flash("Unsupported file type for viewing", "warning")
+            return abort(415)  # Unsupported type for viewing
-            return redirect(url_for('view_documents'))
 
-    return send_file(filepath, as_attachment=True, download_name=filename)
+    return send_file(filepath, as_attachment=True)
 
 
 
@@ -111,28 +105,14 @@ def display_itr():
 def add_itr():
     if request.method == 'POST':
         itr = ITRHandler()
-        mat = MatCreditHandler()
         itr.add_itr(request.form)
         itr.close()
-        if 'documents' in request.files:
+        flash("ITR record added successfully!", "success")
-            doc = DocumentHandler()
-            doc.Upload(request)
-
-        # AUTO SAVE MAT FROM ITR
-        mat.save_from_itr(
-            year=request.form["year"],
-            mat_created=float(request.form.get("mat_credit_created", 0)),
-            mat_utilized=float(request.form.get("mat_credit_utilized", 0)),
-            remarks="Created via ITR"
-        )
-        
-        # flash("ITR record added successfully!", "success")
-        flash("ITR record and documents uploaded successfully!", "success")
         return redirect(url_for('display_itr'))
 
-    return render_template('add_itr.html',current_date=date.today().isoformat())
+    return render_template('add_itr.html')
 
-## 4. DELETE an ITR records
+## 4. DELETE an ITR record
 @app.route('/itr/delete/<int:id>', methods=['POST'])
 @auth.login_required
 def delete_itr(id):
@@ -155,7 +135,7 @@ def update_itr(id):
 
     record = itr.get_itr_by_id(id)
     itr.close()
-    return render_template('update_itr.html', record=record, current_date=date.today().isoformat())
+    return render_template('update_itr.html', record=record)
 
 
 
@@ -180,25 +160,11 @@ def display_ao():
 def add_ao():
     if request.method == 'POST':
         ao = AOHandler()
-        mat = MatCreditHandler()
         ao.add_ao(request.form)
         ao.close()
-
-        if 'documents' in request.files:
-            doc = DocumentHandler()
-            doc.Upload(request)
-
-        # AUTO SAVE MAT FROM ITR
-        mat.save_from_itr(
-            year=request.form["year"],
-            mat_created=float(request.form.get("mat_credit_created", 0)),
-            mat_utilized=float(request.form.get("mat_credit_utilized", 0)),
-            remarks="Created via ao"
-        ) 
-
         flash("AO record added successfully!", "success")
         return redirect(url_for('display_ao'))
-    return render_template('add_ao.html',current_date=date.today().isoformat())
+    return render_template('add_ao.html')
 
 # 3. UPDATE AO record
 @app.route('/ao/update/<int:id>', methods=['GET', 'POST'])
@@ -252,25 +218,12 @@ def display_cit():
 def add_cit():
     if request.method == 'POST':
         cit = CITHandler()
-        mat = MatCreditHandler()
         cit.add_cit(request.form)
         cit.close() 
-
-        if 'documents' in request.files:
-            doc = DocumentHandler()
-            doc.Upload(request)
-
-        # AUTO SAVE MAT FROM ITR
-        mat.save_from_itr(
-            year=request.form["year"],
-            mat_created=float(request.form.get("mat_credit_created", 0)),
-            mat_utilized=float(request.form.get("mat_credit_utilized", 0)),
-            remarks="Created via cit"
-        )
         flash("CIT record added successfully!", "success")
         return redirect(url_for('display_cit'))
 
-    return render_template('add_cit.html', current_date=date.today().isoformat())
+    return render_template('add_cit.html')
 
 # 3 delete CIT records by id
 @app.route('/cit/delete/<int:id>', methods=['POST'])
@@ -322,27 +275,13 @@ def display_itat():
 def add_itat():
     if request.method == 'POST':
         itat = ITATHandler()
-        mat = MatCreditHandler()
         data = {k: request.form.get(k, 0) for k in request.form}
         itat.add_itat(data)
         itat.close()
-
-        if 'documents' in request.files:
-            doc = DocumentHandler()
-            doc.Upload(request)
-
-        # AUTO SAVE MAT FROM ITR
-        mat.save_from_itr(
-            year=request.form["year"],
-            mat_created=float(request.form.get("mat_credit_created", 0)),
-            mat_utilized=float(request.form.get("mat_credit_utilized", 0)),
-            remarks="Created via ITR"
-        )
-
         flash("ITAT record added successfully!", "success")
         return redirect(url_for('display_itat'))
 
-    return render_template('add_itat.html',current_date=date.today().isoformat())
+    return render_template('add_itat.html')
 
 # 3.Update ITAT records by id
 @app.route('/itat/update/<int:id>', methods=['GET', 'POST'])

requirements.txt

@@ -1,13 +0,0 @@
-Flask==3.0.1
-python-dotenv==1.0.1
-pandas==2.2.0
-Werkzeug==3.0.1
-
-mysql-connector-python==8.3.0
-
-Flask-HTTPAuth==4.8.0
-
-openpyxl==3.1.2
-xlrd==2.0.1
-
-gunicorn==21.2.0

static/js/ao_calc.js

@@ -1,4 +1,5 @@
 document.addEventListener("DOMContentLoaded", function () {
+
     function getValue(id) {
         var el = document.getElementsByName(id)[0];
         return el ? parseFloat(el.value) || 0 : 0;
@@ -10,14 +11,15 @@ document.addEventListener("DOMContentLoaded", function () {
     }
 
     window.calculate = function () {
+
         // --- BASIC INPUTS ---
         var gross_total_income = getValue("gross_total_income");
         var disallowance_14a = getValue("disallowance_14a");
         var disallowance_37 = getValue("disallowance_37");
 
         // -- total gross income --
-        var gross_total = gross_total_income + disallowance_37 + disallowance_14a;
+        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");
@@ -25,24 +27,6 @@ document.addEventListener("DOMContentLoaded", function () {
         var d80_other = getValue("deduction_80ia_other");
         var d80_sec37 = getValue("deduction_sec37_disallowance");
 
-        // -- TAX A CALCULATIONS --
-        var per_a = getValue("per_a");
-        var tax_a = getValue("tax_a");
-        var per_surcharge_a = getValue("per_surcharge_a");
-        var surcharge_a = getValue("surcharge_a");
-        var per_cess_a = getValue("per_cess_a");
-        var edu_cess_a = getValue("edu_cess_a");
-
-        // -- TAX b CALCULATIONS --
-
-        var tax_book_profit = getValue("tax_book_profit");
-        console.log(tax_book_profit);
-
-        var per_surcharge_b = getValue("per_surcharge_b");
-        var surcharge_b = getValue("surcharge_b");
-        var per_cess_b = getValue("per_cess_b");
-        var edu_cess_b = getValue("edu_cess_b");
-
         var deduction = d80_business + d80_misc + d80_other + d80_sec37 - 1.35;
 
         var deduction_80g = getValue("deduction_80g");
@@ -51,46 +35,27 @@ document.addEventListener("DOMContentLoaded", function () {
         var net_taxable_income = gross_total - deduction - deduction_80g;
         setValue("net_taxable_income", net_taxable_income);
 
-        // --- TAX (A)% AMOUNT ---
+        // --- TAX 30% ---
-        var tax_a = net_taxable_income * (per_a / 100);
+        var tax30 = net_taxable_income * 0.30;
-        setValue("tax_a", tax_a);
+        setValue("tax_30_percent", tax30);
-
-        // --- SURCHARGE (A)% AMOUNT ---
-        var surcharge_a = tax_a * (per_surcharge_a / 100);
-        setValue("surcharge_a", surcharge_a);
-
-        // --- CESS (A)% AMOUNT ---
-        var edu_cess_a = (surcharge_a + tax_a) * (per_cess_a / 100);
-        setValue("edu_cess_a", edu_cess_a);
-
-        //SUM OF (A)%
-        var sum_of_a = tax_a + surcharge_a + edu_cess_a;
-
-        setValue("sum_of_a", sum_of_a);
-
-        //-----------------------------------------------------------------------------------------------------------
-        //-----------------------------------------------------------------------------------------------------------
-
-        // --- SURCHARGE (B)% AMOUNT ---
-        var surcharge_b = tax_book_profit * (per_surcharge_b / 100);
-        setValue("surcharge_b", surcharge_b);
-
-        // --- CESS (B)% AMOUNT ---
-        var edu_cess_b = (surcharge_b + tax_book_profit) * (per_cess_b / 100);
-        setValue("edu_cess_b", edu_cess_b);
-
-        //SUM OF (B)%
-        var sum_of_b = tax_book_profit + surcharge_b + edu_cess_b;
-
-        setValue("sum_of_b", sum_of_b);
 
         // --- TAX PAYABLE (18.5%) ---
         var tax185 = getValue("tax_book_profit_18_5");
 
         // --- Education Cess 3% ---
-        var tax_payable = tax_a > tax_book_profit ? tax_a : tax_book_profit;
+        var tax_payable = (tax30 > tax185) ? tax30 : tax185;
         setValue("tax_payable", tax_payable);
 
+        // // --- SURCHARGE ---
+        // var percent = getValue("persentage");
+        // var surcharge = tax_payable * (percent / 100);
+        // setValue("surcharge", surcharge);
+
+        // // --- edu_cess ---
+        // var per_cess = getValue("persentage_cess")
+        // var edu_cess = (tax_payable + surcharge) * (per_cess / 100);
+        // setValue("edu_cess", edu_cess);
+
         // --- SURCHARGE ---
         var percent = getValue("persentage");
         var surcharge = tax_payable * (percent / 100);
@@ -102,37 +67,14 @@ document.addEventListener("DOMContentLoaded", function () {
         setValue("edu_cess", edu_cess);
 
         // --- total tax payable ---
-        var total_tax_payable = sum_of_a > sum_of_b ? sum_of_a : sum_of_b;
+        var total_tax_payable = tax_payable + surcharge + edu_cess;
         setValue("total_tax_payable", total_tax_payable);
 
-        // // --- mat_credit_created --- new
-        // setValue("mat_credit_created", Math.max(tax185 - total_tax_payable, 0));
-        // // --- mat credit_utilized --- new
-        // setValue("mat_credit_utilized", Math.max(total_tax_payable - tax185, 0));
-
-        // --- MAT credit and utilized ---
-        var a = sum_of_a;
-        var b = sum_of_b;
-        var result = 0;
-        var zero = 0;
-        if (b > a) {
-            result = b - a;
-            setValue("mat_credit_created", result);
-            setValue("mat_credit_utilized", zero);
-        }
-
-        if (a > b) {
-            result = a - b;
-            setValue("mat_credit_utilized", result);
-            setValue("mat_credit_created", zero);
-        }
-
         // --- FINAL TAX ---
-        var mat_credit_uti = getValue("mat_credit_utilized");
+        var mat_credit = getValue("mat_credit_utilized");
         var interest_234c = getValue("interest_234c");
 
-        // var total_tax = total_tax_payable + mat_credit + interest_234c;
+        var total_tax = total_tax_payable + mat_credit + interest_234c;
-        var total_tax = total_tax_payable + interest_234c - mat_credit_uti;
         setValue("total_tax", total_tax);
 
         // --- ASSESSMENT ---
@@ -146,4 +88,4 @@ document.addEventListener("DOMContentLoaded", function () {
         var refund = total_tax - all_tax;
         setValue("refund", refund);
     };
-});
+});

static/js/cit_calc.js

@@ -68,28 +68,6 @@ document.addEventListener("DOMContentLoaded", function () {
         var total_tax_payable = tax_payable + surcharge + edu_cess;
         setValue("total_tax_payable", total_tax_payable);
 
-
-        // --- mat credit_utilized ---
-        var a = tax185
-        var b = total_tax_payable
-        var result = 0
-        if (a > b) {
-            result = a - b
-            setValue("mat_credit_created", result);
-        }
-        else {
-            setValue("mat_credit_created", result);
-        }
-
-        if (b > a) {
-            result = b - a
-            setValue("mat_credit_utilized", result);
-        }
-        else {
-            setValue("mat_credit_utilized", result);
-        }
-
-
         // --- FINAL TAX ---
         var mat_credit = getValue("mat_credit_utilized");
         var interest_234c = getValue("interest_234c");

static/js/itr_calc.js

@@ -1,134 +1,91 @@
 document.addEventListener("DOMContentLoaded", function () {
 
-    function getValue(name) {
+    function getValue(id) {
-        var el = document.getElementsByName(name)[0];
+        var el = document.getElementsByName(id)[0];
         return el ? parseFloat(el.value) || 0 : 0;
     }
 
-    function setValue(name, val) {
+    function setValue(id, val) {
-        var el = document.getElementsByName(name)[0];
+        var el = document.getElementsByName(id)[0];
         if (el) el.value = Number(val).toFixed(2);
     }
 
-    // ---- Track last edited field for Tax(A) ----
-    let lastEditedTaxA = null;
-
-    document.getElementsByName("per_tax_a")[0].addEventListener("input", () => {
-        lastEditedTaxA = "percentage";
-    });
-
-    document.getElementsByName("tax_a_cal")[0].addEventListener("input", () => {
-        lastEditedTaxA = "amount";
-    });
-
     window.calculate = function () {
 
-        // ---------------- BASIC INPUTS ----------------
+        // --- BASIC INPUTS ---
         var gross_total_income = getValue("gross_total_income");
         var disallowance_14a = getValue("disallowance_14a");
         var disallowance_37 = getValue("disallowance_37");
 
-        var gross_total = gross_total_income + disallowance_14a + disallowance_37;
+        // -- total gross income --
-        setValue("gti_as_per_ao", gross_total);
+        var gross_total = gross_total_income + disallowance_37 + disallowance_14a
+        // console.log("gross_total income:: " + gross_total)
 
-        // ---------------- DEDUCTIONS ----------------
+        // --- DEDUCTIONS ---
         var d80_business = getValue("deduction_80ia_business");
         var d80_misc = getValue("deduction_80ia_misc");
         var d80_other = getValue("deduction_80ia_other");
         var d80_sec37 = getValue("deduction_sec37_disallowance");
-        var deduction_80g = getValue("deduction_80g");
 
         var deduction = d80_business + d80_misc + d80_other + d80_sec37 - 1.35;
 
+        var deduction_80g = getValue("deduction_80g");
+
+        // --- NET TAXABLE INCOME ---
         var net_taxable_income = gross_total - deduction - deduction_80g;
         setValue("net_taxable_income", net_taxable_income);
 
-        // ================= TAX (A) – TWO WAY =================
+        // --- TAX 30% ---
-        var per_tax_a = getValue("per_tax_a");
+        var tax30 = net_taxable_income * 0.30;
-        var tax_a_cal = getValue("tax_a_cal");
+        setValue("tax_30_percent", tax30);
 
-        if (net_taxable_income > 0) {
+        // --- TAX PAYABLE (18.5%) ---
-            if (lastEditedTaxA === "percentage") {
+        var tax185 = getValue("tax_book_profit_18_5");
-                tax_a_cal = net_taxable_income * (per_tax_a / 100);
-                setValue("tax_a_cal", tax_a_cal);
-            }
-            else if (lastEditedTaxA === "amount") {
-                per_tax_a = (tax_a_cal / net_taxable_income) * 100;
-                setValue("per_tax_a", per_tax_a);
-            }
-        }
 
-        var per_surcharge_a = getValue("per_surcharge_a");
+        // --- Education Cess 3% ---
-        var surcharge_a_cal = tax_a_cal * (per_surcharge_a / 100);
+        var tax_payable = (tax30 > tax185) ? tax30 : tax185;
-        setValue("surcharge_a_cal", surcharge_a_cal);
-
-        var per_cess_a = getValue("per_cess_a");
-        var edu_cess_a_cal = (tax_a_cal + surcharge_a_cal) * (per_cess_a / 100);
-        setValue("edu_cess_a_cal", edu_cess_a_cal);
-
-        var sum_of_a = tax_a_cal + surcharge_a_cal + edu_cess_a_cal;
-        setValue("sum_of_a", sum_of_a);
-
-        // ================= TAX (B) =================
-        var tax_b_cal = getValue("tax_b_cal");
-
-        var per_surcharge_b = getValue("per_surcharge_b");
-        var surcharge_b_cal = tax_b_cal * (per_surcharge_b / 100);
-        setValue("surcharge_b_cal", surcharge_b_cal);
-
-        var per_cess_b = getValue("per_cess_b");
-        var edu_cess_b_cal = (tax_b_cal + surcharge_b_cal) * (per_cess_b / 100);
-        setValue("edu_cess_b_cal", edu_cess_b_cal);
-
-        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) ? 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;
+        // // --- SURCHARGE ---
+        // var percent = getValue("persentage");
+        // var surcharge = tax_payable * (percent / 100);
+        // setValue("surcharge", surcharge);
+
+        // // --- edu_cess ---
+        // var per_cess = getValue("persentage_cess")
+        // var edu_cess = (tax_payable + surcharge) * (per_cess / 100);
+        // setValue("edu_cess", edu_cess);
+
+        // --- SURCHARGE ---
+        var percent = getValue("persentage");
+        var surcharge = tax_payable * (percent / 100);
+        setValue("surcharge", surcharge);
+
+        // --- EDUCATION CESS ---
+        var per_cess = getValue("persentage_cess");
+        var edu_cess = (tax_payable + surcharge) * (per_cess / 100);
+        setValue("edu_cess", edu_cess);
+
+        // --- total tax payable ---
+        var total_tax_payable = tax_payable + surcharge + edu_cess;
         setValue("total_tax_payable", total_tax_payable);
 
-        // ================= MAT CREDIT =================
+        // --- FINAL TAX ---
-        var mat_created = 0;
+        var mat_credit = getValue("mat_credit_utilized");
-        var mat_utilized = 0;
-
-        if (sum_of_a < sum_of_b) {
-            mat_created = sum_of_b - sum_of_a;
-        } else {
-            mat_utilized = sum_of_a - sum_of_b;
-        }
-
-        setValue("mat_credit_created", mat_created);
-        setValue("mat_credit_utilized", mat_utilized);
-
-        // ================= Opening Balance and closing =================  
-        var opening_balance = getValue("opening_balance");
-        var closing_balance = (opening_balance + mat_created) - mat_utilized
-        setValue("closing_balance", closing_balance);
-
-        // ================= FINAL TAX =================
         var interest_234c = getValue("interest_234c");
 
-        var total_tax = total_tax_payable + interest_234c - mat_utilized;
+        var total_tax = total_tax_payable + mat_credit + interest_234c;
         setValue("total_tax", total_tax);
 
-        // ================= ADJUSTMENTS =================
+        // --- ASSESSMENT ---
         var adv_tax = getValue("advance_tax");
         var tds = getValue("tds");
         var tcs = getValue("tcs");
-        var tax_on_assessment = getValue("tax_on_assessment");
+        var tax_on_regular_assessment = getValue("tax_on_assessment");
-        var interest_244a_per143 = getValue("interest_244a_per143");
-        var refund_received = getValue("refund_received");
 
-        var paid_tax = adv_tax + tds + tcs + tax_on_assessment;
+        var all_tax = adv_tax + tds + tcs + tax_on_regular_assessment;
 
-        var refund = total_tax - paid_tax;
+        var refund = total_tax - all_tax;
         setValue("refund", refund);
-
-        var balance_receivable = (refund + interest_244a_per143) - refund_received
-        setValue("balance_receivable", balance_receivable);
-
     };
 });

static/js/summary_preview.js

@@ -45,6 +45,11 @@ document.getElementById("year").addEventListener("change", function () {
 
             // Show preview
             previewDiv.style.display = "block";
+
+           
+
+            
+
         })
         .catch(err => console.error("Preview load error:", err));
 });

templates/add_ao.html

@@ -1,7 +1,6 @@
 {% extends "base.html" %}
 
 {% block title %}Add New AO Record{% endblock %}
-
 {% block extra_css %}
 <!-- Child page CSS -->
 <link rel="stylesheet" href="{{ url_for('static', filename='css/add_model.css') }}">
@@ -9,9 +8,9 @@
 
 {% block content %}
 <div class="container">
-    <h2 style="text-align:center;">New AO Form</h2>
+
-    <form id="ao" method="POST" enctype="multipart/form-data">
+    <h2 style="text-align:center;">New Assessing Officer Form</h2>
-        <input type="hidden" name="stage" value="ao">
+    <form id="ao" method="POST">
         <div class="form-group full-width inline-2">
             <div>
                 <label>Assessment Year:</label>
@@ -20,13 +19,13 @@
                         -- Please select Assessment Year --
                     </option>
                 </select>
+
+
+
                 <div id="yearError" style="color:red; display:none; margin-bottom:10px;"></div>
             </div>
-            <div>
-                <label>Record Created Date:</label>
-                <input type="date" name="created_at" value="{{ current_date }}" required>
-            </div>
         </div>
+
         <div class="form-group full-width inline-2">
             <div>
                 <label>Gross Total Income:</label>
@@ -41,12 +40,6 @@
                 <input type="number" name="disallowance_37" step="any" value="0.00" 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="0.00" readonly>
-            </div>
-        </div>
 
         <div class="form-group full-width inline-2">
             <div>
@@ -59,12 +52,13 @@
                 <input type="number" name="deduction_80ia_misc" step="any" value="0.00" oninput="calculate()" required>
             </div>
             <div>
-                <label>Less : Deduction 80IA Other Operating Revenue:</label>
+                <label>Less :Deduction 80IA Other Operating Revenue:</label>
                 <input type="number" name="deduction_80ia_other" step="any" value="0.00" oninput="calculate()" required>
             </div>
         </div>
 
         <div class="form-group full-width inline-2">
+
             <div>
                 <label>Less :Deduction Sec 37 Disallowance:</label>
                 <input type="number" name="deduction_sec37_disallowance" step="any" value="0.00" oninput="calculate()"
@@ -74,101 +68,56 @@
                 <label>Less: Deduction 80G: </label>
                 <input type="number" name="deduction_80g" step="any" value="0.00" oninput="calculate()" required>
             </div>
+
+        </div>
+        <div class="form-group">
+            <label>Net Taxable Income:</label>
+            <input type="number" name="net_taxable_income" class="auto" step="any" value="0.00" readonly>
         </div>
 
         <div class="form-group full-width inline-2">
             <div>
-                <label>Net Taxable Income:</label>
+                <label>Tax @ 30% (A):</label>
-                <input type="number" name="net_taxable_income" class="auto" step="any" value="0.00" readonly>
+                <input type="number" name="tax_30_percent" step="any" value="0.00" oninput="calculate()" required>
-            </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="0.00" oninput="calculate()">
-            </div>
-            <div>
-                <label>Tax @(A):</label>
-                <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_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_b_cal" step="any" value="0.00" oninput="calculate()" required>
+                <input type="number" name="tax_book_profit_18_5" step="any" value="0.00" oninput="calculate()" 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="0.00" oninput="calculate()">
-            </div>
-            <div>
-                <label>Surcharge on Tax(A):</label>
-                <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_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>
-                <input type="number" name="per_cess_a" step="any" value="0.00" oninput="calculate()">
-            </div>
-            <div>
-                <label>Education Cess:Tax(A): </label>
-                <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>
-                <input type="number" name="per_cess_b" step="any" value="0.00" oninput="calculate()">
-            </div>
-            <div>
-                <label>Education Cess:Tax(B): </label>
-                <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>
-                <input type="number" name="sum_of_a" class="auto" step="any" value="0.00" readonly>
-            </div>
-            <div>
-                <label>Total cal Tax(B): </label>
-                <input type="number" name="sum_of_b" class="auto" step="any" value="0.00" 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="0.00" readonly>
             </div>
+        </div>
+
+
+
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>Enter Percentage (%) Surcharge:</label>
+                <input type="number" name="persentage" step="any" value="0.00" oninput="calculate()">
+            </div>
+            <div>
+                <label>Surcharge:</label>
+                <input type="number" name="surcharge" class="auto" value="0.00" readonly>
+            </div>
+            <div>
+                <label>Enter Percentage (%) Cess:</label>
+                <input type="number" name="persentage_cess" step="any" value="0.00" oninput="calculate()">
+            </div>
+            <div>
+                <label>Education Cess:</label>
+                <input type="number" name="edu_cess" class="auto" step="any" value="0.00" readonly>
+            </div>
+        </div>
+
+
+        <div class="form-group full-width inline-2">
             <div>
                 <label>Total tax Payable:</label>
                 <input type="number" name="total_tax_payable" class="auto" step="any" value="0.00" readonly>
             </div>
         </div>
-
-        <div class="form-group full-width inline-2">
-            <div>
-                <label>Opening Balance:</label>
-                <input type="number" name="opening_balance" step="any" value="0.00" oninput="calculate()">
-            </div>
-        </div>
-
         <div class="form-group full-width inline-2">
             <div>
                 <label>Less :Mat Credit Created:</label>
@@ -178,24 +127,14 @@
                 <label>Less :Mat Credit Utilized:</label>
                 <input type="number" name="mat_credit_utilized" step="any" value="0.00" 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="0.00" oninput="calculate()">
-            </div>
             <div>
                 <label>Add :Interest 234c:</label>
                 <input type="number" name="interest_234c" step="any" value="0.00" oninput="calculate()" required>
             </div>
         </div>
-
+        <div class="form-group">
-        <div class="form-group full-width inline-2">
+            <label>Total Tax:</label>
-            <div>
+            <input type="number" name="total_tax" step="any" class="auto" value="0.00" readonly>
-                <label>Total Tax:</label>
-                <input type="number" name="total_tax" step="any" class="auto" value="0.00" readonly>
-            </div>
         </div>
 
         <div class="form-group full-width inline-2">
@@ -221,48 +160,29 @@
             </div>
             <div>
                 <label>Tax on Regular Assessment:</label>
-                <input type="number" name="tax_on_assessment" step="any" value="0.00" oninput="calculate()">
+                <input type="number" name="tax_on_assessment" step="any" value="0.00" oninput="calculate()" required>
             </div>
 
         </div>
+
         <div class="form-group">
             <label>Refund:</label>
             <input type="number" name="refund" class="auto" step="any" value="0.00" readonly>
         </div>
 
-        <div class="form-group full-width inline-2">
+        <div class="form-group">
-            <div class="form-group">
+            <label>Remarks:</label>
-                <label>Add : Interest u/s 244A as per 143:</label>
+            <input type="text" name="Remarks">
-                <input type="number" name="interest_244a_per143" step="any" value="0.00" oninput="calculate()">
-            </div>
-            <div class="form-group">
-                <label>Less : Refund Received on:</label>
-                <input type="number" name="refund_received" step="any" value="0.00" oninput="calculate()">
-            </div>
-            <div class="form-group">
-                <label>Balance Receivable:</label>
-                <input type="number" name="balance_receivable" class="auto" step="any" value="0.00"
-                    oninput="calculate()">
-            </div>
         </div>
 
-        <div class="form-group full-width inline-2">
-            <div>
-                <label>Select Documents:</label>
-                <input type="file" name="documents" multiple>
-            </div>
-            <div>
-                <label>Remarks:</label>
-                <input type="text" name="Remarks">
-            </div>
-        </div>
 
         <button type="submit">Submit</button>
     </form>
 </div>
+
 {% endblock %}
 
 {% block extra_js %}
-<script src="{{ url_for('static', filename='js/itr_calc.js') }}"></script>
+<script src="{{ url_for('static', filename='js/ao_calc.js') }}"></script>
 <script src="{{ url_for('static', filename='js/year_dropdown.js') }}"></script>
 {% endblock %}

templates/add_cit.html

@@ -9,8 +9,7 @@
 {% block content %}
 <div class="container">
     <h2 style="text-align:center;">New CIT Form </h2>
-    <form id="cit" method="POST" enctype="multipart/form-data">
+    <form id="cit" method="POST">
-        <input type="hidden" name="stage" value="itr">
         <div class="form-group full-width inline-2">
             <div>
                 <label>Assessment Year:</label>
@@ -21,10 +20,6 @@
                 </select>
                 <div id="yearError" style="color:red; display:none; margin-bottom:10px;"></div>
             </div>
-            <div>
-                <label>Record Created Date:</label>
-                <input type="date" name="created_at" value="{{ current_date }}" required>
-            </div>
         </div>
 
         <div class="form-group full-width inline-2">
@@ -42,13 +37,6 @@
             </div>
         </div>
 
-        <div class="form-group full-width inline-2">
-            <div>
-                <label>GTI as per CIT</label>
-                <input type="number" name="gti_as_per_ao" class="auto" step="any" value="0.00" readonly>
-            </div>
-        </div>
-
         <div class="form-group full-width inline-2">
             <div>
                 <label>Deduction 80IA Business Income:</label>
@@ -86,88 +74,43 @@
 
         <div class="form-group full-width inline-2">
             <div>
-                <label>Enter Percentage(%) calculate: Tax(A):</label>
+                <label>Tax @ 30% (A):</label>
-                <input type="number" name="per_tax_a" step="any" value="0.00" oninput="calculate()">
+                <input type="number" name="tax_30_percent" step="any" value="0.00" oninput="calculate()" required>
-            </div>
-            <div>
-                <label>Tax @(A):</label>
-                <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_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_b_cal" step="any" value="0.00" oninput="calculate()" required>
+                <input type="number" name="tax_book_profit_18_5" step="any" value="0.00" oninput="calculate()" 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="0.00" oninput="calculate()">
-            </div>
-            <div>
-                <label>Surcharge on Tax(A):</label>
-                <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_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>
-                <input type="number" name="per_cess_a" step="any" value="0.00" oninput="calculate()">
-            </div>
-            <div>
-                <label>Education Cess:Tax(A): </label>
-                <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>
-                <input type="number" name="per_cess_b" step="any" value="0.00" oninput="calculate()">
-            </div>
-            <div>
-                <label>Education Cess:Tax(B): </label>
-                <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>
-                <input type="number" name="sum_of_a" class="auto" step="any" value="0.00" readonly>
-            </div>
-            <div>
-                <label>Total cal Tax(B): </label>
-                <input type="number" name="sum_of_b" class="auto" step="any" value="0.00" 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="0.00" readonly>
             </div>
-            <div>
-                <label>Total tax Payable:</label>
-                <input type="number" name="total_tax_payable" class="auto" step="any" value="0.00" readonly>
-            </div>
         </div>
 
         <div class="form-group full-width inline-2">
             <div>
-                <label>Opening Balance:</label>
+                <label>Enter Percentage (%) Surcharge:</label>
-                <input type="number" name="opening_balance" step="any" value="0.00" oninput="calculate()">
+                <input type="number" name="persentage" step="any" value="0.00" oninput="calculate()">
+            </div>
+            <div>
+                <label>Surcharge:</label>
+                <input type="number" name="surcharge" class="auto" value="0.00" readonly>
+            </div>
+            <div>
+                <label>Enter Percentage (%) Cess:</label>
+                <input type="number" name="persentage_cess" step="any" value="0.00" oninput="calculate()">
+            </div>
+            <div>
+                <label>Education Cess:</label>
+                <input type="number" name="edu_cess" class="auto" step="any" value="0.00" readonly>
+            </div>
+
+        </div>
+
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>Total tax Payable:</label>
+                <input type="number" name="total_tax_payable" class="auto" step="any" value="0.00" readonly>
             </div>
         </div>
 
@@ -180,12 +123,6 @@
                 <label>Less :Mat Credit Utilized:</label>
                 <input type="number" name="mat_credit_utilized" step="any" value="0.00" 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="0.00" oninput="calculate()">
-            </div>
             <div>
                 <label>Add :Interest 234c:</label>
                 <input type="number" name="interest_234c" step="any" value="0.00" oninput="calculate()" required>
@@ -229,31 +166,9 @@
             <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">
-            <div class="form-group">
+            <label>Remarks:</label>
-                <label>Add : Interest u/s 244A as per 143:</label>
+            <input type="text" name="Remarks">
-                <input type="number" name="interest_244a_per143" step="any" value="0.00" oninput="calculate()">
-            </div>
-            <div class="form-group">
-                <label>Less : Refund Received on:</label>
-                <input type="number" name="refund_received" step="any" value="0.00" oninput="calculate()">
-            </div>
-            <div class="form-group">
-                <label>Balance Receivable:</label>
-                <input type="number" name="balance_receivable" class="auto" step="any" value="0.00"
-                    oninput="calculate()">
-            </div>
-        </div>
-
-        <div class="form-group full-width inline-2">
-            <div>
-                <label>Select Documents:</label>
-                <input type="file" name="documents" multiple>
-            </div>
-            <div>
-                <label>Remarks:</label>
-                <input type="text" name="Remarks">
-            </div>
         </div>
 
         <button type="submit">Submit</button>
@@ -262,6 +177,6 @@
 {% endblock %}
 
 {% block extra_js %}
-<script src="{{ url_for('static', filename='js/itr_calc.js') }}"></script>
+<script src="{{ url_for('static', filename='js/cit_calc.js') }}"></script>
 <script src="{{ url_for('static', filename='js/year_dropdown.js') }}"></script>
 {% endblock %}

templates/add_itat.html

@@ -10,8 +10,8 @@
 {% block content %}
 <div class="container">
     <h2 style="text-align:center;">New Income Tax Appellate Tribunal Form</h2>
-    <form id="itat" method="POST" enctype="multipart/form-data" onsubmit="return showSuccessMessage()">
+    <form id="itat" method="POST" onsubmit="return showSuccessMessage()">
-        <input type="hidden" name="stage" value="itr">
+
         <div class="form-group full-width inline-2">
             <div>
                 <label>Assessment Year:</label>
@@ -22,10 +22,6 @@
                 </select>
                 <div id="yearError" style="color:red; display:none; margin-bottom:10px;"></div>
             </div>
-            <div>
-                <label>Record Created Date:</label>
-                <input type="date" name="created_at" value="{{ current_date }}" required>
-            </div>
         </div>
 
         <div class="form-group full-width inline-2">
@@ -43,13 +39,6 @@
             </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="0.00" readonly>
-            </div>
-        </div>
-
         <div class="form-group full-width inline-2">
             <div>
                 <label>Less :Deduction 80IA Business Income:</label>
@@ -66,6 +55,8 @@
             </div>
         </div>
 
+
+
         <div class="form-group full-width inline-2">
             <div>
                 <label>Less :Deduction Sec 37 Disallowance:</label>
@@ -87,88 +78,43 @@
 
         <div class="form-group full-width inline-2">
             <div>
-                <label>Enter Percentage(%) calculate: Tax(A):</label>
+                <label>Tax @ 30% (A):</label>
-                <input type="number" name="per_tax_a" step="any" value="0.00" oninput="calculate()">
+                <input type="number" name="tax_30_percent" step="any" value="0.00" oninput="calculate()" required>
-            </div>
-            <div>
-                <label>Tax @(A):</label>
-                <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_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_b_cal" step="any" value="0.00" oninput="calculate()" required>
+                <input type="number" name="tax_book_profit_18_5" step="any" value="0.00" oninput="calculate()" 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="0.00" oninput="calculate()">
-            </div>
-            <div>
-                <label>Surcharge on Tax(A):</label>
-                <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_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>
-                <input type="number" name="per_cess_a" step="any" value="0.00" oninput="calculate()">
-            </div>
-            <div>
-                <label>Education Cess:Tax(A): </label>
-                <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>
-                <input type="number" name="per_cess_b" step="any" value="0.00" oninput="calculate()">
-            </div>
-            <div>
-                <label>Education Cess:Tax(B): </label>
-                <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>
-                <input type="number" name="sum_of_a" class="auto" step="any" value="0.00" readonly>
-            </div>
-            <div>
-                <label>Total cal Tax(B): </label>
-                <input type="number" name="sum_of_b" class="auto" step="any" value="0.00" 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="0.00" readonly>
             </div>
+        </div>
+
+        <div class="form-group full-width inline-2">
             <div>
-                <label>Total tax Payable:</label>
+                <label>Enter Percentage (%) Surcharge:</label>
-                <input type="number" name="total_tax_payable" class="auto" step="any" value="0.00" readonly>
+                <input type="number" name="persentage" step="any" value="0.00" oninput="calculate()">
+            </div>
+            <div>
+                <label>Surcharge:</label>
+                <input type="number" name="surcharge" class="auto" value="0.00" readonly>
+            </div>
+
+            <div>
+                <label>Enter Percentage (%) Cess:</label>
+                <input type="number" name="persentage_cess" step="any" value="0.00" oninput="calculate()">
+            </div>
+            <div>
+                <label>Education Cess:</label>
+                <input type="number" name="edu_cess" class="auto" step="any" value="0.00" readonly>
             </div>
         </div>
 
         <div class="form-group full-width inline-2">
             <div>
-                <label>Opening Balance:</label>
+                <label>Total tax Payable:</label>
-                <input type="number" name="opening_balance" step="any" value="0.00" oninput="calculate()">
+                <input type="number" name="total_tax_payable" class="auto" step="any" value="0.00" readonly>
             </div>
         </div>
 
@@ -181,13 +127,6 @@
                 <label>Less :Mat Credit Utilized:</label>
                 <input type="number" name="mat_credit_utilized" step="any" value="0.00" 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="0.00" oninput="calculate()">
-            </div>
             <div>
                 <label>Add :Interest 234c:</label>
                 <input type="number" name="interest_234c" step="any" value="0.00" oninput="calculate()" required>
@@ -233,31 +172,9 @@
             <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">
-            <div class="form-group">
+            <label>Remarks:</label>
-                <label>Add : Interest u/s 244A as per 143:</label>
+            <input type="text" name="Remarks">
-                <input type="number" name="interest_244a_per143" step="any" value="0.00" oninput="calculate()">
-            </div>
-            <div class="form-group">
-                <label>Less : Refund Received on:</label>
-                <input type="number" name="refund_received" step="any" value="0.00" oninput="calculate()">
-            </div>
-            <div class="form-group">
-                <label>Balance Receivable:</label>
-                <input type="number" name="balance_receivable" class="auto" step="any" value="0.00"
-                    oninput="calculate()">
-            </div>
-        </div>
-
-        <div class="form-group full-width inline-2">
-            <div>
-                <label>Select Documents:</label>
-                <input type="file" name="documents" multiple>
-            </div>
-            <div>
-                <label>Remarks:</label>
-                <input type="text" name="Remarks">
-            </div>
         </div>
 
         <button type="submit">Submit</button>

templates/add_itr.html

@@ -10,8 +10,7 @@
 {% block content %}
 <div class="container">
     <h2 style="text-align:center;">New Income Tax Return Form</h2>
-    <form id="itr" method="POST" enctype="multipart/form-data">
+    <form id="itr" method="POST">
-        <input type="hidden" name="stage" value="itr">
         <div class="form-group full-width inline-2">
             <div>
                 <label>Assessment Year:</label>
@@ -22,10 +21,6 @@
                 </select>
                 <div id="yearError" style="color:red; display:none; margin-bottom:10px;"></div>
             </div>
-            <div>
-                <label>Record Created Date:</label>
-                <input type="date" name="created_at" value="{{ current_date }}" required>
-            </div>
         </div>
         <div class="form-group full-width inline-2">
             <div>
@@ -41,12 +36,6 @@
                 <input type="number" name="disallowance_37" step="any" value="0.00" 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="0.00" readonly>
-            </div>
-        </div>
 
         <div class="form-group full-width inline-2">
             <div>
@@ -85,91 +74,44 @@
 
         <div class="form-group full-width inline-2">
             <div>
-                <label>Enter Percentage(%) calculate: Tax(A):</label>
+                <label>Tax @ 30% (A):</label>
-                <input type="number" name="per_tax_a" step="any" value="0.00" oninput="calculate()">
+                <input type="number" name="tax_30_percent" step="any" value="0.00" oninput="calculate()" required>
-            </div>
-            <div>
-                <label>Tax @(A):</label>
-                <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_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_b_cal" step="any" value="0.00" oninput="calculate()" required>
+                <input type="number" name="tax_book_profit_18_5" step="any" value="0.00" oninput="calculate()" 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="0.00" oninput="calculate()">
-            </div>
-            <div>
-                <label>Surcharge on Tax(A):</label>
-                <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_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>
-                <input type="number" name="per_cess_a" step="any" value="0.00" oninput="calculate()">
-            </div>
-            <div>
-                <label>Education Cess:Tax(A): </label>
-                <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>
-                <input type="number" name="per_cess_b" step="any" value="0.00" oninput="calculate()">
-            </div>
-            <div>
-                <label>Education Cess:Tax(B): </label>
-                <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>
-                <input type="number" name="sum_of_a" class="auto" step="any" value="0.00" readonly>
-            </div>
-            <div>
-                <label>Total cal Tax(B): </label>
-                <input type="number" name="sum_of_b" class="auto" step="any" value="0.00" 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="0.00" readonly>
             </div>
+        </div>
+
+        <div class="form-group full-width inline-2">
+            <div>
+                <label>Enter Percentage (%) Surcharge:</label>
+                <input type="number" name="persentage" step="any" value="0.00" oninput="calculate()">
+            </div>
+            <div>
+                <label>Surcharge:</label>
+                <input type="number" name="surcharge" class="auto" value="0.00" readonly>
+            </div>
+            <div>
+                <label>Enter Percentage (%) Cess:</label>
+                <input type="number" name="persentage_cess" step="any" value="0.00" oninput="calculate()">
+            </div>
+            <div>
+                <label>Education Cess: </label>
+                <input type="number" name="edu_cess" class="auto" step="any" value="0.00" readonly>
+            </div>
+        </div>
+
+        <div class="form-group full-width inline-2">
             <div>
                 <label>Total tax Payable:</label>
                 <input type="number" name="total_tax_payable" class="auto" step="any" value="0.00" readonly>
             </div>
         </div>
-
-        <div class="form-group full-width inline-2">
-            <div>
-                <label>Opening Balance:</label>
-                <input type="number" name="opening_balance" step="any" value="0.00" oninput="calculate()">
-            </div>
-        </div>
-
         <div class="form-group full-width inline-2">
             <div>
                 <label>Less :Mat Credit Created:</label>
@@ -179,13 +121,6 @@
                 <label>Less :Mat Credit Utilized:</label>
                 <input type="number" name="mat_credit_utilized" step="any" value="0.00" 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="0.00" oninput="calculate()">
-            </div>
             <div>
                 <label>Add :Interest 234c:</label>
                 <input type="number" name="interest_234c" step="any" value="0.00" oninput="calculate()" required>
@@ -226,39 +161,14 @@
             </div>
 
         </div>
-
+        <div class="form-group">
-        <div class="form-group full-width inline-2">
+            <label>Refund:</label>
-            <div class="form-group">
+            <input type="number" name="refund" class="auto" step="any" value="0.00" readonly>
-                <label>Refund:</label>
-                <input type="number" name="refund" class="auto" step="any" value="0.00">
-            </div>
         </div>
 
-        <div class="form-group full-width inline-2">
+        <div class="form-group">
-            <div class="form-group">
+            <label>Remarks:</label>
-                <label>Add : Interest u/s 244A as per 143:</label>
+            <input type="text" name="Remarks">
-                <input type="number" name="interest_244a_per143" step="any" value="0.00" oninput="calculate()">
-            </div>
-            <div class="form-group">
-                <label>Less : Refund Received on:</label>
-                <input type="number" name="refund_received" step="any" value="0.00" oninput="calculate()">
-            </div>
-            <div class="form-group">
-                <label>Balance Receivable:</label>
-                <input type="number" name="balance_receivable" class="auto" step="any" value="0.00"
-                    oninput="calculate()">
-            </div>
-        </div>
-
-        <div class="form-group full-width inline-2">
-            <div>
-                <label>Select Documents:</label>
-                <input type="file" name="documents" multiple>
-            </div>
-            <div>
-                <label>Remarks:</label>
-                <input type="text" name="Remarks">
-            </div>
         </div>
 
         <button type="submit">Submit</button>

templates/display_ao.html

@@ -22,8 +22,6 @@
                     <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>
             </thead>
@@ -33,9 +31,7 @@
                     <td>AY {{ ao.year }}-{{ ao.year+1 }}</td>
                     <td>{{ ao.gross_total_income }}</td>
                     <td>{{ ao.net_taxable_income }}</td>
-                    <td>{{ ao.total_tax_payable }}</td>
+                    <td>{{ ao.total_tax }}</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,7 +22,6 @@
                     <th>Net Taxable Income</th>
                     <th>Total Tax Payable</th>
                     <th>Refund</th>
-                    <th>Created Record Date</th>
                     <th>Actions</th>
                 </tr>
             </thead>
@@ -34,7 +33,6 @@
                     <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,11 +20,10 @@
                 <thead>
                     <tr>
                         <th>Year</th>
-                        <th>Gross Total Income</th>
+                        <th>MAT Tax Credit</th>
-                        <th>Net Taxable Income</th>
+                        <th>Surcharge</th>
-                        <th>Total Tax Payable</th>
+                        <th>Cess</th>
-                        <th>Refund</th>
+                        <th>Total Credit</th>
-                        <th>Created Record Date</th>
                         <th>Actions</th>
                     </tr>
                 </thead>
@@ -36,7 +35,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/display_itr.html

@@ -22,7 +22,6 @@
                     <th>Net Taxable Income</th>
                     <th>Total Tax Payable</th>
                     <th>Refund</th>
-                    <th>Created Record Date</th>
                     <th>Actions</th>
                 </tr>
             </thead>
@@ -34,7 +33,6 @@
                     <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_itr', id=record.id) }}" class="btn btn-update">Edit</a>
                         <form action="{{ url_for('delete_itr', id=record.id) }}" method="post"

templates/mat_credit.html

@@ -42,7 +42,7 @@
             <tbody>
                 {% for row in mat_rows %}
                 <tr>
-                    <td contenteditable="false">{{ row.financial_year }}-{{ row.financial_year | int + 1 }}</td>
+                    <td contenteditable="true">{{ row.financial_year }}</td>
                     <td><input value="{{ row.mat_credit }}"></td>
 
                     {% for y in added_years %}

templates/summary_reports.html

@@ -1,7 +1,9 @@
 {% extends "base.html" %} {% block title %}Download Summary Report{% endblock %}
 {% block extra_css %}
-<link rel="stylesheet" href="{{ url_for('static', filename='css/summary.css') }}" />
+<link
-
+  rel="stylesheet"
+  href="{{ url_for('static', filename='css/summary.css') }}"
+/>
 {% endblock %} {% block content %}
 <div class="container">
   <div class="head">
@@ -32,4 +34,4 @@
 </div>
 {% endblock %} {% block extra_js %}
 <script src="{{ url_for('static', filename='js/summary_preview.js') }}"></script>
-{% endblock %}
+{% endblock %}

templates/update_ao.html

@@ -8,67 +8,47 @@
 
 {% block content %}
 <div class="container">
-    <h2>Update AO Record for Year {{ record.year }} - {{ record.year + 1 }}</h2>
+    <h2>Update AO Record for Year {{ record.year }}--{{ record.year + 1 }}</h2>
     <form method="POST" action="{{ url_for('update_ao', id=record.id) }}">
         <div class="form-group full-width inline-2">
             <div>
                 <label>Year:</label>
                 <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>
@@ -77,117 +57,56 @@
             <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>Net Taxable Income:</label>
+                <label>Tax @ 30% (A):</label>
-                <input type="number" name="net_taxable_income" class="auto" step="any"
+                <input type="number" name="tax_30_percent" step="any" value="{{ record.tax_30_percent}}"
-                    value="{{ record.net_taxable_income }}" readonly>
+                    oninput="calculate()" required>
-            </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_b_cal" step="any" value="{{ record.tax_b_cal }}" oninput="calculate()"
+                <input type="number" name="tax_book_profit_18_5" step="any" value="{{ record.tax_book_profit_18_5}}"
-                    required>
+                    oninput="calculate()" 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 }}"
+                <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>
+                    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 }}"
@@ -198,17 +117,9 @@
                 <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>
@@ -216,65 +127,46 @@
         <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 }}"
+                <input type="number" name="advance_tax" step="any" value="{{ record.advance_tax}}" oninput="calculate()"
-                    oninput="calculate()" required>
+                    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()">
+                    oninput="calculate()" required>
             </div>
         </div>
+
         <div class="form-group">
             <label>Refund:</label>
-            <input type="number" name="refund" class="auto" step="any" value="{{ record.refund }}" readonly>
+            <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">
-            <div class="form-group">
+            <label>Remarks:</label>
-                <label>Add : Interest u/s 244A as per 143:</label>
+            <input type="text" name="Remarks" value="{{ record.remarks}}">
-                <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_cit.html

@@ -16,17 +16,6 @@
                 <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">
@@ -46,14 +35,6 @@
                     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>
@@ -84,6 +65,7 @@
                 <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>
@@ -91,99 +73,42 @@
                 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>Enter Percentage(%) calculate: Tax(A):</label>
+                <label>Tax @ 30% (A):</label>
-                <input type="number" name="per_tax_a" step="any" value="{{ record.per_tax_a }}" oninput="calculate()">
+                <input type="number" name="tax_30_percent" step="any" value="{{ record.tax_30_percent}}"
-            </div>
+                    oninput="calculate()" required>
-            <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_b_cal" step="any" value="{{ record.tax_b_cal }}" oninput="calculate()"
+                <input type="number" name="tax_book_profit_18_5" step="any" value="{{ record.tax_book_profit_18_5}}"
-                    required>
+                    oninput="calculate()" 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 }}"
@@ -194,14 +119,6 @@
                 <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}}"
@@ -249,24 +166,6 @@
             <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,17 +14,6 @@
                 <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">
@@ -45,15 +34,6 @@
             </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>
@@ -84,7 +64,6 @@
                     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"
@@ -92,101 +71,41 @@
         </div>
 
 
-        <div class="form-group full-width inline-2">
+        <div class=" form-group full-width inline-2">
             <div>
-                <label>Enter Percentage(%) calculate: Tax(A):</label>
+                <label>Tax @ 30% (A):</label>
-                <input type="number" name="per_tax_a" step="any" value="{{ record.per_tax_a }}" oninput="calculate()">
+                <input type="number" name="tax_30_percent" step="any" value="{{ record.tax_30_percent}}"
-            </div>
+                    oninput="calculate()" required>
-            <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_b_cal" step="any" value="{{ record.tax_b_cal }}" oninput="calculate()"
+                <input type="number" name="tax_book_profit_18_5" step="any" value="{{ record.tax_book_profit_18_5}}"
-                    required>
+                    oninput="calculate()" 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 }}"
+                <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>
+                    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 }}"
@@ -197,14 +116,6 @@
                 <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}}"
@@ -252,29 +163,9 @@
             <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">
-            <div class="form-group">
+            <label>Remarks:</label>
-                <label>Add : Interest u/s 244A as per 143:</label>
+            <input type="text" name="Remarks" value="{{ record.remarks}}">
-                <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,17 +15,6 @@
                 <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">
@@ -46,15 +35,6 @@
             </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>
@@ -96,99 +76,39 @@
 
         <div class="form-group full-width inline-2">
             <div>
-                <label>Enter Percentage(%) calculate: Tax(A):</label>
+                <label>Tax @ 30% (A):</label>
-                <input type="number" name="per_tax_a" step="any" value="{{ record.per_tax_a }}" oninput="calculate()">
+                <input type="number" name="tax_30_percent" class="auto" step="any" value="{{ record.tax_30_percent }}"
-            </div>
+                    readonly>
-            <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_b_cal" step="any" value="{{ record.tax_b_cal }}" oninput="calculate()"
+                <input type="number" name="tax_book_profit_18_5" step="any" value="{{ record.tax_book_profit_18_5 }}"
-                    required>
+                    oninput="calculate()" 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 }}"
@@ -199,14 +119,6 @@
                 <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 }}"
@@ -253,31 +165,10 @@
             <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">
-            <div class="form-group">
+            <label>Remarks:</label>
-                <label>Add : Interest u/s 244A as per 143:</label>
+            <input type="text" name="Remarks" value="{{ record.Remarks }}">
-                <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>
     </form>
 </div>

templates/view_docs.html

@@ -27,11 +27,7 @@
         </select>
         <button type="submit">Apply</button>
     </form>
-    {% with messages = get_flashed_messages(with_categories=true) %}
+
-    {% for category, message in messages %}
-    <div class="alert alert-{{ category }}">{{ message }}</div>
-    {% endfor %}
-    {% endwith %}
     <!-- DOCUMENT TABLE -->
     <div class="table-responsive">
         <table>