Tax amount set from vouchadv for multple line

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

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

@@ -38,6 +38,7 @@ public class VoucherPostSave extends ValidatorEJB implements VoucherPostSaveLoca
 
 		double diffAmtExch = 0, adjAmt = 0, netAmt = 0, netAmtBc = 0, vouchAmt = 0, billAmt = 0, taxAmt = 0, totAmt = 0;
 		double netAmtRcp = 0, advAmt = 0, netAmtDet = 0, netAmtBcRcp = 0, taxAmtDet = 0, totAmtDet = 0, netAmtBcDet = 0 ;
+		double vouchAvdTaxAmt=0;
 				 
 		int cnt=0;
 		try
@@ -48,7 +49,7 @@ public class VoucherPostSave extends ValidatorEJB implements VoucherPostSaveLoca
 
 			tranId = GenericUtility.getInstance().getColumnValue("tran_id",dom);
 			// Advance Screen Cross Update
-			sql="select coalesce(adj_amt,0), coalesce(diff_amt__exch,0) from vouchadv WHERE  tran_id = ? " ;
+			sql="select case when sum(case when adj_amt is null then 0 else adj_amt end) is null then 0 else sum(case when adj_amt is null then 0 else adj_amt end) end,case when sum(case when diff_amt__exch is null then 0 else diff_amt__exch end) is null then 0 else sum(case when diff_amt__exch is null then 0 else diff_amt__exch end) end,case when sum(case when tax_amt is null then 0 else tax_amt end) is null then 0 else sum(case when tax_amt is null then 0 else tax_amt end) end from vouchadv WHERE  tran_id = ? " ;
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1,tranId );
 			rs = pstmt.executeQuery();
@@ -56,6 +57,7 @@ public class VoucherPostSave extends ValidatorEJB implements VoucherPostSaveLoca
 			{
 				adjAmt = rs.getDouble(1);
 				diffAmtExch = rs.getDouble(2);
+				vouchAvdTaxAmt=rs.getDouble(3);
 			}
 			rs.close();
 			rs = null;
@@ -245,10 +247,10 @@ public class VoucherPostSave extends ValidatorEJB implements VoucherPostSaveLoca
 				sql="UPDATE voucher set adv_amt = ?, tax_amt = ?, tot_amt = ?, net_amt = ?, net_amt__bc = ?  WHERE  tran_id = ? ";
 					pstmt = conn.prepareStatement(sql);
 					pstmt.setDouble(1,advAmt );
-					pstmt.setDouble(2,taxAmtDet);
-					pstmt.setDouble(3,totAmtDet);
-					pstmt.setDouble(4,netAmtDet);
-					pstmt.setDouble(5,netAmtBcDet);
+					pstmt.setDouble(2,taxAmtDet+vouchAvdTaxAmt);
+					pstmt.setDouble(3,totAmtDet+vouchAvdTaxAmt);
+					pstmt.setDouble(4,netAmtDet+vouchAvdTaxAmt);
+					pstmt.setDouble(5,netAmtBcDet+vouchAvdTaxAmt);
 					pstmt.setString(6,tranId);
 					cnt = pstmt.executeUpdate();
 					pstmt.close();