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

correction

Browse Source
This commit is contained in:
mashfiq 2025-10-08 17:02:14 +06:00
parent 99d14b5fe0
commit 947692280e
4 changed files with 53 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
HRM.DA/Service/Leave/LeaveEncashmentService.cs
View File

@ -39,8 +39,8 @@ namespace HRM.Service
oLeaveEncashment.CreatedDate = oReader.GetDateTime("CreatedDate").Value;
oLeaveEncashment.ModifiedBy = oReader.GetString("ModifiedBy") == null ? 0 : oReader.GetInt32("ModifiedBy").Value;
oLeaveEncashment.ModifiedDate = oReader.GetDateTime("ModifiedDate");
oLeaveEncashment.BasicSalary = oReader.GetDouble("BasicSalary").Value;
oLeaveEncashment.ESSSubmittedDays = oReader.GetDouble("ESSSubmittedDays").Value;
oLeaveEncashment.BasicSalary = oReader.GetDouble("BasicSalary", true, 0);
oLeaveEncashment.ESSSubmittedDays = oReader.GetDouble("ESSSubmittedDays", true, 0);
oLeaveEncashment.presentDays = oReader.GetDouble("PresentDays").Value;
oLeaveEncashment.absentDays = oReader.GetDouble("AbsentDays").Value;
oLeaveEncashment.enjoyedLeave = oReader.GetDouble("EnjoyedLeave").Value;

15
HRM.Report/Class/rptEcho.cs
View File

@ -3368,7 +3368,8 @@ namespace HRM.Report
public byte[] ShowLeaveReport(string sEmpIDs, int lyyid, int payrollTypeID, DateTime nextPayProcessDate, string reportType)
{
try
{
ReportProcessor form = new ReportProcessor();
DataTable dTEmpLeave = new HRM.Report.PayrollDataSet.dsEmpLeaveLedger.LeaveBalanceDataTable();
@ -3396,6 +3397,11 @@ namespace HRM.Report
throw new Exception("Leave balance not found");
}
}
catch (Exception ex)
{
throw new Exception(ex.Message, ex);
}
}
public byte[] ShowLeaveRegisterBanglaReport(string sEmpID, int authPersonID, int payrollTypeID, DateTime nextPayProcessDate, string reportType)
{
@ -3647,6 +3653,8 @@ namespace HRM.Report
}
public byte[] ShowLeaveEncashmentReport(string sEmpIDs, DateTime fromMonth, int lyyid, int payrollTypeID, DateTime nextPayProcessDate, string reportType)
{
try
{
ReportProcessor form = new ReportProcessor();
@ -3671,6 +3679,11 @@ namespace HRM.Report
string RDLC = "EncashmentReportEcho.rdlc";
return form.CommonReportViewForReports(null, dSet, null, RDLC, oParameters, true, payrollTypeID, reportType);
}
catch (Exception ex)
{
throw new Exception(ex.Message, ex);
}
}
#endregion
}
}

2
HRM.UI/ClientApp/src/app/app.api.service.ts
View File

@ -14,7 +14,7 @@ export class ApiService {
public isSSO = false;
public versionDeployement = false;
// public versionNumber = `V-${GlobalfunctionExtension.generateVersionNumber(new Date(2025, 1, 25))}-`+"01";
public versionNumber = `V-20250902-`+"01";
public versionNumber = `V-20251008-`+"01";
public static BASE_URL = '';
public base_url = '';
// public currentLink = '';

1
HRM.UI/ClientApp/src/app/reports/leave-encashment-report/leave-encashment-report.component.ts
View File

@ -110,6 +110,7 @@ export class LeaveEncashmentReportComponent implements OnInit {
reportid: 728,
itemid: this.leaveYearId,
empIds: this.empIds,
fromDate: this.fromDate,
reportType: reportType,
};