Contract no added in Sales return Form,pricelist and rate should set from contract no

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

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

@@ -1424,7 +1424,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 						}
 						
 						//added by priyanka 
-						//if contract no is defined set rate based on contract no else follow existing hierachy
+						//if contract no is defined set rate based on contracr else follow existing hierachy
 						trDate= Timestamp.valueOf(genericUtility.getValidDateString(tranDate, genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat()) + " 00:00:00.0");
 						System.out.println(">>>>>>>>>Tran Date:"+trDate);
 						contractNo = genericUtility.getColumnValue("contract_no", dom1);
@@ -1537,16 +1537,17 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 							reStr = reStr.substring(0,pos);
 							valueXmlString.append(reStr);
 							
-					    	
+					    	//}	//added by priyanka
 						}
 						else
 						{
 							System.out.println("contract no is null");
 							tranDate = tranDate == null ? ( new Timestamp( System.currentTimeMillis() ) ).toString() : tranDate;
 							System.out.println("Getting rate if pricelist is not null===="+rate);
-						   
+						   	//if(rate<=0)
+							// {
 								rate = distCommon.pickRate(priceList,tranDate,itemCode," ","L",qtyStdUom, conn);
-							
+							// }
 								System.out.println(">>>>>>>>>>Check rate in item_code:"+rate);
 							varValue = distCommon.getPriceListType(priceList,conn);
 							varValue = varValue == null ?"" : varValue.trim();