adv_amt setting corrected in case of bill discounting

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

webitm-fin/ibase/webitm/ejb/fin/ReceiptAdvPostSave.java

@@ -216,11 +216,13 @@ public class ReceiptAdvPostSave extends ValidatorEJB implements ReceiptAdvPostSa
 				if (chqAmtActual != 0)
 				{
 					// 29/05/14 manoharan
-					sql="select  chq_amt - ((case when bill_amt is null then 0 else bill_amt  end)+ (case when advadj_amt is null then 0 else advadj_amt end) - ?  +  (case when oth_amt is null then 0 else oth_amt end)  + (case when fin_chg is null then 0 else fin_chg end) + tax_amt)  from receipt WHERE  tran_id = ? " ;
+					// 30/06/14 manoharan not to deduct dbamt
+					//sql="select  chq_amt - ((case when bill_amt is null then 0 else bill_amt  end)+ (case when advadj_amt is null then 0 else advadj_amt end) - ?  +  (case when oth_amt is null then 0 else oth_amt end)  + (case when fin_chg is null then 0 else fin_chg end) + tax_amt)  from receipt WHERE  tran_id = ? " ;
+					sql="select  chq_amt - ((case when bill_amt is null then 0 else bill_amt  end)+ (case when advadj_amt is null then 0 else advadj_amt end)  +  (case when oth_amt is null then 0 else oth_amt end)  + (case when fin_chg is null then 0 else fin_chg end) + tax_amt)  from receipt WHERE  tran_id = ? " ;
 					pstmt = conn.prepareStatement(sql);
 
-					pstmt.setDouble(1,bdAmt );
-					pstmt.setString(2,tranId );
+					//pstmt.setDouble(1,bdAmt );
+					pstmt.setString(1,tranId );
 					rs = pstmt.executeQuery();
 					if (rs.next())
 					{
@@ -237,11 +239,13 @@ public class ReceiptAdvPostSave extends ValidatorEJB implements ReceiptAdvPostSa
 					// end 29/05/14 manoharan
 				
 				
-					sql="UPDATE receipt SET adv_amt = chq_amt - ((case when bill_amt is null then 0 else bill_amt  end)+ (case when advadj_amt is null then 0 else advadj_amt end) - ?  +  (case when oth_amt is null then 0 else oth_amt end)  + (case when fin_chg is null then 0 else fin_chg end) + tax_amt) WHERE  tran_id = ? " ;
+					// 30/06/14 manoharan not to deduct dbamt
+					//sql="UPDATE receipt SET adv_amt = chq_amt - ((case when bill_amt is null then 0 else bill_amt  end)+ (case when advadj_amt is null then 0 else advadj_amt end) - ?  +  (case when oth_amt is null then 0 else oth_amt end)  + (case when fin_chg is null then 0 else fin_chg end) + tax_amt) WHERE  tran_id 					= ? " ;
+					sql="UPDATE receipt SET adv_amt = chq_amt - ((case when bill_amt is null then 0 else bill_amt  end)+ (case when advadj_amt is null then 0 else advadj_amt end) +  (case when oth_amt is null then 0 else oth_amt end)  + (case when fin_chg is null then 0 else fin_chg end) + tax_amt) WHERE  tran_id = ? " ;
 					pstmt = conn.prepareStatement(sql);
 
-					pstmt.setDouble(1,bdAmt );
-					pstmt.setString(2,tranId );
+					//pstmt.setDouble(1,bdAmt );
+					pstmt.setString(1,tranId );
 					cnt = pstmt.executeUpdate();
 					pstmt.close();
 					pstmt = null;