From 4592113f761d8f65f9e7e10059fe6d16cef785fa Mon Sep 17 00:00:00 2001 From: pjpatil12 Date: Thu, 29 Jan 2026 18:19:49 +0530 Subject: [PATCH] changes of cess cal --- AppCode/AOHandler.py | 38 ++-- AppCode/CITHandler.py | 39 ++-- AppCode/ITATHandler.py | 30 ++-- AppCode/ITRHandler.py | 28 +-- AppCode/__pycache__/AOHandler.cpython-313.pyc | Bin 7576 -> 7623 bytes .../__pycache__/CITHandler.cpython-313.pyc | Bin 7619 -> 7694 bytes .../__pycache__/ITATHandler.cpython-313.pyc | Bin 7630 -> 7677 bytes .../__pycache__/ITRHandler.cpython-313.pyc | Bin 7802 -> 7857 bytes static/js/ao_calc.js | 32 ++-- static/js/cit_calc.js | 20 ++- static/js/itr_calc.js | 22 ++- templates/add_ao.html | 29 +-- templates/add_cit.html | 59 +++--- templates/add_itat.html | 77 ++++---- templates/add_itr.html | 20 ++- templates/ao_reports.html | 37 ++-- templates/cit_reports.html | 36 ++-- templates/display_ao.html | 10 +- templates/display_cit.html | 95 +++++----- templates/display_itat.html | 88 +++++---- templates/display_itr.html | 8 +- templates/itat_reports.html | 33 ++-- templates/itr_reports.html | 35 ++-- templates/mat_credit.html | 2 +- templates/reports.html | 18 +- templates/summary_reports.html | 33 ++-- templates/update_ao.html | 31 ++-- templates/update_cit.html | 168 ++++++++++++++++-- templates/update_itat.html | 166 +++++++++++++++-- templates/update_itr.html | 30 ++-- templates/upload.html | 43 ++--- templates/view_docs.html | 125 ++++++------- 32 files changed, 808 insertions(+), 544 deletions(-) diff --git a/AppCode/AOHandler.py b/AppCode/AOHandler.py index 86b0820..bc5327a 100644 --- a/AppCode/AOHandler.py +++ b/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", diff --git a/AppCode/CITHandler.py b/AppCode/CITHandler.py index a1d9ca0..96b9ed9 100644 --- a/AppCode/CITHandler.py +++ b/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", diff --git a/AppCode/ITATHandler.py b/AppCode/ITATHandler.py index f714e5f..d307389 100644 --- a/AppCode/ITATHandler.py +++ b/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", diff --git a/AppCode/ITRHandler.py b/AppCode/ITRHandler.py index 3731c99..4cb6bf1 100644 --- a/AppCode/ITRHandler.py +++ b/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", diff --git a/AppCode/__pycache__/AOHandler.cpython-313.pyc b/AppCode/__pycache__/AOHandler.cpython-313.pyc index f533e36f2a7658c7785b2cef0410bbf7ee7a2006..1302561b1a7f6d90252991dc53983b7c6f254915 100644 GIT binary patch delta 1034 zcmYk3O=ufO6vt<@)#}SyY4l}9t8d9s6kCZcTeU66mM!@sm15I$V@ljmXCsMJ#j(vw zqK%u96iV@-hr)xzfgXG)rH2p*x|G~fC+F~n z94oMM)1qc)K?`#fIZ7PM94qk3GU?%2&G#7|puW%Ik`6`c>!hqkjF%u|Tf;Y?Z7W)B zEJ0xJo8LPxY>)6;%ESc=Y}s=-3*Xpf#wYgcrb%V$qCv^QkaSgeTbYKNQV!3+Ln*=d zT#`+*N?w^$F2SjkU>Y+w527Q17vQ`jB@~oJxaLR*OG*(ASS%^aaO?;fdDRO1LI1^#fS@jSRZ`^lSZq9@+k(`t21Q<>4K3pGjCF^D|2`v&-9Wr6C;K^; zakx$|b$;_t873Fdi)<-UUO+#S6Tsmf98x)?&l2*))qGU|J2~`;B@F7 oOX`XH>TXSKYIk_W9*2?R7_Nr=_&fMG6me_{IM7F&8ewby01oROA^-pY delta 1026 zcmYk5O>7%Q6vt<5cGum+yPnuiQh&!EaZTJdYu8Qe)Xj(Eq>a-9T?IsiYHe+cMx;qt zI|3|0gTx^RxbPy=$a7DzCnLs5*yZ`zB=DoKw zJEQq&=E02e%;}U7YpYLM>nHxlN=3vzxFw!U4>otq+FiqZy;0RNJ-Jcesn#0JW;NR* zt*w@^QEeG-SGSFKj5`~Ro_x<}RcmIWzTSdE>8Zme4J&&~e-3p%aOimKD*Jv)G@Yz7 zLtN&$EO04tS%kmOWIdOdZN9=}7xiC|hU7hw4s~W_0pmF+4=m#)_-J53=8Ltn_t_tv z-v$n_?ScbZ&YYwPZ0x2Aj|I0~);0Li`KpxBvlngpB^Xy;vgh>6&{lGI3LYsjVJgY8 z;ahb?n%47rL7#yWCB{5vbOj=63>RThP1>*Ov#_bg>~s1&?6ZDBFTpozP~cUI@Kl}f zmi5zF*4#P1DApoKUxI*ZSe3uP1VvO5GH zyM2Pmw-ml~*TgH#q#WS&q@d*4h~H+|6Yp%9^@eFy8JGr>wj-8~#U?LIPNr<80l#`~ zi#*Y+!j$(lJlom#5{&2J^Wk5V3L9^J&3<_oQJV?7BOl)P1(mKVZjBeHo!Q@AQ7b-6 z1!k#;NYsiIsl>s7$cxs*EqaE7jL5i^%+mo5gNP)*kg1b<1(A!^_1g%h(204Tf ziCc+j8s-o=jpXSVhv?~?c^cyoN1;?VobHYU{(BO0U0<~8kN2}Iymx~Zkf$?vHe<^c z(RZ0rXr+jLaFy{&+I~cQ435(BNq@^g5+guXP>&8QX8|G_3kxD>&8*pgzxlDrHDQbbsh3vePu%td*%d_hEM z9f*=g&vVz{H)+gwN$%}ac4YZ6Sqmch$=mL-?P?sb;DvR2OrI(nMYWhlG;60XmYzDaepl@D=!s#PDYOM{*O7b^HFUQze-?kmScz3oZwfsgbVbaqTK; zxaLTEJu9_ZF1Wd}9W3^0#yeg!H3P?v0DS7G8W!2%;%0C<<9HF~oPJz{XPjHn7uj&v zaAQ}k)m2qtMy)a&m?Gnm$kfEtR9vT4;mrAhfd{GzOuDY)<@P-n!MFe)xW5;9PV-Cl z^+$;6nsDg3ch~0^JNBq{F-HX^AKJrObcyPjqy|L7T4a$LxiKN~gf{jZHFIM@kH`q$#KDadk>$9x=KBK zW&n}Ed#}?$uDys1Yr!P-aWjO7UkjwEpPK+8QEgBJ_PTPr)~Kr!)y8hK{u3mJ-f&&w zRVZ;h#qkcu1Nd&}ifcgcJD(n8nAI_uT3A2u=N^puXZ&|qP}i`>7E_w)EuOK7%Q7=~xOvUl0U>z&w68gJ~_S*OOtq+UC5V>ix!LgJ(qutfX_;yU&U8o5ce z>!`F8QG}3sK)rmZAS6V4>j5N?g@k}hRKX!Vu!jmEpCTb44yYPZfe;s%F=C{B=6z=7 zo0*-P)A!COkNkcau~z=3b>TDZ3#IA95qQJ*=Txt=Z`WU|*{@nvBiE6w#(uSKIZid- zA+5butyyi=UawxNU8!w1t&V)L)~eQRt8t+P2jb6?M-0k0#NYecpGuoJF~jyx`|MuU z*)fiJjs=cIjwKk83!wsw&I=6J(eZ!vw6EQiMU3a5)iZ-vpxv_|^UDhCd-QAjpPmn} zXIz4h{FB%K*RL`D=6_MlnfX&5a{@M$XM{VdKbjH6GO`I}|X30DQLjj#- z%xoG~0y-|kP9P=Bn6vPHKo{oBdH9<33+5sm1)^SFwFDk@Oj|a)Cu{~M`9)ZZBXec9 zf7AbL8n6(7Z8haJHbpZBH`OO`9==tJ!c*od{G}#@HM0Uk#9%i)M=s-a_@1QjM*AVz z!J3_ATU`y9|37UeT<8Y z$VoRY?>f?Ps~ByNw$eQt2VlP{x#++wU!M&GH+xRMbLNrcH^My`~^!-B|jIks*H_qE>j zjBr2WT{qxM?el?K?D0D4;@WeowcSS3vd8PqJ;yqLYeR2`m-&OQah&AeFu)B P!+~oa963gu-9`TbYE%sF diff --git a/AppCode/__pycache__/ITATHandler.cpython-313.pyc b/AppCode/__pycache__/ITATHandler.cpython-313.pyc index 4f59d0e3bd1d5afe9ea2635a261377a65c7618f5..d189e80c35061e2890ce2bb5f2ead0faa6470d08 100644 GIT binary patch delta 591 zcmYk%y>HV%6aesCLLA5WsFFHq`UOTQgMn6Q3RDn2nuf2I7PYC7Kmx3beSjr5iO#kJ zK}c-Cd;=mZ?ZC(Y`5%y2Ks%(A&D4URM{;E6R%ea8x1 zOg(;J$*3ASqBXXjTc5)4E;U-zCX_ZH!xnVp;_+g!G*c?+VQRAvxw{es(gr)4zl|1p z&+-|B7TK$j9dxVb7WN|SOX6*z3$-#({wi+TE}=7)+w#a~_BuJuoCza$8EPy8*MXNn zm+effjE+Rd`zP{(a#)~H6fOL8BjM;6o1dIJ^+W`6sV$0Pk2WEz4Mc%$AOoZYTt2(m XvICc#r*GKSOX8D@Qd2TZCU0VY&cVbkEY!jNQDE~z zjvz)wJD~ZRY(>04sz?q*ID!Z#5aA3WTqcWfS&A3{nZ*%6qJiNPP(N1(`v-x|iCi3v zj1H5txP2MzC-2}kpS)apjYI%Y(JevG5XTUY#JrT8)FQp)oc!X{_{rHax|`o|=d()} zfefqS4~BU`!9l^$NVUiiC_1@ASeLcP7{od#EW>Cr`JQkZw+)c1$x&nq67>>MnOrO) z#ppD-Pb5$!0Vs5fEh)b!CAFw15y&Y@1`<^q$~wx*26_etnoLE>lbJ>1*gy)45+|pN z#xUA%J|Zf}$mlrvn%E`Al+7!}|1wXWArm6%3R2<;B78vv$Qwn|CNs+VNb;~sf06?e zOhA?cBNMCCSFR#PR*A`Jvc_gLK!vy13V?o1EH26g>B7%Q6vt=0vDa~(^{%~+6Mw~@aniVn)6^kd;>M}-RXahD!6Nh$x!yHc$`|WI z&?3~pDW@XzE=8&;Bo2)@RH|}ATq>a+(#xJIE9wCugg9`R8qq^f%(ztQX!M`|Z{Ey% zv-@7nJ}OB6^!2$A8`;>G&2Phxq>clJ0E;ix-qwLx|FmX)Vw^b*{a~|hv|1oL)e-M@ zZGW?F8hW$4)bvJ86FVvG@FTwE=t262_6}FfOE=ydN zxvX%x26tTJYLVI229rb7v32j${u9e3V!R0Lb7i~^Np}VRb+YR=a1XgK?u2K3c{~no zDa3R{`dFMGxd|JYgd^z#;UbxW=Tbg%DUVr7Hg=?qzt^L${o6_|Wf;O8PoOtXrpY^G zhFpdXPg2Yijq$tijVCG05)F<$NxMc0WU6buG3w|6#1uZ75%OL(Lh$Y7|mx9XsJjP2nOOs}Z~mPt-=L z#uA=6ZtR-6VVXA>m8JhWqYVI zEHO#hn7A9*KJf24+>a!}hwRXqW3RTO*IMQt2XXJ__RZF3Tc!!mBjw>#e)L;nGbE+)zV delta 1119 zcmZ9LO>7%Q7=~xOu{Uv@U5~v^VkiE$8;ldjj$;z%rwRFwlLF0j`8(jc_7)QTnuQbb5)2MAUVX6HWS@t^j8V7FbV&d zF(C^=7KJPcS%wGBj5f_}<4rDiP|J3c+kd0>HK)EF4=rBA{3OEk~YLx3MYH!B~Ezp;Y+ zjmsmn$ax&@t8sOL7PGj3pEj-&xUF{Ei*%As!S8BZxq_cER_wj^{ck@dlbRPEI>D~o;c1qn{ke;rIAi7xZ(w*xm2unfu z!=11X>TNUw8cF$!+zp9)>z+c}v%KC#i|{&0N=tMZZj-3ALQ8N!a(EEFBRBCXtaWVBccHdZtu!~b>XA75os4q~<%O!QRu{6Xc|ov_Z2Gl|mKE-4K z?TEZ+rQc>90-T7PxB83hoB$Uh{STe2Q+NfDAuGGgQ~_>8B35*q5dj`Vl429D01c7o zr)lQnevftW_0|jXtXoui5DDG=fcb?FAQHABIo2zn50Ri1%Cn$=5F!aHImW^QB4?E% ziwcOH?O9}T0SOdJ9ft>wyZioslQYMGSS!bC`xn_5(z^EN4?poQ+wzm>o4{PKG>N_) zUGSIE(vdsB;VA7a73HIXEc|3>H7h+1xK`8B3;w<@y6=g3xK}Q(FIVcdO~cGo zH@6zb*YHE%hrSgto{K^*3Aroe9yEh%KGojaO1QX0Y+U&NW$*dxHTXUl>)Yd@6UR1h rR%w`90_5%8>${B`o8}GhhD!JV-U;>K&*5e$tu}2q&_Y5@ACLYAZxAA7 diff --git a/static/js/ao_calc.js b/static/js/ao_calc.js index 14e771e..8e5b445 100644 --- a/static/js/ao_calc.js +++ b/static/js/ao_calc.js @@ -17,22 +17,22 @@ document.addEventListener("DOMContentLoaded", function () { var disallowance_14a = getValue("disallowance_14a"); var disallowance_37 = getValue("disallowance_37"); - // -- total gross income --- + // -- total gross income -- var gross_total = gross_total_income + disallowance_37 + disallowance_14a - console.log("gross_total income:: " + gross_total) + // console.log("gross_total income:: " + gross_total) // --- DEDUCTIONS --- var d80_business = getValue("deduction_80ia_business"); var d80_misc = getValue("deduction_80ia_misc"); var d80_other = getValue("deduction_80ia_other"); + var d80_sec37 = getValue("deduction_sec37_disallowance"); - var deduction_sec37 = d80_business + d80_misc + d80_other; - setValue("deduction_sec37_disallowance", deduction_sec37); + var deduction = d80_business + d80_misc + d80_other + d80_sec37 - 1.35; var deduction_80g = getValue("deduction_80g"); // --- NET TAXABLE INCOME --- - var net_taxable_income = gross_total - deduction_sec37 - deduction_80g; + var net_taxable_income = gross_total - deduction - deduction_80g; setValue("net_taxable_income", net_taxable_income); // --- TAX 30% --- @@ -42,24 +42,36 @@ 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); + // // --- SURCHARGE --- + // var percent = getValue("persentage"); + // var surcharge = tax_payable * (percent / 100); + // setValue("surcharge", surcharge); + + // // --- edu_cess --- + // var per_cess = getValue("persentage_cess") + // var edu_cess = (tax_payable + surcharge) * (per_cess / 100); + // setValue("edu_cess", edu_cess); + // --- SURCHARGE --- var percent = getValue("persentage"); var surcharge = tax_payable * (percent / 100); - setValue("surcharge_12", surcharge); + setValue("surcharge", surcharge); - // --- Education Cess 3% --- - var edu_cess = (tax_payable + surcharge) * 0.03; - setValue("edu_cess_3", edu_cess); + // --- EDUCATION CESS --- + var per_cess = getValue("persentage_cess"); + var edu_cess = (tax_payable + surcharge) * (per_cess / 100); + setValue("edu_cess", edu_cess); // --- total tax payable --- var total_tax_payable = tax_payable + surcharge + edu_cess; setValue("total_tax_payable", total_tax_payable); // --- FINAL TAX --- - var mat_credit = getValue("mat_credit"); + var mat_credit = getValue("mat_credit_utilized"); var interest_234c = getValue("interest_234c"); var total_tax = total_tax_payable + mat_credit + interest_234c; diff --git a/static/js/cit_calc.js b/static/js/cit_calc.js index c8bf5c7..1a08b64 100644 --- a/static/js/cit_calc.js +++ b/static/js/cit_calc.js @@ -45,21 +45,31 @@ document.addEventListener("DOMContentLoaded", function () { var tax_payable = (tax30 > tax185) ? tax30 : tax185; setValue("tax_payable", tax_payable); + // // --- SURCHARGE --- + // var percent = getValue("persentage"); + // 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); + // --- SURCHARGE --- var percent = getValue("persentage"); var surcharge = tax_payable * (percent / 100); - setValue("surcharge_12", surcharge); + setValue("surcharge", surcharge); - // --- Education Cess 3% --- - var edu_cess = (tax_payable + surcharge) * 0.03; - setValue("edu_cess_3", edu_cess); + // --- EDUCATION CESS --- + var per_cess = getValue("persentage_cess"); + var edu_cess = (tax_payable + surcharge) * (per_cess / 100); + setValue("edu_cess", edu_cess); // --- total tax payable --- var total_tax_payable = tax_payable + surcharge + edu_cess; setValue("total_tax_payable", total_tax_payable); // --- FINAL TAX --- - var mat_credit = getValue("mat_credit"); + var mat_credit = getValue("mat_credit_utilized"); var interest_234c = getValue("interest_234c"); var total_tax = total_tax_payable + mat_credit + interest_234c; diff --git a/static/js/itr_calc.js b/static/js/itr_calc.js index ac993a9..8e5b445 100644 --- a/static/js/itr_calc.js +++ b/static/js/itr_calc.js @@ -19,7 +19,7 @@ document.addEventListener("DOMContentLoaded", function () { // -- total gross income -- var gross_total = gross_total_income + disallowance_37 + disallowance_14a - console.log("gross_total income:: " + gross_total) + // console.log("gross_total income:: " + gross_total) // --- DEDUCTIONS --- var d80_business = getValue("deduction_80ia_business"); @@ -46,20 +46,32 @@ document.addEventListener("DOMContentLoaded", function () { var tax_payable = (tax30 > tax185) ? tax30 : tax185; setValue("tax_payable", tax_payable); + // // --- SURCHARGE --- + // var percent = getValue("persentage"); + // var surcharge = tax_payable * (percent / 100); + // setValue("surcharge", surcharge); + + // // --- edu_cess --- + // var per_cess = getValue("persentage_cess") + // var edu_cess = (tax_payable + surcharge) * (per_cess / 100); + // setValue("edu_cess", edu_cess); + // --- SURCHARGE --- var percent = getValue("persentage"); var surcharge = tax_payable * (percent / 100); - setValue("surcharge_12", surcharge); + setValue("surcharge", surcharge); - var edu_cess = (tax_payable + surcharge) * 0.03; - setValue("edu_cess_3", edu_cess); + // --- EDUCATION CESS --- + var per_cess = getValue("persentage_cess"); + var edu_cess = (tax_payable + surcharge) * (per_cess / 100); + setValue("edu_cess", edu_cess); // --- total tax payable --- var total_tax_payable = tax_payable + surcharge + edu_cess; setValue("total_tax_payable", total_tax_payable); // --- FINAL TAX --- - var mat_credit = getValue("mat_credit"); + var mat_credit = getValue("mat_credit_utilized"); var interest_234c = getValue("interest_234c"); var total_tax = total_tax_payable + mat_credit + interest_234c; diff --git a/templates/add_ao.html b/templates/add_ao.html index 85c412d..74756e1 100644 --- a/templates/add_ao.html +++ b/templates/add_ao.html @@ -92,11 +92,15 @@
- +
- - + + +
+
+ +
@@ -106,9 +110,15 @@ + +
+
+ + +
- +
@@ -163,16 +173,9 @@
+{% endblock %} + {% block extra_js %} -{% endblock %} - - - {% endblock %} \ No newline at end of file diff --git a/templates/add_cit.html b/templates/add_cit.html index 4986fd1..5d1630d 100644 --- a/templates/add_cit.html +++ b/templates/add_cit.html @@ -8,7 +8,6 @@ {% endblock %} {% block content %}
-

