Commit bc2465ad authored by ngadkari's avatar ngadkari

added adj cust adv column value in map and it will be used for advance adjustment not from disparm

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@204747 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 159d87c6
......@@ -1588,13 +1588,22 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
adjDrcr = "N";
}
}
if(additionalMap.containsKey("ADJ_CUST_ADV"))//CONDITION ADDED BY NANDKUMAR GADKARI 06/08/19
{
adjCustAdv = (String) additionalMap.get("ADJ_CUST_ADV");
if(adjCustAdv == null || adjCustAdv.trim().length() == 0)
{
adjCustAdv = "N";
}
}
}
else
{
adjDrcr = checkNull(distCommon.getDisparams("999999","ADJUST_DR_CR_NOTE",conn));
adjCustAdv = checkNull(distCommon.getDisparams("999999","ADJUST_CUST_ADV",conn)); //added by nandkumar gadkari on 06/08/19
}
//Modified by Azhar K. on [07-05-2019][End]
adjCustAdv = checkNull(distCommon.getDisparams("999999","ADJUST_CUST_ADV",conn));
//adjCustAdv = checkNull(distCommon.getDisparams("999999","ADJUST_CUST_ADV",conn)); //COMMENTED by nandkumar gadkari on 06/08/19
adjNewProdInv = checkNull(distCommon.getDisparams("999999","ADJUST_NEW_PRODUCT_INVOICE",conn));
advAdjMode = checkNull(distCommon.getDisparams("999999","ADJ_ADV_CUST_SALE",conn));
......
......@@ -759,7 +759,7 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
additionalMap.put("ADJ_DRCR", adjDrcr);
//Modified by Azhar K. on [07-05-2019][End]
additionalMap.put("ADJ_CUST_ADV", adjCustAdv); //added by nandkumar gadkari on 06/08/19
fromDate = java.sql.Timestamp.valueOf(e12GenericUtility.getValidDateString(fromDateStr, e12GenericUtility.getApplDateFormat(),e12GenericUtility.getDBDateFormat()) + " 00:00:00.0");
toDate = java.sql.Timestamp.valueOf(e12GenericUtility.getValidDateString(toDateStr, e12GenericUtility.getApplDateFormat(),e12GenericUtility.getDBDateFormat()) + " 00:00:00.0");
/*----------------changes start by mahendra -----------------*/
......
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