CelHRTeam/EchoTex_Payroll
13
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: CelHRTeam:f02f0a4348c7966a93a1dc92904f35f30d842750
Branches Tags
CelHRTeam:devqc
CelHRTeam:dev_chapal
CelHRTeam:dev_mashfiq
CelHRTeam:dev_sojib
CelHRTeam:main
..
compare: CelHRTeam:2791455be298c61d28e9aef2f9099198eeecb689
Branches Tags
CelHRTeam:devqc
CelHRTeam:dev_chapal
CelHRTeam:dev_mashfiq
CelHRTeam:dev_sojib
CelHRTeam:main

No commits in common. "f02f0a4348c7966a93a1dc92904f35f30d842750" and "2791455be298c61d28e9aef2f9099198eeecb689" have entirely different histories.
f02f0a4348 ... 2791455be2

1 changed files with 15 additions and 18 deletions
Show Stats Expand all files Collapse all files

33
HRM.DA/Service/Attendance/AttendanceProcess.cs
View File

@ -2454,26 +2454,23 @@ namespace HRM.DA
DataSet EmpOTHours = new ShiftTermService().GetEmpOT(oPayrollType.NextPayProcessDate, trm.ID);
foreach (DataRow Dr in EmpOTHours.Tables[0].Rows)
{
//if (Convert.ToDouble(Dr["TotalOT"])>0)
//{
Employee tempEmployee = employees.Where(emp => emp.ID.ToString() == Dr["EmployeeID"].ToString()).FirstOrDefault();
if (tempEmployee == null || tempEmployee.IsEligibleOT == false) continue;
Employee tempEmployee = employees.Where(emp => emp.ID.ToString() == Dr["EmployeeID"].ToString()).FirstOrDefault();
if (tempEmployee == null || tempEmployee.IsEligibleOT == false) continue;
if (tempEmployee.GradeID == null)
{
ErrorList.Add(new SalaryProcessStatus(tempEmployee.EmployeeNo, tempEmployee.Name, "Grade not assinged"));
continue;
if (tempEmployee.GradeID == null)
{
ErrorList.Add(new SalaryProcessStatus(tempEmployee.EmployeeNo, tempEmployee.Name, "Grade not assinged"));
continue;
}
if (Dr["TotalOT"] == DBNull.Value)
{
// ErrorList.Add(new SalaryProcessStatus(tempEmployee.EmployeeNo, tempEmployee.Name, "value can't be null "));
continue;
}
}
if (Dr["TotalOT"] == DBNull.Value)
{
// ErrorList.Add(new SalaryProcessStatus(tempEmployee.EmployeeNo, tempEmployee.Name, "value can't be null "));
continue;
}
EmpOverTimes = MakeEmployeeOvertimeObj(ref EmpOverTimes, ref ErrorList, tempEmployee, termParameters,
oPayrollType, trm.ID, Convert.ToDouble(Dr["TotalOT"]), userid);
//}
EmpOverTimes = MakeEmployeeOvertimeObj(ref EmpOverTimes, ref ErrorList, tempEmployee, termParameters,
oPayrollType, trm.ID, Convert.ToDouble(Dr["TotalOT"]), userid);
}
}
}