changes done by manoharan for Voucher Information

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

webitm-fin/module-resource/jsp/billStatus.jsp

@@ -711,17 +711,23 @@ while(rs.next())
 	pstmt4 = null; 
 	
 	
-	
-	/*---------------Voucher Information---------------------------------------------*/
-	
-	 sql = "  select distinct v.tran_id,v.tran_date,v.tran_type,v.supp_code,v.bill_no,v.bill_amt,v.bill_date, ";
+}//end of while loop for receipt information
+rs.close();
+rs = null;
+pstmt.close();
+pstmt = null; 
+
+	//---------------Voucher Information---------------------------------------------
+	// manoharan distinct removed, also inner query in 
+	 sql = "  select v.tran_id,v.tran_date,v.tran_type,v.supp_code,v.bill_no,v.bill_amt,v.bill_date, ";
 	sql = sql + " v.bank_code,v.due_date,v.adv_amt,v.bill_amt,v.tax_amt,v.tot_amt, ";
 	sql = sql + " v.confirmed,v.conf_date,v.paid,v.net_amt,v.vouch_type,v.PURC_ORDER,v.DUE_DATE,v.SUPP_BILL_AMT,'"+rcpNo+"' prcp_id  ";
-	sql = sql + " from voucher v  where v.purc_order=? and v.tran_id in(select distinct tran_id from vouchrcp where prcp_id=?) ";
-
+	// manoharan commented and added new condiition
+	//sql = sql + " from voucher v  where v.purc_order=? and v.tran_id in(select distinct tran_id from vouchrcp where prcp_id=?) ";
+	sql = sql + " from voucher v  where (v.tran_id in(select distinct tran_id from vouchrcp where prcp_id in (select tran_id from porcp where purc_order = ? ) )) or (v.vouch_type = 'A' and v.purc_order = ?)";
 	pstmt1 = conn.prepareStatement(sql);
 	pstmt1.setString(1,purcOrder);  
-	pstmt1.setString(2,rcpNo);  
+	pstmt1.setString(2,purcOrder);  
 	rs1 = pstmt1.executeQuery();
 	while(rs1.next())
 	{  
@@ -854,7 +860,7 @@ while(rs.next())
     System.out.println("========Payment Information=========");
  
     sql = " select pmt.tran_id,pmt.tran_date,pmt.tran_type,pmt.pay_mode,pmt.site_code,pmt.bank_code ";
-	sql = sql + "  ,pmt.sundry_type,pmt.sundry_code,pmt.ref_no,pmt.ref_date,pmtdet.pay_amt,pmt.tax_amt,pmt.discount_amt,pmt.confirmed,pmt.conf_date ";
+	sql = sql + "  ,pmt.sundry_type,pmt.sundry_code,pmt.ref_no,pmt.ref_date,pmtdet.pay_amt,pmtdet.tax_amt,pmtdet.discount_amt,pmt.confirmed,pmt.conf_date ";
 	sql = sql + " ,pmtdet.vouch_no,pmtdet.vouch_date ";
 	sql = sql + " from misc_payment pmt,misc_paydet pmtdet where pmtdet.tran_id = pmt.tran_id ";
 	sql = sql + " and pmtdet.vouch_no=? ";
@@ -1026,8 +1032,6 @@ while(rs.next())
 	pstmt2.close();
 	pstmt2 = null; 
 	
-	
-	
 	}//end of while for voucher information
 	rs1.close();
 	rs1 = null;
@@ -1036,13 +1040,7 @@ while(rs.next())
 	
 	
 	
-		
-	
-}//end of while loop for receipt information
-rs.close();
-rs = null;
-pstmt.close();
-pstmt = null; 
+
 
 %>