Commit 54c21099 authored by manohar's avatar manohar

Bug fixing finance charge calculation


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@95550 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 5bb7aba8
...@@ -3304,7 +3304,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -3304,7 +3304,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
rcpAutoFinchg = finCommon.getFinparams("999999", "RCP_AUTO_FINCHG",conn).trim(); rcpAutoFinchg = finCommon.getFinparams("999999", "RCP_AUTO_FINCHG",conn).trim();
if (rcpAutoFinchg.equals("") || rcpAutoFinchg == null ) if (rcpAutoFinchg.equals("") || rcpAutoFinchg == null )
{ {
bdFluctuationCf = "N"; rcpAutoFinchg = "N";
} }
if (rcpAutoFinchg.equals("Y")) if (rcpAutoFinchg.equals("Y"))
{ {
...@@ -3339,7 +3339,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -3339,7 +3339,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
tranDate = dateFormat1.parse(genericUtility.getColumnValue("tran_date", dom)); tranDate = dateFormat1.parse(genericUtility.getColumnValue("tran_date", dom1));
if (tranDate.before(dueDate)) if (tranDate.before(dueDate))
{ {
days = (int)(dueDate.getTime() - tranDate.getTime()) / 361440000; days = (int)(dueDate.getTime() - tranDate.getTime()) / 361440000;
...@@ -3359,7 +3359,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -3359,7 +3359,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
if (finChg == 0.0D) finChg = 0.0D; if (finChg == 0.0D) finChg = 0.0D;
if (discountLc == 0.0D) discountLc = 0.0D; if (discountLc == 0.0D) discountLc = 0.0D;
if (fchgType == "P") if ("P".equals(fchgType))
{ {
discountLc = rcpAmt * (finChg / 36500.0D) * days; discountLc = rcpAmt * (finChg / 36500.0D) * days;
} }
......
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