New CIT Form

@@ -17,13 +16,13 @@
+
+ +
-
- -
@@ -44,25 +43,25 @@
-
- -
+
+ +
-
- -
+
+ +
@@ -78,11 +77,10 @@
-
- -
- - +
+ + +
@@ -92,15 +90,20 @@
- +
+
+ + +
+
+ + +
+
-
- - -
@@ -109,8 +112,12 @@
- - + + +
+
+ +
@@ -123,13 +130,13 @@
+
+ +
-
- -
@@ -138,7 +145,6 @@
-
@@ -150,7 +156,6 @@
-
diff --git a/templates/add_itat.html b/templates/add_itat.html index 4b26648..8d32c71 100644 --- a/templates/add_itat.html +++ b/templates/add_itat.html @@ -9,9 +9,7 @@ {% block content %}
-

New Income Tax Appellate Tribunal Form

-
@@ -20,13 +18,13 @@
+
+ +
-
- -
@@ -39,33 +37,35 @@
- +
- +
+
+ + +
+ +
- - -
-
- +
-
- -
+
+ +
@@ -81,11 +81,10 @@
-
- -
- - +
+ + +
@@ -95,15 +94,20 @@
- + +
+ +
+ + +
+
+ +
-
- - -
@@ -112,8 +116,12 @@
- - + + +
+
+ +
@@ -126,13 +134,13 @@
+
+ +
-
- -
@@ -173,11 +181,4 @@ {% block extra_js %} -{% endblock %} - - \ No newline at end of file +{% endblock %} \ No newline at end of file diff --git a/templates/add_itr.html b/templates/add_itr.html index 35a8e3a..267e5e6 100644 --- a/templates/add_itr.html +++ b/templates/add_itr.html @@ -10,7 +10,6 @@ {% block content %}

