diff --git a/XPS/Appunti.txt b/XPS/Appunti.txt
new file mode 100644
index 0000000..6f1409e
--- /dev/null
+++ b/XPS/Appunti.txt
@@ -0,0 +1,10 @@
+------------------------------------------------
+- 20081024
+------------------------------------------------
+OK 01 - togliere codCli (non gli serve)
+OK 02 - togliere data prev da ins magazziniere...
+03 - una vista x ogni funzione
+04 - barcode da web?
+05 - avanzamento stato: obj mamma ha stato min tra i vari child
+06 - agganciare filtraggi e filtro ricerca generica
+OK 07 - accettazione x magazziniere, che non possa accettare o cancellare post aver già accettato... idem x editing...
\ No newline at end of file
diff --git a/XPS/Web.config b/XPS/Web.config
index fe2bfef..3b5acf3 100644
--- a/XPS/Web.config
+++ b/XPS/Web.config
@@ -113,7 +113,7 @@
     <add key="reportOpzPdf" value="&amp;rs:Format=PDF"/>
 	</appSettings>
 	<connectionStrings>
-  <add name="SteamWare_XPSConnectionString" connectionString="Data Source=localhost;Initial Catalog=SteamWare_XPS;Integrated Security=True"
+  <add name="SteamWare_XPSConnectionString" connectionString="Data Source=localhost;Initial Catalog=SteamWare_XPS;Persist Security Info=True;User id=sa;Password=keyhammer"
    providerName="System.Data.SqlClient" />
  </connectionStrings>
 	<system.webServer>
diff --git a/XPS/detComm.aspx.cs b/XPS/detComm.aspx.cs
index d480830..535cef8 100644
--- a/XPS/detComm.aspx.cs
+++ b/XPS/detComm.aspx.cs
@@ -10,6 +10,12 @@ public partial class detComm : System.Web.UI.Page
     {
         mod_dettComm1.eh_selValore += new EventHandler(mod_dettComm1_eh_selValore);
         mod_dettComm1.eh_resetSelezione += new EventHandler(mod_dettComm1_eh_resetSelezione);
+        mod_ULP1.eh_nuovoValore += new EventHandler(mod_ULP1_eh_nuovoValore);
+    }
+
+    void mod_ULP1_eh_nuovoValore(object sender, EventArgs e)
+    {
+        mod_dettComm1.doUpdateNoReset();
     }
 
     void mod_dettComm1_eh_resetSelezione(object sender, EventArgs e)
diff --git a/XPS/elencoComm.aspx b/XPS/elencoComm.aspx
index 5afcb09..c477a7e 100644
--- a/XPS/elencoComm.aspx
+++ b/XPS/elencoComm.aspx
@@ -1,7 +1,9 @@
 <%@ Page Language="C#" MasterPageFile="~/AjaxSearch.master" AutoEventWireup="true" CodeFile="elencoComm.aspx.cs" Inherits="elencoComm" Title="Untitled Page" %>
 
 <%@ Register Src="mod_elencoComm.ascx" TagName="mod_elencoComm" TagPrefix="uc1" %>
+<%@ Register src="mod_fixCal.ascx" tagname="mod_fixCal" tagprefix="uc2" %>
 <asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
     <uc1:mod_elencoComm ID="Mod_elencoComm1" runat="server" />
+    <uc2:mod_fixCal ID="mod_fixCal1" runat="server" />
 </asp:Content>
 
diff --git a/XPS/mod_ULP.ascx b/XPS/mod_ULP.ascx
index 7138074..59288a6 100644
--- a/XPS/mod_ULP.ascx
+++ b/XPS/mod_ULP.ascx
@@ -4,7 +4,7 @@
 <%@ Register Src="mod_navPath.ascx" TagName="mod_navPath" TagPrefix="uc2" %>
 <asp:GridView ID="grView" runat="server" AutoGenerateColumns="False" DataSourceID="ods"
     DataKeyNames="Cod" AllowPaging="True" AllowSorting="True" OnSelectedIndexChanged="grView_SelectedIndexChanged"
