remove trim from cctr_code

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

webitm-wms/ibase/webitm/ejb/wms/SalesReturnConf.java

@@ -610,7 +610,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
 				exchRate = rs.getDouble("EXCH_RATE");
 				sundryCode = checkNull(rs.getString("SUNDRY_CODE"));
 				acctCode = checkNull(rs.getString("ACCT_CODE"));
-				cctrCode = checkNull(rs.getString("CCTR_CODE"));
+				cctrCode = rs.getString("CCTR_CODE");
 				dueDate = rs.getTimestamp("DUE_DATE");
 				siteCode = checkNull(rs.getString("SITE_CODE"));
 				finEntity = checkNull(rs.getString("FIN_ENTITY"));
@@ -765,13 +765,13 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
 			if(rs.next())
 			{
 				acctCodeBal=checkNull(rs.getString("acct_code__bal"));
-				cctrCodeBal=checkNull(rs.getString("cctr_code__bal"));
+				cctrCodeBal=rs.getString("cctr_code__bal");
 				acctCodeBc=checkNull(rs.getString("acct_code__bc"));
-				cctrCodeBc=checkNull(rs.getString("cctr_code__bc"));
+				cctrCodeBc=rs.getString("cctr_code__bc");
 				acctCodeCf=checkNull(rs.getString("acct_code__cf"));
 				acctCodeCfAp=checkNull(rs.getString("acct_code__cf_ap"));
-				cctrCodeCf=checkNull(rs.getString("cctr_code__cf"));
-				cctrCodeCfAp=checkNull(rs.getString("acct_code__cf_ap"));
+				cctrCodeCf=rs.getString("cctr_code__cf");
+				cctrCodeCfAp=rs.getString("acct_code__cf_ap");
 			}
 			rs.close();
 			rs = null;
@@ -853,15 +853,15 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
 			xmlString.append("<fin_entity><![CDATA[" + finEntity + "]]></fin_entity>");
 			//xmlString.append("<finent_descr><![CDATA[" + checkNull(finentDescr) + "]]></finent_descr>");
 			xmlString.append("<acct_code__bal><![CDATA[" + checkNull(acctCodeBal) + "]]></acct_code__bal>");
-			xmlString.append("<cctr_code__bal><![CDATA[" + checkNull(cctrCodeBal) + "]]></cctr_code__bal>");
+			xmlString.append("<cctr_code__bal><![CDATA[" + cctrCodeBal + "]]></cctr_code__bal>");
 			xmlString.append("<auto_paid><![CDATA[" + "Y" + "]]></auto_paid>");		
 			xmlString.append("<bank_charges><![CDATA[" + 0 + "]]></bank_charges>");
 			xmlString.append("<acct_code__bc><![CDATA[" + checkNull(acctCodeBc) + "]]></acct_code__bc>");
-			xmlString.append("<cctr_code__bc><![CDATA[" + checkNull(cctrCodeBc) + "]]></cctr_code__bc>");
+			xmlString.append("<cctr_code__bc><![CDATA[" + cctrCodeBc + "]]></cctr_code__bc>");
 			xmlString.append("<curr_code__bc><![CDATA[" + checkNull(currCodeBc) + "]]></curr_code__bc>");
 			xmlString.append("<exch_rate__bc><![CDATA[" + excRateBc + "]]></exch_rate__bc>");	
 			xmlString.append("<acct_code__cf><![CDATA[" + checkNull(acctCodeCf)+ "]]></acct_code__cf>");	
-			xmlString.append("<cctr_code__cf><![CDATA[" + checkNull(cctrCodeCf) + "]]></cctr_code__cf>");
+			xmlString.append("<cctr_code__cf><![CDATA[" + cctrCodeCf + "]]></cctr_code__cf>");
 			xmlString.append("<tax_amt><![CDATA[" + 0 + "]]></tax_amt>");
 			xmlString.append("<tax_date><![CDATA[" + checkNull(currDateStr) + "]]></tax_date>");
 			//xmlString.append("<WF_STATUS ><![CDATA[" + checkNull(wfStatus) + "]]></WF_STATUS >");
@@ -893,7 +893,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
 			xmlString.append("<exch_rate__vouch><![CDATA["+exchRate+"]]></exch_rate__vouch>");							
 			xmlString.append("<diff_amt__exch><![CDATA[0]]></diff_amt__exch>");							
 			xmlString.append("<acct_code__ap><![CDATA["+checkNull(acctCode)+"]]></acct_code__ap>");//
-			xmlString.append("<cctr_code__ap><![CDATA["+checkNull(cctrCode)+"]]></cctr_code__ap>");//
+			xmlString.append("<cctr_code__ap><![CDATA["+cctrCode+"]]></cctr_code__ap>");//
 			xmlString.append("<sundry_type><![CDATA["+checkNull(sundryType)+"]]></sundry_type>");//
 			xmlString.append("<sundry_code><![CDATA["+checkNull(sundryCode)+"]]></sundry_code>");//					
 			xmlString.append("<bank_charges><![CDATA["+0+"]]></bank_charges>");