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

AppCode/AOHandler.py

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

AppCode/CITHandler.py

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

AppCode/ITATHandler.py

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

AppCode/ITRHandler.py

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

AppCode/YearGet.py

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