diff --git a/CompanyManagment.EFCore/Repository/CheckoutRepository.cs b/CompanyManagment.EFCore/Repository/CheckoutRepository.cs
index afbf3e48..7c12bee5 100644
--- a/CompanyManagment.EFCore/Repository/CheckoutRepository.cs
+++ b/CompanyManagment.EFCore/Repository/CheckoutRepository.cs
@@ -299,7 +299,7 @@ public class CheckoutRepository : RepositoryBase<long, Checkout>, ICheckoutRepos
                         {
                             // مجاز نیست
                             extension = false;
-                            description = "بعد از تاریخ ترک کار میتواند فیش صادر کنید";
+                            description = "بعد از تاریخ ترک کار می توانید فیش صادر کنید";
                             leftWorkDate = leftWork.LeftWorkDate.ToFarsi();
                             contractStart = leftWork.StartWorkDate > startSreach
                                 ? leftWork.StartWorkDate.ToFarsi()
@@ -321,7 +321,7 @@ public class CheckoutRepository : RepositoryBase<long, Checkout>, ICheckoutRepos
                     {
                         // مجاز نیست
                         extension = false;
-                        description = "بعد از تاریخ ترک کار میتواند فیش صادر کنید";
+                        description = "بعد از تاریخ ترک کار می توانید فیش صادر کنید";
                         leftWorkDate = leftWork.LeftWorkDate.ToFarsi();
                         contractStart = leftWork.StartWorkDate > startSreach
                             ? leftWork.StartWorkDate.ToFarsi()
@@ -343,6 +343,10 @@ public class CheckoutRepository : RepositoryBase<long, Checkout>, ICheckoutRepos
                     // مجاز نیست
                     extension = false;
                     description = "به دلیل داشتن حضورغیاب تا پایان ماه مجاز به ایجاد فیش نمی باشید";
+                    contractStart = leftWork.StartWorkDate > startSreach
+                        ? leftWork.StartWorkDate.ToFarsi()
+                        : startSreach.ToFarsi();
+                    contractEnd = endSearch.ToFarsi();
 
                 }
                 else if (!leftWork.HasLeft && startSreach < currentStart)
@@ -376,32 +380,54 @@ public class CheckoutRepository : RepositoryBase<long, Checkout>, ICheckoutRepos
 
             #region Static
 
-            if (leftWork.HasLeft && !hasRollCall)
+            if (!hasRollCall)
             {
-                if (leftWork.LeftWorkDate > startSreach && leftWork.LeftWorkDate <= endSearch)
+                if (leftWork.HasLeft)
                 {
-                    extension = true;
-                    contractStart = leftWork.StartWorkDate > startSreach
-                        ? leftWork.StartWorkDate.ToFarsi()
-                        : startSreach.ToFarsi();
-                    contractEnd = leftWork.LeftWorkDate.AddDays(-1).ToFarsi();
-                    leftWorkDate = leftWork.LeftWorkDate.ToFarsi();
-                }
-                else if(leftWork.LeftWorkDate <= startSreach)
-                {
-                    // مجاز نیست
-                    extension = false;
-                    description = "به دلیل ترک کار پیش از تاریخ انتخاب شده مجاز به ایجاد فیش نمی باشید";
-                    leftWorkDate = leftWork.LeftWorkDate.ToFarsi();
+                    if (leftWork.LeftWorkDate > startSreach && leftWork.LeftWorkDate <= endSearch)
+                    {
+                        extension = true;
+                        contractStart = leftWork.StartWorkDate > startSreach
+                            ? leftWork.StartWorkDate.ToFarsi()
+                            : startSreach.ToFarsi();
+                        contractEnd = leftWork.LeftWorkDate.AddDays(-1).ToFarsi();
+                        leftWorkDate = leftWork.LeftWorkDate.ToFarsi();
+                    }
+                    else if (leftWork.LeftWorkDate <= startSreach)
+                    {
+                        // مجاز نیست
+                        extension = false;
+                        description = "به دلیل ترک کار پیش از تاریخ انتخاب شده مجاز به ایجاد فیش نمی باشید";
+                        leftWorkDate = leftWork.LeftWorkDate.ToFarsi();
+                    }
+                    else if(leftWork.LeftWorkDate > endSearch)
+                    {
+                        extension = true;
+
+                        if (contractStartGr <= startSreach && contractStartGr > endSearch)
+                        {
+                            laterThanEnd = true;
+
+                            contractStart = startSreach.ToFarsi();
+                            contractEnd = endSearch.ToFarsi();
+                        }
+                        else
+                        {
+                            contractStart = leftWork.StartWorkDate > startSreach
+                                ? leftWork.StartWorkDate.ToFarsi()
+                                : startSreach.ToFarsi();
+                            contractEnd = endSearch.ToFarsi();
+                        }
+                    }
                 }
                 else
                 {
                     extension = true;
-                  
+               
                     if (contractStartGr <= startSreach && contractStartGr > endSearch)
                     {
                         laterThanEnd = true;
-              
+
                         contractStart = startSreach.ToFarsi();
                         contractEnd = endSearch.ToFarsi();
                     }
@@ -413,6 +439,7 @@ public class CheckoutRepository : RepositoryBase<long, Checkout>, ICheckoutRepos
                         contractEnd = endSearch.ToFarsi();
                     }
                 }
+          
             }
 
             #endregion
