Commit b9988612 authored by smanohar's avatar smanohar

due_date calculation start_from passed as B in itemchange of bill_dte corrected

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@212414 ce508802-f39f-4f6c-b175-0d175dae99d5
parent bbe9ee14
...@@ -2867,11 +2867,11 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M ...@@ -2867,11 +2867,11 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M
} }
} }
else if(currentColumn.trim().equalsIgnoreCase("tran_date")) /*else if(currentColumn.trim().equalsIgnoreCase("tran_date"))
{ {
tranDate = genericUtility.getColumnValue("tran_date", dom); tranDate = genericUtility.getColumnValue("tran_date", dom);
valueXmlString.append("<eff_date>").append("<![CDATA[" + tranDate + "]]>").append("</eff_date>"); valueXmlString.append("<eff_date>").append("<![CDATA[" + tranDate + "]]>").append("</eff_date>");
} } */
else if(currentColumn.trim().equalsIgnoreCase("cctr_code__ap")) else if(currentColumn.trim().equalsIgnoreCase("cctr_code__ap"))
{ {
...@@ -4349,7 +4349,7 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M ...@@ -4349,7 +4349,7 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M
startFrom = findValue(conn, "start_from", "crterm", "cr_term", crTerm); startFrom = findValue(conn, "start_from", "crterm", "cr_term", crTerm);
System.out.println("3478 CRDAY = " + crDays1); System.out.println("3478 CRDAY = " + crDays1);
System.out.println("start from = " + startFrom); System.out.println("start from = " + startFrom);
dueDate = getDueDate(conn, simpleDateFormat, "B", tranDate, effDate, billDate, crDays); dueDate = getDueDate(conn, simpleDateFormat, startFrom, tranDate, effDate, billDate, crDays);
System.out.println("due date = " + dueDate); System.out.println("due date = " + dueDate);
dueDate1 = simpleDateFormat.format(dueDate); dueDate1 = simpleDateFormat.format(dueDate);
valueXmlString.append("<due_date>").append("<![CDATA[" + dueDate1 + "]]>").append("</due_date>"); valueXmlString.append("<due_date>").append("<![CDATA[" + dueDate1 + "]]>").append("</due_date>");
...@@ -5372,6 +5372,8 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M ...@@ -5372,6 +5372,8 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M
try try
{ {
System.out.println("In getDueDate startFrom ["+startFrom + "] tranDate [" + tranDate + "] effDate [" + effDate + "] billDate [" + billDate+ "] crDays [" +crDays + "]");
System.out.println("In getDueDate tranDate [" + simpleDateFormat.parse(tranDate) + "]");
if("R".equalsIgnoreCase(startFrom)) if("R".equalsIgnoreCase(startFrom))
{ {
cal.setTime((simpleDateFormat.parse(tranDate))); cal.setTime((simpleDateFormat.parse(tranDate)));
...@@ -5400,6 +5402,7 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M ...@@ -5400,6 +5402,7 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M
cal.add(Calendar.DATE,crDays); cal.add(Calendar.DATE,crDays);
dueDate = cal.getTime(); dueDate = cal.getTime();
} }
System.out.println("In getDueDate ["+startFrom + "] dueDate [" + simpleDateFormat.format(dueDate) + "]");
} }
catch (ParseException e) catch (ParseException 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