Gimatex: Export bank receipt

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

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

@@ -298,7 +298,12 @@ public class ReceiptAdvPostSave extends ValidatorEJB implements ReceiptAdvPostSa
 				// 29/05/14 manoharan
 				// 30/06/14 manoharan not to deduct dbamt
 				//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 = ? " ;
+				//commented by monika-26-july-2019...
+				
+				//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 = ? " ;
+				//changes done-monika-26-july-2019-as tax_amt is already added
+				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))  from receipt WHERE  tran_id = ? " ;
+				//end
 				//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);
 
@@ -327,7 +332,11 @@ public class ReceiptAdvPostSave extends ValidatorEJB implements ReceiptAdvPostSa
 			
 				// 30/06/14 manoharan not to deduct dbamt
 				//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 					= ? " ;
+				//Changes and Commented-monika-26-july-2019
+				//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= ? " ;
+				//changes done-monika-26-july-2019-as tax_amt is already added
+				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)) WHERE  tran_id= ? " ;
+				//end
 				//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);
 
@@ -349,7 +358,7 @@ public class ReceiptAdvPostSave extends ValidatorEJB implements ReceiptAdvPostSa
 			
 			diffAmtExchTotal =  diffAmtExchDet + diffAmtExchAdv + diffAmtExchEpc;
 
-			sql="select  ((case when adv_amt is null then 0 else  adv_amt end)+  (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) net_amt  from receipt WHERE  tran_id = ? " ;
+			sql="select ((case when adv_amt is null then 0 else  adv_amt end)+  (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) net_amt  from receipt WHERE  tran_id = ? " ;
 			pstmt = conn.prepareStatement(sql);
 
 			//pstmt.setDouble(1,bdAmt );