Gimatex: Export bank receipt

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

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

@@ -3737,16 +3737,25 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
 
 					if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
 					{
-						sql = "SELECT  tot_amt, adj_amt FROM receivables  WHERE tran_ser = ?  and ref_no = ?  for update ";
+						//COMMENTED BY MONIKA
+						//sql = "SELECT  tot_amt, adj_amt FROM receivables  WHERE tran_ser = ?  and ref_no = ?  for update ";
+					//CHANGES DONE BY MONIKA-0N 7 AUGUST 2019
+						sql = "SELECT  tot_amt, adj_amt FROM misc_payables  WHERE tran_ser = ?  and ref_no = ?  for update ";//end
 					}
 
 					else if ( "mssql".equalsIgnoreCase(CommonConstants.DB_NAME ))
 					{
-						sql = "SELECT  tot_amt, adj_amt FROM receivables (updlock) where tran_ser = ? and  ref_no = ?  " ;
+						//COMMENTED BY MONIKA
+						//sql = "SELECT  tot_amt, adj_amt FROM receivables (updlock) where tran_ser = ? and  ref_no = ?  " ;
+						//CHANGES DONE BY MONIKA-0N 7 AUGUST 2019
+						sql = "SELECT  tot_amt, adj_amt FROM misc_payables (updlock) where tran_ser = ? and  ref_no = ?  " ;//end
 					}
 					else
 					{
-						sql =" SELECT  tot_amt, adj_amt FROM receivables WHERE tran_ser = ?  and ref_no = ?  for update nowait" ;
+						//COMMENTED BY MONIKA
+						//sql =" SELECT  tot_amt, adj_amt FROM receivables WHERE tran_ser = ?  and ref_no = ?  for update nowait" ;
+						//CHANGES DONE BY MONIKA-0N 7 AUGUST 2019
+						sql =" SELECT  tot_amt, adj_amt FROM misc_payables WHERE tran_ser = ?  and ref_no = ?  for update nowait" ;//end
 					}
 					pstmt = conn.prepareStatement(sql);
 					pstmt.setString(1,"E-FUND");
@@ -3775,8 +3784,11 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
 						return errString;
 					}
 
-
-					adjAmt = adjAmt + totAmt;
+					//commented by monika
+					//adjAmt = adjAmt + totAmt;
+					//changes done by monika on 07 aug 2019
+					adjAmt = adjAmt + amount;
+					//end
 					if(totAmt == adjAmt)
 					{
 						status = "A";
@@ -3787,8 +3799,8 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
 					}
 
 
-				//	sql = "update misc_payables set adj_amt = ?  where tran_ser = 'E-FUND' and ref_no = ? ";//commeneted by monika
-					sql = "update misc_payables set adj_amt = ?  where tran_ser = ? and ref_no = ? ";//added by monika  0n 7 august 2019 
+				//	sql = "update misc_payables set adj_amt = ?  where tran_ser = 'E-FUND' and ref_no = ? ";//commeneted by monika 0n 7 august 2019
+					sql = "update misc_payables set adj_amt = ?  where tran_ser = ? and ref_no = ? ";
 					pstmt = conn.prepareStatement(sql);
 					pstmt.setDouble(1,adjAmt);
 					pstmt.setString(2,"E-FUND");