Changed by Manish on 03/05/16

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

webitm-wms/ibase/webitm/ejb/wms/SalesReturnConf.java

@@ -963,7 +963,12 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
 			xmlString.append("<remarks><![CDATA[" + "Generate Automatic payment" + "]]></remarks>");
 			xmlString.append("<net_amt><![CDATA[" + 0 + "]]></net_amt>");
 			xmlString.append("<curr_code><![CDATA[" + checkNull(currCode) + "]]></curr_code>");
-			xmlString.append("<exch_rate><![CDATA[" + mexrate + "]]></exch_rate>");
+			//	xmlString.append("<exch_rate><![CDATA[" + mexrate + "]]></exch_rate>");
+
+			//  Changed by Manish on 03/05/16 as per Shailes Sir [satrt]
+			xmlString.append("<exch_rate><![CDATA[" + exchRate + "]]></exch_rate>");
+			//  Changed by Manish on 03/05/16 as per Shailes Sir [end]
+
 			xmlString.append("<net_amt__bc><![CDATA[" + 0 + "]]></net_amt__bc>");			
 			xmlString.append("<site_code><![CDATA[" + checkNull(siteCode) + "]]></site_code>");
 			//xmlString.append("<site_descr><![CDATA[" + checkNull(siteDescr) + "]]></site_descr>");/

webitm-wms/ibase/webitm/utility/wms/CommonWmsUtil.java

@@ -1483,7 +1483,9 @@ public  class CommonWmsUtil {
 			}
 			if(!trackNo.equals(""))
 			{
-				trackNo = trackNo.substring(1,trackNo.length()-1);
+				//trackNo = trackNo.substring(1,trackNo.length()-1);
+				trackNo = trackNo.substring(0,trackNo.length()-1);
+				System.out.println("trackNo is["+trackNo+"]");
 			}
 		}
 		catch (Exception e)