diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx b/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx
index 8be3516..6981431 100644
--- a/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx
+++ b/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx
@@ -1,6 +1,6 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_archivioDocumenti.ascx.cs" Inherits="ETS_WS.WebUserControls.mod_archivioDocumenti" %>
 <%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %>
-<%@ Register Src="mod_textAutocomplete.ascx" TagName="mod_textAutocomplete" TagPrefix="uc1" %>
+<%@ Register Src="mod_singleFileUpload.ascx" TagName="mod_singleFileUpload" TagPrefix="uc1" %>
 <% if (false)
    { %>
 <link href="../css/BuildBlocks.css" rel="stylesheet" type="text/css" />
@@ -9,17 +9,17 @@
 <link href="../css/MasterPage.css" rel="stylesheet" type="text/css" />
 <link href="../css/Style.css" rel="stylesheet" type="text/css" />
 <% } %>
-<asp:GridView ID="grView" runat="server" AllowSorting="True" AutoGenerateColumns="False" DataSourceID="ods" DataKeyNames="idxFile" Width="100%" AllowPaging="True">
+<uc1:mod_singleFileUpload ID="mod_singleFileUpload1" runat="server" btnText="Carica Nuovo File" />
+<asp:GridView ID="grView" runat="server" AllowSorting="True" AutoGenerateColumns="False" DataSourceID="ods" DataKeyNames="idxFile" Width="100%" AllowPaging="True" OnRowCancelingEdit="grView_RowCancelingEdit" OnRowEditing="grView_RowEditing" OnRowUpdated="grView_RowUpdated">
     <RowStyle CssClass="lightGray" />
     <AlternatingRowStyle CssClass="" />
-    <EditRowStyle CssClass="secColA-1" />
-    <SelectedRowStyle CssClass="secColA-2" />
+    <EditRowStyle CssClass="secColA-4" />
+    <SelectedRowStyle CssClass="secColA-4" />
     <FooterStyle CssClass="secColA-1" />
     <PagerStyle CssClass="secColA-1" ForeColor="White" HorizontalAlign="Center" Height="1.2em" VerticalAlign="Middle" Font-Size="11pt" />
     <HeaderStyle CssClass="secColA-1" ForeColor="White" Font-Bold="True" Font-Size="11pt" Height="1.2em" />
     <EmptyDataRowStyle CssClass="secColA-5" />
     <Columns>
-        <%--<asp:BoundField DataField="Numero" HeaderText="Numero" SortExpression="Numero" />--%>
         <asp:TemplateField HeaderText="">
             <ItemTemplate>
                 <asp:ImageButton ID="imgEdit" runat="server" CausesValidation="False" CommandName="Edit" ImageUrl="~/images/edit_m.png" ToolTip="Edit" />
@@ -29,15 +29,15 @@
                 <asp:ImageButton ID="imgCancel" runat="server" CausesValidation="False" CommandName="Cancel" ImageUrl="~/images/cancel_m.png" ToolTip="Cancel" />
             </EditItemTemplate>
         </asp:TemplateField>
-        <asp:TemplateField HeaderText="Commessa" SortExpression="Commessa">
+        <asp:TemplateField HeaderText="Comm." SortExpression="Commessa" ItemStyle-Wrap="false">
             <EditItemTemplate>
-                <asp:TextBox ID="txtCommessa" runat="server" Text='<%# Bind("Commessa") %>' Width="6em" />
-                <asp:AutoCompleteExtender ID="aceCommessa" runat="server" TargetControlID="txtCommessa" ServicePath="~/WS/AutoCompletamento.asmx" ServiceMethod="elencoCommesseSoloCod" CompletionInterval="10" MinimumPrefixLength="1"
-                    CompletionListCssClass="autocompleteListCssClass" CompletionListItemCssClass="autocomplete" CompletionListHighlightedItemCssClass="autocompleteHiglight" CompletionListElementID="autocompleteElemID" />
+                <asp:TextBox ID="txtCommessa" runat="server" Text='<%# Bind("Commessa") %>' Width="5em" />
+                <asp:AutoCompleteExtender ID="aceCommessa" runat="server" TargetControlID="txtCommessa" ServicePath="~/WS/AutoCompletamento.asmx" ServiceMethod="elencoCommesseSoloCod" CompletionInterval="10" MinimumPrefixLength="1" CompletionListCssClass="autocompleteListCssClass" CompletionListItemCssClass="autocomplete" CompletionListHighlightedItemCssClass="autocompleteHiglight" CompletionListElementID="autocompleteElemID" />
             </EditItemTemplate>
             <ItemTemplate>
                 <asp:Label ID="Label1" runat="server" Text='<%# Eval("Commessa") %>' />
             </ItemTemplate>
