Commit 1e7b0d67 authored by smanohar's avatar smanohar

Bug fix in certain cases the misc_payables was not created with full amount

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@216039 ce508802-f39f-4f6c-b175-0d175dae99d5
parent cbcfc963
...@@ -1011,7 +1011,8 @@ public class VoucherConf extends ActionHandlerEJB //implements ReceiptAdvConfLoc ...@@ -1011,7 +1011,8 @@ public class VoucherConf extends ActionHandlerEJB //implements ReceiptAdvConfLoc
acctCodeDisc = cctrCodeDisc.substring(0,cctrCodeDisc.indexOf(",")); acctCodeDisc = cctrCodeDisc.substring(0,cctrCodeDisc.indexOf(","));
cctrCodeDisc = cctrCodeDisc.substring(cctrCodeDisc.indexOf(",")+1); cctrCodeDisc = cctrCodeDisc.substring(cctrCodeDisc.indexOf(",")+1);
} }
System.out.println("Account 2 acctCodePh [" + acctCodePh + "] rcpAmt [" +rcpAmt + "]"); System.out.println("Account 2 acctCodeDisc [" + acctCodeDisc + "] rcpAmt [" +rcpAmt + "]");
System.out.println("Account 2.1 acctCodePh [" + acctCodePh + "] rcpAmt [" +rcpAmt + "]");
////////////////////////////////////////// //////////////////////////////////////////
if (cctrCodePh == null ) if (cctrCodePh == null )
{ {
...@@ -2981,9 +2982,10 @@ public class VoucherConf extends ActionHandlerEJB //implements ReceiptAdvConfLoc ...@@ -2981,9 +2982,10 @@ public class VoucherConf extends ActionHandlerEJB //implements ReceiptAdvConfLoc
miscPayMap = null; miscPayMap = null;
miscPayMap = new HashMap(); miscPayMap = new HashMap();
miscPayMap.put("hold_amt", "0.0"); miscPayMap.put("hold_amt", "0.0");
netAmt = (double) Double.parseDouble( "" + VchHdrMap.get("net_amt"));
if (!"A".equals(vouchType) && holdAmt > 0) if (!"A".equals(vouchType) && holdAmt > 0)
{ {
netAmt = (double) Double.parseDouble( "" + VchHdrMap.get("net_amt")); //netAmt = (double) Double.parseDouble( "" + VchHdrMap.get("net_amt"));
if ( holdAmt < netAmt ) if ( holdAmt < netAmt )
{ {
...@@ -3019,7 +3021,8 @@ public class VoucherConf extends ActionHandlerEJB //implements ReceiptAdvConfLoc ...@@ -3019,7 +3021,8 @@ public class VoucherConf extends ActionHandlerEJB //implements ReceiptAdvConfLoc
miscPayMap.put("exch_rate", (double) Double.parseDouble( "" + VchHdrMap.get("exch_rate"))); miscPayMap.put("exch_rate", (double) Double.parseDouble( "" + VchHdrMap.get("exch_rate")));
miscPayMap.put("bill_no", (String) VchHdrMap.get("bill_no")); miscPayMap.put("bill_no", (String) VchHdrMap.get("bill_no"));
miscPayMap.put("bill_date", (Timestamp) VchHdrMap.get("bill_date")); miscPayMap.put("bill_date", (Timestamp) VchHdrMap.get("bill_date"));
tempAmt = netAmt + rndAmt - retenAmt; ///amish 24-12-04 retention amount deducted //tempAmt = netAmt + rndAmt - retenAmt; ///amish 24-12-04 retention amount deducted
tempAmt = netAmt - retenAmt; ///amish 24-12-04 retention amount deducted
miscPayMap.put("tot_amt", tempAmt); miscPayMap.put("tot_amt", tempAmt);
miscPayMap.put("bank_code", (String) VchHdrMap.get("bank_code")); miscPayMap.put("bank_code", (String) VchHdrMap.get("bank_code"));
miscPayMap.put("auto_pay", (String) VchHdrMap.get("auto_pay")); miscPayMap.put("auto_pay", (String) VchHdrMap.get("auto_pay"));
......
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