SCM issue tracker 73-N site_code__dlv to be set as login site if not set through resource pack

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

webitm-dis/ibase/webitm/ejb/dis/SReturnForm.java

@@ -148,7 +148,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 		String priceListClg="",taxClasss="";
 		double mdisc = 0,mminShlife=0,exchRate =0;
 		String tranDate = "",mvarValue="",locDescr="",lsDamagedtype="",tranType=""; 
-		String invoiceId ="",tranMode="",siteCode="",custCodeBil="",currCode="";
+		String invoiceId ="",tranMode="",siteCode="",custCodeBil="",currCode="",siteCodeDlv="";
 		String analCode ="",itemSer ="",invDate ="",salesPers ="",custCode =""; 
 		String saleOrder ="",salesPers1 ="",salesPers2 ="";
 		String mSiteDescr="",custName="",tranCode="",tranName="";
@@ -268,7 +268,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 					if (currentColumn.trim().equals("itm_default") )			
 					{
 						loginSiteCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginSiteCode");
-						
+						siteCodeDlv = genericUtility.getColumnValue("site_code__dlv",dom);
 						//get login site description
 						sql = " select descr from site where site_code = ? ";
 						pstmt= conn.prepareStatement( sql );
@@ -284,7 +284,11 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 						rs = null;
 						valueXmlString.append("<site_code protect =\"1\">").append("<![CDATA["+loginSiteCode.trim()+"]]>").append("</site_code>");
 						valueXmlString.append("<site_descr>").append("<![CDATA["+loginSiteDescr.trim()+"]]>").append("</site_descr>");
-						valueXmlString.append("<site_code__dlv protect =\"0\">").append("<![CDATA["+loginSiteCode.trim()+"]]>").append("</site_code__dlv>");
+						// 24/05/13 manoharan if site_code__dlv is not set through resource pack set the same as login site 73-N
+						if (siteCodeDlv == null || siteCodeDlv.trim().length() == 0)
+						{
+							valueXmlString.append("<site_code__dlv protect =\"0\">").append("<![CDATA["+loginSiteCode.trim()+"]]>").append("</site_code__dlv>");
+						}
 						
 						String currAppdate ="";
 						java.sql.Timestamp currDate = null;