+            <ItemStyle Wrap="False"></ItemStyle>
         </asp:TemplateField>
         <asp:TemplateField>
             <ItemTemplate>
@@ -48,7 +48,7 @@
             <ItemTemplate>
                 <asp:HyperLink runat="server" ID="hlFile" Text='<%# shortMe(Eval("NomeFile"),25,4) %>' ToolTip='<%# accoda("{0}/{1}",new object[]{Eval("fullPath"),Eval("Nome")}) %>' Target="_blank" NavigateUrl='<%# accoda("{0}/{1}",new object[]{Eval("fullPath"),Eval("Nome")})%>' />
             </ItemTemplate>
-            <ItemStyle Wrap="False"></ItemStyle>
+            <ItemStyle Wrap="true"></ItemStyle>
         </asp:TemplateField>
         <asp:TemplateField HeaderText="">
             <ItemTemplate>
@@ -60,24 +60,26 @@
                 <asp:Label ID="lblProto" runat="server" Text='<%# Eval("Numero") %>' ToolTip='<%# Eval("NrProtocollo") %>' />
             </ItemTemplate>
         </asp:TemplateField>
-        <asp:TemplateField HeaderText="DataRic" SortExpression="DataRic">
+        <asp:TemplateField HeaderText="DataRic" SortExpression="DataRic" ItemStyle-VerticalAlign="Top">
             <EditItemTemplate>
-                DataDoc:<asp:TextBox ID="txtDataDoc" runat="server" Text='<%# Bind("DataDoc","{0:dd/MM/yyyy}") %>' Width="5em" ToolTip="Data Documento" />
+                <asp:Label runat="server" ID="lblDataDoc" Text="DataDoc:" />
+                <asp:TextBox ID="txtDataDoc" runat="server" Text='<%# Bind("DataDoc","{0:dd/MM/yyyy}") %>' Width="5em" ToolTip="Data Documento" />
                 <asp:CalendarExtender runat="server" FirstDayOfWeek="Monday" ID="ceDataDoc" TargetControlID="txtDataDoc" />
                 <br />
-                DataRic:<asp:TextBox ID="txtDataRic" runat="server" Text='<%# Bind("DataRic","{0:dd/MM/yyyy}") %>' Width="5em" ToolTip="Data Ricezione" />
+                <asp:Label runat="server" ID="lblDataRic" Text="DataRic:" />
+                <asp:TextBox ID="txtDataRic" runat="server" Text='<%# Bind("DataRic","{0:dd/MM/yyyy}") %>' Width="5em" ToolTip="Data Ricezione" />
                 <asp:CalendarExtender runat="server" FirstDayOfWeek="Monday" ID="ceDataRic" TargetControlID="txtDataRic" />
             </EditItemTemplate>
             <ItemTemplate>
                 <asp:Label ID="lblDataDoc" runat="server" Text='<%# Eval("DataRic","{0:dd/MM/yy}") %>' ToolTip='<%# Eval("DataDoc","data doc: {0:dd/MM/yy}") %>' />
             </ItemTemplate>
+            <ItemStyle VerticalAlign="Top"></ItemStyle>
         </asp:TemplateField>
         <asp:TemplateField HeaderText="Fase" SortExpression="Fase">
             <EditItemTemplate>
                 <div style="vertical-align: text-bottom;">
                     <asp:TextBox ID="txtFase" runat="server" Text='<%# Bind("Fase") %>' Width="10em" TextMode="MultiLine" Rows="3" />
-                    <asp:AutoCompleteExtender ID="aceFase" runat="server" TargetControlID="txtFase" ServicePath="~/WS/AutoCompletamento.asmx" ServiceMethod="elencoFasi" CompletionInterval="10" MinimumPrefixLength="1" CompletionListCssClass="autocompleteListCssClass"
-                        CompletionListItemCssClass="autocomplete" CompletionListHighlightedItemCssClass="autocompleteHiglight" CompletionListElementID="autocompleteElemID" />
+                    <asp:AutoCompleteExtender ID="aceFase" runat="server" TargetControlID="txtFase" ServicePath="~/WS/AutoCompletamento.asmx" ServiceMethod="elencoFasi" CompletionInterval="10" MinimumPrefixLength="1" CompletionListCssClass="autocompleteListCssClass" CompletionListItemCssClass="autocomplete" CompletionListHighlightedItemCssClass="autocompleteHiglight" CompletionListElementID="autocompleteElemID" />
                 </div>
             </EditItemTemplate>
             <ItemTemplate>