-    OnDataBound="grView_DataBound" OnRowUpdating="grView_RowUpdating">
+    OnDataBound="grView_DataBound" OnRowUpdating="grView_RowUpdating" OnRowUpdated="grView_RowUpdated">
     <RowStyle CssClass="ctrRowStyleDet" />
     <AlternatingRowStyle CssClass="ctrAltRowStyleDet" />
     <EditRowStyle CssClass="ctrEditRowStyleDet" />
@@ -19,15 +19,15 @@
     <Columns>
         <asp:TemplateField ShowHeader="False">
             <HeaderTemplate>
-                <asp:Button ID="btnReset" runat="server" Text='<%# traduci("Reset") %>' OnClick="btnReset_Click"
-                    Visible="true" />
+                <%--<asp:Button ID="btnReset" runat="server" Text='<%# traduci("Reset") %>' OnClick="btnReset_Click"
+                    Visible="true" />--%>
             </HeaderTemplate>
             <ItemTemplate>
-                <asp:ImageButton ID="imgSelect" runat="server" CausesValidation="False" CommandName="Select"
-                    ToolTip='<%# traduci("Select") %>' ImageUrl='<%# imgPath(SteamWare.tipoImg.seleziona, SteamWare.dimImg.small) %>' />
+                <%--<asp:ImageButton ID="imgSelect" runat="server" CausesValidation="False" CommandName="Select"
+                    ToolTip='<%# traduci("Select") %>' ImageUrl='<%# imgPath(SteamWare.tipoImg.seleziona, SteamWare.dimImg.small) %>' />--%>
                 <asp:ImageButton ID="imgClona" runat="server" CausesValidation="False" ToolTip='<%# traduci("clonaRow") %>'
                     ImageUrl='<%# imgPath(SteamWare.tipoImg.clona , SteamWare.dimImg.small) %>' CommandArgument="clonaObj"
-                    CommandName="Update" OnClick="imgClonaRow_Click" />
+                    Visible='<%# userCanDel(Eval("CodStato")) %>' CommandName="Update" OnClick="imgClonaRow_Click" />
             </ItemTemplate>
         </asp:TemplateField>
         <asp:TemplateField HeaderText="#" SortExpression="Posizione">
@@ -53,7 +53,8 @@
             </HeaderTemplate>
             <ItemTemplate>
                 <asp:ImageButton ID="imgEdit" runat="server" CausesValidation="False" CommandName="Edit"
-                    ToolTip='<%# traduci("Edit") %>' ImageUrl='<%# imgPath(SteamWare.tipoImg.modifica, SteamWare.dimImg.small) %>' />
+                    ToolTip='<%# traduci("Edit") %>' ImageUrl='<%# imgPath(SteamWare.tipoImg.modifica, SteamWare.dimImg.small) %>'
+                    Visible='<%# userCanDel(Eval("CodStato")) %>' />
             </ItemTemplate>
             <EditItemTemplate>
                 <asp:ImageButton ID="imgUpdate" runat="server" CausesValidation="False" CommandName="Update"
@@ -94,18 +95,23 @@
                 <asp:Label ID="Label4" runat="server" Text='<%# Bind("Qta") %>'></asp:Label>
             </ItemTemplate>
         </asp:TemplateField>
