changes of cess cal

AppCode/AOHandler.py

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

AppCode/CITHandler.py

@@ -37,13 +37,15 @@ class CITHandler:
     # INSERT CIT RECORD
     def add_cit(self, data):
         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'
-        ]
+                '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', 'edu_cess',
+                '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]
 
@@ -53,13 +55,15 @@ class CITHandler:
     # UPDATE CIT RECORD
     def update_cit(self, id, data):
         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'
-        ]
+                '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', 'edu_cess',
+                'total_tax_payable', 'mat_credit_created', 'mat_credit_utilized',
+                'interest_234c', 'total_tax', 'advance_tax', 'tds', 'tcs',
+                'sat', 'tax_on_assessment', 'refund', 'Remarks'
+            ]
 
         values = [id] + [data.get(col, 0) for col in columns]
 
@@ -106,10 +110,11 @@ class CITHandler:
                 "tax_30_percent": "Tax @ 30%",
                 "tax_book_profit_18_5": "Tax @ 18.5% on Book Profit",
                 "tax_payable": "Tax Payable",
-                "surcharge_12": "Surcharge @ 12%",
-                "edu_cess_3": "Education Cess @ 3%",
+                "surcharge": "Surcharge @ %",
+                "edu_cess": "Education Cess @ %",
                 "total_tax_payable": "Total Tax Payable",
-                "mat_credit": "Less: MAT Credit Utilized",
+                "mat_credit_created": "Add: MAT Credit Created",
+                "mat_credit_utilized": "Less: MAT Credit Utilized",
                 "interest_234c": "Add: Interest u/s 234C",
                 "total_tax": "Total Tax",
                 "advance_tax": "Advance Tax",

AppCode/ITATHandler.py

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

AppCode/ITRHandler.py

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