commited to add changes of 4A purchase ret.

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

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

@@ -926,21 +926,21 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
                          }
 						 dtlSql = dtlSql 
 						 +" '' as REMARKS , "
-						 +" fn_get_gst_rate('VOUCH',i.tran_id, it.line_no) as gst_rate "
+						 +" fn_get_gst_rate('VOUCH',i.tran_id, it.line_no) as gst_rate  "
 						 
 						 /*commented by kaustubh */
 						 /*+" from porcp i,porcpdet it,item item"*/
 						 /*+" from porcp i,porcpdet it,taxtran tx, siteitem si, tax t, item item, uom u " */
-						+" from voucher i,vouchrcp it, item, porcp pr, porcpdet pd "    //changed on 31 july 2017 
+						+" from voucher i,vouchrcp it, item, porcp pr, porcpdet pd  "    //changed on 31 july 2017 
 						 +" where i.tran_id = it.tran_id "
 						 +" and pr.tran_id = pd.tran_id"
-						 +"and pr.tran_ser = 'P-RET'"
-						 +"and it.prcp_id = pr.tran_id"
+						 +" and pr.tran_ser = 'P-RET'"
+						 +" and it.prcp_id = pr.tran_id"
 						 /* commented by kaustubh*/
 						/* +" and si.site_code = i.site_code "
 						 +" and si.item_code = it.item_code "*/
 						+" and it.LINE_NO__RCP = pd.line_no"
-						+"and item.item_code = it.item_code"
+						+" and item.item_code = it.item_code"
 						 /*commented by kaustubh on 21-7-2017*/ 
 						/* +"and (select count(1) from taxtran ti, tax tx where tx.tax_code = ti.tax_code "
 						 +"and ti.tran_code = 'P-RET' "
@@ -6990,7 +6990,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 									  dtlSql = dtlSql  +" and it.date_adv  < '"+strDate+"' ";
 								  }
 								 dtlSql = dtlSql 
-								+" group by fn_get_gst_rate('R-ADV',i.tran_id, it.line_no) ";		
+								+"  group by fn_get_gst_rate('R-ADV',i.tran_id, it.line_no) ";		
 							 
 					      retString = executeSqlAndPopulateData(hdrSql,dtlSql,"11(B.1)");