Commit b95c3627 authored by msalla's avatar msalla

In Bank receipt if user adds the charges in 4th screen and keep the flag...

In Bank receipt if user adds the charges in 4th screen and keep the flag effect to Y then accounting effect is not posting properly

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@207438 ce508802-f39f-4f6c-b175-0d175dae99d5
parent e9747b4d
...@@ -424,13 +424,13 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -424,13 +424,13 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
double amtRev = 0.0; double amtRev = 0.0;
double badAmt = 0.0; double badAmt = 0.0;
double totBc = 0.0,taxAmt=0.0; double totBc = 0.0,taxAmt=0.0;
double chq = 0.0; double chq = 0.0,othAmt=0.0;
int i = 0; int i = 0;
int cnt = 0 ; int cnt = 0 ;
int maxline = 0; int maxline = 0;
int cnt1 = 0 , findIndex = -1; int cnt1 = 0 , findIndex = -1;
Date tranDate = null; Date tranDate = null;
HashMap RcpHdrMap = null; HashMap RcpHdrMap = null;
HashMap DetMap = null; HashMap DetMap = null;
HashMap RcpDetMap = null; HashMap RcpDetMap = null;
...@@ -458,7 +458,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -458,7 +458,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
java.sql.Timestamp today = null; java.sql.Timestamp today = null;
java.util.Date date = null; java.util.Date date = null;
GenericUtility genericUtility = new GenericUtility(); GenericUtility genericUtility = new GenericUtility();
//Ended by varsha v for truncating time from tran_date on 07-05-18 //Ended by varsha v for truncating time from tran_date on 07-05-18
try try
{ {
finCommon = new FinCommon(); finCommon = new FinCommon();
...@@ -2076,7 +2076,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -2076,7 +2076,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
//changes made-by-monika-30-may-2019 //changes made-by-monika-30-may-2019
chq = ((double) Double.parseDouble( "" + RcpHdrMap.get("chq_amt")) ); chq = ((double) Double.parseDouble( "" + RcpHdrMap.get("chq_amt")) );
//end //end
//addded by monika-27 july-2019 //addded by monika-27 july-2019 for tax amt
taxAmt=((double) Double.parseDouble( "" + RcpHdrMap.get("tax_amt")) ); taxAmt=((double) Double.parseDouble( "" + RcpHdrMap.get("tax_amt")) );
//end //end
// if EPC adjusted in same currency then // if EPC adjusted in same currency then
...@@ -2087,12 +2087,16 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -2087,12 +2087,16 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
{ {
chq = chq + ((double) Double.parseDouble( "" + RcpHdrMap.get("efundadj_amt"))) ; chq = chq + ((double) Double.parseDouble( "" + RcpHdrMap.get("efundadj_amt"))) ;
} }
//commented by monika -27 july-2019 //commented by monika -27 july-2019
//System.out.println("chq and ["+chq+"] total ["+total + "] diff [" + Math.abs(chq - total ) +"]"); //System.out.println("chq and ["+chq+"] total ["+total + "] diff [" + Math.abs(chq - total ) +"]");
//if(Math.abs(chq - total) > 1) //if(Math.abs(chq - total) > 1)
//changes by monika-27 july-2019 //changes by monika-27 july-2019
System.out.println("chq and ["+chq+"] total ["+total + "] diff [" + Math.abs(chq - (total -taxAmt) ) +"]"); System.out.println("chq and ["+chq+"] total ["+total + "] diff [" + Math.abs(chq - (total -taxAmt) ) +"]");
if(Math.abs(chq - (total - taxAmt)) > 1)//end //if(Math.abs(chq - (total - taxAmt)) > 1)
//added by monika on 14 sept 2019 for accounting effect--
othAmt=((double) Double.parseDouble( "" + RcpHdrMap.get("oth_amt")));
// System.out.println("chq and ["+chq+"] total ["+total + "] other_amount ]"+othAmt+" ] diff [" + Math.abs(chq - (total -taxAmt)+othAmt ) +"]");
if(Math.abs(chq - (total - taxAmt)+othAmt) > 1)//end
{ {
errString = itmDBAccessEJB.getErrorString("","VTRCPT8","","",conn); errString = itmDBAccessEJB.getErrorString("","VTRCPT8","","",conn);
conn.rollback(); conn.rollback();
......
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