rcpacct amount converted to transaction currency and update in oth_amt, also...

rcpacct amount converted to transaction currency and update in oth_amt, also tax_amt from details updated in header


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

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

@@ -75,7 +75,7 @@ public class ReceiptAdvPostSave extends ValidatorEJB implements ReceiptAdvPostSa
 		String acctFin = "";
 		String acctFinS = "";
 		double rcpAmt=0,finChg=0, diffAmtExchDet = 0, diffAmtExchAdv = 0, diffAmtExchEpc = 0;
-		double billAmtDet = 0, advAmtHdr = 0, adjAmtAdv = 0, bdAmt =0, advAmtRact = 0, othAmt =0;
+		double billAmtDet = 0, advAmtHdr = 0, adjAmtAdv = 0, bdAmt =0, advAmtRact = 0, othAmt =0,exchRateHdr = 0, taxAmt = 0;
 		int cnt=0;
 		try
 		{
@@ -91,13 +91,14 @@ public class ReceiptAdvPostSave extends ValidatorEJB implements ReceiptAdvPostSa
 				//finChg = Double.parseDouble(GenericUtility.getInstance().getColumnValueFromNode("fin_chg",dom.getElementsByTagName("Detail2").item(i)));
 				
 
-				sql="select sum(diff_amt__exch) from rcpdet WHERE  tran_id = ? " ;
+				sql="select sum(diff_amt__exch), sum(tax_amt) from rcpdet WHERE  tran_id = ? " ;
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString(1,tranId );
 				rs = pstmt.executeQuery();
 				if (rs.next())
 				{
 					diffAmtExchDet = rs.getDouble(1);
+					taxAmt = rs.getDouble(2);
 				}
 				rs.close();
 				rs = null;
@@ -122,13 +123,14 @@ public class ReceiptAdvPostSave extends ValidatorEJB implements ReceiptAdvPostSa
 				rs.close();
 				rs = null;
 				
-				sql="select adv_amt from receipt WHERE  tran_id = ? ";
+				sql="select adv_amt, exch_rate from receipt WHERE  tran_id = ? ";
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString(1,tranId );
 				rs = pstmt.executeQuery();
 				if (rs.next())
 				{
 					advAmtHdr = rs.getDouble(1);
+					exchRateHdr = rs.getDouble(2);
 				}
 				rs.close();
 				rs = null;
@@ -136,9 +138,10 @@ public class ReceiptAdvPostSave extends ValidatorEJB implements ReceiptAdvPostSa
 				pstmt = null;
 
 				
-				sql="select sum(case when eff_bank <> 'N' then amount else 0 end ) oth_amt from rcpacct WHERE  tran_id = ? ";
+				sql="select sum( (case when eff_bank <> 'N' then amount else 0 end) * exch_rate / ? ) oth_amt from rcpacct WHERE  tran_id = ? ";
 				pstmt = conn.prepareStatement(sql);
-				pstmt.setString(1,tranId );
+				pstmt.setDouble(1,exchRateHdr);
+				pstmt.setString(2,tranId );
 				rs = pstmt.executeQuery();
 				if (rs.next())
 				{
@@ -149,11 +152,12 @@ public class ReceiptAdvPostSave extends ValidatorEJB implements ReceiptAdvPostSa
 				pstmt.close();
 				pstmt = null;
 
-				sql="UPDATE receipt SET oth_amt = ? WHERE  tran_id = ? " ;
+				sql="UPDATE receipt SET oth_amt = ?, tax_amt = ? WHERE  tran_id = ? " ;
 				pstmt = conn.prepareStatement(sql);
 
 				pstmt.setDouble(1,othAmt );
-				pstmt.setString(2,tranId );
+				pstmt.setDouble(2,taxAmt );
+				pstmt.setString(3,tranId );
 				cnt = pstmt.executeUpdate();
 				pstmt.close();
 				pstmt = null;
@@ -207,7 +211,8 @@ 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)) ,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)) * exch_rate WHERE  tran_id = ? " ;
+				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 = ? " ;
 				pstmt = conn.prepareStatement(sql);
 
 				pstmt.setDouble(1,diffAmtExchDet );