diff --git a/WebDoorCreator.Data/DbModels/OrderStatusViewModel.cs b/WebDoorCreator.Data/DbModels/OrderStatusViewModel.cs
index bbb95b4..217e2d2 100644
--- a/WebDoorCreator.Data/DbModels/OrderStatusViewModel.cs
+++ b/WebDoorCreator.Data/DbModels/OrderStatusViewModel.cs
@@ -72,9 +72,19 @@ namespace WebDoorCreator.Data.DbModels
 
 
         /// <summary>
-        /// Data promessa di consegna
+        /// Expected order delivery from DCA
         /// </summary>
-        public DateTime DateDelivery { get; set; } = DateTime.Now.AddDays(60);
+        public DateTime DateProm { get; set; } = DateTime.Now.AddDays(60);
+
+        /// <summary>
+        /// Date Order confirmed by customer from Order table
+        /// </summary>
+        public DateTime DateOrd { get; set; }
+
+        /// <summary>
+        /// Effective order delivery date
+        /// </summary>
+        public DateTime DateDelivery { get; set; } 
 
         /// <summary>
         /// Eventuale sconto globale
diff --git a/WebDoorCreator.UI/Components/Order/OrderList.razor b/WebDoorCreator.UI/Components/Order/OrderList.razor
index e4eb569..57c4405 100644
--- a/WebDoorCreator.UI/Components/Order/OrderList.razor
+++ b/WebDoorCreator.UI/Components/Order/OrderList.razor
@@ -41,7 +41,29 @@ else
                             <button class="btn btn-sm btn-primary me-1" @onclick="()=>setOrd2Show(item.OrderId)" title="Order detail"><i class="fa-solid fa-magnifying-glass"></i></button>
                             @if (!isTplPage)
                             {
-                                <button class="btn btn-sm btn-primary" @onclick="()=>editOrder(item)" title="Edit Order"><i class="fa-solid fa-pen"></i></button>
+                                <AuthorizeView Roles="SuperAdmin, DcaAdmin, DcaOrdMan, DcaProj" Context="OrderEdit">
+                                    <Authorized>
+                                        @if (item.OrderStatus < 30)
+                                        {
+                                            <button class="btn btn-sm btn-primary" @onclick="()=>editOrder(item)" title="Edit Order"><i class="fa-solid fa-pen"></i></button>
+                                        }
+                                        else
+                                        {
+                                            <button class="btn btn-sm btn-secondary disabled" title="Edit Order"><i class="fa-solid fa-pen"></i></button>
+                                        }
+                                    </Authorized>
+                                    <NotAuthorized>
+                                        @if (item.OrderStatus < 20)
+                                        {
+                                            <button class="btn btn-sm btn-primary" @onclick="()=>editOrder(item)" title="Edit Order"><i class="fa-solid fa-pen"></i></button>
+                                        }
+                                        else
+                                        {
+                                            <button class="btn btn-sm btn-secondary disabled" title="Edit Order"><i class="fa-solid fa-pen"></i></button>
+                                        }
+                                    </NotAuthorized>
+                                </AuthorizeView>
+                                @*<button class="btn btn-sm btn-primary" @onclick="()=>editOrder(item)" title="Edit Order"><i class="fa-solid fa-pen"></i></button>*@
                                 <button class="btn btn-sm btn-primary" @onclick="()=>cloneAndShow(item.OrderId)" title="Duplicate Order"><i class="fa-solid fa-clone"></i></button>
                                 <a class="btn btn-sm btn-info" target="_blank" href="@reportUrl(item.OrderId)" title="Download pdf report"><i class="fa-regular fa-file-pdf"></i></a>
                             }
@@ -65,8 +87,8 @@ else
                             <div class="small">@item.OrderDescript</div>
                         }
                     </td>
-                    <td class="small">@item.DateIns</td>
-                    <td class="small">@item.DateDelivery</td>
+                    <td class="small">@($"{item.DateIns:yyyy-MM-dd}")</td>
+                    <td class="small">@($"{item.DateDelivery:yyyy-MM-dd}")</td>
                     <AuthorizeView Roles="SuperAdmin, DcaAdmin, DcaOrdMan, DcaProj" Context="BackOffice">
                         <Authorized>
                             <td class="small">@(GetCompany(item.CompanyId))</td>
diff --git a/WebDoorCreator.UI/Components/Gen/OrdersDoorsDoorDef.razor b/WebDoorCreator.UI/Components/Order/OrdersDoorsDoorDef.razor
similarity index 100%
rename from WebDoorCreator.UI/Components/Gen/OrdersDoorsDoorDef.razor
rename to WebDoorCreator.UI/Components/Order/OrdersDoorsDoorDef.razor
diff --git a/WebDoorCreator.UI/Components/Gen/OrdersDoorsDoorDef.razor.cs b/WebDoorCreator.UI/Components/Order/OrdersDoorsDoorDef.razor.cs
similarity index 98%
rename from WebDoorCreator.UI/Components/Gen/OrdersDoorsDoorDef.razor.cs
rename to WebDoorCreator.UI/Components/Order/OrdersDoorsDoorDef.razor.cs
index 046e2a4..6daa1de 100644
--- a/WebDoorCreator.UI/Components/Gen/OrdersDoorsDoorDef.razor.cs
+++ b/WebDoorCreator.UI/Components/Order/OrdersDoorsDoorDef.razor.cs
@@ -6,7 +6,7 @@ using WebDoorCreator.Data.DbModels;
 using WebDoorCreator.Data.Services;
 using WebDoorCreator.UI.Data;
 
-namespace WebDoorCreator.UI.Components.Gen
+namespace WebDoorCreator.UI.Components.Order
 {
     public partial class OrdersDoorsDoorDef : IDisposable
     {
@@ -151,9 +151,9 @@ namespace WebDoorCreator.UI.Components.Gen
         protected string translOpt(bool condition, string lemmaCF, string lemmaCT)
         {
             string answ = "";
-            if(condition)
+            if (condition)
             {
-                answ= VocService.Traduci(WDCUService.currLanguage ?? "EN", lemmaCT);
+                answ = VocService.Traduci(WDCUService.currLanguage ?? "EN", lemmaCT);
             }
             else
             {
diff --git a/WebDoorCreator.UI/Components/Gen/OrdersDoorsDoorDef.razor.css b/WebDoorCreator.UI/Components/Order/OrdersDoorsDoorDef.razor.css
similarity index 100%
rename from WebDoorCreator.UI/Components/Gen/OrdersDoorsDoorDef.razor.css
rename to WebDoorCreator.UI/Components/Order/OrdersDoorsDoorDef.razor.css
diff --git a/WebDoorCreator.UI/Components/Gen/OrdersDoorsDoorDef.razor.less b/WebDoorCreator.UI/Components/Order/OrdersDoorsDoorDef.razor.less
similarity index 100%
rename from WebDoorCreator.UI/Components/Gen/OrdersDoorsDoorDef.razor.less
rename to WebDoorCreator.UI/Components/Order/OrdersDoorsDoorDef.razor.less
diff --git a/WebDoorCreator.UI/Components/Gen/OrdersDoorsDoorDef.razor.min.css b/WebDoorCreator.UI/Components/Order/OrdersDoorsDoorDef.razor.min.css
similarity index 100%
rename from WebDoorCreator.UI/Components/Gen/OrdersDoorsDoorDef.razor.min.css
rename to WebDoorCreator.UI/Components/Order/OrdersDoorsDoorDef.razor.min.css