From 3cffd3fa82f1ce1dbe1c2784fd6262f399e4aefa Mon Sep 17 00:00:00 2001
From: sandy <sandy@kaur-sandeep>
Date: Thu, 27 Mar 2014 19:18:39 +0530
Subject: [PATCH 1/4] April issue resolved

---
 tcc/models.py  |   1 +
 tcc/models.pyc | Bin 42495 -> 43490 bytes
 tcc/views.py   | 146 ++++++++++++++++++++++++++++---------------------
 tcc/views.pyc  | Bin 63092 -> 63852 bytes
 4 files changed, 85 insertions(+), 62 deletions(-)

diff --git a/tcc/models.py b/tcc/models.py
index 8db4f34..caa3149 100644
--- a/tcc/models.py
+++ b/tcc/models.py
@@ -618,6 +618,7 @@ class Bill(models.Model):
 	
 	""" 
 	job_no = models.IntegerField(editable =False)
+	date = models.DateField(auto_now_add=True)
 	education_tax = models.IntegerField(blank=True,null=True)
 	higher_education_tax = models.IntegerField(blank=True,null=True)
 	service_tax = models.IntegerField(blank=True,null=True)
diff --git a/tcc/models.pyc b/tcc/models.pyc
index 9e9adde51ba031b6fab626e2c8f1ae772571258f..e3287bb4972efe743ac08f8a2af8037fb5428ce7 100644
GIT binary patch
delta 2667
zcmZ{me@v8h9LJyMIS%fJ{D?dBfCx^FqXY4P85e}plgyy>kV1E32zJ1Lqa;K$EObzj
zXG8cbMP)Ypu@=oO`nI*EC976!W<l8>Et?Ad!9Ug#VxrUfd}!nOexKX@anB#G@9Xpa
ze1AO8?fdU#W%3s#N;ea2+UszQM9muIXJEvVr(|ctgu?<)o7#9_WizJV6qO8Zva$G>
zfUJ@Uhn0=SHgXP;KzuRhU=_?+o)?R{t#5Nha)S-L%gRJ$YT1XHl<~xOMdf7DDlUZ@
z#iR_2%Dt2vO-f7Z22q(yb!(K}c3~eZ;9S06sDbI_pQ?Zw-&nC$1+)p(D~C0y-t=lg
zfjj9Vi-1iyKGFE!KcVp(oJSXZJTEI-pSgppAu^e@N<+%BOF2SQom{<1j0w0r8f7*|
zqr92x6L*?Dw#Ld8QSaSPHgkkJIo$nXr~B>=oI=OmT~H`0a^W_y6PzmgSX6>**9$3$
zU|ClnD!uET5)^zhJeo#9PrgPm6srnrDQ@J3X*KqZN5m#G8xIIdk2u`)Tpl+}i@jB%
zHdr{on$kW|VeS{AIfB~??`$3ta~ro5aSG+$_G)q)%T90#O}?c3bulIK#Q}|S>!l`9
z>8sG5R?>D&qhs4MxfGg<!KW&$#mB#(G`zG@9bVW1sC<@7psA)+)rj->rpm!7l;Wz^
zq@1sQnNujGVyF1^u)90?PlHmL{9+1B`?F*d<P;{rrGZFr)tWk^B)=ln8l)~s_8FyG
zozxg1`E^A65&v_=X9~m3Vfd0TJUWzjVq?V@6FRWKW5e*cF#M4)JYL#bo}rf{sr3zf
zn2b(mnx`QUNOL+Ny{<hj4dK>gdOV7c3=7D)HW;moHJgd8q{kW<ulq<iG`LW2G}>@1
zGAdGzXP4^@-1*?<D+d&~)R!;R=r5qZ4~{p?s+iPZ7`2;~H@Ue#3;bI27crt2M(b1A
z-_1X8E%B8wGX<B3KS`3o-kb!lmd8T=t`4;s1$>FaXW0BMyC(Q+<e#&e)*u&3{uuHx
zme*$II8Ivr9Zv4qtVUyh`8v4Ti&R9_SFrjj`>ef^t0w*<@+r1$-{Tyo)Va{qd!ea6
zVfA0^T1SRX>^6@4AuH`n)}$uGSAA|#y@sllWgYD0R9u6yS_g3{8Ialais=7=ek$DP
zx+&tDi1V1?t#38EIfcBCS$ax1PV1|HvxmH5#BEf!u)?5t@36r1;U)5G@XulKW}*KR
z^?KIxUN4tSJ9-EC9#(ZEky{XT><?Z0T~vdtsK1R<DPkV^Q8o_=9H)rk(1-`9o?%zt
z-^-~K@euiWfMch{HA=E1eZlq*6mU8ve+Lhai+^K!1=Wk}?1`nEN-x*XAP;)f)RsY;
zJjM<UHi?>Yoz5>2?yoSyj#CF!pC%W9(Z4ds2iRlrT1c~)hSnkR=Ak#EI?24JM>&;l
OkY(pO<OH~KF84n}FbOUI

delta 2082
zcmZvdeN2^Q7{=fCJ-kCXgBDSI4f7Zt7$4<<&4YX&iC{!Ws3DG>0WqTjJsl$w8JUUW
z5RR|zfHY}%rZhfs$kViiZQ5+MTpx^9tCfKM!5@@uN)6Z4p7(Sf-fM6D$8%r5>$;!&
zJ`a1Z&nfq>D#51Pp&>3u=-J?v^>Pkb;?l_;ayanUQehY~nSW9OM{iL$OA6Z~gSzlQ
zgHSd2-S8)c%3-oblmdGpq61hOX$+#i$Z`OZqdr9U#+bK3yd9G&+*-6dZXCqA4K{Qx
zK3V{xdt(NQE0*Sfm@pPj=Qr)wQEGW?I&ji@w8ZD?+VtjeOj)(o>KgeH&gv&NoOl9J
zZxW)m<Uv3mOsNs5w!cqPQ}Jkf;%RZz?(@}_Vz9bw+fn>24aI}$Rj@5)-5McSt<4ep
zUUAfN^R~SMxv`lALgcLfXPV5)0>GAC3EA{R?gWTe^BhKZl>^=Lj%`Muz5s#c0=p6L
z6b1mcRJdD+-Xb6LZ7M#b3*qD_@qqYuNxBflNNuIqQ+}r30I&sTD3<JHCn0cCc@B!&
zQ~u~#3`~3OxB#>b$5ga}`&z|&C|<5?1o6PG|Excx3Zr|gl7(9gv(AM;w`=Xy2*6s6
zz(jSCNYE~qU;8}tU#?9MqHx#N1>Ee%x_v^_oP)dJWwZPj@bUT|&P+Y@rTiCDn8mHg
zbm%27&AhUeN?#t;J5zSUdV0$fOLYw^Q02Q--c;yPyIn7;Gm<2=P|6-7*!6#4JNs*I
zhIp}jCiMb$_pmoS%P@;PP3K=d11&z|kdJ-bWI^ZWym*eqzkXCWwYV>N@d~@Q-vUK#
zdiiH^A8-aD`MTt5WNyuY7GHDY92;tNfl>X27q7GJZJVL!Py5r5cE^zREjQj|^9K`6
z(BeB@yvueTjy0ym(8cx)0Ds}&L#*gXuK@XlmB&rwiAyABha1RWIk|z%-bJV_@>&|p
z>b#80y1|Q?%z3l~ivCF|XsNpl+`n_s$vS%0zAW~TFv{*T%loLf556GkO%B$x8-2Zy
zsNUkmW_F39#mxiHR_-^9xXQsUHZ{-;pn8WF2iR*v4@1#^$uWcbE(d+A=2#1W>OEeZ
zB<uS=m`0K%=@S-tA`?J=;ukbB4F4~x!oeA~<AX;8$X6aZYm%fUg~v*AVld5CM$sQz
zR2q(t);m!CNRWJm6^=B5kw32cCr{~+8pPATXSaO3&A*>@v6dxz>NI?UR5J$`S@P&b
O0Va%f$`Ld*mi7<!g{LzB

diff --git a/tcc/views.py b/tcc/views.py
index 26e9e37..1a8df88 100644
--- a/tcc/views.py
+++ b/tcc/views.py
@@ -425,15 +425,17 @@ def selectfield(request):
 		user = request.user
 		jobno = request.GET.get('job','')
 		if jobno =='':
-			id = Bill.objects.aggregate(Max('job_no'))
-			maxid =id['job_no__max']
-			if maxid== None :
-				maxid = 1
+			id = Bill.objects.aggregate(Max('id'))
+			maxid =id['id__max']
+			get_last_jobno = Bill.objects.get(id = maxid)
+			last_jobno = get_last_jobno.job_no
+			if last_jobno== None :
+				last_jobno = 1
 			else:
-				maxid = maxid + 1
+				last_jobno = last_jobno + 1
 		else:
-			maxid = jobno
-		m = Clientadd(client = client,user=user,job_no=maxid)
+			last_jobno = jobno
+		m = Clientadd(client = client,user=user,job_no=last_jobno)
 		m.save()
 		client = Clientadd.objects.aggregate(Max('id'))
 		client =client['id__max']
@@ -926,19 +928,21 @@ def job_ok(request):
 	tds amount etc.
 	"""
 	material =request.GET.get('id', '')