-        <asp:BoundField DataField="DataArrivo" HeaderText="DataArrivo" 
-            SortExpression="DataArrivo" DataFormatString="{0:dd/MM/yy HH:mm}" 
-            ReadOnly="True" />
-        <asp:BoundField DataField="DataPrevista" HeaderText="DataPrevista" SortExpression="DataPrevista"
-            ReadOnly="True" DataFormatString="{0:dd/MM/yy HH:mm}" />
+        <asp:BoundField DataField="DataArrivo" HeaderText="DataArrivo" SortExpression="DataArrivo"
+            DataFormatString="{0:dd/MM/yy HH:mm}" ReadOnly="True" />
+        <asp:TemplateField HeaderText="DataPrevista" SortExpression="DataPrevista">
+            <EditItemTemplate>
+                <asp:Label ID="Label5" runat="server" Text='<%# Bind("DataPrevista", "{0:dd/MM/yy HH:mm}") %>'></asp:Label>
+            </EditItemTemplate>
+            <ItemTemplate>
+                <asp:Label ID="Label5" runat="server" Text='<%# Bind("DataPrevista", "{0:dd/MM/yy HH:mm}") %>'></asp:Label>
+            </ItemTemplate>
+        </asp:TemplateField>
         <asp:TemplateField ShowHeader="False">
             <HeaderTemplate>
             </HeaderTemplate>
             <ItemTemplate>
                 <asp:ImageButton ID="imgDelete" runat="server" CausesValidation="False" CommandName="Delete"
                     ToolTip='<%# traduci("Delete") %>' ImageUrl='<%# imgPath(SteamWare.tipoImg.elimina , SteamWare.dimImg.small) %>'
-                    Visible='<%# userCanDel() %>' />
+                    Visible='<%# userCanDel(Eval("CodStato")) %>' />
                 <cc1:ConfirmButtonExtender ID="ConfirmButtonExtender1" runat="server" ConfirmText='<%# traduci("confermaDel")%>'
                     TargetControlID="imgDelete">
                 </cc1:ConfirmButtonExtender>
@@ -113,7 +119,7 @@
         </asp:TemplateField>
     </Columns>
 </asp:GridView>
-<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}"
+<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="Original_{0}"
     SelectMethod="getByCodMamma" TypeName="DS_applicazioneTableAdapters.v_ULPTableAdapter"
     DeleteMethod="sp_delRow" UpdateMethod="UpdateQuery">
     <DeleteParameters>
@@ -123,6 +129,7 @@
         <asp:Parameter Name="descrizione" Type="String" />
         <asp:Parameter Name="Qta" Type="Int32" />
         <asp:Parameter Name="Peso" Type="Double" />
+        <asp:Parameter Name="DataPrevista" Type="DateTime" />
         <asp:Parameter Name="Original_Cod" Type="String" />
     </UpdateParameters>
     <SelectParameters>
diff --git a/XPS/mod_ULP.ascx.cs b/XPS/mod_ULP.ascx.cs
index 4b1fa8c..a3e26c3 100644
--- a/XPS/mod_ULP.ascx.cs
+++ b/XPS/mod_ULP.ascx.cs
@@ -229,14 +229,6 @@ public partial class mod_ULP : ApplicationUserControl
 #endif
     }
     /// <summary>
-    /// determina se l'utente possa cancellare, x ora sempre si...
-    /// </summary>
-    /// <returns></returns>
-    public bool userCanDel()
-    {
-        return true;
-    }
-    /// <summary>
     /// gestione cambio selezione valore
     /// </summary>
     /// <param name="sender"></param>
@@ -292,7 +284,38 @@ public partial class mod_ULP : ApplicationUserControl
                 break;
         }
     }
-
+    /// <summary>
+    /// righe aggiornate
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    protected void grView_RowUpdated(object sender, GridViewUpdatedEventArgs e)
+    {
+        // segnalo update...
+        if (eh_nuovoValore != null)
+        {
+            eh_nuovoValore(this, new EventArgs());
+        }
+    }
+    /// <summary>
+    /// restituisce se sia visibile il controllo di accettazione...
+    /// </summary>
+    /// <param name="codStato"></param>
+    /// <returns></returns>
+    public bool isAccettVisible(object codStato)
+    {
+        bool answ = true;
+        if (codStato.ToString().IndexOf("01") < 0) answ = false;
+        return answ;
+    }
+    /// <summary>
+    /// determina se l'utente possa cancellare, x ora sempre si...
+    /// </summary>
+    /// <returns></returns>
+    public bool userCanDel(object codStato)
+    {
+        return isAccettVisible(codStato);
+    }
 
     #endregion
 }