New Income Tax Return Form

-
@@ -91,21 +90,32 @@
- +
- - + + +
+
+ +
+
+
+
+
+ + +
- +
diff --git a/templates/ao_reports.html b/templates/ao_reports.html index 44a45f1..cea0f14 100644 --- a/templates/ao_reports.html +++ b/templates/ao_reports.html @@ -7,29 +7,18 @@ {% endblock %} {% block content %} -
-
- -

Download AO Report

- - - -
- - - -
- - - - - -
+
+

Download AO Report

+
+
+ +
+ +
- {% endblock %} \ No newline at end of file diff --git a/templates/cit_reports.html b/templates/cit_reports.html index fafbc20..be2e1c1 100644 --- a/templates/cit_reports.html +++ b/templates/cit_reports.html @@ -7,28 +7,18 @@ {% endblock %} {% block content %} -
-
- -

Download CIT Report

- -
- -
- - - -
- - -
- -
+
+

Download CIT Report

+
+
+ +
+ +
- {% endblock %} \ No newline at end of file diff --git a/templates/display_ao.html b/templates/display_ao.html index d5c9075..cdd2799 100644 --- a/templates/display_ao.html +++ b/templates/display_ao.html @@ -1,15 +1,13 @@ {% extends "base.html" %} - {% block title %}AO Records{% endblock %} -{% block content %} - - +{% block extra_css %} +{% endblock %} + +{% block content %}
-

