bug fixed

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

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

@@ -1188,14 +1188,16 @@ public class RetainerContractIC extends ValidatorEJB implements RetainerContract
 					valueXmlString.append("<sundry_name>").append("<![CDATA[" + sundryName + "]]>").append("</sundry_name>");
 					valueXmlString.append("<acct_code__arap>").append("<![CDATA[" + acctCode + "]]>").append("</acct_code__arap>");
 					valueXmlString.append("<cctr_code__arap>").append("<![CDATA[" + cctrCode + "]]>").append("</cctr_code__arap>");
-
 				
-					if(crTerm == null || crTerm.trim().length() == 0)
+					if(!("J".equalsIgnoreCase(payableReceivable)))
 					{
-						valueXmlString.append("<cr_term>").append("<![CDATA[" + "0" + "]]>").append("</cr_term>");
-					}else{
-						valueXmlString.append("<cr_term>").append("<![CDATA[" + crTerm + "]]>").append("</cr_term>");
-					}				
+						if(crTerm == null || crTerm.trim().length() == 0)
+						{
+							valueXmlString.append("<cr_term>").append("<![CDATA[" + "0" + "]]>").append("</cr_term>");
+						}else{
+							valueXmlString.append("<cr_term>").append("<![CDATA[" + crTerm + "]]>").append("</cr_term>");
+						}
+					}
 					if(creditPrd == null )
 					{
 						valueXmlString.append("<credit_days>").append("<![CDATA[" + 0 + "]]>").append("</credit_days>");
@@ -1253,8 +1255,7 @@ public class RetainerContractIC extends ValidatorEJB implements RetainerContract
 					else if(sundryType != null && "O".equalsIgnoreCase(sundryType))
 					{
 						valueXmlString.append("<sundry_code>").append("<![CDATA[" + " " + "]]>").append("</sundry_code>");
-						valueXmlString.append("<payable_receivable>").append("<![CDATA[" + "J" + "]]>").append("</payable_receivable>");						
-						valueXmlString.append("<cr_term>").append("<![CDATA[" + "0" + "]]>").append("</cr_term>");																									
+						valueXmlString.append("<payable_receivable>").append("<![CDATA[" + "J" + "]]>").append("</payable_receivable>");																																				
 					}else
 					{
 						valueXmlString.append("<sundry_code>").append("<![CDATA[" + sundryCode + "]]>").append("</sundry_code>");

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

@@ -759,7 +759,7 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
 		int row = 0, cnt = 0, cc = 0, cycle = 0, rel = 0, rej = 0, norel = 0;		
 		String fromDateStr = "", toDateStr = "",billDateStr="",lastDate1Str=""; 
 		String tranId = "", sundryCode = "", lastDateStr="",validDateStr="";
-		String sundryType="", tranType="",taxClass="",taxChap="",taxEnv="",amtHdr="",payMode="",billNo1="", currCode="", acctCode="",cctrCode="", projCode="", siteCode="", bankCode="", autoPay="", crTerm="", crDays="";
+		String sundryType="", tranType="",taxClass="",taxChap="",taxEnv="",amtHdr="",payMode="",billNo1="", currCode="", acctCode="",cctrCode="", projCode="", siteCode="", bankCode="", autoPay="", crTerm="", crDays="",effDateStr;
 		NodeList parentNodeList = null;		
 		Node parentNode = null;	
 		Connection conn = null;
@@ -826,9 +826,10 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
 				billNo1  = checkNull(genericUtility.getColumnValueFromNode("bill_no", parentNode));
 				billDateStr = checkNull(genericUtility.getColumnValueFromNode("bill_date", parentNode));
 				projCode = checkNull(genericUtility.getColumnValueFromNode("proj_code",parentNode));
+				effDateStr = checkNull(genericUtility.getColumnValueFromNode("eff_date",parentNode));
 				System.out.println("[1]"+sundryCode+"[2]"+sundryType+"[3]"+tranType+"[4]"+taxClass+"[5]"+taxChap+"[6]"+taxEnv+"" +
 						"[7]"+amtHdr+"[8]"+currCode+"[9]"+acctCode+"[10]"+cctrCode+"[11]"+siteCode+"[12]"+bankCode+"" +
-						"[13]"+autoPay+"[14]"+crTerm+"[15]"+crDays+"[16]"+payMode+"[17]"+billNo1+"[18]"+billDateStr+"[19]"+projCode);
+						"[13]"+autoPay+"[14]"+crTerm+"[15]"+crDays+"[16]"+payMode+"[17]"+billNo1+"[18]"+billDateStr+"[19]"+projCode+"[20]"+effDateStr);
 				//end
 				hdrMap.put("contract_id", contractId);
 				hdrMap.put("sundry_code", sundryCode);
@@ -850,6 +851,7 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
 				hdrMap.put("bill_no", billNo1);
 				hdrMap.put("bill_date", billDateStr);				
 				hdrMap.put("proj_code", projCode);
+				hdrMap.put("eff_date", effDateStr);
 				
 				System.out.println("[hdrMap]>>>>["+hdrMap+"]");
 				
@@ -1656,7 +1658,8 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
         	if(relDateStr != null){
         		relDate = Timestamp.valueOf(genericUtility.getValidDateString(relDateStr, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
         	}
-        	String effDate1Str = genericUtility.getColumnValue("eff_date", headerDom);	
+        	//String effDate1Str = genericUtility.getColumnValue("eff_date", headerDom);	
+        	String effDate1Str = hdrMap.get("eff_date");
         	if(effDate1Str != null){
         	effDate1 = Timestamp.valueOf(genericUtility.getValidDateString(effDate1Str, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
         	}