-	id = Job.objects.aggregate(Max('job_no'))
-	maxid =id['job_no__max']
-	job_no = maxid
+	id = Job.objects.aggregate(Max('id'))
+	maxid =id['id__max']
+	last_job_no = Job.objects.get(id=maxid)
+	get_job_no = last_job_no.job_no
+	date = last_job_no.date
 	value =Job.objects.values_list('testtotal__unit_price',flat=True)\
-	.filter(job_no=maxid)
+	.filter(job_no=get_job_no).filter(date=date)
 	price = sum(value)
 	from ofau.tcc.variable import *
 	try:
 		trans_value = Job.objects.values_list('suspence__rate',flat=\
-		True).filter(job_no=maxid)
+		True).filter(job_no=get_job_no).filter(date=date)
 		trans_total = sum(trans_value)
 		discount_value = Job.objects.values_list('discount',flat=True)\
-		.filter(job_no=maxid)
+		.filter(job_no=get_job_no).filter(date=date)
 		discount_total = sum(discount_value)
 		trans_net_total = price + trans_total - discount_total
 		service_tax= round(servicetax *  trans_net_total)
@@ -948,17 +952,17 @@ def job_ok(request):
 		net_total =  trans_net_total + higher_education_tax +\
 		education_tax + service_tax
 		bal = Job.objects.values_list('tds',flat=True).\
-		filter(job_no=maxid)
+		filter(job_no=get_job_no).filter(date=date)
 		tdstotal = sum(bal)
 		balance = net_total - tdstotal
