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

Merge pull request 'ok' (#42) from dev_chapal into devqc

Browse Source 
Reviewed-on: http://103.197.204.162:3025/CelHRTeam/EchoTex_Payroll/pulls/42
This commit is contained in:
chapal 2025-05-06 11:17:17 +06:00
commit f02f0a4348
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2454,6 +2454,8 @@ namespace HRM.DA
DataSet EmpOTHours = new ShiftTermService().GetEmpOT(oPayrollType.NextPayProcessDate, trm.ID); DataSet EmpOTHours = new ShiftTermService().GetEmpOT(oPayrollType.NextPayProcessDate, trm.ID);
foreach (DataRow Dr in EmpOTHours.Tables[0].Rows) 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(); Employee tempEmployee = employees.Where(emp => emp.ID.ToString() == Dr["EmployeeID"].ToString()).FirstOrDefault();
if (tempEmployee == null || tempEmployee.IsEligibleOT == false) continue; if (tempEmployee == null || tempEmployee.IsEligibleOT == false) continue;
@ -2471,6 +2473,7 @@ namespace HRM.DA
EmpOverTimes = MakeEmployeeOvertimeObj(ref EmpOverTimes, ref ErrorList, tempEmployee, termParameters, EmpOverTimes = MakeEmployeeOvertimeObj(ref EmpOverTimes, ref ErrorList, tempEmployee, termParameters,
oPayrollType, trm.ID, Convert.ToDouble(Dr["TotalOT"]), userid); oPayrollType, trm.ID, Convert.ToDouble(Dr["TotalOT"]), userid);
//}
} }
} }
} }