bill discount entry and receivables being adjusted

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

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

@@ -277,12 +277,14 @@ public class ReceiptAdvPostSave extends ValidatorEJB implements ReceiptAdvPostSa
 			{
 				// 29/05/14 manoharan
 				// 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 = ? " ; //Added advadjamtount in formulla by manoj dtd 27/06/2016
+				//Changes and commented by Ajay on 23/01/2018:START
+				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 = ? " ; //Added advadjamtount in formulla by manoj dtd 27/06/2016
 				pstmt = conn.prepareStatement(sql);
 
-				//pstmt.setDouble(1,bdAmt );
-				pstmt.setString(1,tranId );
+				pstmt.setDouble(1,bdAmt );
+				pstmt.setString(2,tranId );
+				//Changes and commented by Ajay on 23/01/2018:END
 				rs = pstmt.executeQuery();
 				if (rs.next())
 				{
@@ -304,12 +306,14 @@ public class ReceiptAdvPostSave extends ValidatorEJB implements ReceiptAdvPostSa
 			
 			
 				// 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 = ? " ;//Added advadjamtount in formulla by manoj dtd 27/06/2016
+				//Changes and Commented by Ajay on 23/01/2018:START
+				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 = ? " ;//Added advadjamtount in formulla by manoj dtd 27/06/2016
 				pstmt = conn.prepareStatement(sql);
 
-				//pstmt.setDouble(1,bdAmt );
-				pstmt.setString(1,tranId );
+				pstmt.setDouble(1,bdAmt );
+				pstmt.setString(2,tranId );
+				//Changes and Commented by Ajay on 23/01/2018:END
 				cnt = pstmt.executeUpdate();
 				pstmt.close();
 				pstmt = null;