diff --git a/CompanyManagment.EFCore/Repository/CheckoutRepository.cs b/CompanyManagment.EFCore/Repository/CheckoutRepository.cs
index f67e1c2e..cb843e5a 100644
--- a/CompanyManagment.EFCore/Repository/CheckoutRepository.cs
+++ b/CompanyManagment.EFCore/Repository/CheckoutRepository.cs
@@ -1691,7 +1691,7 @@ public class CheckoutRepository : RepositoryBase<long, Checkout>, ICheckoutRepos
             return new List<CheckoutViewModel>();
         }
         #endregion
-        var query = _context.CheckoutSet
+        var query = _context.CheckoutSet.Include(w => w.CheckoutWarningMessageList)
             .AsSplitQuery().Select(x => new CheckoutViewModel()
             {
                 Id = x.id,
@@ -1726,7 +1726,14 @@ public class CheckoutRepository : RepositoryBase<long, Checkout>, ICheckoutRepos
                     SalaryAidDateTimeFa = s.SalaryAidDateTimeFa,
                     SalaryAidDateTimeGe = s.SalaryAidDateTime
                 }).ToList(),
-                HasAmountConflict = x.HasAmountConflict
+                HasAmountConflict = x.HasAmountConflict,
+                IsUpdateNeeded = x.IsUpdateNeeded,
+                CheckoutWarningMessageList = x.CheckoutWarningMessageList.Select(wm => new CheckoutWarningMessageModel
+                {
+                    WarningMessage = wm.WarningMessage,
+                    TypeOfCheckoutWarning = wm.TypeOfCheckoutWarning,
+
+                }).ToList()
 
             }).Where(x => x.WorkshopId == searchModel.WorkshopId);
         if (searchModel.EmployeeId > 0)
diff --git a/ServiceHost/Areas/Client/Pages/Company/Checkouts/Index.cshtml b/ServiceHost/Areas/Client/Pages/Company/Checkouts/Index.cshtml
index b06f3dd1..2bb15424 100644
--- a/ServiceHost/Areas/Client/Pages/Company/Checkouts/Index.cshtml
+++ b/ServiceHost/Areas/Client/Pages/Company/Checkouts/Index.cshtml
@@ -8,6 +8,9 @@
     Layout = "Shared/_ClientLayout";
     ViewData["Title"] = " - " + "فیش حقوقی";
     int i = 0;
+
+    const string hasAmountConflictText = "توجه داشته باشید این فیش حقوقی دارای تغییرات اعمال نشده میباشد. جهت صدور فیش حقوقی استاندارد مجددا فیش را ایجاد کنید!";
+    const string needUpdateText = "جهت صدور فیش حقوقی استاندارد مجددا فیش را ایجاد کنید";
 }
 
 @section Styles {
@@ -335,7 +338,7 @@
                                 </span>
                             </div>
                             <div class="Rtable-cell column-heading d-none d-lg-block width11"> </div>
-                            <div class="Rtable-cell column-heading d-none d-lg-block width2" >شماره پرسنلی</div>
+                            <div class="Rtable-cell column-heading d-none d-lg-block width2">شماره پرسنلی</div>
                             <div class="Rtable-cell column-heading d-none d-md-block width3">سال</div>
                             <div class="Rtable-cell column-heading d-none d-md-block width4">ماه</div>
                             <div class="Rtable-cell column-heading d-none d-md-block width5">شماره قرارداد</div>
@@ -364,7 +367,10 @@
                                 <div class="Rtable-cell d-lg-block d-none width11">
                                     <div class="Rtable-cell--heading"> </div>
                                     <div class="Rtable-cell--content">
-                                        @if (item.HasAmountConflict)
+
+
+
+                                        @if (item.IsUpdateNeeded || item.HasAmountConflict)
                                         {
                                             <svg xmlns="http://www.w3.org/2000/svg"
                                                  width="24" height="24" fill="red"
@@ -373,11 +379,30 @@
                                                  style="cursor: pointer; margin-left: 10px;"
                                                  data-bs-toggle="tooltip"
                                                  data-bs-placement="top"
-                                                 title="توجه داشته باشید این فیش حقوقی دارای تغییرات اعمال نشده میباشد. جهت صدور فیش حقوقی استاندارد مجددا فیش را ایجاد کنید!">
-                                                <path d="M8 15A7 7 0 1 0 8 1a7 7 0 0 0 0 14zm0 1A8 8 0 1 1 8 0a8 8 0 0 1 0 16z"/>
-                                                <path d="M7.002 11a1 1 0 1 1 2 0 1 1 0 0 1-2 0zm.1-5.995a.905.905 0 0 1 1.8 0l-.35 3.5a.552.552 0 0 1-1.1 0l-.35-3.5z"/>
+                                                 title='@{
+                                                                var tooltipText = ""; int messCounter = 1;
+                                                                if (item.HasAmountConflict && !item.IsUpdateNeeded)
+                                                                {
+                                                                    tooltipText +=  @hasAmountConflictText;
+
+                                                                }else if (item.HasAmountConflict && item.IsUpdateNeeded)
+                                                                {
+                                                                    foreach (var warning in item.CheckoutWarningMessageList) { tooltipText += " " + messCounter + " - " + warning.WarningMessage;  messCounter++;}
+
+
+                                                                    tooltipText += " " +  @needUpdateText; }
+                                                                else if (!item.HasAmountConflict && item.IsUpdateNeeded)
+                                                                { foreach (var warning in item.CheckoutWarningMessageList) { tooltipText += " " + messCounter + " - " + warning.WarningMessage;  messCounter++; }
+                                                                    tooltipText += " " +  @needUpdateText;}
+                                                                    @Html.Raw(tooltipText)
+
+                                                           }'>
+                                                <path d="M8 15A7 7 0 1 0 8 1a7 7 0 0 0 0 14zm0 1A8 8 0 1 1 8 0a8 8 0 0 1 0 16z" />
+                                                <path d="M7.002 11a1 1 0 1 1 2 0 1 1 0 0 1-2 0zm.1-5.995a.905.905 0 0 1 1.8 0l-.35 3.5a.552.552 0 0 1-1.1 0l-.35-3.5z" />
                                             </svg>
+
                                         }
+
                                     </div>
                                 </div>
                                 <div class="Rtable-cell d-lg-block d-none width2">