@@ -87,8 +89,7 @@
         <asp:TemplateField HeaderText="Fonte" SortExpression="Fonte">
             <EditItemTemplate>
                 <asp:TextBox ID="txtFonte" runat="server" Text='<%# Bind("Fonte") %>' Width="10em" TextMode="MultiLine" Rows="3" />
-                <asp:AutoCompleteExtender ID="aceFonte" runat="server" TargetControlID="txtFonte" ServicePath="~/WS/AutoCompletamento.asmx" ServiceMethod="elencoFonti" CompletionInterval="10" MinimumPrefixLength="1" CompletionListCssClass="autocompleteListCssClass"
-                    CompletionListItemCssClass="autocomplete" CompletionListHighlightedItemCssClass="autocompleteHiglight" CompletionListElementID="autocompleteElemID" />
+                <asp:AutoCompleteExtender ID="aceFonte" runat="server" TargetControlID="txtFonte" ServicePath="~/WS/AutoCompletamento.asmx" ServiceMethod="elencoFonti" CompletionInterval="10" MinimumPrefixLength="1" CompletionListCssClass="autocompleteListCssClass" CompletionListItemCssClass="autocomplete" CompletionListHighlightedItemCssClass="autocompleteHiglight" CompletionListElementID="autocompleteElemID" />
             </EditItemTemplate>
             <ItemTemplate>
                 <asp:Label ID="Label3" runat="server" Text='<%# Eval("Fonte") %>' />
@@ -96,7 +97,7 @@
         </asp:TemplateField>
         <asp:TemplateField HeaderText="Oggetto" SortExpression="Oggetto">
             <EditItemTemplate>
-                <asp:TextBox ID="TextBox4" runat="server" Text='<%# Bind("Oggetto") %>' Width="25em" TextMode="MultiLine" Rows="3" />
+                <asp:TextBox ID="TextBox4" runat="server" Text='<%# Bind("Oggetto") %>' Width="20em" TextMode="MultiLine" Rows="3" />
             </EditItemTemplate>
             <ItemTemplate>
                 <asp:Label ID="Label4" runat="server" Text='<%# Eval("Oggetto") %>' />
@@ -123,8 +124,7 @@
         </asp:TemplateField>
     </Columns>
 </asp:GridView>
-<asp:ObjectDataSource ID="ods" runat="server" SelectMethod="getBySearch_paged" TypeName="ETS_Data.DS_WebScipTableAdapters.tbDocumentiTableAdapter" OldValuesParameterFormatString="Original_{0}" EnablePaging="True"
-    SelectCountMethod="getBySearch_count" SortParameterName="SortExpression" onupdating="ods_Updating" UpdateMethod="updateQuery">
+<asp:ObjectDataSource ID="ods" runat="server" SelectMethod="getBySearch_paged" TypeName="ETS_Data.DS_WebScipTableAdapters.tbDocumentiTableAdapter" OldValuesParameterFormatString="Original_{0}" EnablePaging="True" SelectCountMethod="getBySearch_count" SortParameterName="SortExpression" OnUpdating="ods_Updating" UpdateMethod="updateQuery">
     <%--EnableCaching="true" CacheDuration="5" SortParameterName="SortExpression" --%>
     <SelectParameters>
         <asp:SessionParameter DefaultValue="*" Name="inizio" SessionField="_inizio" Type="DateTime" />
diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx.cs b/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx.cs
index b16c083..2adb900 100644
--- a/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx.cs
+++ b/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx.cs
@@ -5,6 +5,7 @@ using System.Web;
 using System.Web.UI;
 using System.Web.UI.WebControls;
 using ETS_Data;
+using NLog;
 
 namespace ETS_WS.WebUserControls
 {
@@ -15,12 +16,22 @@ namespace ETS_WS.WebUserControls
         /// </summary>
         public event EventHandler eh_reqEdit;
         /// <summary>
+        /// logger class
+        /// </summary>
+        protected Logger lg = LogManager.GetCurrentClassLogger();
+        /// <summary>
         /// caricamento pagina
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
         protected void Page_Load(object sender, EventArgs e)
         {
+            if (!Page.IsPostBack)
+            {
+                showHideSubstFile(false);
+            }
+            mod_singleFileUpload1.tempArea = WebShipUtils.mng.UserTempPath;
+            mod_singleFileUpload1.eh_fileUploaded += new EventHandler(mod_singleFileUpload1_eh_fileUploaded);
         }
         /// <summary>
         /// restituisce il nome di un icona (nel formato nome_icona.png) dal filetype (*.fileType)
@@ -203,7 +214,7 @@ namespace ETS_WS.WebUserControls
             fileMover.obj.muoviFile(WebShipUtils.mng.UserTempPath, rigaDoc.fullPath,rigaDoc.Nome, rigaDoc.NomeFile, false);
             // evento segnalazione richeista editing!
             Response.Redirect("~/MyDocs.aspx");
-  #endif
+#endif
         }
         /// <summary>
         /// gestione update ods