@@ -444,7 +471,7 @@ public class CheckoutRepository : RepositoryBase<long, Checkout>, ICheckoutRepos
                 LeftWorkDate = leftWorkDate
             };
 
-        }).ToList();
+        }).OrderByDescending(x=>x.Extension).ToList();
 
 
 
diff --git a/ServiceHost/Areas/Admin/Pages/Company/Checkouts/Create.cshtml b/ServiceHost/Areas/Admin/Pages/Company/Checkouts/Create.cshtml
index 7edbf7fa..16f6e9b9 100644
--- a/ServiceHost/Areas/Admin/Pages/Company/Checkouts/Create.cshtml
+++ b/ServiceHost/Areas/Admin/Pages/Company/Checkouts/Create.cshtml
@@ -362,12 +362,14 @@
 		</div>
 		<div class="col-sm-4 pull-right" dir="rtl">
 			<div class="form-group" id="start1" style="width: 100% !important; margin: 0 auto;">
-				<input dir="ltr" disabled="disabled" id="sendStart" onchange="startValidcheck(this);" maxlength="10" style="text-align: center; width: 100%" placeholder="تاریخ شروع" class="form-control" asp-for="ContractStart"/>
-			</div>
+				<input dir="ltr" disabled="disabled" id="sendStartDisabled" onchange="startValidcheck(this);" maxlength="10" style="text-align: center; width: 100%" placeholder="تاریخ شروع" class="form-control" asp-for="ContractStart"/>
+								<input type="hidden" id="sendStart" />
+            </div>
 		</div>
 		<div class="col-sm-4 pull-right" dir="rtl">
 			<div class="form-group" id="end1" style="width: 100% !important; margin: 0 auto;">
-				<input dir="ltr" disabled="disabled" id="sendEnd" onchange="endValidcheck(this);" maxlength="10" style="text-align: center;width: 100%" placeholder="تاریخ پایان" class="form-control" asp-for="ContractEnd"/>
+                <input dir="ltr" disabled="disabled" id="sendEndDisabled" onchange="endValidcheck(this);" maxlength="10" style="text-align: center;width: 100%" placeholder="تاریخ پایان" class="form-control" asp-for="ContractEnd" />
+				<input type="hidden" id="sendEnd" />
 			</div>
 		</div>
 	</div>
@@ -482,11 +484,11 @@
 </div>
 </div>
 @* <script src="~/lib/jquery-ajax-unobtrusive/jquery.unobtrusive-ajax.min.js"></script> *@
-<script src="~/adminTheme/assets/datatables/jquery.dataTables.min.js"></script>
+<link href="~/AdminTheme/assets/datatables/jquery.dataTables.min.css" rel="stylesheet" type="text/css" />
 <script src="~/adminTheme/assets/datatables/dataTables.bootstrap.js"></script>
 <script src="~/lib/select2/js/select2.js"></script>
 <script src="~/lib/select2/js/i18n/fa.js"></script>
-<link href="~/AdminTheme/assets/datatables/jquery.dataTables.min.css" rel="stylesheet" type="text/css"/>
+
 
 
 <link href="~/lib/select2/css/select2.css" rel="stylesheet"/>
diff --git a/ServiceHost/Areas/Admin/Pages/Company/Checkouts/Index.cshtml b/ServiceHost/Areas/Admin/Pages/Company/Checkouts/Index.cshtml
index da8cc149..e416cff2 100644
--- a/ServiceHost/Areas/Admin/Pages/Company/Checkouts/Index.cshtml
+++ b/ServiceHost/Areas/Admin/Pages/Company/Checkouts/Index.cshtml
@@ -202,7 +202,7 @@
 
 
 @section Script {
-	<script src="~/lib/jquery-ajax-unobtrusive/jquery.unobtrusive-ajax.min.js"></script>
+    <script src="~/lib/jquery-ajax-unobtrusive/jquery.unobtrusive-ajax.min.js"></script> 
 	<script src="~/AdminTheme/assets/js/site.js"></script>
 	<script src="~/adminTheme/assets/datatables/jquery.dataTables.min.js"></script>
 	<script src="~/adminTheme/assets/datatables/dataTables.bootstrap.js"></script>