changes done for issue tracker no:246,248,250

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

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

@@ -1177,7 +1177,7 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
         double exchRate = 0.0, rndTo = 0.0;
         int crDays = 0, detRows = 0, cnt = 0, taxRc = 0;
         String analCode1 = "", analCode2 = "", deptCode = "", remarksDet = "", billNo1 = "", billDateStr = "", temp = "", chqName = "",today="";
-        String errString = "", tranIDSer = "",xmlString="",loginSite="";
+        String errString = "", tranIDSer = "",xmlString="",loginSite="", fromDateStr="", toDateStr="";
         PreparedStatement pstmt = null, pstmt1 = null, pstmt2 = null;
 		ResultSet rs = null, rs1 = null, rs2 = null;
 		String sql = "", sql1 = "";
@@ -1211,7 +1211,8 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
         	chgTerm = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "chgTerm" );
 			chgUser = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginCode" );
         	System.out.println("[chgTerm:"+chgTerm+"][chgUser"+chgUser+"]");             	
-			
+        	fromDateStr = checkNull(genericUtility.getColumnValue("date__fr", headerDom));
+        	toDateStr = genericUtility.getColumnValue("date__to", headerDom);			
         	//all below variabes taken from retainer contract
 			System.out.println("---- hdrMap inside miscVoucherAP ---[ "+hdrMap+" ]");
         	tranType = hdrMap.get("contract_type");
@@ -1399,6 +1400,7 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
 			xmlBuff.append("<auto_pay>").append("<![CDATA[" + autoPay + "]]>").append("</auto_pay>");
 			xmlBuff.append("<adv_amt>").append("<![CDATA[" + advAmt + "]]>").append("</adv_amt>");
 			xmlBuff.append("<cr_term>").append("<![CDATA[" + crTerm + "]]>").append("</cr_term>");
+			xmlBuff.append("<site_code__pay>").append("<![CDATA[" + siteCode + "]]>").append("</site_code__pay>");
 			if(dueDate != null){
 			xmlBuff.append("<due_date>").append("<![CDATA[" + sdf.format(dueDate) + "]]>").append("</due_date>");
 			}
@@ -1424,7 +1426,7 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
 			xmlBuff.append("<emp_code>").append("<![CDATA[" + empCodedet + "]]>").append("</emp_code>");
 			xmlBuff.append("<net_amt__bc>").append("<![CDATA[" + netAmtBc + "]]>").append("</net_amt__bc>");
 			xmlBuff.append("<pay_mode>").append("<![CDATA[" + payMode + "]]>").append("</pay_mode>");			
-			xmlBuff.append("<remarks>").append("<![CDATA[" + "#" +contractId + ", Autogenerated" + "]]>").append("</remarks>");
+			xmlBuff.append("<remarks>").append("<![CDATA[" + "Against contract id:"+contractId+" from "+fromDateStr+" to "+toDateStr+" "+"]]>").append("</remarks>");
 			xmlBuff.append("<acct_code__cf>").append("<![CDATA[" + acctCodeCf + "]]>").append("</acct_code__cf>");
 			xmlBuff.append("<cctr_code__cf>").append("<![CDATA[" + cctrCodeCf + "]]>").append("</cctr_code__cf>");
 			xmlBuff.append("<acct_code__pay>").append("<![CDATA[" + acctCode + "]]>").append("</acct_code__pay>");
@@ -1572,13 +1574,12 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
 				tranId = arrayForTranIdIssue[1].substring(0, endIndexIssue);
 				System.out.println("@V@ Tran id :- [" + tranId + "]");
 			
-				totAmt = 0;
-				billAmt = 0;
-				totTax = 0;
-					
-				analCode = "";
-				empCode = "";
-				
+				//totAmt = 0;
+				//billAmt = 0;
+				//totTax = 0;				
+				//analCode = "";
+				//empCode = "";
+				System.out.println("[1]"+netAmt+"[2]"+netAmtBc+"[3]"+billAmt+"[4]"+totTax+"[5]"+totAmt+"[6]"+totTax+"[7]"+billAmt+"[8]"+tranId);
 				// updating misc voucher header related values
 				sql = "update misc_voucher set net_amt = ?, net_amt__bc = ?, bill_amt = ?, tax_amt = ?," +
 						" tot_amt = ?, supp_bill_amt = ? where tran_id = ? ";