merging from branch

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

webitm-fin/ibase/webitm/ejb/fin/.directory

+[Dolphin]
+SortOrder=1
+SortRole=date
+Timestamp=2016,4,20,12,6,40
+Version=3
+ViewMode=1

webitm-fin/ibase/webitm/ejb/fin/PayrollVoucherComIc.java

@@ -229,7 +229,9 @@ public class PayrollVoucherComIc extends ValidatorEJB implements PayrollVoucherC
 			double exchrate=0;
 		    sitecode = genericUtility.getColumnValue("site_code__to",dom);
 		    trandt  = genericUtility.getColumnValue("tran_date__fr",dom);
-		   sql="select a.curr_code from finent a, site b where b.fin_entity = a.fin_entity and b.site_code = ?";
+		    currcodebase= genericUtility.getColumnValue("curr_code", dom);
+		    System.out.println("Currency Code is"+ currcodebase );
+		  /* sql="select a.curr_code from finent a, site b where b.fin_entity = a.fin_entity and b.site_code = ?";
 		   System.out.println("SQL :: "+sql);
 		   pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1,sitecode);
@@ -243,7 +245,7 @@ public class PayrollVoucherComIc extends ValidatorEJB implements PayrollVoucherC
 		pstmt.close();
 		pstmt = null;
 		currcode = genericUtility.getColumnValue("curr_code",dom);
-		valueXmlString.append("<curr_code>").append(currcodebase).append("</curr_code>\r\n");
+		valueXmlString.append("<curr_code>").append(currcodebase).append("</curr_code>\r\n");*/
 		sql="select descr from currency where curr_code = ?";
 		System.out.println("SQL :: "+sql);
 		pstmt = conn.prepareStatement(sql);
@@ -258,20 +260,7 @@ public class PayrollVoucherComIc extends ValidatorEJB implements PayrollVoucherC
 		pstmt.close();
 		pstmt = null;
 		System.out.println("currdescr1 :: "+currdescr1);
-		valueXmlString.append("<descr>").append(currdescr1).append("</descr>\r\n");
-		if(currcodebase != null && currcodebase.trim().length() > 0)
-		{
-			exchrate=finCommon.getDailyExchRateSellBuy( currcode,currcodebase,sitecode,trandt,"B",conn);
-			valueXmlString.append("<exch_rate>").append(exchrate).append("</exch_rate>\r\n");
-		}
-		if(currcodebase != currcode)
-		{
-			valueXmlString.append("<exch_rate protect = \"0\">").append("<![CDATA[" + exchrate + "]]>").append("</exch_rate >");
-		}
-		else
-		{
-			valueXmlString.append("<exch_rate protect = \"1\">").append("<![CDATA[" + exchrate + "]]>").append("</exch_rate >");
-		}
+		valueXmlString.append("<curr_descr>").append(currdescr1).append("</curr_descr>\r\n");
 		}
 		else if(currentColumn.equalsIgnoreCase("site_code__fr"))
 		{

webitm-fin/ibase/webitm/ejb/fin/PurchaseVoucherGltracePreviewLocal.java

@@ -15,6 +15,6 @@ import javax.ejb.Local;
 public interface PurchaseVoucherGltracePreviewLocal extends ActionHandlerLocal 
 {
 	
-	public String preview(String tranID,String xtraParams, String forcedFlag) throws RemoteException,ITMException;
+	public String preview(String tranID,String xtraParams, String forcedFlag, Connection conn) throws RemoteException,ITMException;
 }
 

webitm-fin/ibase/webitm/ejb/fin/PurchaseVoucherGltracePreviewRemote.java

@@ -14,6 +14,6 @@ import javax.ejb.Remote;
 @Remote 
 public interface PurchaseVoucherGltracePreviewRemote extends ActionHandlerRemote
 {
-	public String preview(String tranID,String xtraParams, String forcedFlag) throws RemoteException,ITMException;
+	public String preview(String tranID,String xtraParams, String forcedFlag, Connection conn) throws RemoteException,ITMException;
 
 }

webitm-fin/ibase/webitm/ejb/fin/adv/.directory

 [Dolphin]
 SortOrder=1
+SortRole=date
 Sorting=2
-Timestamp=2014,1,29,14,59,8
+Timestamp=2016,4,20,12,7,43
+Version=3
 ViewMode=1

webitm-fin/ibase/webitm/ejb/fin/adv/MiscValConf.java

@@ -1167,9 +1167,11 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
 				if(rs.next())
 				{
 					sitePayment = rs.getString("site_code__pay");
+					System.out.println( "Site Payment"+sitePayment);
 				}
 				else
 				{
+					System.out.println("Else Condition");
 					sqlInner ="select site_code__pay from supplier where supp_code = ? " ;		
 					pstmtInner = conn.prepareStatement(sqlInner);
 					pstmtInner.setString(1,supp);
@@ -1182,6 +1184,7 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
 					rsInner = null;
 					pstmtInner.close();
 					pstmtInner = null;
+					System.out.println("Else sitePayment"+sitePayment);
 				}
 				rs.close();
 				rs = null;
@@ -1192,6 +1195,8 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
 				{
 					sitePayment = siteCode;
 				}
+				System.out.println("sitePayment"+sitePayment+" !=siteCode"+siteCode);
+				
 				if((sitePayment != siteCode) && (("I").equalsIgnoreCase(runMode)))
 				{
 					winName = "W_PAY_IBCA";