diff --git a/CompanyManagment.Application/CustomizeWorkshopSettingsApplication.cs b/CompanyManagment.Application/CustomizeWorkshopSettingsApplication.cs
index d07e70b2..18fd28e1 100644
--- a/CompanyManagment.Application/CustomizeWorkshopSettingsApplication.cs
+++ b/CompanyManagment.Application/CustomizeWorkshopSettingsApplication.cs
@@ -352,6 +352,15 @@ public class CustomizeWorkshopSettingsApplication(ICustomizeWorkshopSettingsRepo
             return op.Failed("گروه انتخاب شده نا معتبر است");
         }
 
+        if (_customizeWorkshopEmployeeSettingsRepository
+            .Exists(x => x.WorkshopId == command.WorkshopId && command.EmployeeIds.Contains(x.EmployeeId)))
+        {
+            foreach (var employeeId in command.EmployeeIds)
+            {
+                _customizeWorkshopEmployeeSettingsRepository.RemoveByWorkshopIdAndEmployeeId(command.WorkshopId, employeeId);
+            }
+        }
+
         if (customizeWorkshopGroupSettings.MainGroup)
         {
             var createDefaultEmployee = CreateEmployeeSettings(command);
diff --git a/CompanyManagment.Application/LoanApplication.cs b/CompanyManagment.Application/LoanApplication.cs
index 62e131ed..c529be69 100644
--- a/CompanyManagment.Application/LoanApplication.cs
+++ b/CompanyManagment.Application/LoanApplication.cs
@@ -165,6 +165,7 @@ public class LoanApplication : ILoanApplication
         }
 
         _loanRepository.SaveChanges();
+        transaction.Complete();
         return op.Succcedded();
     }
 
diff --git a/ServiceHost/Areas/AdminNew/Pages/Company/AndroidApk/Index.cshtml.cs b/ServiceHost/Areas/AdminNew/Pages/Company/AndroidApk/Index.cshtml.cs
index 1b2fdcf4..2606c334 100644
--- a/ServiceHost/Areas/AdminNew/Pages/Company/AndroidApk/Index.cshtml.cs
+++ b/ServiceHost/Areas/AdminNew/Pages/Company/AndroidApk/Index.cshtml.cs
@@ -220,14 +220,28 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
             //Console.WriteLine("endStep 1 ============");
             //SetRollCall(r1);
 
-          await  RefactorEmployeeDocumentItem();
-          await ChangeIsConfirmed();
-          await RemoveEmployeeClientTemps();
-
+            await SetCalculationDateInSalaryAid();
             ViewData["message"] = "تومام دو";
             return Page();
         }
 
+        private async System.Threading.Tasks.Task SetCalculationDateInSalaryAid()
+        {
+            var salaryAids = await _context.SalaryAids.ToListAsync();
+            foreach (var salaryAid in salaryAids)
+            {
+                var calculationDate = salaryAid.SalaryAidDateTime;
+
+                var calculationMonth = Convert.ToInt32(calculationDate.ToFarsiMonth());
+                var calculationYear = Convert.ToInt32(calculationDate.ToFarsiYear());
+
+                salaryAid.Edit(salaryAid.Amount,salaryAid.SalaryAidDateTime,0,UserType.Anonymous,calculationMonth, calculationYear);
+
+            }
+
+            await _context.SaveChangesAsync();
+        }
+
         private async System.Threading.Tasks.Task RemoveEmployeeClientTemps()
         {
             var employeeDocuments = _context.EmployeeDocuments