\ No newline at end of file
diff --git a/XPS/mod_dettComm.ascx b/XPS/mod_dettComm.ascx
index 3ccf0e9..9ed7218 100644
--- a/XPS/mod_dettComm.ascx
+++ b/XPS/mod_dettComm.ascx
@@ -31,7 +31,7 @@
                     ToolTip='<%# traduci("Select") %>' ImageUrl='<%# imgPath(SteamWare.tipoImg.seleziona, SteamWare.dimImg.small) %>' />
                 <asp:ImageButton ID="imgClona" runat="server" CausesValidation="False" ToolTip='<%# traduci("clonaRow") %>'
                     ImageUrl='<%# imgPath(SteamWare.tipoImg.clona , SteamWare.dimImg.small) %>' CommandArgument="clonaObj"
-                    CommandName="Update" OnClick="imgClonaRow_Click" />
+                    CommandName="Update" OnClick="imgClonaRow_Click" Visible='<%# userCanDel(Eval("CodStato")) %>'  />
             </ItemTemplate>
         </asp:TemplateField>
         <asp:TemplateField HeaderText="DDT" SortExpression="DDT">
@@ -41,25 +41,14 @@
                 <asp:Label ID="Label3" runat="server" Text='<%# Bind("DDT") %>' ToolTip='<%# Eval("Cod")%>'></asp:Label>
             </ItemTemplate>
         </asp:TemplateField>
-        <asp:BoundField DataField="Posizione" HeaderText="#" SortExpression="Posizione" ReadOnly="True" />
-        <asp:TemplateField ShowHeader="False">
-            <HeaderTemplate>
-            </HeaderTemplate>
-            <ItemTemplate>
-                <asp:HyperLink runat="server" ID="lnkPDF" ImageUrl="~/images/table.png" NavigateUrl='<%# XPS.obj.urlReport(Eval("Cod"),"label","") %>'
-                    Target="_blank" ToolTip='<%# traduci("anteprimaBarcode") %>' />
-                <asp:HyperLink runat="server" ID="lnkShow" ImageUrl="~/images/page_pdf.png" NavigateUrl='<%# XPS.obj.urlReport(Eval("Cod"),"label","PDF") %>'
-                    Target="_blank" ToolTip='<%# traduci("stampaBarcode") %>' />
-            </ItemTemplate>
-        </asp:TemplateField>
-        <asp:BoundField DataField="CodCli" HeaderText="CodCli" SortExpression="CodCli" ReadOnly="True" />
-        <asp:BoundField DataField="Stato" HeaderText="Stato" SortExpression="Stato" ReadOnly="True" />
+        <asp:BoundField DataField="Posizione" HeaderText="Riga" SortExpression="Posizione" ReadOnly="True" />
+       <asp:BoundField DataField="Stato" HeaderText="Stato" SortExpression="Stato" ReadOnly="True" />
         <asp:TemplateField ShowHeader="False">
             <HeaderTemplate>
             </HeaderTemplate>
             <ItemTemplate>
                 <asp:ImageButton ID="imgEdit" runat="server" CausesValidation="False" CommandName="Edit"
-                    ToolTip='<%# traduci("Edit") %>' ImageUrl='<%# imgPath(SteamWare.tipoImg.modifica, SteamWare.dimImg.small) %>' />
+                    ToolTip='<%# traduci("Edit") %>' ImageUrl='<%# imgPath(SteamWare.tipoImg.modifica, SteamWare.dimImg.small) %>' Visible='<%# userCanDel(Eval("CodStato")) %>'  />
             </ItemTemplate>
             <EditItemTemplate>
                 <asp:ImageButton ID="imgUpdate" runat="server" CausesValidation="False" CommandName="Update"
@@ -97,7 +86,7 @@
             <ItemTemplate>
                 <asp:ImageButton ID="imgDelete" runat="server" CausesValidation="False" CommandName="Delete"
                     ToolTip='<%# traduci("Delete") %>' ImageUrl='<%# imgPath(SteamWare.tipoImg.elimina , SteamWare.dimImg.small) %>'