Assessing Officer Records πŸ‘¨β€πŸ’Ό

-
βž• Add AO Record diff --git a/templates/display_cit.html b/templates/display_cit.html index 0de9802..fd5f2fe 100644 --- a/templates/display_cit.html +++ b/templates/display_cit.html @@ -1,57 +1,56 @@ {% extends "base.html" %} - {% block title %}CIT Records{% endblock %} +{% block extra_css %} + +{% endblock %} {% block content %} - - -
-
-

CIT Records🧾

- - {% if cit_records %} -
- - - - - - - - - - - - - {% for record in cit_records %} - - - - - - - - - {% endfor %} - -
YearGross Total IncomeNet Taxable IncomeTotal Tax PayableRefundActions
AY {{ record.year }}-{{ record.year+1 }}{{ "{:,.2f}".format(record.gross_total_income) }}{{ "{:,.2f}".format(record.net_taxable_income) }}{{ "{:,.2f}".format(record.total_tax_payable) }}{{ "{:,.2f}".format(record.refund) }} - Edit -
- -
-
-
- - {% else %} -

- No records found. Click the button above to add one! -

- {% endif %} +
+

CIT Records🧾

+ + {% if cit_records %} +
+ + + + + + + + + + + + + {% for record in cit_records %} + + + + + + + + + {% endfor %} + +
YearGross Total IncomeNet Taxable IncomeTotal Tax PayableRefundActions
AY {{ record.year }}-{{ record.year+1 }}{{ "{:,.2f}".format(record.gross_total_income) }}{{ "{:,.2f}".format(record.net_taxable_income) }}{{ "{:,.2f}".format(record.total_tax_payable) }}{{ "{:,.2f}".format(record.refund) }} + Edit +
+ +
+
+
+ + {% else %} +