-		m = Bill(job_no = job_no, price = price, service_tax=service_tax, 
+		m = Bill(job_no = get_job_no, price = price, service_tax=service_tax, 
 		higher_education_tax = higher_education_tax, education_tax = 
-		education_tax, net_total = net_total, balance = 
+		education_tax, net_total = net_total, date = date, balance = 
 		balance,trans_total=trans_total,trans_net_total=trans_net_total,
 		discount_total=discount_total)
 	except Exception:
 		discount_value = Job.objects.values_list('discount',flat=True).\
-		filter(job_no=maxid)
+		filter(job_no=get_job_no).filter(date=date)
 		discount_total = sum(discount_value)
 		trans_net_total = price - discount_total
 		service_tax= round(servicetax *  trans_net_total)
@@ -968,16 +972,17 @@ def job_ok(request):
 		net_total =  trans_net_total + higher_education_tax +\
 		education_tax + service_tax
 		bal = Job.objects.values_list('tds',flat=True).\
-		filter(job_no=maxid)
+		filter(job_no=get_job_no).filter(date=date)
 		tdstotal = sum(bal)
 		balance = net_total - tdstotal
-		m = Bill(job_no = job_no, price = price, service_tax=service_tax, 
+		m = Bill(job_no = get_job_no, price = price, service_tax=service_tax, 
 		higher_education_tax = higher_education_tax, education_tax = 
-		education_tax, net_total = net_total, balance = balance, 
+		education_tax, net_total = net_total,  date = date,balance = balance, 
 		discount_total=discount_total,trans_net_total=trans_net_total,)
 	m.save()
-	amt = Job.objects.filter(job_no=maxid).values('amount__report_type')
-	temp = {"maxid":maxid,'amt':amt}
+	amt = Job.objects.filter(job_no=get_job_no).values('amount__report_type').\
+	filter(date=date)
+	temp = {"maxid":get_job_no,'amt':amt}
 	if request.user.is_staff == 1 and request.user.is_active == 1 and \
 	request.user.is_superuser == 1 :
 		return HttpResponseRedirect('job_ok_show')
@@ -987,22 +992,27 @@ def job_ok(request):
 @stop_caching
 def job_ok_show(request):
 	material =request.GET.get('id', '')
-	id = Job.objects.aggregate(Max('job_no'))
-	maxid =id['job_no__max']
-	job_no = maxid
-	amt = Job.objects.filter(job_no=maxid).values('amount__report_type')
-	temp = {"maxid":maxid,'amt':amt}
+	id = Job.objects.aggregate(Max('id'))
+	maxid =id['id__max']
+	job = Job.objects.get(id=maxid)
+	last_job_no = job.job_no
+	date=job.date
+	amt = Job.objects.filter(job_no=last_job_no).filter(date=date).\
+	values('amount__report_type')
+	temp = {"maxid":last_job_no,'amt':amt}
 	return render_to_response('tcc/job_ok.html',dict(temp.items() + 
 		tmp.items()), context_instance=RequestContext(request))
 
 @stop_caching
 def client_job_ok_show(request):
-	material =request.GET.get('id', '')
-	id = Job.objects.aggregate(Max('job_no'))
-	maxid =id['job_no__max']
-	job_no = maxid
-	amt = Job.objects.filter(job_no=maxid).values('amount__report_type')
-	temp = {"maxid":maxid,'amt':amt}
+	id = Job.objects.aggregate(Max('id'))
+	maxid =id['id__max']
+	job = Job.objects.get(id=maxid)
+	last_job_no = job.job_no
+	date=job.date
+	amt = Job.objects.filter(job_no=last_job_no).filter(date=date).\
+	values('amount__report_type')
+	temp = {"maxid":last_job_no,'amt':amt}
 	return render_to_response('tcc/client_job_ok.html', dict(temp.items() + 
 		tmp.items()), context_instance=RequestContext(request))
 
@@ -1048,17 +1058,17 @@ def bill(request):
 	jobid = job.id
 	job_no = job.job_no
 	job_date =job.date
-	getjob = Job.objects.all().filter(job_no=job_no).values(
-	'clientjob__material__name','date','testtotal__unit_price','site',
+	getjob = Job.objects.all().filter(job_no=job_no).filter(date=job_date).\
+	values(	'clientjob__material__name','date','testtotal__unit_price','site',
 	'suspencejob__field__name','report_type', 'clientjob__other_test',
 	'clientjob__material__matcomment_id','suspencejob__field__matcomment_id',
 	'sample','letter_no','letter_date', 'suspencejob__other',
 	'clientjob__material__id','suspencejob__field__id',
 	'suspencejob__other_test',).distinct()
-	testname = Job.objects.all().filter(job_no=job_no).values(
+	testname = Job.objects.all().filter(job_no=job_no).filter(date=job_date).values(
 	'clientjob__test__name','clientjob__test__material',
 	'suspencejob__test__material','suspencejob__test__name' ).distinct()
-	gettest = Job.objects.all().filter(job_no=job_no).values(
+	gettest = Job.objects.all().filter(job_no=job_no).filter(date=job_date).values(
 	'clientjob__material__test__name','clientjob__material__id',
 	'clientjob__material__test__name')
 	getadd = Job.objects.all().filter(id = jobid).values(
@@ -1067,7 +1077,9 @@ def bill(request):
 	'client__client__city', 'client__client__company',
 	'client__client__state','site',).distinct()
 	from ofau.tcc.variable import *
-	bill = Bill.objects.get(job_no=job_no)
+	get_bill_id = Bill.objects.filter(job_no=job_no).filter(date=job_date).\
+	values('id')
+	bill = Bill.objects.get(id=get_bill_id)
 	matcomment= MatComment.objects.all()
 	servicetaxprint = servicetaxprint
 	educationtaxprint = educationtaxprint
@@ -1103,17 +1115,17 @@ def suspence_bill(request):
 	jobid = job.id
 	job_no = job.job_no
 	job_date =job.date
-	getjob = Job.objects.all().filter(job_no=job_no).values(
-	'clientjob__material__name','date','testtotal__unit_price','site',
-	'suspencejob__field__name','report_type', 
-	'clientjob__material__matcomment_id','suspencejob__field__matcomment_id',
-	'sample','letter_no','letter_date', 'suspencejob__other',
-	'clientjob__material__id','suspencejob__field__id').distinct()
-	testname = Job.objects.all().filter(job_no=job_no).values(
-	'clientjob__test__name','clientjob__test__material',
+	getjob = Job.objects.all().filter(job_no=job_no).filter(date=job_date).\
+	values('clientjob__material__name','date','testtotal__unit_price','site',
+	'suspencejob__field__name','report_type', 'clientjob__material__matcomment_id',
+	'suspencejob__field__matcomment_id','sample','letter_no','letter_date', 
+	'suspencejob__other','clientjob__material__id',
+	'suspencejob__field__id').distinct()
+	testname = Job.objects.all().filter(job_no=job_no).filter(date=job_date).\
+	values('clientjob__test__name','clientjob__test__material',
 	'suspencejob__test__material','suspencejob__test__name' ).distinct()
-	gettest = Job.objects.all().filter(job_no=job_no).values(
-	'clientjob__material__test__name','clientjob__material__id',
+	gettest = Job.objects.all().filter(job_no=job_no).filter(date=job_date).\
+	values('clientjob__material__test__name','clientjob__material__id',
 	'clientjob__material__test__name')
 	getadd = Job.objects.all().filter(id = jobid).values(
 	'client__client__first_name', 'client__client__middle_name', 
@@ -1121,7 +1133,9 @@ def suspence_bill(request):
 	'client__client__city', 'client__client__company',
 	'client__client__state','site',).distinct()
 	from ofau.tcc.variable import *
-	bill = Bill.objects.get(job_no=job_no)
+	get_bill_id = Bill.objects.filter(job_no=job_no).filter(date=job_date).\
+	values('id')
+	bill = Bill.objects.get(id=get_bill_id)
 	matcomment= MatComment.objects.all()
 	servicetaxprint = servicetaxprint
 	educationtaxprint = educationtaxprint
@@ -1166,11 +1180,13 @@ def receipt_report(request):
 	'client__client__first_name', 'client__client__middle_name', 
 	'client__client__last_name','client__client__address', 
 	'client__client__city','client__client__company')
-	mate = Job.objects.all().filter(job_no=job_no).values(
-	'clientjob__material__name','suspencejob__field__name',
+	mate = Job.objects.all().filter(job_no=job_no).filter(date=job_date).\
+	values('clientjob__material__name','suspencejob__field__name',
 	'report_type','date','clientjob__material__matcomment_id',
 	'suspencejob__field__matcomment_id').distinct()
-	bill = Bill.objects.get(job_no=job_no)
+	get_bill_id = Bill.objects.filter(job_no=job_no).filter(date=job_date).\
+	values('id')
+	bill = Bill.objects.get(id=get_bill_id)
 	matcomment= MatComment.objects.all()
 	balance = bill.balance
 	net_total_eng = num2eng(balance)
@@ -1197,7 +1213,10 @@ def additional(request):
 		maxid =id['id__max']
 		job = Job.objects.get(id = maxid)
 	job_no = job.job_no
-	bill = Bill.objects.get(job_no=job_no)
+	job_date = job.date
+	get_bill_id = Bill.objects.filter(job_no=job_no).filter(date=job_date).\
+	values('id')
+	bill = Bill.objects.get(id=get_bill_id)
 	template = {'job':job,'job_no': job_no ,'bill':bill,'servicetaxprint' : servicetaxprint,
 	'highereducationtaxprint' : highereducationtaxprint,'educationtaxprint'
 	:educationtaxprint,}
@@ -1222,8 +1241,8 @@ def s_report(request):
 	jobid = job.id
 	job_no = job.job_no
 	job_date = job.date
-	getjob = Job.objects.all().filter(job_no=job_no).values(
-	'clientjob__material__name','testtotal__unit_price','site',
+	getjob = Job.objects.all().filter(job_no=job_no).filter(date=job_date).\
+	values('clientjob__material__name','testtotal__unit_price','site',
 	'suspencejob__field__name','report_type','sample','pay',
 	'check_number','check_dd_date','clientjob__material__matcomment_id',
 	'suspencejob__field__matcomment_id').distinct()
@@ -1233,8 +1252,11 @@ def s_report(request):
 	'client__client__city', 'client__client__state','site','letter_no',
 	'letter_date','client__client__company').distinct()
 	from ofau.tcc.variable import *
-	bill = Bill.objects.get(job_no=job_no)
-	bal = Job.objects.values_list('tds',flat=True).filter(job_no=job_no)
+	get_bill_id = Bill.objects.filter(job_no=job_no).filter(date=job_date).\
+	values('id')
+	bill = Bill.objects.get(id=get_bill_id)
+	bal = Job.objects.values_list('tds',flat=True).filter(job_no=job_no).\
+	filter(date=job_date)
 	tdstotal = sum(bal)
 	net_total1 = bill.balance
 	from ofau.tcc.convert_function import *
@@ -1279,10 +1301,10 @@ def rep(request):
 	amount = Amount.objects.all().get(job_id =query)
 	user = Job.objects.all().get(id=query)
 	job = user.job_no
-	id = Job.objects.aggregate(Max('id'))
-	maxid =id['id__max']
-	jobid = Job.objects.get(id = maxid)
-	bill = Bill.objects.all().get(job_no=job)
+	job_date = user.date
+	get_bill_id = Bill.objects.filter(job_no=job).filter(date=job_date).\
+	values('id')
+	bill = Bill.objects.get(id=get_bill_id)
 	name = Job.objects.all().filter(id=query).values(\
 	'client__client__first_name', 'client__client__middle_name', 
 	'client__client__last_name','client__client__address',
@@ -1311,7 +1333,7 @@ def rep(request):
 	amount,'con_type':con_type, 'ratio1':ratio1, 'ratio2':ratio2, 
 	'collegeincome':collegeincome, 'admincharge' : admincharge, 'user'
 	:user, 'name':name, 'mate':mate, 'staff':staff,'bill':bill,'job':job,
-	'jobid':jobid}
+	'jobid':user}
 	return render_to_response('tcc/report.html', dict(template.items() + 
 	tmp.items()), context_instance = RequestContext(request))
 	
diff --git a/tcc/views.pyc b/tcc/views.pyc
index 4260a654fdd0ce144189c966d20f4d69070cccc7..5fda9b0e80a0858974d595a3d33f706d72002c22 100644
GIT binary patch
delta 10644
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
UyMKazl)u#9%U@wG`f||!0<6nRd;kCd

delta 9730
zcmd5>3wTsTmagh1ouu>V&inl&gaj}U5ac1qTX#Uv8wSI;5CeUYgd{-H2pJNCMuYNn
zEaMAB5P=bg_0c-ax}ylIjIy7rh`Kty5M5>XW__(Px-*XZ|K}#@fbmmzcE4{4{dZN}
zs#A4Oo%5el)qniV{rMl=k?#MD^X{1(_i*IAvg9bGR3tuA@M)T+m1<7YW_wJwxv8wA
zZIcQ{s9LRRJt`Qf0{v9G=Kt1ys->R_M5v6`2-Omy0&!}oOEs=l0gpn<3L}jkm4-@#
zN42=w8jMzfNY$cMAWF5kC=4UpmAe%kJgU}<veM`jo=&%Q&!=TvH0IN)#;HWAQLT|G
z7^4DS6^vCak*YS1B7*T<g)}TQ5Tk-V)uKd>OIKXhFi`ai`qfgeYMiL?kK<!G=Iox8
zc&7?iNqp$lp<}hj2jy6PlTe<dXP5!y<8^{5IGJwNl&729%SY)b^FsN+2<T4LoBTtU
zn&bKX`Zw8i_M+h88oMsA6;GOm;Hipr>uepZQ*^9O*WS<_!*}%4H<)qf)#z8uuJcCg
z^`W=V%h721%jg+;i@9h_f4#xfjTxmkn|B|b9pixrNA6Rhug47X=uM_%;zxNmqS=~B
zxQDQvu!C?fVW%mWH9LO;ifJwkk3~UY4T)WURv9~OH1|!iQf_B)GXT4;)QXjMW3#oz
z#7y3uBZ4pF<L!iA(or>fQpyimL<AQx(afFFpl>tJOqrNsDC-u&Ai_<APLnzH!STC#
z8n>{NKv+Y#n!qJmve-LVqF8G_;WomZ#xw1D*Ec$}X__7B*~X?#=F6E6Wq$Wdm_rwj
zD*YZcQcj5QC>1L2(q^hINssK-;4QO;$Mk5>+GUQ;dd2?kDZ}DWD#6ZlZDA3s(X9UX
z^*o66TwWwfXr_eOgoT9Rggpe>q4i7i_9cVHht+=_8++{mtBr*F38MHEmR1q=5*{!s
zO0y%aU$MN;EV*=0nQYkr*2BAX=0=HCEne1GKf>Bzp1L$AQ}$MtE8BV}2R}%7$o%Qj
z2ecj9X}Kcwqh|MI!*!>5{W4qcGZ$2j8cn+fQz$jZZVJv>7ObwbMsnD%3Hu2L0YSRU
zr21tm8-m?y-d8yl;y$Y!ocCMydV=sI;Q*nNa4n(3oImeM{eI}ad4F*0-<i$x(=lw%
z{LUEZLgCi6SWls;SumvhX;wwc*RVuF4Y~nME9<Ri*uv#n&k<ym_n5;AYKo4qE|MI5
zqFR#9wt)mu^oypVYEb{9tUpS4iNF;E`w^O#+t%;d^oH49m6!4+i?0(p2!{yANE<#c
zidWhVRgL!YWsSj%(C{nPxc&cz#u|Lcr|9{bd16s<kxU~p9Kn1da?gJ6(m-z8TYM_7
zCBwwj-(j0{KF*R@&bus$J)U6cJ;M70QGuxBEIp+0X)isnI*9P^gbxVG${Y?1880)-
zd>^tkyy^y4PZIt>_%7vCB!m@HwJf;AZv08e*yp<Si{{xSrTSxYeEA$Ry(V6-GC!>u
z<4c9C6nrM*(=^^~R*X&a+AdY=R<-?<Z7!dl)rQ#E)#71<L`1YB5q@-SlnS^R3fq-N
zG_<27{2`X28$xT8s`IKj%_DSpFydvOgCk`yg{s!5UXyv*zpaniqGdp|4Dd48wnVA4
z7OzTgjZrrKBYMWDWQvQGdR$LEPU`VJbt$#PV{{xou?X<KUJF1h^|bZ%x_()JUlx#{
zS`d*FFnOY~eWDYj5?BKCfQe&O0Fxjdqf?v;_}M#vF^MXW$aM#jxR^k)!us2lw>3#!
z*5J|oY$v8a;%Y-s535jA@`E(;zom_~@Z?m-|D85O1CBP@RW$U_pjBl{Qk$wxU>ek|
zgkDxx3mvA&9we(87fmscsz$XWt3VoZsT8J3wMnWL^>j(+hPu02Qohxa8g8-ER3L*=
zD_F{mkzycARg`3#s`}I2sngtsT;w=y4I?~45l78$8ZPkMK-XMvzHX@0$IRSi<vQI=
zdOY21U*^peQYDo-%=$J<#|bCQzb;!eft*=FZ**uvcqSZse0)H1vq+xE@c@n04NX;7
zRoAVwtv{R1%hSev&F6n1d`b8(!dC=Y)m<nBIe#$F6qE?Fp3j6@kAW2yv~_~xn@BS%
zCWYCY_UJ6+Rk0|!wNG+9ryj5U`15G5E3v0XI_j~=z~b=NJ*w|si8=`qb9J&VLVvGo
z5$QS-sib0fn}Sc%HU%QeHI>tI$v#1ckKj(-bW;m{L8=Y^j_BTa4>lg;#3UN2J&YuZ
z0ktO&hsvCUT$1Q$Nw9m8=n^j`on?u-FGSH2b^BS0`72T4|1tBs#vC2jy`g5!7tv<s
z$xO4f$eYsFc2TJn!>w;1;0<b)@|3GvvwZ(V-Tm(W?_WJ`b#A1Uh!-gNkqXGL6!!On
zJ`@moZe^D14E=t*>Rz}F1Jnnr6ZEI%%hd%Eps0QcP$ymH>uY!DSaZp%8Rp~W@n-bT
zN0?PVuWrNX3%0@2mu3j?%b80KV2A*q-Bu8BylMpz`xF=+gbPw>^{YU>3KXciMC4td
z;ch;!K|k1%8zz;Y0)_Yjareg;n7asHAoBtE0v#6P3x~3Zf%x{Djy0t*p!+h|AVNX1
zDQ{062eC;i;KD&K8BMY-EOsc5n_MhNDn-?TkA?|DJ?65(MCA(1(~@YSTgo)C$ozfF
z3uahrp1%s3u)ZKL$qS~NVOOVl8mjAUoHACmF7@2YM>|6&Tc^47R#UdNLBD41Ub{Z?
zINRGfgr<IRb#ThE`g$8_<PB!hHD#V7eB6lyI7g?Nch{wvz1R5X6=UD5B0>paAYlMu
zD|?r+lusxm6cG9o@(3lIDgsblAFK%o?Vwa&y}BlV6b`42=@b%$tgmS?3d-x&`5+FG
zP6jB4e_5cDXdx93$R`UWl8r~6c<{}-*ZlU{;bJ26STT_kXPQW&d9{6jiM(!vnSR~h
zU?#aLkoP@ik`EJrnH1m)W<sNZnb2rpCNvtF39ZI&etNx_$&l|ilXJdhCS_tK4~m%#
z?J|?suBVy2c72f<+>tpqn)*M}PAo6mB&m#LDURTn3e;xBv+5)G2?>NGLNXzRkZRU-
z434Y$2LEUb%EB4>p^nsS#}*{Fm(3S*5hE$q=F^Tem|xDi*3!Y0ah&65gVqpMB`BT4
zQW@ba6HK2wl&wO<f2$!{!zikpAjb!@^M-_p7t;0?Vl~Rux9!ow7|_1k@&>01eaAxv
z!j}`det}t<^UXamIi~W)P#f3)85=AB1sI29f$g{(l8YVWy1d)LWfT|zvC3ft#3o-a
z`a*h(8zjF1tp$-aN;U#ctHH$+f}9@)1<?ukLP$)+7jo<*e8Jk1)u?Rdped+g5y*_d
zf<dHAX(|X-iZgGnf5P0<kvmzGEM^n76EUE$v9#g+9M2xak}!bmy6jD<`D#NTRW>=i
zzw6ntOq=S}**YGil3ptF$hOKTktBk{gd&6T%=kT(rfgIEY^X#v4Tm5V)z>CDTjY=e
z^AjJ)Ayy~o;<F>GFvDlcY}vH74d)c-8wVU@5M3%q5`iNGRK_Git^vDq2^)%wQloID
zzy^)NxdPkC1jEK=BF-RAU^9JSa)~)okOTwA4s2F9!HB~vGz9@(b8z#`DWW=gYhh3!
z&q7nbrNF}wYaKV~8;2x_DtkQ_RWjQ!r`Gu*MVVWbnXsqAG~X0IW*b$NjnT@>bgeg=
zrszB!31%&H(hZK}otY@bdnR2*n_GWT(gyxQXhi6Pu^@OMe-<->3Bh*Sy<zi3UX4__
zE*|02vDw~n7>6|E->`1T%2Y_8p%NY&q063F?Nv4oK?u}H<zmFrlT<6c#u1zh!HAHt
z@;pw}AeK9EnNczun}u!2!M-3*&&3x8<)INSKr+UDl8mvRBxAS-$rwIEGR7Ln#ds}5
zaHIuxh6)T+b|$lgTJzb>NeLy&&gs2_r6$#w5#l91@wXSR3Y*>oty<d&I|z>Zn2jAd
zSLBj>cCt~(HV4%+$P^FW;nP<LvgZ;;9mC+*u*Zo5g?ZM)r^RN$Ep=ngV%euDiwVCa
zXAN<!FyDU5u(oW>DC>)J!y%t12utR30zKSxjycd7>)B7+n{1ADre!#(e{@&Gb{NzP
z*DMM}-s;oH?$U0%x+}*!bzAJ96C6nbRguvW{Zo(ybfv{9Xzj7n2TcC$&2>2V;##5>
zmIc3b(<*2<a@`JZ&cO9~R}aSyaif3~3pWZ#_b`m<p>Qn*IH@88ITD>musc{LgeqMd
zXWnTpjA@TitzOkU9j<OB-JW(nY!tF!>mX#gWMCPYq+BqtoG6dtafYu@{g6}gUVazv
z<&h3TK${}~DPNBOlzRlA+%15IUs!o~-B=u4g@HpegT*~Uyu3XMpc<!)0xoXS6w=QC
z%-^Nz(&0fFylkMNl2ls_WWc2nB4F$c5q6eD2s_(3J410eJM$!+jxWTk419?LOD>#+
z0XgD&Hc}$E9^DJB#{fgu!y@T=AP~A99FeXEm+f}FQg|Ek;5@pYov(0IuPxxN*o9pM
zVb5Y^_c#A|=Zmp}XxuYsc0Oe`brhW2mxnQE$<1h8^};ITm*P3S%-fvWTHrrPA#!o{
z9!u|=th;iqIMb<`NQ}Wni-tP4ie*cJ^>xmXr-(z26Uqrvm1{ydug_-N5dtmNNm<fZ
zN;e0$B+Zpe#Wk$Ujp1m%(z~oO@wNV$un!>Faz(Iu@nYv{v~N#E=dSf5R|hqsK9I1B
zAOUp@<!7=gL1q9;a(orvmN%All=6W@-&U5!a@aURSW}XrF&NJ=&)*%H`x$)|iJwFm
z=0*JL_S&q_XLnC^dv2wyYk80`^LAupPN2XG2vvL#Ud%+ZaYwB#4*hAz3^#I+bn~-a
zv-MQ7ch`k_vf1}=y7BJz=?hHe?!uU7I8su?TSabQcQKx9*nL~pbO@HKkm|a+s%p6w
zZ?Z1pY*Vr5#d=2QzCGu-^aS(L{WCqHp+jcdleuQ{-V}Y%RPLSP*-P0Em>qiumO9T_
zA4-@*kmdi30xu`bm#5~_z4P_T(Ci1c>&OLco}$f))0Q__9jLCls>WW`8M5|mcIU}p
zdE<2U$|7U~c#ET~X=d2bk>=coM`wx*YF;cLP+e2k?Cj)4rsLsaT?KVa@%$Y}pKne-
zTreW657}VRcrHa20!lJi5|a?Q(&Yv7lSlfe&ZLNo39|^Z372Ry;aG91?0YpEz#7U?
zA>XQVmWd0+>w81lp~+hBGF6X`N}bFeV)qL<RXw4KsY!8+sBkHt*Fi~h%&^Cj^^2it
zk3FUJe&gByNQ#(XSiSo>cE0@fbO6OSLIuA$pvRx7ElVP9CwoeA%44r{0RAgW@_sV!
zF;=&loX2N)oJ3TN<prPDFOQ{TS07$5eD%2B^{0qX%s*Y|7Auu=@uE7ry0I!y9kd-U
zK4j{iEXR9qd$J4$^Zb+JwPS*Lo!-eJ^$;fwzt9T4dn2KV5G1T5TtyIrSjCboW{T+O
z*#oIMKJ?Ck?JhkowD!;_7p^__Ki%pPHSRKFpBa+6m_zz=rm)%v_auW@-p*(G>!l(s
z>#$eP3>6=~&IPB+D3W;=ari47PBwL{Zz|gyx-cI;dya>mWF0n{&n+AyM0SwftJwH7
zOW`C!I7>|6taqL6Ea>QS$z{So*K@F#pv>RFs?6$4MXBr9c7v?@$|HVV7g~K}y$9<~
z&Xnz@uQ+>769{`vMSb`;kvA#lb%MyI?>kqVcJ(6s^3mj^QsFEr%xw;fa%7k_x#liA
zsKMQcT&s*VpBx=I;vhSU_J#W;3W%b5=-Z)mVOG)6Tc+}*oF%gP7jv*Uu$aO5n8o=W
zQ#Llhr^gBM%g+gx!iyvC$s0A=!NwZ<D%%o&m$&U5;@)~`$ShGgl`ovww6bZr-LS~6
zUAE96cX`hZoO}tPh9JKweJ3#tFfGS!@e4Vu=dv8VoBWqk^23S@Z$W=b6#DJrj-4;(
z=$k_aUmhFt{kuBSEI1w=f2OUP7w6|9VNz<<vc{!Vi<VS3UfKQoAeR%Kxo7jO^;|<Q
z#jqM)>)|t%d*;qtq8l+(35I`0=U{|Me0Tf*bo<+W==MLyb+r?G1kUVOgM_`XyNT}z
zwFt@d<)Fej$0^{1!ogY0nd<A(Uf8lWQZ-^sz179jx_RM*cS?^jS)15VH1gvus5oUa
zM{gnAMBw#^b+ei9USXTq)i%~8DUp}Ho7H;=+)@dMLA!o=<Jn9i=6DzTg}LAkR>ON8
zwvOI*i3kbZ5X_p+spkCm2fF^l6SCj0bmvK+kr*SJAPI{^8woU>=FJax>M3UJ$;<VI
z(3>ZRX+6lqo%$EOJ@opiA^r42A<xIr8o%Z<@C80e(l49UpR8v6lljtG;j#V!EBt-v
zm!E#^@{8bc+@|q_PV?C3!}U0G^7DoIelz2XCVj*l_@W#wpMFso^BCXk*M$8h_w;Cg
zF^j$Lw03+n&m1@%r{6KppZ>CK9VOmPc!cm2;bp=p!bgP936T`@4NHopD1vOoaF#|8
z&LxZ_oJSZ>5NDgm(tN@dgjzy9;ef(hS<6{$CafV`N4Sx2C*fYgF2ZiYuL#tQb<nhZ
udHdiZw@#dZkB!gOzLCCi-#NZql&AS(d@=Y=^<9A0LSKe&u$lbTp#KJG{J@6*


From 2129e24f5f5c1d0a73d32b6fe3889ad39e8545c3 Mon Sep 17 00:00:00 2001
From: inderpreetsingh <singhs.ishwer@gmail.com>
Date: Tue, 1 Apr 2014 15:47:58 +0530
Subject: [PATCH 2/4] voucher number corrected

---
 tcc/views.py | 49 +++++++++++++++++++++++--------------------------
 1 file changed, 23 insertions(+), 26 deletions(-)

diff --git a/tcc/views.py b/tcc/views.py
index 1a8df88..7d8b07e 100644
--- a/tcc/views.py
+++ b/tcc/views.py
@@ -420,32 +420,28 @@ def selectfield(request):
 	added to same job_no and thus the job_no in clientadd remains
 	same.
 	"""
-	try : 
-		client =UserProfile.objects.get(id=request.GET['id'])
-		user = request.user
-		jobno = request.GET.get('job','')
-		if jobno =='':
-			id = Bill.objects.aggregate(Max('id'))
-			maxid =id['id__max']
-			get_last_jobno = Bill.objects.get(id = maxid)
-			last_jobno = get_last_jobno.job_no
-			if last_jobno== None :
-				last_jobno = 1
-			else:
-				last_jobno = last_jobno + 1
+	client =UserProfile.objects.get(id=request.GET['id'])
+	user = request.user
+	jobno = request.GET.get('job','')
+	if jobno =='':
+		id = Bill.objects.aggregate(Max('id'))
+		maxid =id['id__max']
+		get_last_jobno = Bill.objects.get(id = maxid)
+		last_jobno = get_last_jobno.job_no
+		if last_jobno== None :
+			last_jobno = 1
 		else:
-			last_jobno = jobno
-		m = Clientadd(client = client,user=user,job_no=last_jobno)
-		m.save()
-		client = Clientadd.objects.aggregate(Max('id'))
-		client =client['id__max']
-		temp = {'client':client}
-		return render_to_response('tcc/typeofwork.html', 
-		dict(temp.items() + tmp.items()), context_instance=
-		RequestContext(request))
-	except Exception:
-		return render_to_response('tcc/profile_first.html',tmp, 
-		context_instance = RequestContext(request))
+			last_jobno = last_jobno + 1
+	else:
+		last_jobno = jobno
+	m = Clientadd(client = client,user=user,job_no=last_jobno)
+	m.save()
+	client = Clientadd.objects.aggregate(Max('id'))
+	client =client['id__max']
+	temp = {'client':client}
+	return render_to_response('tcc/typeofwork.html', 
+	dict(temp.items() + tmp.items()), context_instance=
+	RequestContext(request))
 
 @stop_caching
 @login_required
@@ -1214,12 +1210,13 @@ def additional(request):
 		job = Job.objects.get(id = maxid)
 	job_no = job.job_no
 	job_date = job.date
+	voucher_no = job.id-1708;
 	get_bill_id = Bill.objects.filter(job_no=job_no).filter(date=job_date).\
 	values('id')
 	bill = Bill.objects.get(id=get_bill_id)
 	template = {'job':job,'job_no': job_no ,'bill':bill,'servicetaxprint' : servicetaxprint,
 	'highereducationtaxprint' : highereducationtaxprint,'educationtaxprint'
-	:educationtaxprint,}
+	:educationtaxprint,'voucher_no':voucher_no, }
 	return render_to_response('tcc/additional.html',dict(template.items() + tmp.items()), 
 	context_instance = RequestContext(request))
 

From 0aa858f5511fb5848dce9f5cd9c72a822c3da2f7 Mon Sep 17 00:00:00 2001
From: TCC S <tcc@tcc-desktop.(none)>
Date: Tue, 1 Apr 2014 17:03:53 +0530
Subject: [PATCH 3/4] Jugad for first april

---
 tcc/registers.py              |  3 +++
 tcc/views.py                  | 15 +++++++++++----
 templates/tcc/additional.html |  2 +-
 templates/tcc/report.html     |  2 +-
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/tcc/registers.py b/tcc/registers.py
index 1cb9413..fcfaf0e 100644
--- a/tcc/registers.py
+++ b/tcc/registers.py
@@ -245,6 +245,9 @@ def  main_register(request):
 			'job__client__client__address', 'job__client__client__city',
 			'job__clientjob__material__name',
 			'job__client__client__company').order_by('job__id')
+			for x in amount:
+				x['job__id'] -= 1763
+				
 			admin_charge_temp = Amount.objects.filter(job_id__in=job).\
 			filter(report_type ='General_report').aggregate(Sum(\
 			'admin_charge'))
diff --git a/tcc/views.py b/tcc/views.py
index 7d8b07e..8cde752 100644
--- a/tcc/views.py
+++ b/tcc/views.py
@@ -6,7 +6,7 @@
 """
 
 from ofau.tcc.header import *
-from datetime import datetime
+from datetime import *
 import itertools
 
 from django.views.decorators.cache import patch_cache_control
@@ -1210,10 +1210,13 @@ def additional(request):
 		job = Job.objects.get(id = maxid)
 	job_no = job.job_no
 	job_date = job.date
-	voucher_no = job.id-1708;
+	if (job_date >= date(2014,4,1)):
+		voucher_no = job.id-1763;
+	else:
+		voucher_no = job.id;
 	get_bill_id = Bill.objects.filter(job_no=job_no).filter(date=job_date).\
 	values('id')
-	bill = Bill.objects.get(id=get_bill_id)
+	bill = Bill.objects.filter(id=get_bill_id)[0];
 	template = {'job':job,'job_no': job_no ,'bill':bill,'servicetaxprint' : servicetaxprint,
 	'highereducationtaxprint' : highereducationtaxprint,'educationtaxprint'
 	:educationtaxprint,'voucher_no':voucher_no, }
@@ -1299,6 +1302,10 @@ def rep(request):
 	user = Job.objects.all().get(id=query)
 	job = user.job_no
 	job_date = user.date
+	if (job_date >= date(2014,4,1)):
+		voucher_no = user.id-1763;
+	else:
+		voucher_no = user.id;
 	get_bill_id = Bill.objects.filter(job_no=job).filter(date=job_date).\
 	values('id')
 	bill = Bill.objects.get(id=get_bill_id)
@@ -1330,7 +1337,7 @@ def rep(request):
 	amount,'con_type':con_type, 'ratio1':ratio1, 'ratio2':ratio2, 
 	'collegeincome':collegeincome, 'admincharge' : admincharge, 'user'
 	:user, 'name':name, 'mate':mate, 'staff':staff,'bill':bill,'job':job,
-	'jobid':user}
+	'jobid':user, 'voucher_no':voucher_no }
 	return render_to_response('tcc/report.html', dict(template.items() + 
 	tmp.items()), context_instance = RequestContext(request))
 	
diff --git a/templates/tcc/additional.html b/templates/tcc/additional.html
index 21bc610..abba82b 100644
--- a/templates/tcc/additional.html
+++ b/templates/tcc/additional.html
@@ -3,7 +3,7 @@
 
 <div style="font-size:24px" align='center'><b>{{address.name}}</b></div>
 <div style="font-size:24px" align='center'>{{title.name}}</div><br>
-<div style="position:absolute;right:0px;margin-top:45px;">No.TCC Job/Voucher : {{ job_no }}/{{job.id}} </div>
+<div style="position:absolute;right:0px;margin-top:45px;">No.TCC Job/Voucher : {{ job_no }}/{{ voucher_no }} </div>
 <div style="position:absolute;right:0px;margin-top:65px;">Dated : {{job.date}} </div>
 <br><br>
 <body>
diff --git a/templates/tcc/report.html b/templates/tcc/report.html
index 628238c..333d864 100755
--- a/templates/tcc/report.html
+++ b/templates/tcc/report.html
@@ -5,7 +5,7 @@
 <body>
 <br>
 
-<div style="position:absolute;right:0px;top:75px;">No.TCC Job/Voucher : {{ user.job_no }}/{{user.id}} </div>
+<div style="position:absolute;right:0px;top:75px;">No.TCC Job/Voucher : {{ user.job_no }}/{{ voucher_no }} </div>
 <div style="position:absolute;right:0px;top:95px;">Dated : {{user.date}} </div>
 <div style="position:absolute;left:7px;top:105px;">Director,</div>
 <br></br><br/>

From 119ffcbcda693fc3483110193b171371d760856e Mon Sep 17 00:00:00 2001
From: TCC S <tcc@tcc-desktop.(none)>
Date: Tue, 1 Apr 2014 17:11:44 +0530
Subject: [PATCH 4/4] Little change

---
 tcc/registers.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tcc/registers.py b/tcc/registers.py
index fcfaf0e..fb34f57 100644
--- a/tcc/registers.py
+++ b/tcc/registers.py
@@ -246,7 +246,8 @@ def  main_register(request):
 			'job__clientjob__material__name',
 			'job__client__client__company').order_by('job__id')
 			for x in amount:
-				x['job__id'] -= 1763
+				if year > 2013 and month > 3:
+					x['job__id'] -= 1763
 				
 			admin_charge_temp = Amount.objects.filter(job_id__in=job).\
 			filter(report_type ='General_report').aggregate(Sum(\