@@ -221,5 +232,50 @@ namespace ETS_WS.WebUserControls
             // tolgo commessa che non c'è su query
             e.InputParameters.Remove("Commessa");
         }
+        /// <summary>
+        /// mostro button x sostituzione file
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void grView_RowEditing(object sender, GridViewEditEventArgs e)
+        {
+            showHideSubstFile(true);
+        }
+        /// <summary>
+        /// nascondo button sostituzione file
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void grView_RowUpdated(object sender, GridViewUpdatedEventArgs e)
+        {
+            showHideSubstFile(false);
+        }
+        /// <summary>
+        /// nascondo button sostituzione file
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void grView_RowCancelingEdit(object sender, GridViewCancelEditEventArgs e)
+        {
+            showHideSubstFile(false);
+        }
+        /// <summary>
+        /// mostra/nasconde controllo sostituzione file
+        /// </summary>
+        /// <param name="p"></param>
+        private void showHideSubstFile(bool p)
+        {
+            mod_singleFileUpload1.btnEnabled = p;
+        }
+        /// <summary>
+        /// file caricato! effettuo sostituzione!
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void mod_singleFileUpload1_eh_fileUploaded(object sender, EventArgs e)
+        {
+            lg.Info("Caricato file {0} per sostituzione", mod_singleFileUpload1.newFileName);
+            // effettuo operazioni sostituzione file!
+        }
     }
 }
\ No newline at end of file
diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx.designer.cs b/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx.designer.cs
index 29bd54e..9e3cd8f 100644
--- a/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx.designer.cs
+++ b/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx.designer.cs
@@ -12,6 +12,15 @@ namespace ETS_WS.WebUserControls {
     
     public partial class mod_archivioDocumenti {
         
+        /// <summary>
+        /// mod_singleFileUpload1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::ETS_WS.WebUserControls.mod_singleFileUpload mod_singleFileUpload1;
+        
         /// <summary>
         /// grView control.
         /// </summary>
diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_singleFileUpload.ascx b/ETS-WS/ETS-WS/WebUserControls/mod_singleFileUpload.ascx
index 0eb47dc..be0530f 100644
--- a/ETS-WS/ETS-WS/WebUserControls/mod_singleFileUpload.ascx
+++ b/ETS-WS/ETS-WS/WebUserControls/mod_singleFileUpload.ascx
@@ -24,7 +24,7 @@
                 </div>
             </div>
             <div class="clearDiv divCenter" style="padding-top: 20px;">
-                <asp:Button runat="server" ID="CancelButton" Text="Annulla" />
+                <asp:Button runat="server" ID="CancelButton" Text="Chiudi" />
             </div>
         </div>
     </div>
diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_singleFileUpload.ascx.cs b/ETS-WS/ETS-WS/WebUserControls/mod_singleFileUpload.ascx.cs
index 56a1ffe..4621fc9 100644
--- a/ETS-WS/ETS-WS/WebUserControls/mod_singleFileUpload.ascx.cs
+++ b/ETS-WS/ETS-WS/WebUserControls/mod_singleFileUpload.ascx.cs
@@ -28,6 +28,26 @@ namespace ETS_WS.WebUserControls
             fileUplAsync.UploadedComplete += new EventHandler<AjaxControlToolkit.AsyncFileUploadEventArgs>(fileUplAsync_UploadedComplete);
         }
         /// <summary>
+        /// imposta testo button x switch visibilità
+        /// </summary>
+        public string btnText
+        {
+            set
+            {
+                btnShowSostFile.Text = value;
+            }
+        }
+        /// <summary>
+        /// button abilitato
+        /// </summary>
+        public bool btnEnabled
+        {
+            set
+            {
+                btnShowSostFile.Enabled = value;
+            }
+        }
+        /// <summary>
         /// area dove salvare i file caricati async
         /// </summary>
         public string tempArea
diff --git a/ETS-WS/ETS-WS/bin/ETS-WS.dll b/ETS-WS/ETS-WS/bin/ETS-WS.dll
index f4085eb..e5d4e98 100644
Binary files a/ETS-WS/ETS-WS/bin/ETS-WS.dll and b/ETS-WS/ETS-WS/bin/ETS-WS.dll differ