+ No records found. Click the button above to add one! +

+ {% endif %}
+ {% endblock %} \ No newline at end of file diff --git a/templates/display_itat.html b/templates/display_itat.html index e1f5a1f..26cb4f5 100644 --- a/templates/display_itat.html +++ b/templates/display_itat.html @@ -2,62 +2,58 @@ {% block title %}ITAT Records{% endblock %} - {% block extra_css %} {% endblock %} {% block content %} -
-
+
+

Income Tax Appellate Tribunal Records πŸ“„

+
-

Income Tax Appellate Tribunal Records πŸ“„

-
+ βž• Add New Record - βž• Add New Record + + {% if records %} +
+ + + + + + + + + + + + + {% for record in records %} + + + + + + - - {% if records %} -
-
YearMAT Tax CreditSurchargeCessTotal CreditActions
AY {{ record.year }}-{{ record.year+1 }}{{ "{:,.2f}".format(record.gross_total_income) }}{{ "{:,.2f}".format(record.net_taxable_income) }}{{ "{:,.2f}".format(record.total_tax_payable) }}{{ "{:,.2f}".format(record.refund) }}
- - - - - - - - - - - - {% for record in records %} - - - - - - - - - - {% endfor %} - -
YearMAT Tax CreditSurchargeCessTotal CreditActions
AY {{ record.year }}-{{ record.year+1 }}{{ "{:,.2f}".format(record.gross_total_income) }}{{ "{:,.2f}".format(record.net_taxable_income) }}{{ "{:,.2f}".format(record.total_tax_payable) }}{{ "{:,.2f}".format(record.refund) }} - Edit - -
- -
-
-
- - {% else %} -