-                    Visible='<%# userCanDel() %>' />
+                    Visible='<%# userCanDel(Eval("CodStato")) %>'  />
                 <cc1:ConfirmButtonExtender ID="ConfirmButtonExtender1" runat="server" ConfirmText='<%# traduci("confermaDel")%>'
                     TargetControlID="imgDelete">
                 </cc1:ConfirmButtonExtender>
diff --git a/XPS/mod_dettComm.ascx.cs b/XPS/mod_dettComm.ascx.cs
index 53484a2..db0b61b 100644
--- a/XPS/mod_dettComm.ascx.cs
+++ b/XPS/mod_dettComm.ascx.cs
@@ -78,6 +78,7 @@ public partial class mod_dettComm : ApplicationUserControl
             eh_resetSelezione(this, new EventArgs());
         } 
     }
+
     #endregion
 
     #region gestione eventi
@@ -246,14 +247,6 @@ public partial class mod_dettComm : ApplicationUserControl
 #endif
     }
     /// <summary>
-    /// determina se l'utente possa cancellare, x ora sempre si...
-    /// </summary>
-    /// <returns></returns>
-    public bool userCanDel()
-    {
-        return true;
-    }
-    /// <summary>
     /// gestione cambio selezione valore
     /// </summary>
     /// <param name="sender"></param>
@@ -309,7 +302,32 @@ public partial class mod_dettComm : ApplicationUserControl
                 break;
         }
     }
-
+    /// <summary>
+    /// effettua update del modulo
+    /// </summary>
+    public void doUpdateNoReset()
+    {
+        grView.DataBind();
+    }
+    /// <summary>
+    /// restituisce se sia visibile il controllo di accettazione...
+    /// </summary>
+    /// <param name="codStato"></param>
+    /// <returns></returns>
+    public bool isAccettVisible(object codStato)
+    {
+        bool answ = true;
+        if (codStato.ToString().IndexOf("01") < 0) answ = false;
+        return answ;
+    }
+    /// <summary>
+    /// determina se l'utente possa cancellare, x ora sempre si...
+    /// </summary>
+    /// <returns></returns>
+    public bool userCanDel(object codStato)
+    {
+        return isAccettVisible(codStato);
+    }
 
     #endregion
 }
\ No newline at end of file
diff --git a/XPS/mod_elencoComm.ascx b/XPS/mod_elencoComm.ascx
index 77009f8..beaffa7 100644
--- a/XPS/mod_elencoComm.ascx
+++ b/XPS/mod_elencoComm.ascx
@@ -12,7 +12,7 @@
                 </asp:ObjectDataSource>
             </td>
             <td align="right">
-                <asp:Button ID="btnShowNew" runat="server" OnClick="btnShowNew_Click" />
+                <asp:Button ID="btnShowNew" runat="server" OnClick="btnShowNew_Click" CausesValidation="false" />
             </td>
         </tr>
         <tr>
@@ -33,14 +33,19 @@
                             </td>
                             <td>
                                 <asp:TextBox ID="txtDDT" runat="server"></asp:TextBox>
+                                <asp:RequiredFieldValidator ID="rfvDDT" runat="server" ErrorMessage="!!!" ControlToValidate="txtDDT"  />
                             </td>
                         </tr>
                         <tr>
                             <td>
-                                <asp:Label ID="lblNomeComm" runat="server" />
+                                <asp:Label ID="lblDataDDT" runat="server" />
                             </td>
                             <td>
-                                <asp:TextBox ID="txtNome" runat="server"></asp:TextBox>
+                                <asp:TextBox ID="txtDataDDT" runat="server"></asp:TextBox> 
+                                <asp:RequiredFieldValidator ID="rfvDataDDT" runat="server" ErrorMessage="!!!" ControlToValidate="txtDataDDT" />
+                                <cc1:CalendarExtender ID="CalendarExtender1" runat="server" FirstDayOfWeek="Monday"
+                                    TargetControlID="txtDataDDT" Format="dd/MM/yyyy">
+                                </cc1:CalendarExtender>
                             </td>
                         </tr>
                         <tr>
