commited new changes of taxes in GSTR2 purchase queries.

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@106610 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-gst-client/ibase/webitm/ejb/gstclient/GstDataPrc.java

@@ -877,8 +877,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 				  		{
 				  		   hdrSql = hdrSql +" and ti.tax_env not in ("+taxEnvAllStr+") ";
 				  		}
-				  	//	hdrSql = hdrSql +" ) = 0 "     changed on 10 aug 2017 
-				  		hdrSql = hdrSql +" ) > 0 "
+				  		hdrSql = hdrSql +" ) = 0 "     
+				  	//	hdrSql = hdrSql +" ) > 0 "   Commented on 14 aug 2017
 				  		+"and (select count(1) from voucher vh, vouchrcp vr, porcp pr where vr.tran_id = vh.tran_id and vh.purc_order = pr.purc_order " 
 				  		+"and pr.tran_ser = 'P-RET' and vr.PRCP_ID = pr.tran_id) > 0"		
 				  		+" and case when i.confirmed is null then 'N' else i.confirmed end = 'Y' "
@@ -1545,7 +1545,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 							 if(taxClassAllStr.length() > 0)
 						  	 {
 						  		hdrSql = hdrSql +" and ti.tax_class in ("+taxClassAllStr+") ";
-						  	 }
+						  	 }	
 							 hdrSql = hdrSql +" ) > 0 "
 							+" and case when i.confirmed is null then 'N' else i.confirmed end = 'Y' "
 							//+" and i.conf_date between ? and ? " commneted by kaustubh on 27 july 2017
@@ -1971,7 +1971,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 							  +" and (select count(1) from taxtran ti where ti.tran_code = 'S-INV' and ti.tran_id = i.invoice_id ";
 							  if(GST_EXPWP_TAXCLASS.length() > 0)
 						  	  {
-						  		   hdrSql = hdrSql +" and ti.tax_env in ("+GST_EXPWP_TAXCLASS+") ";
+						  		   hdrSql = hdrSql +" and ti.tax_class in ("+GST_EXPWP_TAXCLASS+") ";
 						  	  }
 							  if(GST_EXPWP_TAXENV.length() > 0)
 						  	  {