No ITAT records found. Click the button above to add one!

- {% endif %} + + Edit +
+ +
+ + + {% endfor %} + +
+ + {% else %} +

No ITAT records found. Click the button above to add one!

+ {% endif %} +
{% endblock %} \ No newline at end of file diff --git a/templates/display_itr.html b/templates/display_itr.html index 9d635e2..9a8e774 100644 --- a/templates/display_itr.html +++ b/templates/display_itr.html @@ -1,14 +1,12 @@ {% extends "base.html" %} - {% block title %}ITR Records{% endblock %} -{% block content %} - +{% block extra_css %} +{% endblock %} - +{% block content %}
-

Income Tax Return Records 🧾

βž• Add New Record diff --git a/templates/itat_reports.html b/templates/itat_reports.html index 4b3614d..d4d7776 100644 --- a/templates/itat_reports.html +++ b/templates/itat_reports.html @@ -7,25 +7,18 @@ {% endblock %} {% block content %} -
-
- -

Download ITAT Report

-
- -
- -
- - -
-
+
+

Download ITAT Report

+
+
+ +
+ +
- - {% endblock %} \ No newline at end of file diff --git a/templates/itr_reports.html b/templates/itr_reports.html index 36675a5..0698681 100644 --- a/templates/itr_reports.html +++ b/templates/itr_reports.html @@ -7,27 +7,18 @@ {% endblock %} {% block content %} -
-
- -

