Commit f16e2815 authored by manohar's avatar manohar

Bug fixing , all recalculation durig confirm removed as the same is done in post_save


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@94131 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 290c4b91
...@@ -497,7 +497,6 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -497,7 +497,6 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
RcpHdrMap.put("entry_batch_no",rs.getString("entry_batch_no")); RcpHdrMap.put("entry_batch_no",rs.getString("entry_batch_no"));
RcpHdrMap.put("bill_amt",rs.getDouble("bill_amt")); RcpHdrMap.put("bill_amt",rs.getDouble("bill_amt"));
RcpHdrMap.put("diff_amt__exch",rs.getDouble("diff_amt__exch")); RcpHdrMap.put("diff_amt__exch",rs.getDouble("diff_amt__exch"));
RcpHdrMap.put("net_amt__bc",rs.getDouble("net_amt__bc"));
RcpHdrMap.put("anal_code",rs.getString("anal_code")); RcpHdrMap.put("anal_code",rs.getString("anal_code"));
RcpHdrMap.put("bill_disc_amt",rs.getDouble("bill_disc_amt")); RcpHdrMap.put("bill_disc_amt",rs.getDouble("bill_disc_amt"));
RcpHdrMap.put("oth_amt",rs.getDouble("oth_amt")); RcpHdrMap.put("oth_amt",rs.getDouble("oth_amt"));
...@@ -1812,8 +1811,11 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -1812,8 +1811,11 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
} }
exchRate = (double) Double.parseDouble( "" + RcpHdrMap.get("exch_rate")); exchRate = (double) Double.parseDouble( "" + RcpHdrMap.get("exch_rate"));
total = total + ( (double) Double.parseDouble( "" + RcpHdrMap.get("tax_amt"))); //change done by akhilesh on 05/sep/2013 for adjust tax amount // 14/01/14 manoharan no need to recalculate as it is taken care off in pose_save
totBc = total * exchRate; //total = total + ( (double) Double.parseDouble( "" + RcpHdrMap.get("tax_amt"))); //change done by akhilesh on 05/sep/2013 for adjust tax amount
//totBc = total * exchRate;
total = (double) Double.parseDouble( "" + RcpHdrMap.get("net_amt"));
totBc = (double) Double.parseDouble( "" + RcpHdrMap.get("net_amt__bc"));
System.out.println("Final total ["+ total + "] totBc [" + totBc + "]"); System.out.println("Final total ["+ total + "] totBc [" + totBc + "]");
//total = 0; //total = 0;
...@@ -1948,7 +1950,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -1948,7 +1950,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
sql = "update receipt set net_amt = ?, net_amt__bc = ? where tran_id = ?"; /*sql = "update receipt set net_amt = ?, net_amt__bc = ? where tran_id = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setDouble(1,total); pstmt.setDouble(1,total);
pstmt.setDouble(2,totBc); pstmt.setDouble(2,totBc);
...@@ -1956,6 +1958,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -1956,6 +1958,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
pstmt.executeUpdate(); pstmt.executeUpdate();
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
*/
} }
catch(Exception e) catch(Exception e)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment