commited by kaustubh for gstr 1 query

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

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

@@ -4313,7 +4313,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 						+" and state.state_code = c.STATE_CODE  "
 						+"and d.site_code= i.site_code__dlv "
 						+"and st.state_code = d.state_code " 
-						+"and st.state_code = state.state_code "
+						//+"and st.state_code = state.state_code "
+						+" and ((st.state_code   = state.state_code) AND (s.fin_entity   = d.fin_entity)) "
 						//+" and (select count(1) from taxtran ti where ti.tran_code = 'D-ISS' and ti.tran_id = i.tran_id ";
 						+" and (select count(1) from taxtran ti, tax tm  where tm.tax_code = ti.tax_code and ti.tran_code = 'D-ISS' " 
 						+" and ti.tran_id = i.tran_id and tm.tax_type in ('G','H','I','J') ";
@@ -4321,10 +4322,10 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 				  		{
 				  		   hdrSql = hdrSql +" and ti.tax_class  in ("+GST_NIL_TAXCLASS+") ";
 				  		}
-				  		if(taxEnvAllStr.length() > 0)
+				  		/*if(taxEnvAllStr.length() > 0)
 				  		{
 				  		   hdrSql = hdrSql +" and ti.tax_env  in ("+GST_NIL_TAXENV+")  ";
-				  		}
+				  		}*/
 				  		hdrSql = hdrSql +" ) > 0 "
 				  		+" and case when i.confirmed is null then 'N' else i.confirmed end = 'Y' "
 						/*+" and i.conf_date between ? and ? " modified by kaustubh on 27 july */