pjpatil12/IncomeTaxSystem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

year check valid or not All form commit

Browse Source
This commit is contained in:
pjpatil12
2025-12-08 13:40:33 +05:30
parent bd24fa5f4e
commit 425f213606
13 changed files with 175 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
AppCode/ITRHandler.py
View File

@@ -1,18 +1,10 @@
from AppCode.Config import DBConfig
import mysql.connector
from AppCode.YearGet import YearGet
import pandas as pd
import pymysql
import io
# new
from AppCode.Config import DBConfig
import mysql.connector
import pandas as pd
import io
from flask import send_file, render_template, request
from AppCode.Config import DBConfig
from AppCode.YearGet import YearGet
class ITRHandler:
@@ -44,18 +36,16 @@ class ITRHandler:
for result in self.cursor.stored_results():
records = result.fetchall()
# return single record
if records:
print(records[0])
return records[0] # return single record
return records[0]
return None
# INSERT ITR RECORD using procedure "add_itr"
def add_itr(self, data):
columns = [
'year', 'gross_total_income', 'disallowance_14a', 'disallowance_37',
'deduction_80ia_business', 'deduction_80ia_misc', 'deduction_80ia_other',
@@ -72,23 +62,6 @@ class ITRHandler:
self.conn.commit()
# UPDATE ITR RECORD by ITR id
# def update(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', 'tax_on_assessment', 'refund'
# ]
# values = [data.get(col, 0) for col in columns]
# values.insert(0, id) # first argument is ID
# print("values.insert(0, id)-->",values.insert(0, id))
# self.cursor.callproc("UpdateITR", values)
# self.conn.commit()
def update(self, id, data):
columns = [
@@ -115,7 +88,7 @@ class ITRHandler:
self.conn.commit()
# dowanload itr report by year
def itr_report_download(self, selected_year):
try:
@@ -131,14 +104,10 @@ class ITRHandler:
# Convert SQL rows to DataFrame
df = pd.DataFrame(rows)
# Transpose
df_transposed = df.transpose()
df_transposed.insert(0, 'Field', df_transposed.index)
print("df-->",df_transposed)
record_cols = {
i: f"Record {i}"
for i in df_transposed.columns if isinstance(i, int)

2
AppCode/YearGet.py
View File

@@ -11,13 +11,11 @@ class YearGet:
def get_year_by_model(self, proc_name):
try:
self.cursor.callproc(proc_name)
years = []
for result in self.cursor.stored_results():
rows = result.fetchall()
years = [row["year"] for row in rows]
print("-- years get --",years)
return years
except mysql.connector.Error as e:

BIN
AppCode/__pycache__/ITRHandler.cpython-313.pyc
View File

Binary file not shown.

BIN
AppCode/__pycache__/YearGet.cpython-313.pyc
View File

Binary file not shown.

18
main.py
View File

@@ -6,7 +6,6 @@ import io
import mysql.connector
from werkzeug.utils import secure_filename
from config import db_config
from AppCode.Config import DBConfig
from AppCode.FileHandler import FileHandler
from AppCode.DocumentHandler import DocumentHandler
@@ -133,6 +132,23 @@ def update_itr(id):
return render_template('update_itr.html', record=record)
# new new -- check year in table existe or not by using ajax calling.
@app.route('/check_year', methods=['POST'])
def check_year():
table_name = request.json.get("table")
year = request.json.get("year")
conn = DBConfig.get_db_connection()
cursor = conn.cursor()
query = f"SELECT COUNT(*) FROM {table_name} WHERE year = %s"
cursor.execute(query, (year,))
result = cursor.fetchone()[0]
cursor.close()
conn.close()
return {"exists": result > 0}
## ===============================================

50
static/js/ao_calc.js
View File

@@ -1,15 +1,5 @@
document.addEventListener("DOMContentLoaded", function () {
// All fields that must trigger calculation
const fields = [
"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"
];
function getVal(id) {
return parseFloat(document.getElementsByName(id)[0].value) || 0;
}
@@ -18,23 +8,22 @@ document.addEventListener("DOMContentLoaded", function () {
document.getElementsByName(id)[0].value = Number(value).toFixed(2);
}
function calculate() {
window.calculate = function () {
// 1️ Base Values
// Base Values
let gross_total_income = getVal("gross_total_income");
let disallowance_14a = getVal("disallowance_14a");
let disallowance_37 = getVal("disallowance_37");
// 2️ Deductions
// Deductions
let d80_business = getVal("deduction_80ia_business");
let deduction_sec37 = getVal("deduction_sec37_disallowance");
let deduction_80g = getVal("deduction_80g");
// 3️ Formula: TOTAL DEDUCTION
// Total Deduction
let total_deductions = d80_business + deduction_sec37;
// (deduction_80ia_business + deduction_sec37_disallowance)
// 4️ Net Taxable Income
// Net Taxable Income
let net_taxable_income =
(gross_total_income + disallowance_14a + disallowance_37)
- total_deductions
@@ -42,35 +31,30 @@ document.addEventListener("DOMContentLoaded", function () {
setVal("net_taxable_income", net_taxable_income);
// 5️ Tax @ 30%
// Tax @ 30%
let tax_30_percent = net_taxable_income * 0.30;
setVal("tax_30_percent", tax_30_percent);
// 6️ Book Profit – Tax Payable
let tax_payable = getVal("tax_book_profit_18_5");
// (tax_payable = tax_book_profit_18_5)
// 7️ Surcharge
// Surcharge @ 12%
let surcharge_12 = tax_30_percent * 0.12;
setVal("surcharge_12", surcharge_12);
// 8️ Education Cess
// Education Cess @ 3%
let edu_cess_3 = (tax_30_percent + surcharge_12) * 0.03;
setVal("edu_cess_3", edu_cess_3);
// 9️ Total Tax Payable
// Total Tax Payable
let total_tax_payable = tax_30_percent + surcharge_12 + edu_cess_3;
setVal("total_tax_payable", total_tax_payable);
// MAT Credit & Interest
// MAT, Interest
let mat_credit = getVal("mat_credit");
let interest_234c = getVal("interest_234c");
// 1️1️ Total Tax
let total_tax = total_tax_payable + mat_credit + interest_234c;
setVal("total_tax", total_tax);
// 1️2️ Assessment side – Advance Tax, TDS, TCS
// Advance, TDS, TCS
let advance_tax = getVal("advance_tax");
let tds = getVal("tds");
let tcs = getVal("tcs");
@@ -78,16 +62,8 @@ document.addEventListener("DOMContentLoaded", function () {
let tax_on_assessment = advance_tax + tds + tcs;
setVal("tax_on_assessment", tax_on_assessment);
// 1️3️ Refund / Payable
// Refund / Payablesss
let refund = total_tax - tax_on_assessment;
setVal("refund", refund);
}
// Attach input listeners
fields.forEach(id => {
let input = document.getElementsByName(id)[0];
if (input) {
input.addEventListener("input", calculate);
}
});
};
});

87
static/js/cit_calc.js
View File

@@ -1,89 +1,74 @@
document.addEventListener("DOMContentLoaded", function () {
const fields = [
"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",
"tax_payable", "surcharge_12", "edu_cess_3", "total_tax_payable",
"mat_credit", "interest_234c", "total_tax",
"advance_tax", "tds", "tcs", "tax_on_assessment", "refund"
];
function getVal(id) {
let el = document.getElementsByName(id)[0];
var el = document.getElementsByName(id)[0];
return el ? parseFloat(el.value) || 0 : 0;
}
function setVal(id, value) {
let el = document.getElementsByName(id)[0];
var el = document.getElementsByName(id)[0];
if (el) el.value = Number(value).toFixed(2);
}
function calculate() {
// MAIN CALC FUNCTION
window.calculate = function () {
// Base values
let gross_total_income = getVal("gross_total_income");
let disallowance_14a = getVal("disallowance_14a");
let disallowance_37 = getVal("disallowance_37");
// BASIC VALUES
var gross_total_income = getVal("gross_total_income");
var disallowance_14a = getVal("disallowance_14a");
var disallowance_37 = getVal("disallowance_37");
// Deductions
let d80_business = getVal("deduction_80ia_business");
let deduction_sec37 = getVal("deduction_sec37_disallowance");
let deduction_80g = getVal("deduction_80g");
var d80_business = getVal("deduction_80ia_business");
var deduction_sec37 = getVal("deduction_sec37_disallowance");
var deduction_80g = getVal("deduction_80g");
// Net Taxable Income
let net_taxable_income =
// NET TAXABLE INCOME
var net_taxable_income =
(gross_total_income + disallowance_14a + disallowance_37)
- (d80_business + deduction_sec37)
- deduction_80g;
setVal("net_taxable_income", net_taxable_income);
// 30% tax
let tax_30_percent = net_taxable_income * 0.30;
// TAX @ 30%
var tax_30_percent = net_taxable_income * 0.30;
setVal("tax_30_percent", tax_30_percent);
// Book profit tax (user input)
let tax_payable = getVal("tax_book_profit_18_5");
// TAX PAYABLE = 18.5% BOOK PROFIT (user enters)
var tax_payable = getVal("tax_book_profit_18_5");
setVal("tax_payable", tax_payable);
// Surcharge 12%
let surcharge_12 = tax_payable * 0.12;
// SURCHARGE
var surcharge_12 = tax_payable * 0.12;
setVal("surcharge_12", surcharge_12);
// Education Cess 3%
let edu_cess_3 = (tax_payable + surcharge_12) * 0.03;
// CESS
var edu_cess_3 = (tax_payable + surcharge_12) * 0.03;
setVal("edu_cess_3", edu_cess_3);
// Total Tax Payable
let total_tax_payable = tax_payable + surcharge_12 + edu_cess_3;
// TOTAL TAX PAYABLE
var total_tax_payable = tax_payable + surcharge_12 + edu_cess_3;
setVal("total_tax_payable", total_tax_payable);
// MAT + Interest
let mat_credit = getVal("mat_credit");
let interest_234c = getVal("interest_234c");
// OTHER VALUES
var mat_credit = getVal("mat_credit");
var interest_234c = getVal("interest_234c");
// Total Tax
let total_tax = total_tax_payable + mat_credit + interest_234c;
// FINAL TAX
var total_tax = total_tax_payable + mat_credit + interest_234c;
setVal("total_tax", total_tax);
// Assessment → Advance Tax + TDS + TCS
let advance_tax = getVal("advance_tax");
let tds = getVal("tds");
let tcs = getVal("tcs");
// PAYMENTS
var advance_tax = getVal("advance_tax");
var tds = getVal("tds");
var tcs = getVal("tcs");
let tax_on_assessment = advance_tax + tds + tcs;
var tax_on_assessment = advance_tax + tds + tcs;
setVal("tax_on_assessment", tax_on_assessment);
// Refund (or payable)
let refund = total_tax - tax_on_assessment;
// REFUND
var refund = total_tax - tax_on_assessment;
setVal("refund", refund);
}
// Attach listeners
fields.forEach(id => {
let el = document.getElementsByName(id)[0];
if (el) el.addEventListener("input", calculate);
});
};
});

83
static/js/itr_calc.js
View File

@@ -1,83 +1,72 @@
document.addEventListener("DOMContentLoaded", function () {
const fields = [
"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", "tax_on_assessment", "refund"
];
function getValue(id) {
return parseFloat(document.getElementsByName(id)[0].value) || 0;
var el = document.getElementsByName(id)[0];
return el ? parseFloat(el.value) || 0 : 0;
}
function setValue(id, val) {
document.getElementsByName(id)[0].value = val.toFixed(2);
var el = document.getElementsByName(id)[0];
if (el) el.value = Number(val).toFixed(2);
}
function calculate() {
window.calculate = function () {
let gross_total_income = getValue("gross_total_income");
let disallowance_14a = getValue("disallowance_14a");
let disallowance_37 = getValue("disallowance_37");
// --- BASIC INPUTS ---
var gross_total_income = getValue("gross_total_income");
var disallowance_14a = getValue("disallowance_14a");
var disallowance_37 = getValue("disallowance_37");
// FORMULAS
// // Auto-calculations (your logic)
setValue("gross_total_income", disallowance_37 + gross_total_income);
setValue("disallowance_37", disallowance_14a + disallowance_37);
// Deductions
let d80_business = getValue("deduction_80ia_business");
let d80_misc = getValue("deduction_80ia_misc");
let d80_other = getValue("deduction_80ia_other");
// --- DEDUCTIONS ---
var d80_business = getValue("deduction_80ia_business");
var d80_misc = getValue("deduction_80ia_misc");
var d80_other = getValue("deduction_80ia_other");
let deduction_sec37 = d80_business + d80_misc + d80_other - 1.35;
var deduction_sec37 = d80_business + d80_misc + d80_other - 1.35;
setValue("deduction_sec37_disallowance", deduction_sec37);
let deduction_80g = getValue("deduction_80g");
var deduction_80g = getValue("deduction_80g");
// Net taxable income
let net_taxable_income = gross_total_income - deduction_sec37 - deduction_80g;
// --- NET TAXABLE INCOME ---
var net_taxable_income = gross_total_income - deduction_sec37 - deduction_80g;
setValue("net_taxable_income", net_taxable_income);
// Tax calculations
// --- TAX 30% ---
setValue("tax_30_percent", net_taxable_income * 0.30);
let tax_book_profit = getValue("tax_book_profit_18_5");
setValue("tax_payable", tax_book_profit);
// --- TAX PAYABLE (18.5%) ---
var tax_book = getValue("tax_book_profit_18_5");
setValue("tax_payable", tax_book);
let surcharge = tax_book_profit * 0.12;
var surcharge = tax_book * 0.12;
setValue("surcharge_12", surcharge);
let edu_cess = (tax_book_profit + surcharge) * 0.03;
var edu_cess = (tax_book + surcharge) * 0.03;
setValue("edu_cess_3", edu_cess);
let total_tax_payable = tax_book_profit + surcharge + edu_cess;
var total_tax_payable = tax_book + surcharge + edu_cess;
setValue("total_tax_payable", total_tax_payable);
let mat_credit = getValue("mat_credit");
let interest_234c = getValue("interest_234c");
// --- FINAL TAX ---
var mat_credit = getValue("mat_credit");
var interest_234c = getValue("interest_234c");
let total_tax = total_tax_payable + mat_credit + interest_234c;
var total_tax = total_tax_payable + mat_credit + interest_234c;
setValue("total_tax", total_tax);
// Assessment
let adv_tax = getValue("advance_tax");
let tds = getValue("tds");
let tcs = getValue("tcs");
// --- ASSESSMENT ---
var adv_tax = getValue("advance_tax");
var tds = getValue("tds");
var tcs = getValue("tcs");
let tax_on_assessment = adv_tax + tds + tcs;
var tax_on_assessment = adv_tax + tds + tcs;
setValue("tax_on_assessment", tax_on_assessment);
let refund = total_tax - tax_on_assessment;
var refund = total_tax - tax_on_assessment;
setValue("refund", refund);
}
// Attach event listeners
fields.forEach(id => {
const element = document.getElementsByName(id)[0];
if (element) {
element.addEventListener("input", calculate);
}
});
};
});

42
static/js/year_dropdown.js
View File

@@ -1,23 +1,51 @@
document.addEventListener("DOMContentLoaded", function () {
const yearDropdown = document.getElementById("year");
const errorDiv = document.getElementById("yearError");
// Get the form dynamically
const form = document.querySelector("form"); // get from id as table name
// Dynamic table name = form id
const tableName = form.id.toLowerCase();
const currentYear = new Date().getFullYear();
const startYear = 1990;
// Fill Year dropdown
for (let y = currentYear; y >= startYear; y--) {
let nextYear = y + 1;
let option = document.createElement("option");
// Backend receives only first year (example 2024)
option.value = y;
// User sees (example AY 2024–2025)
option.textContent = `AY ${y}-${nextYear}`;
yearDropdown.appendChild(option);
}
// Validate selected year
yearDropdown.addEventListener("change", function () {
let selectedYear = parseInt(this.value);
fetch("/check_year", {
method: "POST",
headers: { "Content-Type": "application/json" },
body: JSON.stringify({
table: tableName, // dynamic table name
year: selectedYear
})
})
.then(res => res.json())
.then(data => {
if (data.exists) {
errorDiv.style.display = "block";
errorDiv.innerText = `Year ${selectedYear} already exists!`;
// Block submission
form.onsubmit = function () { return false; };
} else {
errorDiv.style.display = "none";
form.onsubmit = null; // Allow submit
}
});
});
});

12
templates/add_ao.html
View File

@@ -15,13 +15,19 @@
<a href="{{ url_for('index') }}" class="back-btn">← Back to Dashboard</a>
<h2>AO Form Entry</h2>
<form method="POST" onsubmit="return showSuccessMessage()">
<form id="ao" method="POST" onsubmit="return showSuccessMessage()">
<!-- <label>Year:</label>
<input type="number" name="year" required> -->
<div class="form-group">
<label>Year:</label>
<select id="year" name="year" required></select>
<select id="year" name="year" required>
<option>---- Select Years ----</option>
</select>
</div>
<div id="yearError" style="color:red; display:none; margin-bottom:10px;">
</div>
{% for field in [
@@ -33,7 +39,7 @@
"tax_on_assessment", "refund"
] %}
<label for="{{ field }}">{{ field.replace("_", " ").title() }}:</label>
<input type="number" name="{{ field }}" step="0.01" required>
<input type="number" name="{{ field }}" step="0.01" oninput="calculate()" required>
<!-- <input type="number" name="{{ field }}" step="0.01" oninput="calculate()" required> -->
{% endfor %}
<button type="submit">Submit</button>

13
templates/add_cit.html
View File

@@ -15,14 +15,19 @@
<a href="{{ url_for('index') }}" class="back-btn">← Back to Dashboard</a>
<h2>CIT Form Entry</h2>
<form method="POST">
<form id="cit" method="POST">
<!-- <label>Year:</label>
<input type="number" name="year" required value="{{ record.year if record else '' }}"> -->
<div class="form-group">
<label> Year:</label>
<select id="year" name="year" required></select>
<select id="year" name="year" required>
<option>---- Select Years ----</option>
</select>
</div>
<div id="yearError" style="color:red; display:none; margin-bottom:10px;">
</div>
{% for field in [
"gross_total_income", "deduction_80ia_business", "deduction_sec37_disallowance",
@@ -31,9 +36,9 @@
"interest_234c", "total_tax", "advance_tax", "tds", "tcs", "tax_on_assessment", "refund"
] %}
<label for="{{ field }}">{{ field.replace("_", " ").title() }}:</label>
<input type="number" name="{{ field }}" step="0.01" required value="{{ record[field] if record else '' }}">
<input type="number" name="{{ field }}" step="0.01" oninput="calculate()" required>
{% endfor %}
<button type="submit">{{ 'Update' if record else 'Submit' }}</button>
<button type="submit">Submit </button>
</form>
</div>

9
templates/add_itat.html
View File

@@ -14,13 +14,18 @@
<a href="{{ url_for('index') }}" class="back-btn">← Back to Dashboard</a>
<h2>ITAT Form Entry</h2>
<form method="POST" onsubmit="return showSuccessMessage()">
<form id="itat" method="POST" onsubmit="return showSuccessMessage()">
<!-- <label>Year:</label>
<input type="number" name="year" step="0.01" required> -->
<div class="form-group">
<label> Year:</label>
<select id="year" name="year" required></select>
<select id="year" name="year" required>
<option>---- Select Years ----</option>
</select>
</div>
<div id="yearError" style="color:red; display:none; margin-bottom:10px;">
</div>
<label>MAT Tax Credit:</label>

11
templates/add_itr.html
View File

@@ -17,7 +17,7 @@
<h2>Add New Income Tax Return Record</h2>
<form method="POST" action="{{ url_for('add_itr') }}">
<form id="itr" method="POST" action="{{ url_for('add_itr') }}">
<!-- <div class="form-group">
<label>Year:</label>
<input type="number" name="year" required>
@@ -26,8 +26,11 @@
<div class="form-group">
<label> Year:</label>
<select id="year" name="year" required>
<option>---- Select Years ----</option>
</select>
</div>
<div id="yearError" style="color:red; display:none; margin-bottom:10px;">
</div>
{% for field in [
"gross_total_income", "disallowance_14a", "disallowance_37",
@@ -37,9 +40,11 @@
"edu_cess_3", "total_tax_payable", "mat_credit", "interest_234c",
"total_tax", "advance_tax", "tds", "tcs", "tax_on_assessment", "refund"
] %}
<div class="form-group">
<label>{{ field.replace("_", " ").title() }}:</label>
<input type="number" name="{{ field }}" step="any" value="0.00" required>
<input type="number" name="{{ field }}" step="any" value="0.00" oninput="calculate()" required>
</div>
{% endfor %}
@@ -48,4 +53,4 @@
</div>
</body>
</html>
</html