@@ -49,11 +54,12 @@
                             </td>
                             <td>
                                 <asp:TextBox ID="txtDescr" runat="server"></asp:TextBox>
+                                <asp:RequiredFieldValidator ID="rfvDescr" runat="server" ErrorMessage="!!!" ControlToValidate="txtDescr" />
                             </td>
                         </tr>
                         <tr>
                             <td colspan="2">
-                                <asp:Button ID="btnNewComm" runat="server" OnClick="btnNewComm_Click" />
+                                <asp:Button ID="btnNewComm" runat="server" OnClick="btnNewComm_Click" CausesValidation="true" />
                             </td>
                         </tr>
                     </table>
@@ -64,7 +70,7 @@
 </div>
 <asp:GridView ID="grView" runat="server" AutoGenerateColumns="False" DataSourceID="ods"
     DataKeyNames="Cod" AllowPaging="True" AllowSorting="True" OnSelectedIndexChanged="grView_SelectedIndexChanged"
-    OnDataBound="grView_DataBound">
+    OnDataBound="grView_DataBound" onrowupdating="grView_RowUpdating">
     <RowStyle CssClass="ctrRowStyle" />
     <AlternatingRowStyle CssClass="ctrAltRowStyle" />
     <EditRowStyle CssClass="ctrEditRowStyle" />
@@ -85,8 +91,10 @@
             <ItemTemplate>
                 <asp:ImageButton ID="imgSelect" runat="server" CausesValidation="False" CommandName="Select"
                     ToolTip='<%# traduci("Select") %>' ImageUrl='<%# imgPath(SteamWare.tipoImg.seleziona, SteamWare.dimImg.small) %>' />
+                <asp:ImageButton ID="imgAccetta" runat="server" CausesValidation="False" CommandName="Update" OnClick="imgAccetta_Click"
+                    ToolTip='<%# traduci("Accetta")%>' ImageUrl='<%# imgPath(SteamWare.tipoImg.conferma , SteamWare.dimImg.small) %>' Visible='<%# isAccettVisible(Eval("CodStato")) %>' />
             </ItemTemplate>
-            <EditItemTemplate>
+            <%--<EditItemTemplate>
                 <asp:ImageButton ID="imgUpdate" runat="server" CausesValidation="False" CommandName="Update"
                     ToolTip='<%# traduci("Update")%>' ImageUrl='<%# imgPath(SteamWare.tipoImg.conferma , SteamWare.dimImg.small) %>' />
                 <asp:ImageButton ID="imgCancel" runat="server" CausesValidation="False" CommandName="Cancel"
@@ -98,7 +106,7 @@
                     OnClick="lblIns_click" />
                 <asp:ImageButton ID="imgCancel" runat="server" CausesValidation="False" CommandName="Cancel"
                     ToolTip='<%# traduci("Cancel") %>' ImageUrl='<%# imgPath(SteamWare.tipoImg.annulla , SteamWare.dimImg.small) %>' />
-            </FooterTemplate>
+            </FooterTemplate>--%>
         </asp:TemplateField>
         <asp:BoundField DataField="Cliente" HeaderText="Cliente" SortExpression="Cliente" />
         <asp:TemplateField HeaderText="DDT" SortExpression="DDT">
@@ -106,6 +114,8 @@
                 <asp:Label ID="Label3" runat="server" Text='<%# Bind("DDT") %>' ToolTip='<%# Eval("Cod")%>'></asp:Label>
             </ItemTemplate>
         </asp:TemplateField>
+        <asp:BoundField DataField="DataDDT" HeaderText="DataDDT" SortExpression="DataDDT"
+            DataFormatString="{0:dd/MM/yy}" />
         <asp:TemplateField ShowHeader="False">
             <HeaderTemplate>
             </HeaderTemplate>
