Commit fafa2688 authored by akhokar's avatar akhokar

Changes done to set payroll date as a posting date in voucher.

PayrollPostAccPrc.java


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@204975 ce508802-f39f-4f6c-b175-0d175dae99d5
parent c3075b87
...@@ -780,7 +780,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -780,7 +780,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
if(payrollDateStr != null && payrollDateStr.trim().length() > 0) if(payrollDateStr != null && payrollDateStr.trim().length() > 0)
{ {
//Modified by Azhar K. on[17-July-2019][To avoid null exception for payroll date][End] //Modified by Azhar K. on[17-July-2019][To avoid null exception for payroll date][End]
payDate = Timestamp.valueOf(genericUtility.getValidDateString(payrollDateStr, payrollDate = Timestamp.valueOf(genericUtility.getValidDateString(payrollDateStr,
genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0"); genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
//Modified by Azhar K. on[17-July-2019][To avoid null exception for payroll date][Start] //Modified by Azhar K. on[17-July-2019][To avoid null exception for payroll date][Start]
} }
...@@ -1090,7 +1090,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -1090,7 +1090,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
} }
payrollDate = (Timestamp) rowMap.get("PAYROLL_DATE"); //payrollDate = (Timestamp) rowMap.get("PAYROLL_DATE");
msitecode = (String) rowMap.get("SITE_CODE__PAY"); msitecode = (String) rowMap.get("SITE_CODE__PAY");
mtotamt = ((Double) rowMap.get("NET_AMT")).doubleValue(); mtotamt = ((Double) rowMap.get("NET_AMT")).doubleValue();
mGrade = (String) rowMap.get("GRADE"); mGrade = (String) rowMap.get("GRADE");
...@@ -1261,14 +1261,14 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -1261,14 +1261,14 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
} }
pstmtTranId.clearParameters(); pstmtTranId.clearParameters();
//Modified by Azhar K. on[17-July-2019][To avoid null exception for payroll date][Start] /*Modified by Azhar K. on[17-July-2019][To avoid null exception for payroll date][Start]
if(payrollDate != null) if(payrollDate != null)
{ {
//Modified by Azhar K. on[17-July-2019][To avoid null exception for payroll date][End] //Modified by Azhar K. on[17-July-2019][To avoid null exception for payroll date][End]
payrollDateStr = checkNull(genericUtility.getValidDateTimeString(payrollDate, genericUtility.getApplDateFormat())); payrollDateStr = checkNull(genericUtility.getValidDateTimeString(payrollDate, genericUtility.getApplDateFormat()));
//Modified by Azhar K. on[17-July-2019][To avoid null exception for payroll date][Start] //Modified by Azhar K. on[17-July-2019][To avoid null exception for payroll date][Start]
} }
//Modified by Azhar K. on[17-July-2019][To avoid null exception for payroll date][End] Modified by Azhar K. on[17-July-2019][To avoid null exception for payroll date][End]*/
String xmlValues = ""; String xmlValues = "";
xmlValues = "<?xml version=\"1.0\" encoding=\"utf-8\"?><Root>"; xmlValues = "<?xml version=\"1.0\" encoding=\"utf-8\"?><Root>";
xmlValues = xmlValues + "<Header></Header>"; xmlValues = xmlValues + "<Header></Header>";
...@@ -1338,10 +1338,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -1338,10 +1338,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
{ {
if(rs != null) if(rs != null)
{ {
rs.close(); rs.close();
rs = null; rs = null;
} }
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn); errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn)); logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
break; break;
......
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