diff --git a/AppCode/AOHandler.py b/AppCode/AOHandler.py index d88cacc..24a21bc 100644 --- a/AppCode/AOHandler.py +++ b/AppCode/AOHandler.py @@ -35,8 +35,8 @@ class AOHandler: 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", + "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" @@ -44,7 +44,7 @@ class AOHandler: values = [data.get(f, 0) for f in fields] - self.cursor.callproc("InsertAO", values) + self.cursor.callproc("InsertAO", values) self.conn.commit() @@ -53,8 +53,8 @@ class AOHandler: 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", + "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" diff --git a/AppCode/__pycache__/AOHandler.cpython-313.pyc b/AppCode/__pycache__/AOHandler.cpython-313.pyc index 020cfa2..1f472ea 100644 Binary files a/AppCode/__pycache__/AOHandler.cpython-313.pyc and b/AppCode/__pycache__/AOHandler.cpython-313.pyc differ diff --git a/main.py b/main.py index 6b2158a..57459f8 100644 --- a/main.py +++ b/main.py @@ -513,7 +513,6 @@ def save_mat_row(): finally: mat.close() - # save mat credit bulk data # @app.route("/save_mat_all", methods=["POST"]) # @auth.login_required @@ -525,7 +524,6 @@ def save_mat_row(): # except Exception as e: # return jsonify({"error": str(e)}), 500 - # run server if __name__ == '__main__': app.run( diff --git a/static/js/ao_calc.js b/static/js/ao_calc.js index 241182f..14e771e 100644 --- a/static/js/ao_calc.js +++ b/static/js/ao_calc.js @@ -50,6 +50,7 @@ document.addEventListener("DOMContentLoaded", function () { var surcharge = tax_payable * (percent / 100); setValue("surcharge_12", surcharge); + // --- Education Cess 3% --- var edu_cess = (tax_payable + surcharge) * 0.03; setValue("edu_cess_3", edu_cess); diff --git a/static/js/cit_calc.js b/static/js/cit_calc.js index cc1b530..c8bf5c7 100644 --- a/static/js/cit_calc.js +++ b/static/js/cit_calc.js @@ -50,6 +50,7 @@ document.addEventListener("DOMContentLoaded", function () { var surcharge = tax_payable * (percent / 100); setValue("surcharge_12", surcharge); + // --- Education Cess 3% --- var edu_cess = (tax_payable + surcharge) * 0.03; setValue("edu_cess_3", edu_cess); diff --git a/static/js/itr_calc.js b/static/js/itr_calc.js index 4e4e9b5..ac993a9 100644 --- a/static/js/itr_calc.js +++ b/static/js/itr_calc.js @@ -42,6 +42,7 @@ document.addEventListener("DOMContentLoaded", function () { // --- TAX PAYABLE (18.5%) --- var tax185 = getValue("tax_book_profit_18_5"); + // --- Education Cess 3% --- var tax_payable = (tax30 > tax185) ? tax30 : tax185; setValue("tax_payable", tax_payable); diff --git a/static/js/mat_credit.js b/static/js/mat_credit.js index e98bb7f..0aa99b5 100644 --- a/static/js/mat_credit.js +++ b/static/js/mat_credit.js @@ -1,11 +1,6 @@ -/* ===================================================== - GLOBAL STATE -===================================================== */ let addedYears = []; -/* ===================================================== - INITIALIZE YEARS FROM DATABASE HEADERS -===================================================== */ +// INITIALIZE YEARS FROM DATABASE HEADERS document.addEventListener("DOMContentLoaded", () => { const headers = document.querySelectorAll("#tableHeader th"); @@ -19,9 +14,8 @@ document.addEventListener("DOMContentLoaded", () => { }); }); -/* ===================================================== - ADD YEAR COLUMN (DYNAMIC) -===================================================== */ + +// ADD YEAR COLUMN (DYNAMIC) function addYearColumn() { const yearSelect = document.getElementById("yearSelect"); const year = yearSelect.value; @@ -54,9 +48,8 @@ function addYearColumn() { }); } -/* ===================================================== - ADD NEW ROW -===================================================== */ + +// ADD NEW ROW function addRow() { const tbody = document.querySelector("#matTable tbody"); const tr = document.createElement("tr"); @@ -79,9 +72,8 @@ function addRow() { tbody.appendChild(tr); } -/* ===================================================== - SAVE SINGLE ROW -===================================================== */ + +// SAVE SINGLE ROW function saveRow(btn) { const tr = btn.closest("tr"); const inputs = tr.querySelectorAll("input"); @@ -128,9 +120,8 @@ function saveRow(btn) { }); } -/* ===================================================== - SAVE ALL ROWS -===================================================== */ + +// SAVE ALL ROWS function saveAll() { let rows = []; diff --git a/templates/add_ao.html b/templates/add_ao.html index dfdc63f..85c412d 100644 --- a/templates/add_ao.html +++ b/templates/add_ao.html @@ -17,13 +17,13 @@ + + +
-
- -
@@ -36,37 +36,36 @@
- +
- +
+
+ + +
+
- - -
-
- +
-
- -
-
- - -
+ +
+
+ +
@@ -78,12 +77,13 @@
+
+ + +
-
- - -
+
@@ -94,22 +94,20 @@
-
- -
+
+ + +
-
- -
- +
@@ -117,19 +115,16 @@
+
+ + +
-
- - -
-
- -
diff --git a/templates/add_itr.html b/templates/add_itr.html index e667552..35a8e3a 100644 --- a/templates/add_itr.html +++ b/templates/add_itr.html @@ -18,13 +18,12 @@
+
+
-
- -
@@ -37,33 +36,33 @@
- +
- +
+
+ + +
- - -
-
- +
-
- -
+
+ +
@@ -79,11 +78,10 @@
-
- -
- - +
+ + +
@@ -95,22 +93,18 @@
-
- -
+
+
-
- -
- +
@@ -124,13 +118,13 @@
+
+ +
-
- -
diff --git a/templates/update_ao.html b/templates/update_ao.html index 66220af..35895da 100644 --- a/templates/update_ao.html +++ b/templates/update_ao.html @@ -7,28 +7,182 @@ {% endblock %} {% block content %} -
-
+
-

