commited to add changes of 4A purchase ret.

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

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

@@ -901,7 +901,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 						/* +" u.descr as UNIT,"*/
 						 +"item.UNIT as UNIT,"
 						 //--sum(it.quantity__stduom) as QUANTITY,
-						 +" (it.quantity) as QUANTITY,"
+					//	 +" (it.quantity) as QUANTITY,"
+						 +" 0 as QUANTITY,"
 						 +" 'OE' as SUPPLY_TYPE,"  ;// -- E/OE (Ecom/Other than Ecom)
 						 
 						 /* chnaged by kaustubh on 19-07-2017*/
@@ -5834,7 +5835,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 								 /*changed by kaustubh on 19-07-2017*/		
 								/*+" and u.unit = item.unit ";*/
 								
-						retString = executeSqlAndPopulateData(hdrSql,dtlSql,"9A(1)");
+					//	retString = executeSqlAndPopulateData(hdrSql,dtlSql,"9A(1)");
 						
 					}
 					
@@ -6068,7 +6069,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 								 /*changed by kaustubh on 20-07-2017*/
 								/*+" u.descr as UNIT,"*/
 								+" item.UNIT as UNIT,"
-							    +" (it.quantity__stduom) as QUANTITY,"
+							  //  +" (it.quantity__stduom) as QUANTITY,"
+								+" (it.quantity) as QUANTITY,"
 								+" 'OE' as SUPPLY_TYPE," ;
 								/*changed by kaustubh on 20-07-2017*/ 
 							    /*+" case when t.tax_type = 'J'  then tx.tax_perc else 0  end as CESS_PERC,"
@@ -6283,7 +6285,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 									 /*changed by kaustubh on 20-07-2017*/
 									/*+" u.descr as UNIT,"*/
 									+" item.UNIT as UNIT,"
-								    +" (it.quantity__stduom) as QUANTITY,"
+								   // +" (it.quantity__stduom) as QUANTITY,"
+									+" (it.quantity) as QUANTITY,"
 									+" 'OE' as SUPPLY_TYPE," ;
 									/*changed by kaustubh on 20-07-2017*/ 
 								    /*+" case when t.tax_type = 'J'  then tx.tax_perc else 0  end as CESS_PERC,"
@@ -7363,7 +7366,10 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 								
 								+" and i.invoice_id = ? ";	
 							 
-					      retString = executeSqlAndPopulateData(hdrSql,dtlSql,"11(B.2)"); 		
+					      retString = executeSqlAndPopulateData(hdrSql,dtlSql,"3"); 
+					      
+					      
+					      
 						
 			}