bill discount amount removed from bill_amt and added to net_amt and net_amt__bc

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

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

@@ -197,7 +197,8 @@ public class ReceiptAdvPostSave extends ValidatorEJB implements ReceiptAdvPostSa
 				pstmt.close();
 				pstmt = null;
 				
-				chqAmt = billAmtDet + bdAmt  + adjAmtAdv;
+				//chqAmt = billAmtDet + bdAmt  + adjAmtAdv; // 21/01/14 bd amount removed from bill_amt
+				chqAmt = billAmtDet + adjAmtAdv;
 				if (chqAmt != 0)
 				{
 					sql="UPDATE receipt SET bill_amt = ? WHERE  tran_id = ? " ;
@@ -210,15 +211,17 @@ public class ReceiptAdvPostSave extends ValidatorEJB implements ReceiptAdvPostSa
 				}
 				
  
-
-				sql="UPDATE receipt SET DIFF_AMT__EXCH = ? + ? + ?, net_amt = ((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 bill_disc_amt is null then 0 else bill_disc_amt end)  + (case when fin_chg is null then 0 else fin_chg end) + tax_amt) , "
-				+" net_amt__bc  = ((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 bill_disc_amt is null then 0 else bill_disc_amt end)  + (case when fin_chg is null then 0 else fin_chg end) + tax_amt)  * exch_rate WHERE  tran_id = ? " ;
+				// -  (case when bill_disc_amt is null then 0 else bill_disc_amt end)  removed on 21/01/14
+				sql="UPDATE receipt SET DIFF_AMT__EXCH = ? + ? + ?, net_amt = ((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__bc  = ((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)  * exch_rate, "
+				+" bill_disc_amt = ? WHERE  tran_id = ? " ;
 				pstmt = conn.prepareStatement(sql);
 
 				pstmt.setDouble(1,diffAmtExchDet );
 				pstmt.setDouble(2,diffAmtExchAdv );
 				pstmt.setDouble(3,diffAmtExchEpc );
-				pstmt.setString(4,tranId );
+				pstmt.setDouble(4,bdAmt );
+				pstmt.setString(5,tranId );
 				cnt = pstmt.executeUpdate();
 				pstmt.close();
 				pstmt = null;