@@ -116,11 +126,10 @@
                     Target="_blank" ToolTip='<%# traduci("stampaBarcode") %>' />
             </ItemTemplate>
         </asp:TemplateField>
-        <asp:BoundField DataField="CodCli" HeaderText="CodCli" SortExpression="CodCli" />
-        <asp:BoundField DataField="Stato" HeaderText="Stato" SortExpression="Stato" />
+        <asp:BoundField DataField="Stato" HeaderText="Stato" SortExpression="CodStato" />
         <asp:BoundField DataField="descrizione" HeaderText="descrizione" SortExpression="descrizione" />
-        <asp:BoundField DataField="Qta" HeaderText="NumRighe" ReadOnly="True" SortExpression="Qta" />
-        <asp:BoundField DataField="Peso" HeaderText="Peso" ReadOnly="True" SortExpression="Peso" DataFormatString="{0:N2} kg" />
+        <asp:BoundField DataField="Peso" HeaderText="Peso" ReadOnly="True" SortExpression="Peso"
+            DataFormatString="{0:N2} kg" />
         <asp:BoundField DataField="Righe" HeaderText="Righe" SortExpression="Righe" />
         <asp:BoundField DataField="Qta" HeaderText="Qta" SortExpression="Qta" />
         <asp:BoundField DataField="Colli" HeaderText="Colli" SortExpression="Colli" />
@@ -134,7 +143,7 @@
             <ItemTemplate>
                 <asp:ImageButton ID="imgDelete" runat="server" CausesValidation="False" CommandName="Delete"
                     ToolTip='<%# traduci("Delete") %>' ImageUrl='<%# imgPath(SteamWare.tipoImg.elimina , SteamWare.dimImg.small) %>'
-                    Visible='<%# userCanDel() %>' />
+                    Visible='<%# userCanDel(Eval("CodStato")) %>' />
                 <cc1:ConfirmButtonExtender ID="ConfirmButtonExtender1" runat="server" ConfirmText='<%# traduci("confermaDel")%>'
                     TargetControlID="imgDelete">
                 </cc1:ConfirmButtonExtender>
diff --git a/XPS/mod_elencoComm.ascx.cs b/XPS/mod_elencoComm.ascx.cs
index 3274dcc..88d43a5 100644
--- a/XPS/mod_elencoComm.ascx.cs
+++ b/XPS/mod_elencoComm.ascx.cs
@@ -161,8 +161,8 @@ public partial class mod_elencoComm : ApplicationUserControl
         btnShowNew.Text = traduci("btnShowNew");
         btnNewComm.Text = traduci("btnNewComm");
         lblCli.Text = traduci("lblCli");
-        lblNomeComm.Text = traduci("lblNomeComm");
         lblNumDDT.Text = traduci("lblNumDDT");
+        lblDataDDT.Text = traduci("lblDataDDT");
         lblDescr.Text = traduci("lblDescr");
     }
 
@@ -210,10 +210,10 @@ public partial class mod_elencoComm : ApplicationUserControl
         catch
         { }
         // creazione di un nuovo set...
-        taComm.sp_creaSetObj(string.Format("{0:yyMMdd}{1:00}", DateTime.Now, nextIdx), "EQUA", mf_cliNew.valore, txtDDT.Text, txtNome.Text, user_std.UtSn.utente, txtDescr.Text);
+        taComm.sp_creaSetObj(string.Format("{0:yyMMdd}{1:00}", DateTime.Now, nextIdx), "EQUA", mf_cliNew.valore, txtDDT.Text, Convert.ToDateTime(txtDataDDT.Text), "", user_std.UtSn.utente, txtDescr.Text);
         // nascondo tutto...
         txtDDT.Text = "";
-        txtNome.Text = "";
+        txtDataDDT.Text = "";
         txtDescr.Text = "";
         scambiaVisibPnlNew();
         // aggiorno pannello...
