to get all tran series

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

webitm-fin/ibase/webitm/ejb/fin/adv/MiscPayAct.java

@@ -136,7 +136,7 @@ public class MiscPayAct extends ActionHandlerEJB implements MiscPayActLocal,Misc
 	private String actionVoucher(Document dom, String objContext, String xtraParams) throws RemoteException , ITMException
 	{
 		//System.out.println("\n***********!!!!!!!!In Action voucher................");
-		//System.out.println("\n  in actionVoucher............");
+		System.out.println("\n  in actionVoucher............");
 		String siteCode = "";
 		String currCode = "";
 		String sundryCode = "";
@@ -176,7 +176,6 @@ public class MiscPayAct extends ActionHandlerEJB implements MiscPayActLocal,Misc
 			tranID  =  genericUtility.getColumnValue("tran_id",dom);
 			//System.out.println("!!!!!!!!The transaction id is==="+tranID);
 			//System.out.println("!!!!!!!!The pay_type is s==="+paymentType);
-
 			//added below condition by mukesh 26sept for req id - FI89ALL024
 			if("P".equalsIgnoreCase(paymentType))
      	    {
@@ -286,8 +285,10 @@ public class MiscPayAct extends ActionHandlerEJB implements MiscPayActLocal,Misc
 					+"MISC_PAYABLES.REF_NO, "
 					+"MISC_PAYABLES.REF_DATE "
 					+"FROM MISC_PAYABLES "
-					+"WHERE (MISC_PAYABLES.TRAN_SER IN ('M-VOUC', 'VOUCH') OR TRAN_SER LIKE 'P-IBC%') "//(07052007)
-					+"AND MISC_PAYABLES.CURR_CODE = '"+currCode+"' "
+					+"WHERE "
+					//(MISC_PAYABLES.TRAN_SER IN ('M-VOUC', 'VOUCH') OR TRAN_SER LIKE 'P-IBC%') "//(07052007)
+					//to get all TRAN_SER(added by Sanjay 28/01/10) on Req-ID FI89ALL106
+					+"MISC_PAYABLES.CURR_CODE = '"+currCode+"' "
 					+"AND MISC_PAYABLES.SITE_CODE = '"+siteCode+"' "
 					+"AND MISC_PAYABLES.SUNDRY_TYPE = '"+sundryType+"' "
 					+"AND MISC_PAYABLES.TOT_AMT - MISC_PAYABLES.ADJ_AMT <> 0 ";
@@ -312,18 +313,18 @@ public class MiscPayAct extends ActionHandlerEJB implements MiscPayActLocal,Misc
 				valueXmlString.append("<tot_amt>").append("<![CDATA[").append(rs2.getString(8) == null?"":rs2.getString(8).trim()).append("]]>").append("</tot_amt>\r\n");
 				valueXmlString.append("<pending_amt>").append("<![CDATA[").append(peindingQty).append("]]>").append("</pending_amt>\r\n");
 				//valueXmlString.append("<adj_amt>").append("<![CDATA[").append(rs2.getString(9) == null?"":rs2.getString(9).trim()).append("]]>").append("</adj_amt>\r\n");
-
+				valueXmlString.append("<bill_no>").append("<![CDATA[").append(rs2.getString(4) == null ? " " : rs2.getString(4).trim()).append("]]>").append("</bill_no>\r\n");				
 				valueXmlString.append("<tran_id__payable>").append("<![CDATA[").append(rs2.getString(1).trim()).append("]]>").append("</tran_id__payable>\r\n");
 			    //valueXmlString.append("<bill_no>").append("<![CDATA[").append(rs2.getString(4) == null?"":rs2.getString(4).trim()).append("]]>").append("</bill_no>\r\n");
 				//commented by mukesh to avoid garbage value 26 sept 08
-				if(rs2.getString(4)==null)
+				/* if(rs2.getString(4)==null)
 				{
 				   valueXmlString.append("<bill_no/>");
 				}
 				else
 				{
 				   valueXmlString.append("<bill_no>").append("<![CDATA[").append(rs2.getString(4).trim()).append("]]>").append("</bill_no>\r\n");
-				}
+				} */
 				valueXmlString.append("<bill_date>").append("<![CDATA[").append(rs2.getDate(5) == null?"":sdf.format(rs2.getDate(5))).append("]]>").append("</bill_date>\r\n");
 				valueXmlString.append("<curr_code>").append("<![CDATA[").append(rs2.getString(6) == null?"":rs2.getString(6).trim()).append("]]>").append("</curr_code>\r\n");
 				valueXmlString.append("<vouch_no>").append("<![CDATA[").append( rs2.getString(11) == null?"":rs2.getString(11).trim() ).append("]]>").append("</vouch_no>\r\n");