diff --git a/CompanyManagment.App.Contracts/Workshop/IWorkshopApplication.cs b/CompanyManagment.App.Contracts/Workshop/IWorkshopApplication.cs
index fef1bb75..9e9ec0ac 100644
--- a/CompanyManagment.App.Contracts/Workshop/IWorkshopApplication.cs
+++ b/CompanyManagment.App.Contracts/Workshop/IWorkshopApplication.cs
@@ -155,7 +155,7 @@ public class CreateWorkshopWorkflowRegistration
///
/// باز بودن در تعطیلات
///
- public bool OpenInHolidays { get; set; }
+ public bool WorkingInHoliday { get; set; }
///
/// محاسبه نوبت کاری در فیش حقوقی
///
@@ -248,9 +248,17 @@ public class CreateWorkshopWorkflowRegistration
///
public string AgreementNumber { get; set; }
+ ///
+ /// نوع محاسبه طلب مرخصی
+ ///
public string ComputeOptions { get; set; }
- public bool AddYearsPay { get; set; }
- public bool AddLeavePay { get; set; }
+
+ ///
+ /// نوع محسبه عیدی و پاداش
+ ///
public string BonusesOptions { get; set; }
+ ///
+ /// نوع محاسبه سنوات
+ ///
public string YearsOptions { get; set; }
}
\ No newline at end of file
diff --git a/CompanyManagment.Application/WorkshopAppliction.cs b/CompanyManagment.Application/WorkshopAppliction.cs
index 6ea07098..ee4405d7 100644
--- a/CompanyManagment.Application/WorkshopAppliction.cs
+++ b/CompanyManagment.Application/WorkshopAppliction.cs
@@ -1070,10 +1070,10 @@ public class WorkshopAppliction : IWorkshopApplication
command.ArchiveCode, command.AgentName, command.AgentPhone, command.Province, command.City,
command.Address,
command.TypeOfInsuranceSend, command.TypeOfContract, command.ContractTerm, command.AgreementNumber
- , command.FixedSalary, command.Population, command.InsuranceJobId, null, false,
- command.AddYearsPay, command.AddLeavePay, command.TotalPaymentHide, false,
+ , command.FixedSalary, command.Population, command.InsuranceJobId, null, true,
+ true, true, command.TotalPaymentHide, false,
command.ComputeOptions,
- command.BonusesOptions, command.YearsOptions, command.HasRollCallFreeVip, command.OpenInHolidays,
+ command.BonusesOptions, command.YearsOptions, command.HasRollCallFreeVip, command.WorkingInHoliday,
command.InsuranceCheckoutOvertime, command.InsuranceCheckoutFamilyAllowance, command.CreateContract,
command.SignContract,
command.CreateCheckout, command.SignCheckout, command.CutContractEndOfYear, command.RotatingShiftCompute,