Download ITR Report

-
- -
- - -
- - -
-
+
+

Download ITR Report

+
+
+ +
+ +
- {% endblock %} \ No newline at end of file diff --git a/templates/mat_credit.html b/templates/mat_credit.html index 6e8ac91..92b0e9f 100644 --- a/templates/mat_credit.html +++ b/templates/mat_credit.html @@ -9,7 +9,7 @@ {% block content %}
- +

MAT Credit and Utilization Records

- - {% for year in years %} - - {% endfor %} - +
+ + - -
+ + -
- {% endblock %} \ No newline at end of file diff --git a/templates/update_ao.html b/templates/update_ao.html index 35895da..9229ffa 100644 --- a/templates/update_ao.html +++ b/templates/update_ao.html @@ -8,11 +8,8 @@ {% block content %}
-

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

-
-
@@ -57,7 +54,6 @@
-
-
@@ -95,36 +90,32 @@
- -
-
- - -
- +
-
- - + +
-
- +
+ + +
- +
@@ -154,7 +145,6 @@
-
@@ -167,7 +157,6 @@
-
diff --git a/templates/update_cit.html b/templates/update_cit.html index 961ad6b..2495d77 100644 --- a/templates/update_cit.html +++ b/templates/update_cit.html @@ -9,25 +9,171 @@ {% block content %}
-