Update AO Record for Year {{ record.year }}

+

Update AO Record for Year {{ record.year }}--{{ record.year + 1 }}

-
+ - - +
+
+ + +
+
- {% for field in record.keys() if field not in ['id', 'year', 'remarks'] %} - - - {% endfor %} +
+
+ + +
+
+ + +
+
+ + +
+
- - +
+
+ + +
+
+ + +
+
+ + +
+
- +
- +
+ + +
+
+ + +
+ +
+
+ + +
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + + +
+
+ + +
+
+ + +
+ +
+ + +
+
+ +
+ +
+ + +
+ +
+ + +
+
+ + +
+
+ +
+
+ + +
+
+ +
+
+ + +
+
+ + +
+
+ + +
+ +
+ +
+
+ + +
+
+ + +
+ +
+ +
+ + +
+ +
+ + +
+ + + + -
{% endblock %} \ No newline at end of file diff --git a/templates/update_itr.html b/templates/update_itr.html index 4ffb58a..1e2309c 100644 --- a/templates/update_itr.html +++ b/templates/update_itr.html @@ -7,28 +7,181 @@ {% endblock %} {% block content %} -
-
+
-

Update ITR Record for Year {{ record.year }}

+

Update ITR Record for Year {{record.year}} - {{record.year+1}}

-
+ - - +
+
+ + +
+
- {% for field in record.keys() if field not in ['id', 'year', 'Remarks'] %} - - - {% endfor %} +
+
+ + +
+
+ + +
+
+ + +
+
- - +
+
+ + +
+
+ + +
+
+ + +
+
- -
-
+
+
+ + +
+
+ + +
+
+ +
+
+ + +
+
+ +
+
+ + +
+
+ + +
+
+ + +
+
+ + + +
+
+ + +
+
+ + +
+
+ + +
+
+ +
+
+ + +
+
+ + +
+
+ + +
+
+ +
+
+ + +
+
+ +
+
+ + +
+
+ + +
+
+ + +
+ +
+ +
+
+ + +
+
+ + +
+
+
+ + +
+ +
+ + +
+ + + +
+{% endblock %} +{% block extra_js %} + {% endblock %} \ No newline at end of file