Commit 5e8e2a7e authored by nkhan's avatar nkhan

check null for gb_date if not null then parse gbf from timestam


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@104156 ce508802-f39f-4f6c-b175-0d175dae99d5
parent f99e1235
......@@ -1659,7 +1659,7 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
int cnt=0,lsNo=0;
UtilMethods utlMethods= new UtilMethods();
Timestamp ldDiscdt=null;
Timestamp gpDateTstamp = null;
try
{
java.util.Date today = new java.util.Date();
......@@ -2004,8 +2004,14 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
//receivablesMap.put("gp_date", InvoiceHrdMap.get("gp_date"));
// 02-dec-16 manoharan avoid deprecated
//receivablesMap.put("gp_date", new Timestamp(Timestamp.parse(InvoiceHrdMap.get("gp_date"))));
receivablesMap.put("gp_date", Timestamp.valueOf(genericUtility.getValidDateString(InvoiceHrdMap.get("gp_date"), genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0"));
//receivablesMap.put("gp_date", Timestamp.valueOf(genericUtility.getValidDateString(InvoiceHrdMap.get("gp_date"), genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0"));
//changed by nasruddin start 8-12-16 start
if( InvoiceHrdMap.get("gp_date")!= null)
{
gpDateTstamp = Timestamp.valueOf(genericUtility.getValidDateString(InvoiceHrdMap.get("gp_date").toString(), genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat()) + " 00:00:00.0");
}
receivablesMap.put("gp_date",gpDateTstamp);
//changed by nasruddin start 8-12-16 End
receivablesMap.put("mrp_value","0");
ldDiscdt=calcDiscountDate(InvoiceHrdMap.get("cr_term"), InvoiceHrdMap.get("tran_date"), InvoiceHrdMap.get("eff_date"),
......@@ -2065,7 +2071,14 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
receivablesMap.put("item_ser", InvoiceHrdMap.get("item_ser"));
receivablesMap.put("gp_no", InvoiceHrdMap.get("gp_no"));
//receivablesMap.put("gp_date", InvoiceHrdMap.get("gp_date"));// Change By Nasruddin on 14-oct-16
receivablesMap.put("gp_date", Timestamp.valueOf(genericUtility.getValidDateString(InvoiceHrdMap.get("gp_date").toString(), genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat()) + " 00:00:00.0"));
//Changed By Nasruddin start 08-12-16 Start
//receivablesMap.put("gp_date", Timestamp.valueOf(genericUtility.getValidDateString(InvoiceHrdMap.get("gp_date").toString(), genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat()) + " 00:00:00.0"));
if( InvoiceHrdMap.get("gp_date")!= null)
{
gpDateTstamp = Timestamp.valueOf(genericUtility.getValidDateString(InvoiceHrdMap.get("gp_date").toString(), genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat()) + " 00:00:00.0");
}
receivablesMap.put("gp_date", gpDateTstamp);
//Changed By Nasruddin start 08-12-16 End
receivablesMap.put("mrp_value","0");
ldDiscdt=calcDiscountDate(InvoiceHrdMap.get("cr_term"), InvoiceHrdMap.get("tran_date"), InvoiceHrdMap.get("eff_date"),
InvoiceHrdMap.get("tran_date"),conn);
......@@ -2444,7 +2457,7 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
{
// TODO Auto-generated method stub
HashMap<String, String> InvoiceHrdMap=new HashMap<String, String>();
String sql="",trnDtStr="",despDtStr="",dueDtStr="",effDtStr="",taxDtStr="",confDtStr="",chgDtStr="", gpDtStr = "";
String sql="",trnDtStr="",despDtStr="",dueDtStr="",effDtStr="",taxDtStr="",confDtStr="",chgDtStr="", gpDtStr = null;
PreparedStatement pstmt=null;
ResultSet rs=null;
......
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