changes of report and models
This commit is contained in:
@@ -23,13 +23,6 @@ class DocumentHandler:
|
||||
# Utility: Parse Year
|
||||
# =========================
|
||||
def parse_year(self, year_value):
|
||||
"""
|
||||
Accepts:
|
||||
- '2026'
|
||||
- 'AY 2026-2027'
|
||||
Returns:
|
||||
- 2026 (int)
|
||||
"""
|
||||
if not year_value:
|
||||
return None
|
||||
|
||||
@@ -166,24 +159,46 @@ class DocumentHandler:
|
||||
|
||||
columns = [
|
||||
'gross_total_income', 'disallowance_14a',
|
||||
'disallowance_37', '-',
|
||||
'disallowance_37',
|
||||
'gross_total_income'+'disallowance_14a'+'disallowance_37',
|
||||
'deduction_80ia_business',
|
||||
'deduction_80ia_misc',
|
||||
'deduction_80ia_other',
|
||||
'deduction_sec37_disallowance',
|
||||
'deduction_80g', '-',
|
||||
'net_taxable_income',
|
||||
'tax_30_percent',
|
||||
'tax_book_profit_18_5',
|
||||
'tax_payable', 'surcharge',
|
||||
'edu_cess', 'total_tax_payable',
|
||||
'-',
|
||||
'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', 'Remarks'
|
||||
'refund',
|
||||
'interest_244a_per143',
|
||||
'refund_received',
|
||||
'balance_receivable',
|
||||
'Remarks'
|
||||
]
|
||||
|
||||
particulars = [
|
||||
@@ -192,18 +207,36 @@ class DocumentHandler:
|
||||
"Less: Deduction u/s 80IA - On Business Income",
|
||||
"- On Misc Receipts", "- On Other",
|
||||
"- On Sec 37 Disallowance",
|
||||
"Less: Deduction u/s 80G", " ",
|
||||
"Net Taxable Income", "Tax @ 30%",
|
||||
"Tax @ 18.5% on Book Profit",
|
||||
"Tax Payable", "Surcharge @ %",
|
||||
"Education Cess @ %", "Total Tax Payable",
|
||||
"Less: Deduction u/s 80G", "-",
|
||||
"Net Taxable Income", "-",
|
||||
"Per% Tax @(A)",
|
||||
"Tax cal(A)",
|
||||
"Per% surcharge @(A)",
|
||||
"Surcharge cal (A)",
|
||||
"Per% cess(A)",
|
||||
"Edu cess cal(A)",
|
||||
"Sum of tax_cal(A)",
|
||||
"-",
|
||||
"Per% Tax @(B)",
|
||||
"Tax cal(B)",
|
||||
"Per% surcharge @(B)",
|
||||
"Surcharge cal (B)",
|
||||
"Per% cess(B)",
|
||||
"Edu cess cal(B)",
|
||||
"Sum of tax_cal(B)",
|
||||
"-",
|
||||
"Tax Payable",
|
||||
"Total Tax Payable",
|
||||
"Opening Balance:",
|
||||
"Add: MAT Credit Created",
|
||||
"Less: MAT Credit Utilized",
|
||||
"Closing Balance",
|
||||
"Add: Interest u/s 234C",
|
||||
"Total Tax", " ",
|
||||
"Total Tax", "-",
|
||||
"Advance Tax", "TDS", "TCS", "SAT",
|
||||
"Tax on Regular Assessment",
|
||||
"Refund", "Remarks"
|
||||
"Refund", "Add : Interest u/s 244A as per 143",
|
||||
"Less : Refund Received on:","Balance Receivable","Remarks"
|
||||
]
|
||||
|
||||
def safe_get(df, col):
|
||||
@@ -275,40 +308,80 @@ class DocumentHandler:
|
||||
"Less: Deduction u/s 80IA - On Business Income",
|
||||
"- On Misc Receipts", "- On Other",
|
||||
"- On Sec 37 Disallowance",
|
||||
"Less: Deduction u/s 80G", " ",
|
||||
"Net Taxable Income", "Tax @ 30%",
|
||||
"Tax @ 18.5% on Book Profit",
|
||||
"Tax Payable", "Surcharge @ %",
|
||||
"Education Cess @ %", "Total Tax Payable",
|
||||
"Less: Deduction u/s 80G", "-",
|
||||
"Net Taxable Income", "-",
|
||||
"Per% Tax @(A)",
|
||||
"Tax cal(A)",
|
||||
"Per% surcharge @(A)",
|
||||
"Surcharge cal (A)",
|
||||
"Per% cess(A)",
|
||||
"Edu cess cal(A)",
|
||||
"Sum of tax_cal(A)",
|
||||
"-",
|
||||
"Per% Tax @(B)",
|
||||
"Tax cal(B)",
|
||||
"Per% surcharge @(B)",
|
||||
"Surcharge cal (B)",
|
||||
"Per% cess(B)",
|
||||
"Edu cess cal(B)",
|
||||
"Sum of tax_cal(B)",
|
||||
"-",
|
||||
"Tax Payable",
|
||||
"Total Tax Payable",
|
||||
"Opening Balance",
|
||||
"Add: MAT Credit Created",
|
||||
"Less: MAT Credit Utilized",
|
||||
"Closing Balance",
|
||||
"Add: Interest u/s 234C",
|
||||
"Total Tax", " ",
|
||||
"Total Tax", "-",
|
||||
"Advance Tax", "TDS", "TCS", "SAT",
|
||||
"Tax on Regular Assessment",
|
||||
"Refund", "Remarks"
|
||||
"Refund", "Add : Interest u/s 244A as per 143",
|
||||
"Less : Refund Received on","Balance Receivable","Remarks"
|
||||
]
|
||||
|
||||
columns = [
|
||||
'gross_total_income', 'disallowance_14a',
|
||||
'disallowance_37', '-',
|
||||
'disallowance_37',
|
||||
'gross_total_income'+'disallowance_14a'+'disallowance_37',
|
||||
'deduction_80ia_business',
|
||||
'deduction_80ia_misc',
|
||||
'deduction_80ia_other',
|
||||
'deduction_sec37_disallowance',
|
||||
'deduction_80g', '-',
|
||||
'net_taxable_income',
|
||||
'tax_30_percent',
|
||||
'tax_book_profit_18_5',
|
||||
'tax_payable', 'surcharge',
|
||||
'edu_cess', 'total_tax_payable',
|
||||
'-',
|
||||
'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', 'Remarks'
|
||||
'refund',
|
||||
'interest_244a_per143',
|
||||
'refund_received',
|
||||
'balance_receivable',
|
||||
'Remarks'
|
||||
]
|
||||
|
||||
data = {
|
||||
@@ -372,5 +445,4 @@ class DocumentHandler:
|
||||
)
|
||||
|
||||
finally:
|
||||
connection.close()
|
||||
|
||||
connection.close()
|
||||
Reference in New Issue
Block a user