Update CIT Record for AY {{ record.year }}

- +
+
+ + +
+
- - +
+
+ + +
+
+ + +
+
+ + +
+
- {% 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_itat.html b/templates/update_itat.html index 12a6d73..bd874fe 100644 --- a/templates/update_itat.html +++ b/templates/update_itat.html @@ -7,25 +7,169 @@ {% block content %}
-

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

-
+
+
+ + +
+
- - +
+
+ + +
+
+ + +
+
+ + +
+
- {% 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 1e2309c..ff4ebf6 100644 --- a/templates/update_itr.html +++ b/templates/update_itr.html @@ -8,11 +8,8 @@ {% block content %}
-

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

-
-
@@ -56,8 +53,6 @@
- -
@@ -97,20 +92,14 @@
- -
-
- - -
- +
- - + +
@@ -120,10 +109,15 @@
+
+ + +
- +
@@ -153,7 +147,6 @@
-
@@ -177,10 +170,9 @@
- -
+ {% endblock %} {% block extra_js %} diff --git a/templates/upload.html b/templates/upload.html index 665e482..19c2c93 100644 --- a/templates/upload.html +++ b/templates/upload.html @@ -7,33 +7,24 @@ {% endblock %} {% block content %} -
-
+
+

Upload Income Tax Documents

+
+ + + + + + + -

Upload Income Tax Documents

- - - - - - - - - - - - - - - -
- -
+ +
{% endblock %} diff --git a/templates/view_docs.html b/templates/view_docs.html index 54b0f66..2e04993 100644 --- a/templates/view_docs.html +++ b/templates/view_docs.html @@ -1,83 +1,66 @@ {% extends "base.html" %} - {% block title %}Document Records{% endblock %} - {% block extra_css %} {% endblock %} - {% block content %} -
-
+
+

Document Records

+ +
+ + -

Document Records

- - - - + + {% set stages = ['ITR','AO','CIT','ITAT'] %} + {% for stage in stages %} + + {% endfor %} + + +
+ + +
+ + + + + + + + + + + + + + + {% for doc in documents %} + + + + + + + + + + + {% endfor %} - - - - - - - - - - - -
-
FileTypeStageYearUploaded AtDownloadView
{{ doc.filename }}{{ doc.filetype }}{{ doc.stage }}AY {{ doc.year }}-{{ doc.year +1 }}{{ doc.uploaded_at }} Download + View
- - - - - - - - - - - - - - {% for doc in documents %} - - - - - - - - - - - - {% endfor %} - -
FileTypeStageYearUploaded AtDownloadView
{{ doc.filename }}{{ doc.filetype }}{{ doc.stage }}AY {{ doc.year }}-{{ doc.year +1 }}{{ doc.uploaded_at }} Download/a> - View
-
- + +
- {% endblock %} \ No newline at end of file