UI changes of update from

This commit is contained in:
2026-01-24 16:29:04 +05:30
parent 50f0e77f77
commit 30a7a4287e
11 changed files with 406 additions and 118 deletions

View File

@@ -35,8 +35,8 @@ class AOHandler:
def add_ao(self, data): def add_ao(self, data):
fields = [ fields = [
"year","gross_total_income", "disallowance_14a", "disallowance_37", "year","gross_total_income", "disallowance_14a", "disallowance_37",
"deduction_80ia_business", "deduction_sec37_disallowance", "deduction_80g", "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", "net_taxable_income", "tax_30_percent", "tax_book_profit_18_5", "tax_payable",
"surcharge_12", "edu_cess_3", "total_tax_payable", "mat_credit", "surcharge_12", "edu_cess_3", "total_tax_payable", "mat_credit",
"interest_234c", "total_tax", "advance_tax", "tds", "tcs","sat", "interest_234c", "total_tax", "advance_tax", "tds", "tcs","sat",
"tax_on_assessment", "refund","Remarks" "tax_on_assessment", "refund","Remarks"
@@ -44,7 +44,7 @@ class AOHandler:
values = [data.get(f, 0) for f in fields] values = [data.get(f, 0) for f in fields]
self.cursor.callproc("InsertAO", values) self.cursor.callproc("InsertAO", values)
self.conn.commit() self.conn.commit()
@@ -53,8 +53,8 @@ class AOHandler:
fields = [ fields = [
"year","gross_total_income", "disallowance_14a", "disallowance_37", "year","gross_total_income", "disallowance_14a", "disallowance_37",
"deduction_80ia_business", "deduction_sec37_disallowance", "deduction_80g", "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", "net_taxable_income", "tax_30_percent", "tax_book_profit_18_5", "tax_payable",
"surcharge_12", "edu_cess_3", "total_tax_payable", "mat_credit", "surcharge_12", "edu_cess_3", "total_tax_payable", "mat_credit",
"interest_234c", "total_tax", "advance_tax", "tds", "tcs","sat", "interest_234c", "total_tax", "advance_tax", "tds", "tcs","sat",
"tax_on_assessment", "refund","Remarks" "tax_on_assessment", "refund","Remarks"

View File

@@ -513,7 +513,6 @@ def save_mat_row():
finally: finally:
mat.close() mat.close()
# save mat credit bulk data # save mat credit bulk data
# @app.route("/save_mat_all", methods=["POST"]) # @app.route("/save_mat_all", methods=["POST"])
# @auth.login_required # @auth.login_required
@@ -525,7 +524,6 @@ def save_mat_row():
# except Exception as e: # except Exception as e:
# return jsonify({"error": str(e)}), 500 # return jsonify({"error": str(e)}), 500
# run server # run server
if __name__ == '__main__': if __name__ == '__main__':
app.run( app.run(

View File

@@ -50,6 +50,7 @@ document.addEventListener("DOMContentLoaded", function () {
var surcharge = tax_payable * (percent / 100); var surcharge = tax_payable * (percent / 100);
setValue("surcharge_12", surcharge); setValue("surcharge_12", surcharge);
// --- Education Cess 3% ---
var edu_cess = (tax_payable + surcharge) * 0.03; var edu_cess = (tax_payable + surcharge) * 0.03;
setValue("edu_cess_3", edu_cess); setValue("edu_cess_3", edu_cess);

View File

@@ -50,6 +50,7 @@ document.addEventListener("DOMContentLoaded", function () {
var surcharge = tax_payable * (percent / 100); var surcharge = tax_payable * (percent / 100);
setValue("surcharge_12", surcharge); setValue("surcharge_12", surcharge);
// --- Education Cess 3% ---
var edu_cess = (tax_payable + surcharge) * 0.03; var edu_cess = (tax_payable + surcharge) * 0.03;
setValue("edu_cess_3", edu_cess); setValue("edu_cess_3", edu_cess);

View File

@@ -42,6 +42,7 @@ document.addEventListener("DOMContentLoaded", function () {
// --- TAX PAYABLE (18.5%) --- // --- TAX PAYABLE (18.5%) ---
var tax185 = getValue("tax_book_profit_18_5"); var tax185 = getValue("tax_book_profit_18_5");
// --- Education Cess 3% ---
var tax_payable = (tax30 > tax185) ? tax30 : tax185; var tax_payable = (tax30 > tax185) ? tax30 : tax185;
setValue("tax_payable", tax_payable); setValue("tax_payable", tax_payable);

View File

@@ -1,11 +1,6 @@
/* =====================================================
GLOBAL STATE
===================================================== */
let addedYears = []; let addedYears = [];
/* ===================================================== // INITIALIZE YEARS FROM DATABASE HEADERS
INITIALIZE YEARS FROM DATABASE HEADERS
===================================================== */
document.addEventListener("DOMContentLoaded", () => { document.addEventListener("DOMContentLoaded", () => {
const headers = document.querySelectorAll("#tableHeader th"); const headers = document.querySelectorAll("#tableHeader th");
@@ -19,9 +14,8 @@ document.addEventListener("DOMContentLoaded", () => {
}); });
}); });
/* =====================================================
ADD YEAR COLUMN (DYNAMIC) // ADD YEAR COLUMN (DYNAMIC)
===================================================== */
function addYearColumn() { function addYearColumn() {
const yearSelect = document.getElementById("yearSelect"); const yearSelect = document.getElementById("yearSelect");
const year = yearSelect.value; const year = yearSelect.value;
@@ -54,9 +48,8 @@ function addYearColumn() {
}); });
} }
/* =====================================================
ADD NEW ROW // ADD NEW ROW
===================================================== */
function addRow() { function addRow() {
const tbody = document.querySelector("#matTable tbody"); const tbody = document.querySelector("#matTable tbody");
const tr = document.createElement("tr"); const tr = document.createElement("tr");
@@ -79,9 +72,8 @@ function addRow() {
tbody.appendChild(tr); tbody.appendChild(tr);
} }
/* =====================================================
SAVE SINGLE ROW // SAVE SINGLE ROW
===================================================== */
function saveRow(btn) { function saveRow(btn) {
const tr = btn.closest("tr"); const tr = btn.closest("tr");
const inputs = tr.querySelectorAll("input"); const inputs = tr.querySelectorAll("input");
@@ -128,9 +120,8 @@ function saveRow(btn) {
}); });
} }
/* =====================================================
SAVE ALL ROWS // SAVE ALL ROWS
===================================================== */
function saveAll() { function saveAll() {
let rows = []; let rows = [];

View File

@@ -17,13 +17,13 @@
<select id="year" name="year" required></select> <select id="year" name="year" required></select>
<div id="yearError" style="color:red; display:none; margin-bottom:10px;"></div> <div id="yearError" style="color:red; display:none; margin-bottom:10px;"></div>
</div> </div>
</div>
<div class="form-group full-width inline-2">
<div> <div>
<label>Gross Total Income:</label> <label>Gross Total Income:</label>
<input type="number" name="gross_total_income" step="any" value="0.00" oninput="calculate()" required> <input type="number" name="gross_total_income" step="any" value="0.00" oninput="calculate()" required>
</div> </div>
</div>
<div class="form-group full-width inline-2">
<div> <div>
<label>Add :Disallowance u/s 14A:</label> <label>Add :Disallowance u/s 14A:</label>
<input type="number" name="disallowance_14a" step="any" value="0.00" oninput="calculate()" required> <input type="number" name="disallowance_14a" step="any" value="0.00" oninput="calculate()" required>
@@ -36,37 +36,36 @@
<div class="form-group full-width inline-2"> <div class="form-group full-width inline-2">
<div> <div>
<label>Deduction 80IA Business Income:</label> <label>Less :Deduction 80IA Business Income:</label>
<input type="number" name="deduction_80ia_business" step="any" value="0.00" oninput="calculate()" <input type="number" name="deduction_80ia_business" step="any" value="0.00" oninput="calculate()"
required> required>
</div> </div>
<div> <div>
<label>Deduction 80IA Misc:</label> <label>Less :Deduction 80IA Misc:</label>
<input type="number" name="deduction_80ia_misc" step="any" value="0.00" oninput="calculate()" required> <input type="number" name="deduction_80ia_misc" step="any" value="0.00" oninput="calculate()" required>
</div> </div>
<div>
<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>
<div class="form-group full-width inline-2"> <div class="form-group full-width inline-2">
<div> <div>
<label>Deduction 80IA Other Operating Revenue:</label> <label>Less :Deduction Sec 37 Disallowance:</label>
<input type="number" name="deduction_80ia_other" step="any" value="0.00" oninput="calculate()" required>
</div>
<div>
<label>Deduction Sec 37 Disallowance:</label>
<input type="number" name="deduction_sec37_disallowance" step="any" value="0.00" oninput="calculate()" <input type="number" name="deduction_sec37_disallowance" step="any" value="0.00" oninput="calculate()"
required> required>
</div> </div>
</div>
<div class="form-group full-width inline-2">
<div> <div>
<label>Less: Deduction 80G: </label> <label>Less: Deduction 80G: </label>
<input type="number" name="deduction_80g" step="any" value="0.00" oninput="calculate()" required> <input type="number" name="deduction_80g" step="any" value="0.00" oninput="calculate()" required>
</div> </div>
<div>
<label>Net Taxable Income:</label> </div>
<input type="number" name="net_taxable_income" class="auto" step="any" value="0.00" readonly> <div class="form-group">
</div> <label>Net Taxable Income:</label>
<input type="number" name="net_taxable_income" class="auto" step="any" value="0.00" readonly>
</div> </div>
<div class="form-group full-width inline-2"> <div class="form-group full-width inline-2">
@@ -78,12 +77,13 @@
<label>Tax @ 18.5% on Book Profit (B):</label> <label>Tax @ 18.5% on Book Profit (B):</label>
<input type="number" name="tax_book_profit_18_5" 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>
<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>
<div class="form-group">
<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 class="form-group full-width inline-2"> <div class="form-group full-width inline-2">
<div> <div>
@@ -94,22 +94,20 @@
<label>Surcharge:</label> <label>Surcharge:</label>
<input type="number" name="surcharge_12" class="auto" value="0.00" readonly> <input type="number" name="surcharge_12" class="auto" value="0.00" readonly>
</div> </div>
</div>
<div class="form-group full-width inline-2">
<div> <div>
<label>Education Cess @ 3%:</label> <label>Education Cess @ 3%:</label>
<input type="number" name="edu_cess_3" class="auto" step="any" value="0.00" readonly> <input type="number" name="edu_cess_3" class="auto" step="any" value="0.00" readonly>
</div> </div>
</div>
<div class="form-group full-width inline-2">
<div> <div>
<label>Total tax Payable:</label> <label>Total tax Payable:</label>
<input type="number" name="total_tax_payable" class="auto" step="any" value="0.00" readonly> <input type="number" name="total_tax_payable" class="auto" step="any" value="0.00" readonly>
</div> </div>
</div>
<div class="form-group full-width inline-2">
<div> <div>
<label>Mat Credit Utilized:</label> <label>Less :Mat Credit Utilized:</label>
<input type="number" name="mat_credit" step="any" value="0.00" oninput="calculate()" required> <input type="number" name="mat_credit" step="any" value="0.00" oninput="calculate()" required>
</div> </div>
<div> <div>
@@ -117,19 +115,16 @@
<input type="number" name="interest_234c" step="any" value="0.00" oninput="calculate()" required> <input type="number" name="interest_234c" step="any" value="0.00" oninput="calculate()" required>
</div> </div>
</div> </div>
<div class="form-group">
<label>Total Tax:</label>
<input type="number" name="total_tax" step="any" class="auto" value="0.00" readonly>
</div>
<div class="form-group full-width inline-2"> <div class="form-group full-width inline-2">
<div>
<label>Total Tax:</label>
<input type="number" name="total_tax" step="any" class="auto" value="0.00" readonly>
</div>
<div> <div>
<label>Advance Tax:</label> <label>Advance Tax:</label>
<input type="number" name="advance_tax" step="any" value="0.00" oninput="calculate()" required> <input type="number" name="advance_tax" step="any" value="0.00" oninput="calculate()" required>
</div> </div>
</div>
<div class="form-group full-width inline-2">
<div> <div>
<label>TDS :</label> <label>TDS :</label>
<input type="number" name="tds" step="any" value="0.00" oninput="calculate()" required> <input type="number" name="tds" step="any" value="0.00" oninput="calculate()" required>

View File

@@ -18,13 +18,12 @@
<select id="year" name="year" required></select> <select id="year" name="year" required></select>
<div id="yearError" style="color:red; display:none; margin-bottom:10px;"></div> <div id="yearError" style="color:red; display:none; margin-bottom:10px;"></div>
</div> </div>
</div>
<div class="form-group full-width inline-2">
<div> <div>
<label>Gross Total Income:</label> <label>Gross Total Income:</label>
<input type="number" name="gross_total_income" step="any" value="0.00" oninput="calculate()" required> <input type="number" name="gross_total_income" step="any" value="0.00" oninput="calculate()" required>
</div> </div>
</div>
<div class="form-group full-width inline-2">
<div> <div>
<label>Add :Disallowance u/s 14A:</label> <label>Add :Disallowance u/s 14A:</label>
<input type="number" name="disallowance_14a" step="any" value="0.00" oninput="calculate()" required> <input type="number" name="disallowance_14a" step="any" value="0.00" oninput="calculate()" required>
@@ -37,33 +36,33 @@
<div class="form-group full-width inline-2"> <div class="form-group full-width inline-2">
<div> <div>
<label>Deduction 80IA Business Income:</label> <label>Less :Deduction 80IA Business Income:</label>
<input type="number" name="deduction_80ia_business" step="any" value="0.00" oninput="calculate()" <input type="number" name="deduction_80ia_business" step="any" value="0.00" oninput="calculate()"
required> required>
</div> </div>
<div> <div>
<label>Deduction 80IA Misc:</label> <label>Less :Deduction 80IA Misc:</label>
<input type="number" name="deduction_80ia_misc" step="any" value="0.00" oninput="calculate()" required> <input type="number" name="deduction_80ia_misc" step="any" value="0.00" oninput="calculate()" required>
</div> </div>
<div>
<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>
<div class="form-group full-width inline-2"> <div class="form-group full-width inline-2">
<div> <div>
<label>Deduction 80IA Other Operating Revenue:</label> <label>Less :Deduction Sec 37 Disallowance:</label>
<input type="number" name="deduction_80ia_other" step="any" value="0.00" oninput="calculate()" required>
</div>
<div>
<label>Deduction Sec 37 Disallowance:</label>
<input type="number" name="deduction_sec37_disallowance" step="any" value="0.00" oninput="calculate()" <input type="number" name="deduction_sec37_disallowance" step="any" value="0.00" oninput="calculate()"
required> required>
</div> </div>
</div>
<div class="form-group full-width inline-2">
<div> <div>
<label>Less: Deduction 80G: </label> <label>Less: Deduction 80G: </label>
<input type="number" name="deduction_80g" step="any" value="0.00" oninput="calculate()" required> <input type="number" name="deduction_80g" step="any" value="0.00" oninput="calculate()" required>
</div> </div>
</div>
<div class="form-group full-width inline-2">
<div> <div>
<label>Net Taxable Income:</label> <label>Net Taxable Income:</label>
<input type="number" name="net_taxable_income" class="auto" step="any" value="0.00" readonly> <input type="number" name="net_taxable_income" class="auto" step="any" value="0.00" readonly>
@@ -79,11 +78,10 @@
<label>Tax @ 18.5% on Book Profit (B):</label> <label>Tax @ 18.5% on Book Profit (B):</label>
<input type="number" name="tax_book_profit_18_5" 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> <div>
<label>Tax Payable (Higher of A or B):</label>
<div class="form-group"> <input type="number" name="tax_payable" class="auto" step="any" value="0.00" readonly>
<label>Tax Payable (Higher of A or B):</label> </div>
<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 class="form-group full-width inline-2">
@@ -95,22 +93,18 @@
<label>Surcharge:</label> <label>Surcharge:</label>
<input type="number" name="surcharge_12" class="auto" value="0.00" readonly> <input type="number" name="surcharge_12" class="auto" value="0.00" readonly>
</div> </div>
</div>
<div class="form-group full-width inline-2">
<div> <div>
<label>Education Cess @ 3%:</label> <label>Education Cess @ 3%:</label>
<input type="number" name="edu_cess_3" class="auto" step="any" value="0.00" readonly> <input type="number" name="edu_cess_3" class="auto" step="any" value="0.00" readonly>
</div> </div>
</div>
<div class="form-group full-width inline-2">
<div> <div>
<label>Total tax Payable:</label> <label>Total tax Payable:</label>
<input type="number" name="total_tax_payable" class="auto" step="any" value="0.00" readonly> <input type="number" name="total_tax_payable" class="auto" step="any" value="0.00" readonly>
</div> </div>
</div>
<div class="form-group full-width inline-2">
<div> <div>
<label>Mat Credit Utilized:</label> <label>Less :Mat Credit Utilized:</label>
<input type="number" name="mat_credit" step="any" value="0.00" oninput="calculate()" required> <input type="number" name="mat_credit" step="any" value="0.00" oninput="calculate()" required>
</div> </div>
<div> <div>
@@ -124,13 +118,13 @@
<label>Total Tax:</label> <label>Total Tax:</label>
<input type="number" name="total_tax" step="any" class="auto" value="0.00" readonly> <input type="number" name="total_tax" step="any" class="auto" value="0.00" readonly>
</div> </div>
</div>
<div class="form-group full-width inline-2">
<div> <div>
<label>Advance Tax:</label> <label>Advance Tax:</label>
<input type="number" name="advance_tax" step="any" value="0.00" oninput="calculate()" required> <input type="number" name="advance_tax" step="any" value="0.00" oninput="calculate()" required>
</div> </div>
</div>
<div class="form-group full-width inline-2">
<div> <div>
<label>TDS :</label> <label>TDS :</label>
<input type="number" name="tds" step="any" value="0.00" oninput="calculate()" required> <input type="number" name="tds" step="any" value="0.00" oninput="calculate()" required>

View File

@@ -7,28 +7,182 @@
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<div class="main"> <div class="container">
<div class="container">
<h2>Update AO Record for Year {{ record.year }}</h2> <h2>Update AO Record for Year {{ record.year }}--{{ record.year + 1 }}</h2>
<form method="POST" action="{{ url_for('update_ao', id=record.id) }}"> <form method="POST" action="{{ url_for('update_ao', id=record.id) }}">
<label for="year">Year:</label> <div class="form-group full-width inline-2">
<input type="text" id="year" name="year" value="{{ record.year }}" readonly class="readonly-field"> <div>
<label>Year:</label>
<input type="tex" name="year" value="{{record.year}}" class="auto" readonly>
</div>
</div>
{% for field in record.keys() if field not in ['id', 'year', 'remarks'] %} <div class="form-group full-width inline-2">
<label for="{{ field }}">{{ field.replace("_", " ").title() }}:</label> <div>
<input type="number" id="{{ field }}" name="{{ field }}" step="any" value="{{ record[field] }}" required> <label>Gross Total Income:</label>
{% endfor %} <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}}"
oninput="calculate()" required>
</div>
<div>
<label>Add :Disallowance u/s 37:</label>
<input type="number" name="disallowance_37" step="any" value="{{ record.disallowance_37}}"
oninput="calculate()" required>
</div>
</div>
<label for="Remarks">Remarks:</label> <div class="form-group full-width inline-2">
<input type="text" id="Remarks" name="Remarks" value="{{ record.remarks}}"> <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>
</div>
<div>
<label>Less :Deduction 80IA Misc:</label>
<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}}"
oninput="calculate()" required>
</div>
</div>
<button type="submit">Update Record</button> <div class="form-group full-width inline-2">
</form> <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>
</div>
<div>
<label>Less: Deduction 80G: </label>
<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>
<label>Tax @ 30% (A):</label>
<input type="number" name="tax_30_percent" step="any" value="{{ record.tax_30_percent}}"
oninput="calculate()" required>
</div>
<div>
<label>Tax @ 18.5% on Book Profit (B):</label>
<input type="number" name="tax_book_profit_18_5" step="any" value="{{ record.tax_book_profit_18_5}}"
oninput="calculate()" required>
</div>
<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>Enter Percentage (%) Surcharge:</label>
<input type="number" name="persentage" step="any" value="{{ record.persentage}}" oninput="calculate()">
</div>
<div>
<label>Surcharge:</label>
<input type="number" name="surcharge_12" class="auto" value="{{ record.surcharge_12}}" readonly>
</div>
<div>
<label>Education Cess @ 3%:</label>
<input type="number" name="edu_cess_3" class="auto" step="any" value="{{ record.edu_cess_3}}" 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>
<label>Less :Mat Credit Utilized:</label>
<input type="number" name="mat_credit" step="any" value="{{ record.mat_credit}}" oninput="calculate()"
required>
</div>
<div>
<label>Add :Interest 234c:</label>
<input type="number" name="interest_234c" step="any" value="{{ record.interest_234c}}"
oninput="calculate()" required>
</div>
</div>
<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>
</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}}" oninput="calculate()"
required>
</div>
<div>
<label>TDS :</label>
<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>
</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>
</div>
<div>
<label>Tax on Regular Assessment:</label>
<input type="number" name="tax_on_assessment" step="any" value="{{ record.tax_on_assessment}}"
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>
</div>
<div class="form-group">
<label>Remarks:</label>
<input type="text" name="Remarks" value="{{ record.remarks}}">
</div>
<button type="submit">Update Record</button>
</form>
</div>
</div> </div>
{% endblock %} {% endblock %}

View File

@@ -7,28 +7,181 @@
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<div class="main"> <div class="container">
<div class="container">
<h2>Update ITR Record for Year {{ record.year }}</h2> <h2>Update ITR Record for Year {{record.year}} - {{record.year+1}}</h2>
<form method="POST" action="{{ url_for('update_itr', id=record.id) }}"> <form method="POST" action="{{ url_for('update_itr', id=record.id) }}">
<label for="year">Year:</label> <div class="form-group full-width inline-2">
<input type="text" id="year" name="year" value="{{ record.year }}" readonly class="readonly-field"> <div>
<label>Year:</label>
<input type="tex" name="year" value="{{record.year}}" class="auto" readonly>
</div>
</div>
{% for field in record.keys() if field not in ['id', 'year', 'Remarks'] %} <div class="form-group full-width inline-2">
<label for="{{ field }}">{{ field.replace("_", " ").title() }}:</label> <div>
<input type="number" id="{{ field }}" name="{{ field }}" step="any" value="{{ record[field] }}" required> <label>Gross Total Income:</label>
{% endfor %} <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 }}"
oninput="calculate()" required>
</div>
<div>
<label>Add :Disallowance u/s 37:</label>
<input type="number" name="disallowance_37" step="any" value="{{ record.disallowance_37 }}"
oninput="calculate()" required>
</div>
</div>
<label for="Remarks">Remarks:</label> <div class="form-group full-width inline-2">
<input type="text" id="Remarks" name="Remarks" value="{{ record.Remarks }}"> <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>
</div>
<div>
<label>Less :Deduction 80IA Misc:</label>
<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 }}"
oninput="calculate()" required>
</div>
</div>
<button type="submit">Update Record</button>
</form>
</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="{{ 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 }}"
oninput="calculate()" required>
</div>
</div>
<div class="form-group full-width inline-2">
<div>
<label>Net Taxable Income:</label>
<input type="number" name="net_taxable_income" class="auto" step="any"
value="{{ record.net_taxable_income }}" readonly>
</div>
</div>
<div class="form-group full-width inline-2">
<div>
<label>Tax @ 30% (A):</label>
<input type="number" name="tax_30_percent" class="auto" step="any" value="{{ record.tax_30_percent }}"
readonly>
</div>
<div>
<label>Tax @ 18.5% on Book Profit (B):</label>
<input type="number" name="tax_book_profit_18_5" step="any" value="{{ record.tax_book_profit_18_5 }}"
oninput="calculate()" required>
</div>
<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>Enter Percentage (%) Surcharge:</label>
<input type="number" name="persentage" step="any" value="{{ record.persentage }}" oninput="calculate()">
</div>
<div>
<label>Surcharge:</label>
<input type="number" name="surcharge_12" class="auto" value="{{ record.surcharge_12 }}" readonly>
</div>
<div>
<label>Education Cess @ 3%:</label>
<input type="number" name="edu_cess_3" class="auto" step="any" value="{{ record.edu_cess_3 }}" 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>
<label>Less :Mat Credit Utilized:</label>
<input type="number" name="mat_credit" step="any" value="{{ record.mat_credit }}" oninput="calculate()"
required>
</div>
<div>
<label>Add :Interest 234c:</label>
<input type="number" name="interest_234c" step="any" value="{{ record.interest_234c }}"
oninput="calculate()" required>
</div>
</div>
<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>
</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 }}"
oninput="calculate()" required>
</div>
<div>
<label>TDS :</label>
<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>
</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>
</div>
<div>
<label>Tax on Regular Assessment:</label>
<input type="number" name="tax_on_assessment" step="any" value="{{ record.tax_on_assessment }}"
oninput="calculate()">
</div>
</div>
<div class="form-group">
<label>Refund:</label>
<input type="number" name="refund" class="auto" step="any" value="{{ record.refund }}" readonly>
</div>
<div class="form-group">
<label>Remarks:</label>
<input type="text" name="Remarks" value="{{ record.Remarks }}">
</div>
<button type="submit">Update Record</button>
</form>
</div> </div>
{% endblock %}
{% block extra_js %}
<script src="{{ url_for('static', filename='js/itr_calc.js') }}"></script>
{% endblock %} {% endblock %}