change gst data tax_code condition.

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

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

@@ -24828,17 +24828,19 @@ dtlSql =         " select '' as  TRAN_ID, "
 						                             +"fn_gst_rate_amt('MDRCRC',i.tran_id, it.line_no, 'J', 'A') as CESS_AMT,";
 	                        
 	                     }
-						 
-						 dtlSql = dtlSql 
-						+" '' as REMARKS ,";
-						 /* if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))    
-									 {
-										 dtlSql = dtlSql  +"(SELECT count(1) from taxtran ti, tax tm where tm.tax_code = ti.tax_code and ti.tran_id = i.tran_id and cast(ti.line_no as integer) = it.line_no and tm.tax_group in ('ITC','RCM') ) as REMARKS, ";
-									 }
-									 else
-									 {
-										 dtlSql = dtlSql  +"(SELECT count(1) from  taxtran ti, tax tm where tm.tax_code = ti.tax_code and ti.tran_id = i.tran_id and to_number(trim(ti.line_no)) = it.line_no and tm.tax_group in ('ITC','RCM') ) as REMARKS, ";
-									 }*/
+						 //PriyankaC on 08MArch2019.[START]
+						 // dtlSql = dtlSql 
+						 //	+" '' as REMARKS ,";
+						 if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))    
+						 {
+							 dtlSql = dtlSql  +"(SELECT count(1) from taxtran ti, tax tm where tm.tax_code = ti.tax_code and ti.tran_id = i.tran_id and cast(ti.line_no as integer) = it.line_no and tm.tax_group in ('ITC','RCM') ) as REMARKS, ";
+						 }
+						 else
+						 {
+							 dtlSql = dtlSql  +"(SELECT count(1) from  taxtran ti, tax tm where tm.tax_code = ti.tax_code and ti.tran_id = i.tran_id and to_number(trim(ti.line_no)) = it.line_no and tm.tax_group in ('ITC','RCM') ) as REMARKS, ";
+						 }
+						 dtlSql = dtlSql
+						 +" 'is' as ITC_TYPE , ";
 						 //PriyankaC on 08MArch2019.[END]
 						 if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))    
 						 {
@@ -26231,7 +26233,10 @@ dtlSql =         " select '' as  TRAN_ID, "
 					+" and trim(c.tax_reg_2) <> 'UNREGISTER' "
 					+" and (select count(1) from taxtran ti, tax tm where tm.tax_code = ti.tax_code "
 					+" and ti.tran_code = 'P-RCP' and ti.tran_id = i.tran_id "
-					+" and tm.TAX_GROUP IN ('ITC','NITC') "
+					// changed by Priyankac As per the suggest by Gaurav. [START]
+					//+" and tm.TAX_GROUP IN ('ITC','NITC') "
+					+" and tm.TAX_GROUP IN ('ITC') "
+					// changed by Priyankac As per the suggest by Gaurav. END
 					+" and Ti.Tax_Perc > 0 "   					//added on 20 june 2018
 					+" and tm.tax_type in ('G','H','I','J')";
 					if(taxClassAllStrOfPurchase.length() > 0)
@@ -26330,7 +26335,10 @@ dtlSql =         " select '' as  TRAN_ID, "
 						+" and item.item_code = it.item_code "
 						+"and (select count(1) from taxtran ti, tax tx where tx.tax_code = ti.tax_code "
 						+"and ti.tran_code = 'P-RCP' "
-						+" and tx.TAX_GROUP IN ('ITC','NITC') "
+						//Changed by PriyankaC as per discuss with gaurav.[START]
+						//+" and tx.TAX_GROUP IN ('ITC','NITC') "
+						+" and tx.TAX_GROUP IN ('ITC') "
+						//Changed by PriyankaC as per discuss with gaurav.[END]
 						+" and ti.tran_id = i.tran_id  " 
 						+" and ti.LINE_NO = it.LINE_NO " 
 						+" and ti.TAX_PERC > 0 "