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

dev_chapal #3

Merged
chapal merged 8 commits from dev_chapal into devqc 2024-10-16 17:21:42 +06:00
Conversation 0 Commits 8 Files Changed 4 +3 -3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1d58361f02 - Show all commits

4
HRM.DA/DA/Bonus/ProductionBonusSetupDA.cs
View File

@ -93,8 +93,8 @@ namespace HRM.DA
internal static DataTable GetLayout(TransactionContext tc, DateTime dtSalaryMonth)
{
return tc.ExecuteDataTable(
"SELECT ProductionBonusSetupID as id, DesignNo as design FROM ProductionBonusSetup where CreationDate >= %d",
dtSalaryMonth);
"SELECT ProductionBonusSetupID as id, DesignNo as design FROM ProductionBonusSetup where Salarymonth >= %d",
GlobalFunctions.FirstDateOfMonth(dtSalaryMonth));
}
internal static DataTable GetLayoutMonthly(TransactionContext tc, DateTime dtSalaryMonth)
{

2
HRM.DA/Service/Employee/EmployeeService.cs
View File

@ -39,7 +39,7 @@ namespace HRM.DA
oEmployee.TinNo = oReader.GetString("tinNo");
oEmployee.CategoryID = oReader.GetInt32("categoryID").Value;
oEmployee.ForeignExPat = oReader.GetBoolean("foreignExPat").Value;
oEmployee.TaxCircle = (EnumTaxCircle)oReader.GetInt32("taxCircle", true, 0);
//oEmployee.TaxCircle = (EnumTaxCircle)oReader.GetInt32("taxCircle", true, 0);
//oEmployee.TaxCircle = oReader.GetString("taxCircle");
oEmployee.IsConfirmed = oReader.GetBoolean("isConfirmed").Value;
oEmployee.Status = (EnumEmployeeStatus)oReader.GetInt32("status").Value;