@@ -230,15 +230,67 @@ public partial class mod_elencoComm : ApplicationUserControl
         // click su inserimento, chiamo il metodo insert dell'ObjectDataSource
         ods.Insert();
     }
-    
+    /// <summary>
+    /// salvo in session che il prox comando è clonare...
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    protected void imgAccetta_Click(object sender, ImageClickEventArgs e)
+    {
+        SteamWare.memLayer.ML.setSessionVal("nextObjCommand", "accettaObj");
+    }
+    /// <summary>
+    /// in caso di aggiornamento verifico se sia salvato un comando accetta...
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    protected void grView_RowUpdating(object sender, GridViewUpdateEventArgs e)
+    {
+        // quale comando?
+        // carico l'idx dell'oggetto
+        string idxObj = e.Keys["Cod"].ToString();
+        string _comando = "";
+        if (SteamWare.memLayer.ML.isInSessionObject("nextObjCommand"))
+        {
+            _comando = SteamWare.memLayer.ML.StringSessionObj("nextObjCommand");
+            SteamWare.memLayer.ML.emptySessionVal("nextObjCommand");
+        }
+        // verifico il tipo di richiesta (up/down level, clona o update normale
+        switch (_comando)
+        {
+            case "accettaObj":
+                // aggiorno lo stato dell'oggetto e dei child, x aggiornare prendo tutto quanto INIZIA come l'idx principale (meno il campo "D" quindi del DDT...)
+                XPS.obj.taObj.UpdStatoTree("02_Accet", user_std.UtSn.utente, DateTime.Now, idxObj.Replace("D", "%"));
+                grView.EditIndex = -1;
+                grView.DataBind();
+                // blocco update!
+                e.Cancel = true;
+                break;
+            default:
+                // faccio update!
+                e.Cancel = true;
+                break;
+        }
+    }
+    /// <summary>
+    /// restituisce se sia visibile il controllo di accettazione...
+    /// </summary>
+    /// <param name="codStato"></param>
+    /// <returns></returns>
+    public bool isAccettVisible(object codStato)
+    {
+        bool answ = true;
+        if (codStato.ToString().IndexOf("01") < 0) answ = false;
+        return answ;
+    }
     /// <summary>
     /// determina se l'utente possa cancellare, x ora sempre si...
     /// </summary>
     /// <returns></returns>
-    public bool userCanDel()
+    public bool userCanDel(object codStato)
     {
-        return true;
+        return isAccettVisible(codStato);
     }
-    
+
     #endregion
 }
\ No newline at end of file
diff --git a/XPS/mod_fixCal.ascx b/XPS/mod_fixCal.ascx
new file mode 100644
index 0000000..388fe1a
--- /dev/null
+++ b/XPS/mod_fixCal.ascx
@@ -0,0 +1,6 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeFile="mod_fixCal.ascx.cs" Inherits="mod_fixCal" %>
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+<asp:TextBox ID="TextBox1" runat="server" Visible="false">
+</asp:TextBox>
+<cc1:CalendarExtender ID="CalendarExtender1" runat="server" TargetControlID="TextBox1"
+    FirstDayOfWeek="monday" Format="dd/MM/yyyy" />
diff --git a/XPS/mod_fixCal.ascx.cs b/XPS/mod_fixCal.ascx.cs
new file mode 100644
index 0000000..5f419e1
--- /dev/null
+++ b/XPS/mod_fixCal.ascx.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Data;
+using System.Configuration;
+using System.Collections;
+using System.Web;
+using System.Web.Security;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Web.UI.WebControls.WebParts;
+using System.Web.UI.HtmlControls;
+
+public partial class mod_fixCal : System.Web.UI.UserControl
+{
+    protected void Page_Load(object sender, EventArgs e)
+    {
+
+    }
+}
diff --git a/db/SteamWare_XPS.zip b/db/SteamWare_XPS.zip
index fdc7a27..8ee1928 100644
Binary files a/db/SteamWare_XPS.zip and b/db/SteamWare_XPS.zip differ