sun source merge mail by rohan b

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

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

@@ -633,7 +633,7 @@ public class TaxSch extends ProcessEJB implements TaxSchLocal, TaxSchRemote
 						else
 						{
 							//Changed by Rohan on 03-04-13 for setting party name is equals to blank.start
-							System.out.println("******PARTY NAME ELSE************");
+							
 							if (partyName == null)
 							{
 								partyName = " " ;
@@ -728,7 +728,7 @@ public class TaxSch extends ProcessEJB implements TaxSchLocal, TaxSchRemote
 					{	
 						siteCodeShip = checkNull(sqlExprResultSet.getString("SUPP_CODE"));
 						exciseRef = checkNull(sqlExprResultSet.getString("EXC_REF"));
-						System.out.println("siteCodeShip:::::"+siteCodeShip+"P-RCP");
+						
 					}
 					//Changed by Rohan on 23-Apr-13 for appending site code from sql.end
 					//genericUtility.getValidDateString(sprocDate, genericUtility.getApplDateFormat(), genericUtility.getApplDateFormat());
@@ -1018,7 +1018,9 @@ public class TaxSch extends ProcessEJB implements TaxSchLocal, TaxSchRemote
 					retTabSepStrBuff.append(checkNull(sqlExprResultSet.getString("BANK_CODE"))).append("\t"); //Bank code
 					retTabSepStrBuff.append(checkNull(sqlExprResultSet.getString("TAX_REF"))).append("\t"); //tax reference
 					retTabSepStrBuff.append(checkNull(sqlExprResultSet.getString("DOC_DESCR"))).append("\t"); //doc desccr
-					retTabSepStrBuff.append(checkNull(sqlExprResultSet.getString("DOC_TYPE"))).append("\t"); //doc typr
+					//Changed by Rohan on 29-04-13 for appending dr cr type
+					retTabSepStrBuff.append((String)this.globalVarMap.get("drcr_type")).append("\t");
+					//retTabSepStrBuff.append(checkNull(sqlExprResultSet.getString("DOC_TYPE"))).append("\t"); //doc typr
 					//Changed by Rohan on 08-04-13 for maintain selecting sequence & display sequecnce same to support sorting functionality.end
 					//Changed by Rohan on 08-04-13 for maintain selecting sequence & display sequecnce same to support sorting functionality.start
 					//retTabSepStrBuff.append(matCategory).append("\t");