modify in sun by manoj ...merging in base office on cvs

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@99575 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-fin/ibase/webitm/ejb/fin/AutoPmtGenPrc.java

@@ -632,7 +632,7 @@ public class AutoPmtGenPrc extends ProcessEJB
 
       curYear = calCurr.get(1);
 
-      chgDate = new Integer(curYear).toString() + "-" + new Integer(curMonth).toString() + "-" + new Integer(curDate).toString();
+      //chgDate = new Integer(curYear).toString() + "-" + new Integer(curMonth).toString() + "-" + new Integer(curDate).toString();
 
       exchRate = this.genericUtility.getColumnValue("exch_rate", headerDom);
 
@@ -1690,7 +1690,7 @@ public class AutoPmtGenPrc extends ProcessEJB
         xmlString.append("<conf_date><![CDATA[]]></conf_date>");
         xmlString.append("<chg_user><![CDATA[" + chgUser + "]]></chg_user>");
         xmlString.append("<chg_term><![CDATA[" + chgTerm + "]]></chg_term>");
-        xmlString.append("<chg_date><![CDATA[" + chgDate + "]]></chg_date>");
+        xmlString.append("<chg_date><![CDATA[" + sysDate + "]]></chg_date>");
 
         xmlString.append("</Detail1>");
         System.out.println("Creating Header====$$$$$=" + xmlString.toString());

webitm-fin/ibase/webitm/ejb/fin/MilestonePayGenPrc.java

@@ -657,7 +657,7 @@ public class MilestonePayGenPrc extends ValidatorEJB implements MilestonePayGenP
 								"pterm.AMT_TYPE ,pterm.REL_AMT ,pterm.REL_AFTER ,pterm.VOUCH_CREATED ,pterm.TASK_CODE ," +
 								"pterm.DUE_DATE , pterm.ADJ_METHOD  ,pterm.TAX_CLASS ," +
 								"pterm.TAX_CHAP , pterm.TAX_ENV ,pterm.RETENTION_PERC ,pterm.SITE_CODE__ADV ," +
-								"pterm.ADJ_PERC,pterm.allow_override, pterm.line_no__prev,pterm.remarks,po.SUPP_CODE, po.ord_amt, po.tax_amt, po.tot_amt" +
+								"pterm.ADJ_PERC,pterm.allow_override, pterm.line_no__prev,pterm.remarks,po.SUPP_CODE, po.ord_amt, po.tax_amt, po.tot_amt " +
 								"FROM PORD_PAY_TERM pterm,porder po  " +
 								"WHERE PTERM.PURC_ORDER = PO.PURC_ORDER and  pterm.PURC_ORDER = ? " +
 								"and  case when pterm.VOUCH_CREATED is null then 'N' else pterm.VOUCH_CREATED  end = 'N' " +