diff --git a/GMW/Web.config b/GMW/Web.config
index 733320a8..d0182772 100644
--- a/GMW/Web.config
+++ b/GMW/Web.config
@@ -61,7 +61,7 @@
         <add key="appName" value="GMW" />
         <add key="SiteName" value="Tekal" />
         <add key="mainRev" value="2.1" />
-        <add key="minRev" value="510" />
+        <add key="minRev" value="511" />
         <add key="copyRight" value="SteamWare © 2010-2012" />
         <add key="_allowForceUser" value="true" />
         <add key="_safePages" value="jumper.aspx#unauthorized.aspx#allegati.aspx#forceUser.aspx#login.aspx#test.aspx#istruzioni.aspx#Test.aspx" />
diff --git a/GMW/WebUserControls/mod_gestPrinterPost.ascx b/GMW/WebUserControls/mod_gestPrinterPost.ascx
index 44021af7..2de6461c 100644
--- a/GMW/WebUserControls/mod_gestPrinterPost.ascx
+++ b/GMW/WebUserControls/mod_gestPrinterPost.ascx
@@ -1,6 +1,10 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_gestPrinterPost.ascx.cs" Inherits="GMW.WebUserControls.mod_gestPrinterPost" %>
 <%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %>
-<asp:GridView ID="grView" runat="server" AllowPaging="True" DataSourceID="ods" EnableModelValidation="True" DataKeyNames="codPostazione" AutoGenerateColumns="False" PageSize="20" AllowSorting="True">
+<% if (false)
+   { %>
+<link href="../Style.css" rel="stylesheet" type="text/css" />
+<% } %>
+<asp:GridView ID="grView" runat="server" AllowPaging="True" DataSourceID="ods" EnableModelValidation="True" DataKeyNames="codPostazione" AutoGenerateColumns="False" PageSize="20" AllowSorting="True" Width="100%">
     <RowStyle CssClass="ctrRowStyle" />
     <AlternatingRowStyle CssClass="ctrAltRowStyle" />
     <EditRowStyle CssClass="ctrEditRowStyle" />
@@ -15,7 +19,7 @@
             Visible='<%# isWritable() %>' />--%>
     </EmptyDataTemplate>
     <Columns>
-        <asp:TemplateField ShowHeader="False">
+        <asp:TemplateField ShowHeader="False" ItemStyle-HorizontalAlign="Center" ItemStyle-Width="54px">
             <HeaderTemplate>
                 <asp:Button ID="btnReset" runat="server" Text='<%# traduci("Reset") %>' OnClick="btnReset_Click" Visible="false" />
             </HeaderTemplate>
@@ -37,10 +41,10 @@
                 <asp:Label ID="lblCodPostazione" runat="server" Text='<%# Eval("codPostazione") %>' />
             </ItemTemplate>
             <EditItemTemplate>
-                <asp:TextBox ID="txtcodPostazione" runat="server" Text='<%# Bind("codPostazione") %>' />
+                <asp:TextBox ID="txtcodPostazione" runat="server" Text='<%# Bind("codPostazione") %>' Width="98%" />
             </EditItemTemplate>
             <FooterTemplate>
-                <asp:TextBox ID="txtcodPostazione" runat="server" Text='<%# Bind("codPostazione") %>' />
+                <asp:TextBox ID="txtcodPostazione" runat="server" Text='<%# Bind("codPostazione") %>' Width="98%" />
             </FooterTemplate>
         </asp:TemplateField>
         <asp:TemplateField HeaderText="stampante" SortExpression="stampante">
@@ -48,15 +52,26 @@
                 <asp:Label ID="lblStampante" runat="server" Text='<%# Eval("stampante") %>' />
             </ItemTemplate>
             <EditItemTemplate>
-                <asp:TextBox ID="txtstampante" runat="server" Text='<%# Bind("stampante") %>'></asp:TextBox>
+                <asp:TextBox ID="txtstampante" runat="server" Text='<%# Bind("stampante") %>' Width="98%" />
             </EditItemTemplate>
             <FooterTemplate>
-                <asp:TextBox ID="txtstampante" runat="server" Text='<%# Bind("stampante") %>'></asp:TextBox>
-            </FooterTemplate>            
+                <asp:TextBox ID="txtstampante" runat="server" Text='<%# Bind("stampante") %>' Width="98%" />
+            </FooterTemplate>
         </asp:TemplateField>
-        <asp:TemplateField ShowHeader="False">
+        <asp:TemplateField HeaderText="note" SortExpression="note">
+            <ItemTemplate>
+                <asp:Label ID="lblnote" runat="server" Text='<%# Eval("note") %>' />
+            </ItemTemplate>
+            <EditItemTemplate>
+                <asp:TextBox ID="txtnote" runat="server" Text='<%# Bind("note") %>' Width="98%" />
+            </EditItemTemplate>
+            <FooterTemplate>
+                <asp:TextBox ID="txtnote" runat="server" Text='<%# Bind("note") %>' Width="98%" />
+            </FooterTemplate>
+        </asp:TemplateField>
+        <asp:TemplateField ShowHeader="False" ItemStyle-HorizontalAlign="Center" ItemStyle-Width="54px">
             <HeaderTemplate>
-                <asp:Button ID="btnNew" runat="server" OnClick="btnNew_Click" Text="New" />
+                <asp:Button ID="btnNew" runat="server" OnClick="btnNew_Click" Text="Nuovo" CssClass="btnNew" />
             </HeaderTemplate>
             <EditItemTemplate>
                 <asp:ImageButton ID="imgUpdate2" runat="server" CausesValidation="False" CommandName="Update" ImageUrl="~/images/apply_m.png" ToolTip='<%# traduci("Update")%>' />
@@ -67,8 +82,7 @@
                 <asp:ImageButton ID="imgCancel2" runat="server" CausesValidation="False" CommandName="Cancel" ImageUrl="~/images/cancel_m.png" ToolTip='<%# traduci("Cancel") %>' />
             </FooterTemplate>
             <ItemTemplate>
-                <asp:ImageButton ID="imgDelete" runat="server" CausesValidation="False" CommandArgument='<%# Eval("codPostazione") %>' CommandName="Delete" ImageUrl="~/images/elimina_m.png" 
-                    ToolTip='<%# traduci("Delete") %>'  />
+                <asp:ImageButton ID="imgDelete" runat="server" CausesValidation="False" CommandArgument='<%# Eval("codPostazione") %>' CommandName="Delete" ImageUrl="~/images/elimina_m.png" ToolTip='<%# traduci("Delete") %>' />
                 <asp:ConfirmButtonExtender ID="ConfirmButtonExtender1" runat="server" ConfirmText='<%# traduci("confermaDel")%>' TargetControlID="imgDelete">
                 </asp:ConfirmButtonExtender>
             </ItemTemplate>
@@ -83,10 +97,12 @@
     <InsertParameters>
         <asp:Parameter Name="codPostazione" Type="String" />
         <asp:Parameter Name="stampante" Type="String" />
+        <asp:Parameter Name="note" Type="String" />
     </InsertParameters>
     <UpdateParameters>
         <asp:Parameter Name="stampante" Type="String" />
         <asp:Parameter Name="codPostazione" Type="String" />
+        <asp:Parameter Name="note" Type="String" />
         <asp:Parameter Name="Original_codPostazione" Type="String" />
     </UpdateParameters>
 </asp:ObjectDataSource>
diff --git a/GMW/bin/GMW.dll b/GMW/bin/GMW.dll
index d7eec9bd..f5566ba4 100644
Binary files a/GMW/bin/GMW.dll and b/GMW/bin/GMW.dll differ
diff --git a/GMW/bin/GMW_data.dll b/GMW/bin/GMW_data.dll
index 3de35102..277334b9 100644
Binary files a/GMW/bin/GMW_data.dll and b/GMW/bin/GMW_data.dll differ
diff --git a/GMW_data/DS_magazzino.Designer.cs b/GMW_data/DS_magazzino.Designer.cs
index 2cce6776..aff2f662 100644
--- a/GMW_data/DS_magazzino.Designer.cs
+++ b/GMW_data/DS_magazzino.Designer.cs
@@ -11872,6 +11872,8 @@ namespace GMW_data {
             
             private global::System.Data.DataColumn columnstampante;
             
+            private global::System.Data.DataColumn columnnote;
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
             public ElencoPostazioniDataTable() {
@@ -11921,6 +11923,14 @@ namespace GMW_data {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public global::System.Data.DataColumn noteColumn {
+                get {
+                    return this.columnnote;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
             [global::System.ComponentModel.Browsable(false)]
@@ -11958,11 +11968,12 @@ namespace GMW_data {
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
-            public ElencoPostazioniRow AddElencoPostazioniRow(string codPostazione, string stampante) {
+            public ElencoPostazioniRow AddElencoPostazioniRow(string codPostazione, string stampante, string note) {
                 ElencoPostazioniRow rowElencoPostazioniRow = ((ElencoPostazioniRow)(this.NewRow()));
                 object[] columnValuesArray = new object[] {
                         codPostazione,
-                        stampante};
+                        stampante,
+                        note};
                 rowElencoPostazioniRow.ItemArray = columnValuesArray;
                 this.Rows.Add(rowElencoPostazioniRow);
                 return rowElencoPostazioniRow;
@@ -11994,6 +12005,7 @@ namespace GMW_data {
             internal void InitVars() {
                 this.columncodPostazione = base.Columns["codPostazione"];
                 this.columnstampante = base.Columns["stampante"];
+                this.columnnote = base.Columns["note"];
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -12003,12 +12015,15 @@ namespace GMW_data {
                 base.Columns.Add(this.columncodPostazione);
                 this.columnstampante = new global::System.Data.DataColumn("stampante", typeof(string), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columnstampante);
+                this.columnnote = new global::System.Data.DataColumn("note", typeof(string), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnnote);
                 this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
                                 this.columncodPostazione}, true));
                 this.columncodPostazione.AllowDBNull = false;
                 this.columncodPostazione.Unique = true;
                 this.columncodPostazione.MaxLength = 250;
                 this.columnstampante.MaxLength = 250;
+                this.columnnote.MaxLength = 250;
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -17764,6 +17779,22 @@ namespace GMW_data {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public string note {
+                get {
+                    try {
+                        return ((string)(this[this.tableElencoPostazioni.noteColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'note\' in table \'ElencoPostazioni\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableElencoPostazioni.noteColumn] = value;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
             public bool IsstampanteNull() {
@@ -17775,6 +17806,18 @@ namespace GMW_data {
             public void SetstampanteNull() {
                 this[this.tableElencoPostazioni.stampanteColumn] = global::System.Convert.DBNull;
             }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public bool IsnoteNull() {
+                return this.IsNull(this.tableElencoPostazioni.noteColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public void SetnoteNull() {
+                this[this.tableElencoPostazioni.noteColumn] = global::System.Convert.DBNull;
+            }
         }
         
         /// <summary>
@@ -33182,34 +33225,42 @@ SELECT idxEvento, DataOra, CodSoggetto, codPostazione, clientIP, UDC, Particolar
             tableMapping.DataSetTable = "ElencoPostazioni";
             tableMapping.ColumnMappings.Add("codPostazione", "codPostazione");
             tableMapping.ColumnMappings.Add("stampante", "stampante");
+            tableMapping.ColumnMappings.Add("note", "note");
             this._adapter.TableMappings.Add(tableMapping);
             this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand();
             this._adapter.DeleteCommand.Connection = this.Connection;
             this._adapter.DeleteCommand.CommandText = "DELETE FROM [ElencoPostazioni] WHERE (([codPostazione] = @Original_codPostazione)" +
                 " AND ((@IsNull_stampante = 1 AND [stampante] IS NULL) OR ([stampante] = @Origina" +
-                "l_stampante)))";
+                "l_stampante)) AND ((@IsNull_note = 1 AND [note] IS NULL) OR ([note] = @Original_" +
+                "note)))";
             this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text;
             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_codPostazione", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "codPostazione", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_stampante", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "stampante", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_stampante", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "stampante", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_note", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "note", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+            this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_note", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "note", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
             this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand();
             this._adapter.InsertCommand.Connection = this.Connection;
-            this._adapter.InsertCommand.CommandText = "INSERT INTO [ElencoPostazioni] ([codPostazione], [stampante]) VALUES (@codPostazi" +
-                "one, @stampante);\r\nSELECT codPostazione, stampante FROM ElencoPostazioni WHERE (" +
-                "codPostazione = @codPostazione) ORDER BY codPostazione";
+            this._adapter.InsertCommand.CommandText = "INSERT INTO [ElencoPostazioni] ([codPostazione], [stampante], [note]) VALUES (@co" +
+                "dPostazione, @stampante, @note);\r\nSELECT codPostazione, stampante, note FROM Ele" +
+                "ncoPostazioni WHERE (codPostazione = @codPostazione) ORDER BY codPostazione";
             this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text;
             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@codPostazione", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "codPostazione", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@stampante", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "stampante", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@note", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "note", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand();
             this._adapter.UpdateCommand.Connection = this.Connection;
-            this._adapter.UpdateCommand.CommandText = @"UPDATE [ElencoPostazioni] SET [codPostazione] = @codPostazione, [stampante] = @stampante WHERE (([codPostazione] = @Original_codPostazione) AND ((@IsNull_stampante = 1 AND [stampante] IS NULL) OR ([stampante] = @Original_stampante)));
-SELECT codPostazione, stampante FROM ElencoPostazioni WHERE (codPostazione = @codPostazione) ORDER BY codPostazione";
+            this._adapter.UpdateCommand.CommandText = @"UPDATE [ElencoPostazioni] SET [codPostazione] = @codPostazione, [stampante] = @stampante, [note] = @note WHERE (([codPostazione] = @Original_codPostazione) AND ((@IsNull_stampante = 1 AND [stampante] IS NULL) OR ([stampante] = @Original_stampante)) AND ((@IsNull_note = 1 AND [note] IS NULL) OR ([note] = @Original_note)));
+SELECT codPostazione, stampante, note FROM ElencoPostazioni WHERE (codPostazione = @codPostazione) ORDER BY codPostazione";
             this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text;
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@codPostazione", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "codPostazione", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@stampante", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "stampante", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@note", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "note", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_codPostazione", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "codPostazione", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_stampante", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "stampante", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_stampante", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "stampante", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_note", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "note", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_note", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "note", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
         }
         
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -33225,8 +33276,7 @@ SELECT codPostazione, stampante FROM ElencoPostazioni WHERE (codPostazione = @co
             this._commandCollection = new global::System.Data.SqlClient.SqlCommand[3];
             this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[0].Connection = this.Connection;
-            this._commandCollection[0].CommandText = "SELECT        codPostazione, stampante\r\nFROM            ElencoPostazioni\r\nORDER B" +
-                "Y codPostazione";
+            this._commandCollection[0].CommandText = "SELECT        *\r\nFROM            ElencoPostazioni\r\nORDER BY codPostazione";
             this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
             this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[1].Connection = this.Connection;
@@ -33242,6 +33292,7 @@ SELECT codPostazione, stampante FROM ElencoPostazioni WHERE (codPostazione = @co
             this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_codPostazione", global::System.Data.SqlDbType.NVarChar, 250, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@codPostazione", global::System.Data.SqlDbType.NVarChar, 250, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@stampante", global::System.Data.SqlDbType.NVarChar, 250, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@note", global::System.Data.SqlDbType.NVarChar, 250, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
         }
         
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -33301,7 +33352,7 @@ SELECT codPostazione, stampante FROM ElencoPostazioni WHERE (codPostazione = @co
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Delete, true)]
-        public virtual int Delete(string Original_codPostazione, string Original_stampante) {
+        public virtual int Delete(string Original_codPostazione, string Original_stampante, string Original_note) {
             if ((Original_codPostazione == null)) {
                 throw new global::System.ArgumentNullException("Original_codPostazione");
             }
@@ -33316,6 +33367,14 @@ SELECT codPostazione, stampante FROM ElencoPostazioni WHERE (codPostazione = @co
                 this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(0));
                 this.Adapter.DeleteCommand.Parameters[2].Value = ((string)(Original_stampante));
             }
+            if ((Original_note == null)) {
+                this.Adapter.DeleteCommand.Parameters[3].Value = ((object)(1));
+                this.Adapter.DeleteCommand.Parameters[4].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.DeleteCommand.Parameters[3].Value = ((object)(0));
+                this.Adapter.DeleteCommand.Parameters[4].Value = ((string)(Original_note));
+            }
             global::System.Data.ConnectionState previousConnectionState = this.Adapter.DeleteCommand.Connection.State;
             if (((this.Adapter.DeleteCommand.Connection.State & global::System.Data.ConnectionState.Open) 
                         != global::System.Data.ConnectionState.Open)) {
@@ -33336,7 +33395,7 @@ SELECT codPostazione, stampante FROM ElencoPostazioni WHERE (codPostazione = @co
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Insert, true)]
-        public virtual int Insert(string codPostazione, string stampante) {
+        public virtual int Insert(string codPostazione, string stampante, string note) {
             if ((codPostazione == null)) {
                 throw new global::System.ArgumentNullException("codPostazione");
             }
@@ -33349,6 +33408,12 @@ SELECT codPostazione, stampante FROM ElencoPostazioni WHERE (codPostazione = @co
             else {
                 this.Adapter.InsertCommand.Parameters[1].Value = ((string)(stampante));
             }
+            if ((note == null)) {
+                this.Adapter.InsertCommand.Parameters[2].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.InsertCommand.Parameters[2].Value = ((string)(note));
+            }
             global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State;
             if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open) 
                         != global::System.Data.ConnectionState.Open)) {
@@ -33369,7 +33434,7 @@ SELECT codPostazione, stampante FROM ElencoPostazioni WHERE (codPostazione = @co
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, true)]
-        public virtual int Update(string codPostazione, string stampante, string Original_codPostazione, string Original_stampante) {
+        public virtual int Update(string codPostazione, string stampante, string note, string Original_codPostazione, string Original_stampante, string Original_note) {
             if ((codPostazione == null)) {
                 throw new global::System.ArgumentNullException("codPostazione");
             }
@@ -33382,19 +33447,33 @@ SELECT codPostazione, stampante FROM ElencoPostazioni WHERE (codPostazione = @co
             else {
                 this.Adapter.UpdateCommand.Parameters[1].Value = ((string)(stampante));
             }
+            if ((note == null)) {
+                this.Adapter.UpdateCommand.Parameters[2].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[2].Value = ((string)(note));
+            }
             if ((Original_codPostazione == null)) {
                 throw new global::System.ArgumentNullException("Original_codPostazione");
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[2].Value = ((string)(Original_codPostazione));
+                this.Adapter.UpdateCommand.Parameters[3].Value = ((string)(Original_codPostazione));
             }
             if ((Original_stampante == null)) {
-                this.Adapter.UpdateCommand.Parameters[3].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[4].Value = global::System.DBNull.Value;
+                this.Adapter.UpdateCommand.Parameters[4].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[5].Value = global::System.DBNull.Value;
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[3].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[4].Value = ((string)(Original_stampante));
+                this.Adapter.UpdateCommand.Parameters[4].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[5].Value = ((string)(Original_stampante));
+            }
+            if ((Original_note == null)) {
+                this.Adapter.UpdateCommand.Parameters[6].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[7].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[6].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[7].Value = ((string)(Original_note));
             }
             global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State;
             if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open) 
@@ -33416,8 +33495,8 @@ SELECT codPostazione, stampante FROM ElencoPostazioni WHERE (codPostazione = @co
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, true)]
-        public virtual int Update(string stampante, string Original_codPostazione, string Original_stampante) {
-            return this.Update(Original_codPostazione, stampante, Original_codPostazione, Original_stampante);
+        public virtual int Update(string stampante, string note, string Original_codPostazione, string Original_stampante, string Original_note) {
+            return this.Update(Original_codPostazione, stampante, note, Original_codPostazione, Original_stampante, Original_note);
         }
         
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -33451,7 +33530,7 @@ SELECT codPostazione, stampante FROM ElencoPostazioni WHERE (codPostazione = @co
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
-        public virtual int updateQuery(string Original_codPostazione, string codPostazione, string stampante) {
+        public virtual int updateQuery(string Original_codPostazione, string codPostazione, string stampante, string note) {
             global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[2];
             if ((Original_codPostazione == null)) {
                 command.Parameters[1].Value = global::System.DBNull.Value;
@@ -33471,6 +33550,12 @@ SELECT codPostazione, stampante FROM ElencoPostazioni WHERE (codPostazione = @co
             else {
                 command.Parameters[3].Value = ((string)(stampante));
             }
+            if ((note == null)) {
+                command.Parameters[4].Value = global::System.DBNull.Value;
+            }
+            else {
+                command.Parameters[4].Value = ((string)(note));
+            }
             global::System.Data.ConnectionState previousConnectionState = command.Connection.State;
             if (((command.Connection.State & global::System.Data.ConnectionState.Open) 
                         != global::System.Data.ConnectionState.Open)) {
diff --git a/GMW_data/DS_magazzino.xsd b/GMW_data/DS_magazzino.xsd
index a264b97b..eb6ea760 100644
--- a/GMW_data/DS_magazzino.xsd
+++ b/GMW_data/DS_magazzino.xsd
@@ -3065,27 +3065,30 @@ SELECT idxEvento, DataOra, CodSoggetto, codPostazione, clientIP, UDC, Particolar
               <DbSource ConnectionRef="GMWConnectionString (Settings)" DbObjectName="TK_GMW.dbo.ElencoPostazioni" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
                 <DeleteCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>DELETE FROM [ElencoPostazioni] WHERE (([codPostazione] = @Original_codPostazione) AND ((@IsNull_stampante = 1 AND [stampante] IS NULL) OR ([stampante] = @Original_stampante)))</CommandText>
+                    <CommandText>DELETE FROM [ElencoPostazioni] WHERE (([codPostazione] = @Original_codPostazione) AND ((@IsNull_stampante = 1 AND [stampante] IS NULL) OR ([stampante] = @Original_stampante)) AND ((@IsNull_note = 1 AND [note] IS NULL) OR ([note] = @Original_note)))</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_codPostazione" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="codPostazione" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_stampante" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="stampante" SourceColumnNullMapping="true" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_stampante" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="stampante" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_note" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="note" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_note" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="note" SourceColumnNullMapping="false" SourceVersion="Original" />
                     </Parameters>
                   </DbCommand>
                 </DeleteCommand>
                 <InsertCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>INSERT INTO [ElencoPostazioni] ([codPostazione], [stampante]) VALUES (@codPostazione, @stampante);
-SELECT codPostazione, stampante FROM ElencoPostazioni WHERE (codPostazione = @codPostazione) ORDER BY codPostazione</CommandText>
+                    <CommandText>INSERT INTO [ElencoPostazioni] ([codPostazione], [stampante], [note]) VALUES (@codPostazione, @stampante, @note);
+SELECT codPostazione, stampante, note FROM ElencoPostazioni WHERE (codPostazione = @codPostazione) ORDER BY codPostazione</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@codPostazione" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="codPostazione" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@stampante" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="stampante" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@note" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="note" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </InsertCommand>
                 <SelectCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>SELECT        codPostazione, stampante
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                    <CommandText>SELECT        *
 FROM            ElencoPostazioni
 ORDER BY codPostazione</CommandText>
                     <Parameters />
@@ -3093,14 +3096,17 @@ ORDER BY codPostazione</CommandText>
                 </SelectCommand>
                 <UpdateCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>UPDATE [ElencoPostazioni] SET [codPostazione] = @codPostazione, [stampante] = @stampante WHERE (([codPostazione] = @Original_codPostazione) AND ((@IsNull_stampante = 1 AND [stampante] IS NULL) OR ([stampante] = @Original_stampante)));
-SELECT codPostazione, stampante FROM ElencoPostazioni WHERE (codPostazione = @codPostazione) ORDER BY codPostazione</CommandText>
+                    <CommandText>UPDATE [ElencoPostazioni] SET [codPostazione] = @codPostazione, [stampante] = @stampante, [note] = @note WHERE (([codPostazione] = @Original_codPostazione) AND ((@IsNull_stampante = 1 AND [stampante] IS NULL) OR ([stampante] = @Original_stampante)) AND ((@IsNull_note = 1 AND [note] IS NULL) OR ([note] = @Original_note)));
+SELECT codPostazione, stampante, note FROM ElencoPostazioni WHERE (codPostazione = @codPostazione) ORDER BY codPostazione</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@codPostazione" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="codPostazione" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@stampante" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="stampante" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@note" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="note" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_codPostazione" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="codPostazione" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_stampante" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="stampante" SourceColumnNullMapping="true" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_stampante" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="stampante" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_note" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="note" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_note" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="note" SourceColumnNullMapping="false" SourceVersion="Original" />
                     </Parameters>
                   </DbCommand>
                 </UpdateCommand>
@@ -3109,6 +3115,7 @@ SELECT codPostazione, stampante FROM ElencoPostazioni WHERE (codPostazione = @co
             <Mappings>
               <Mapping SourceColumn="codPostazione" DataSetColumn="codPostazione" />
               <Mapping SourceColumn="stampante" DataSetColumn="stampante" />
+              <Mapping SourceColumn="note" DataSetColumn="note" />
             </Mappings>
             <Sources>
               <DbSource ConnectionRef="GMWConnectionString (Settings)" DbObjectName="TK_GMW.dbo.stp_EP_delete" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="deleteQuery" Modifier="Public" Name="deleteQuery" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="deleteQuery">
@@ -3131,6 +3138,7 @@ SELECT codPostazione, stampante FROM ElencoPostazioni WHERE (codPostazione = @co
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@Original_codPostazione" Precision="0" ProviderType="NVarChar" Scale="0" Size="250" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@codPostazione" Precision="0" ProviderType="NVarChar" Scale="0" Size="250" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@stampante" Precision="0" ProviderType="NVarChar" Scale="0" Size="250" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@note" Precision="0" ProviderType="NVarChar" Scale="0" Size="250" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </SelectCommand>
@@ -4238,7 +4246,7 @@ SELECT codPostazione, stampante FROM ElencoPostazioni WHERE (codPostazione = @co
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="StoricoAzioniOperatore" msprop:Generator_TableClassName="StoricoAzioniOperatoreDataTable" msprop:Generator_TableVarName="tableStoricoAzioniOperatore" msprop:Generator_TablePropName="StoricoAzioniOperatore" msprop:Generator_RowDeletingName="StoricoAzioniOperatoreRowDeleting" msprop:Generator_RowChangingName="StoricoAzioniOperatoreRowChanging" msprop:Generator_RowEvHandlerName="StoricoAzioniOperatoreRowChangeEventHandler" msprop:Generator_RowDeletedName="StoricoAzioniOperatoreRowDeleted" msprop:Generator_UserTableName="StoricoAzioniOperatore" msprop:Generator_RowChangedName="StoricoAzioniOperatoreRowChanged" msprop:Generator_RowEvArgName="StoricoAzioniOperatoreRowChangeEvent" msprop:Generator_RowClassName="StoricoAzioniOperatoreRow">
+        <xs:element name="StoricoAzioniOperatore" msprop:Generator_TableClassName="StoricoAzioniOperatoreDataTable" msprop:Generator_TableVarName="tableStoricoAzioniOperatore" msprop:Generator_RowChangedName="StoricoAzioniOperatoreRowChanged" msprop:Generator_TablePropName="StoricoAzioniOperatore" msprop:Generator_RowDeletingName="StoricoAzioniOperatoreRowDeleting" msprop:Generator_RowChangingName="StoricoAzioniOperatoreRowChanging" msprop:Generator_RowEvHandlerName="StoricoAzioniOperatoreRowChangeEventHandler" msprop:Generator_RowDeletedName="StoricoAzioniOperatoreRowDeleted" msprop:Generator_RowClassName="StoricoAzioniOperatoreRow" msprop:Generator_UserTableName="StoricoAzioniOperatore" msprop:Generator_RowEvArgName="StoricoAzioniOperatoreRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="idxEvento" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidxEvento" msprop:Generator_ColumnPropNameInRow="idxEvento" msprop:Generator_ColumnPropNameInTable="idxEventoColumn" msprop:Generator_UserColumnName="idxEvento" type="xs:int" />
@@ -4295,7 +4303,7 @@ SELECT codPostazione, stampante FROM ElencoPostazioni WHERE (codPostazione = @co
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="stp_MagFifoByParticolare" msprop:Generator_TableClassName="stp_MagFifoByParticolareDataTable" msprop:Generator_TableVarName="tablestp_MagFifoByParticolare" msprop:Generator_RowChangedName="stp_MagFifoByParticolareRowChanged" msprop:Generator_TablePropName="stp_MagFifoByParticolare" msprop:Generator_RowDeletingName="stp_MagFifoByParticolareRowDeleting" msprop:Generator_RowChangingName="stp_MagFifoByParticolareRowChanging" msprop:Generator_RowEvHandlerName="stp_MagFifoByParticolareRowChangeEventHandler" msprop:Generator_RowDeletedName="stp_MagFifoByParticolareRowDeleted" msprop:Generator_RowClassName="stp_MagFifoByParticolareRow" msprop:Generator_UserTableName="stp_MagFifoByParticolare" msprop:Generator_RowEvArgName="stp_MagFifoByParticolareRowChangeEvent">
+        <xs:element name="stp_MagFifoByParticolare" msprop:Generator_TableClassName="stp_MagFifoByParticolareDataTable" msprop:Generator_TableVarName="tablestp_MagFifoByParticolare" msprop:Generator_TablePropName="stp_MagFifoByParticolare" msprop:Generator_RowDeletingName="stp_MagFifoByParticolareRowDeleting" msprop:Generator_RowChangingName="stp_MagFifoByParticolareRowChanging" msprop:Generator_RowEvHandlerName="stp_MagFifoByParticolareRowChangeEventHandler" msprop:Generator_RowDeletedName="stp_MagFifoByParticolareRowDeleted" msprop:Generator_UserTableName="stp_MagFifoByParticolare" msprop:Generator_RowChangedName="stp_MagFifoByParticolareRowChanged" msprop:Generator_RowEvArgName="stp_MagFifoByParticolareRowChangeEvent" msprop:Generator_RowClassName="stp_MagFifoByParticolareRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="IdxBlocco" msprop:Generator_ColumnVarNameInTable="columnIdxBlocco" msprop:Generator_ColumnPropNameInRow="IdxBlocco" msprop:Generator_ColumnPropNameInTable="IdxBloccoColumn" msprop:Generator_UserColumnName="IdxBlocco" type="xs:int" />
@@ -4327,7 +4335,7 @@ SELECT codPostazione, stampante FROM ElencoPostazioni WHERE (codPostazione = @co
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="stp_UDC_FifoByParticolareBlocco" msprop:Generator_TableClassName="stp_UDC_FifoByParticolareBloccoDataTable" msprop:Generator_TableVarName="tablestp_UDC_FifoByParticolareBlocco" msprop:Generator_RowChangedName="stp_UDC_FifoByParticolareBloccoRowChanged" msprop:Generator_TablePropName="stp_UDC_FifoByParticolareBlocco" msprop:Generator_RowDeletingName="stp_UDC_FifoByParticolareBloccoRowDeleting" msprop:Generator_RowChangingName="stp_UDC_FifoByParticolareBloccoRowChanging" msprop:Generator_RowEvHandlerName="stp_UDC_FifoByParticolareBloccoRowChangeEventHandler" msprop:Generator_RowDeletedName="stp_UDC_FifoByParticolareBloccoRowDeleted" msprop:Generator_RowClassName="stp_UDC_FifoByParticolareBloccoRow" msprop:Generator_UserTableName="stp_UDC_FifoByParticolareBlocco" msprop:Generator_RowEvArgName="stp_UDC_FifoByParticolareBloccoRowChangeEvent">
+        <xs:element name="stp_UDC_FifoByParticolareBlocco" msprop:Generator_TableClassName="stp_UDC_FifoByParticolareBloccoDataTable" msprop:Generator_TableVarName="tablestp_UDC_FifoByParticolareBlocco" msprop:Generator_TablePropName="stp_UDC_FifoByParticolareBlocco" msprop:Generator_RowDeletingName="stp_UDC_FifoByParticolareBloccoRowDeleting" msprop:Generator_RowChangingName="stp_UDC_FifoByParticolareBloccoRowChanging" msprop:Generator_RowEvHandlerName="stp_UDC_FifoByParticolareBloccoRowChangeEventHandler" msprop:Generator_RowDeletedName="stp_UDC_FifoByParticolareBloccoRowDeleted" msprop:Generator_UserTableName="stp_UDC_FifoByParticolareBlocco" msprop:Generator_RowChangedName="stp_UDC_FifoByParticolareBloccoRowChanged" msprop:Generator_RowEvArgName="stp_UDC_FifoByParticolareBloccoRowChangeEvent" msprop:Generator_RowClassName="stp_UDC_FifoByParticolareBloccoRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="UDC" msprop:Generator_ColumnVarNameInTable="columnUDC" msprop:Generator_ColumnPropNameInRow="UDC" msprop:Generator_ColumnPropNameInTable="UDCColumn" msprop:Generator_UserColumnName="UDC">
@@ -4349,7 +4357,7 @@ SELECT codPostazione, stampante FROM ElencoPostazioni WHERE (codPostazione = @co
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="ElencoPostazioni" msprop:Generator_TableClassName="ElencoPostazioniDataTable" msprop:Generator_TableVarName="tableElencoPostazioni" msprop:Generator_TablePropName="ElencoPostazioni" msprop:Generator_RowDeletingName="ElencoPostazioniRowDeleting" msprop:Generator_RowChangingName="ElencoPostazioniRowChanging" msprop:Generator_RowEvHandlerName="ElencoPostazioniRowChangeEventHandler" msprop:Generator_RowDeletedName="ElencoPostazioniRowDeleted" msprop:Generator_UserTableName="ElencoPostazioni" msprop:Generator_RowChangedName="ElencoPostazioniRowChanged" msprop:Generator_RowEvArgName="ElencoPostazioniRowChangeEvent" msprop:Generator_RowClassName="ElencoPostazioniRow">
+        <xs:element name="ElencoPostazioni" msprop:Generator_TableClassName="ElencoPostazioniDataTable" msprop:Generator_TableVarName="tableElencoPostazioni" msprop:Generator_RowChangedName="ElencoPostazioniRowChanged" msprop:Generator_TablePropName="ElencoPostazioni" msprop:Generator_RowDeletingName="ElencoPostazioniRowDeleting" msprop:Generator_RowChangingName="ElencoPostazioniRowChanging" msprop:Generator_RowEvHandlerName="ElencoPostazioniRowChangeEventHandler" msprop:Generator_RowDeletedName="ElencoPostazioniRowDeleted" msprop:Generator_RowClassName="ElencoPostazioniRow" msprop:Generator_UserTableName="ElencoPostazioni" msprop:Generator_RowEvArgName="ElencoPostazioniRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="codPostazione" msprop:Generator_ColumnVarNameInTable="columncodPostazione" msprop:Generator_ColumnPropNameInRow="codPostazione" msprop:Generator_ColumnPropNameInTable="codPostazioneColumn" msprop:Generator_UserColumnName="codPostazione">
@@ -4366,6 +4374,13 @@ SELECT codPostazione, stampante FROM ElencoPostazioni WHERE (codPostazione = @co
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
+              <xs:element name="note" msprop:Generator_ColumnVarNameInTable="columnnote" msprop:Generator_ColumnPropNameInRow="note" msprop:Generator_ColumnPropNameInTable="noteColumn" msprop:Generator_UserColumnName="note" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="250" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
@@ -4509,17 +4524,17 @@ SELECT codPostazione, stampante FROM ElencoPostazioni WHERE (codPostazione = @co
   </xs:element>
   <xs:annotation>
     <xs:appinfo>
-      <msdata:Relationship name="FK_PosizioneUdcCorrente_ElencoCartellini" msdata:parent="ElencoCartellini" msdata:child="PosizioneUdcCorrente" msdata:parentkey="UDC" msdata:childkey="UDC" msprop:Generator_UserChildTable="PosizioneUdcCorrente" msprop:Generator_ChildPropName="GetPosizioneUdcCorrenteRows" msprop:Generator_UserRelationName="FK_PosizioneUdcCorrente_ElencoCartellini" msprop:Generator_ParentPropName="ElencoCartelliniRow" msprop:Generator_RelationVarName="relationFK_PosizioneUdcCorrente_ElencoCartellini" msprop:Generator_UserParentTable="ElencoCartellini" />
-      <msdata:Relationship name="FK_PosizioneUdcStorico_ElencoCartellini" msdata:parent="ElencoCartellini" msdata:child="PosizioneUdcStorico" msdata:parentkey="UDC" msdata:childkey="UDC" msprop:Generator_UserChildTable="PosizioneUdcStorico" msprop:Generator_ChildPropName="GetPosizioneUdcStoricoRows" msprop:Generator_UserRelationName="FK_PosizioneUdcStorico_ElencoCartellini" msprop:Generator_ParentPropName="ElencoCartelliniRow" msprop:Generator_RelationVarName="relationFK_PosizioneUdcStorico_ElencoCartellini" msprop:Generator_UserParentTable="ElencoCartellini" />
-      <msdata:Relationship name="FK_Blocchi_AnagMag" msdata:parent="AnagMag" msdata:child="Blocchi" msdata:parentkey="CodMag CodCS" msdata:childkey="CodMag CodCS" msprop:Generator_UserChildTable="Blocchi" msprop:Generator_ChildPropName="GetBlocchiRows" msprop:Generator_UserRelationName="FK_Blocchi_AnagMag" msprop:Generator_ParentPropName="AnagMagRowParent" msprop:Generator_RelationVarName="relationFK_Blocchi_AnagMag" msprop:Generator_UserParentTable="AnagMag" />
-      <msdata:Relationship name="FK_PosizioneUdcCorrente_Celle" msdata:parent="Celle" msdata:child="PosizioneUdcCorrente" msdata:parentkey="IdxCella" msdata:childkey="IdxCella" msprop:Generator_UserChildTable="PosizioneUdcCorrente" msprop:Generator_ChildPropName="GetPosizioneUdcCorrenteRows" msprop:Generator_UserRelationName="FK_PosizioneUdcCorrente_Celle" msprop:Generator_ParentPropName="CelleRow" msprop:Generator_RelationVarName="relationFK_PosizioneUdcCorrente_Celle" msprop:Generator_UserParentTable="Celle" />
-      <msdata:Relationship name="FK_Celle_Blocchi1" msdata:parent="Blocchi" msdata:child="Celle" msdata:parentkey="IdxBlocco" msdata:childkey="IdxBlocco" msprop:Generator_UserChildTable="Celle" msprop:Generator_ChildPropName="GetCelleRows" msprop:Generator_UserRelationName="FK_Celle_Blocchi1" msprop:Generator_ParentPropName="BlocchiRow" msprop:Generator_RelationVarName="relationFK_Celle_Blocchi1" msprop:Generator_UserParentTable="Blocchi" />
-      <msdata:Relationship name="FK_TipoCella_AnagMag" msdata:parent="AnagMag" msdata:child="TipoCella" msdata:parentkey="CodMag CodCS" msdata:childkey="CodMag CodCS" msprop:Generator_UserChildTable="TipoCella" msprop:Generator_ChildPropName="GetTipoCellaRows" msprop:Generator_UserRelationName="FK_TipoCella_AnagMag" msprop:Generator_ParentPropName="AnagMagRowParent" msprop:Generator_RelationVarName="relationFK_TipoCella_AnagMag" msprop:Generator_UserParentTable="AnagMag" />
-      <msdata:Relationship name="FK_RigheListePrelievo_ElencoCartellini" msdata:parent="ElencoCartellini" msdata:child="RigheListePrelievo" msdata:parentkey="UDC" msdata:childkey="UDC" msprop:Generator_UserChildTable="RigheListePrelievo" msprop:Generator_ChildPropName="GetRigheListePrelievoRows" msprop:Generator_UserRelationName="FK_RigheListePrelievo_ElencoCartellini" msprop:Generator_ParentPropName="ElencoCartelliniRow" msprop:Generator_RelationVarName="relationFK_RigheListePrelievo_ElencoCartellini" msprop:Generator_UserParentTable="ElencoCartellini" />
-      <msdata:Relationship name="FK_RigheListePrelievo_ElencoListePrelievo11" msdata:parent="ElencoListePrelievo" msdata:child="RigheListePrelievo" msdata:parentkey="CodLista" msdata:childkey="CodLista" msprop:Generator_UserChildTable="RigheListePrelievo" msprop:Generator_ChildPropName="GetRigheListePrelievoRows" msprop:Generator_UserRelationName="FK_RigheListePrelievo_ElencoListePrelievo11" msprop:Generator_ParentPropName="_ElencoListePrelievoRow" msprop:Generator_RelationVarName="relationFK_RigheListePrelievo_ElencoListePrelievo11" msprop:Generator_UserParentTable="ElencoListePrelievo" />
-      <msdata:Relationship name="FK_ElencoListePrelievo_TipoListaPrelievo11" msdata:parent="TipoListaPrelievo" msdata:child="ElencoListePrelievo" msdata:parentkey="CodTipoLista" msdata:childkey="CodTipoLista" msprop:Generator_UserChildTable="ElencoListePrelievo" msprop:Generator_ChildPropName="_GetElencoListePrelievoRows" msprop:Generator_UserRelationName="FK_ElencoListePrelievo_TipoListaPrelievo11" msprop:Generator_ParentPropName="TipoListaPrelievoRow" msprop:Generator_RelationVarName="relationFK_ElencoListePrelievo_TipoListaPrelievo11" msprop:Generator_UserParentTable="TipoListaPrelievo" />
-      <msdata:Relationship name="FK_ElencoCartellini_AnagPosizioni" msdata:parent="AnagPosizioni" msdata:child="ElencoCartellini" msdata:parentkey="IdxPosizione" msdata:childkey="IdxPosizione" msprop:Generator_UserChildTable="ElencoCartellini" msprop:Generator_ChildPropName="GetElencoCartelliniRows" msprop:Generator_UserRelationName="FK_ElencoCartellini_AnagPosizioni" msprop:Generator_ParentPropName="AnagPosizioniRow" msprop:Generator_RelationVarName="relationFK_ElencoCartellini_AnagPosizioni" msprop:Generator_UserParentTable="AnagPosizioni" />
-      <msdata:Relationship name="FK_Celle_TipoCella" msdata:parent="TipoCella" msdata:child="Celle" msdata:parentkey="IdxTipoCella" msdata:childkey="IdxTipoCella" msprop:Generator_UserChildTable="Celle" msprop:Generator_ChildPropName="GetCelleRows" msprop:Generator_UserRelationName="FK_Celle_TipoCella" msprop:Generator_ParentPropName="TipoCellaRow" msprop:Generator_RelationVarName="relationFK_Celle_TipoCella" msprop:Generator_UserParentTable="TipoCella" />
+      <msdata:Relationship name="FK_PosizioneUdcCorrente_ElencoCartellini" msdata:parent="ElencoCartellini" msdata:child="PosizioneUdcCorrente" msdata:parentkey="UDC" msdata:childkey="UDC" msprop:Generator_UserChildTable="PosizioneUdcCorrente" msprop:Generator_ChildPropName="GetPosizioneUdcCorrenteRows" msprop:Generator_UserRelationName="FK_PosizioneUdcCorrente_ElencoCartellini" msprop:Generator_RelationVarName="relationFK_PosizioneUdcCorrente_ElencoCartellini" msprop:Generator_UserParentTable="ElencoCartellini" msprop:Generator_ParentPropName="ElencoCartelliniRow" />
+      <msdata:Relationship name="FK_PosizioneUdcStorico_ElencoCartellini" msdata:parent="ElencoCartellini" msdata:child="PosizioneUdcStorico" msdata:parentkey="UDC" msdata:childkey="UDC" msprop:Generator_UserChildTable="PosizioneUdcStorico" msprop:Generator_ChildPropName="GetPosizioneUdcStoricoRows" msprop:Generator_UserRelationName="FK_PosizioneUdcStorico_ElencoCartellini" msprop:Generator_RelationVarName="relationFK_PosizioneUdcStorico_ElencoCartellini" msprop:Generator_UserParentTable="ElencoCartellini" msprop:Generator_ParentPropName="ElencoCartelliniRow" />
+      <msdata:Relationship name="FK_Blocchi_AnagMag" msdata:parent="AnagMag" msdata:child="Blocchi" msdata:parentkey="CodMag CodCS" msdata:childkey="CodMag CodCS" msprop:Generator_UserChildTable="Blocchi" msprop:Generator_ChildPropName="GetBlocchiRows" msprop:Generator_UserRelationName="FK_Blocchi_AnagMag" msprop:Generator_RelationVarName="relationFK_Blocchi_AnagMag" msprop:Generator_UserParentTable="AnagMag" msprop:Generator_ParentPropName="AnagMagRowParent" />
+      <msdata:Relationship name="FK_PosizioneUdcCorrente_Celle" msdata:parent="Celle" msdata:child="PosizioneUdcCorrente" msdata:parentkey="IdxCella" msdata:childkey="IdxCella" msprop:Generator_UserChildTable="PosizioneUdcCorrente" msprop:Generator_ChildPropName="GetPosizioneUdcCorrenteRows" msprop:Generator_UserRelationName="FK_PosizioneUdcCorrente_Celle" msprop:Generator_RelationVarName="relationFK_PosizioneUdcCorrente_Celle" msprop:Generator_UserParentTable="Celle" msprop:Generator_ParentPropName="CelleRow" />
+      <msdata:Relationship name="FK_Celle_Blocchi1" msdata:parent="Blocchi" msdata:child="Celle" msdata:parentkey="IdxBlocco" msdata:childkey="IdxBlocco" msprop:Generator_UserChildTable="Celle" msprop:Generator_ChildPropName="GetCelleRows" msprop:Generator_UserRelationName="FK_Celle_Blocchi1" msprop:Generator_RelationVarName="relationFK_Celle_Blocchi1" msprop:Generator_UserParentTable="Blocchi" msprop:Generator_ParentPropName="BlocchiRow" />
+      <msdata:Relationship name="FK_TipoCella_AnagMag" msdata:parent="AnagMag" msdata:child="TipoCella" msdata:parentkey="CodMag CodCS" msdata:childkey="CodMag CodCS" msprop:Generator_UserChildTable="TipoCella" msprop:Generator_ChildPropName="GetTipoCellaRows" msprop:Generator_UserRelationName="FK_TipoCella_AnagMag" msprop:Generator_RelationVarName="relationFK_TipoCella_AnagMag" msprop:Generator_UserParentTable="AnagMag" msprop:Generator_ParentPropName="AnagMagRowParent" />
+      <msdata:Relationship name="FK_RigheListePrelievo_ElencoCartellini" msdata:parent="ElencoCartellini" msdata:child="RigheListePrelievo" msdata:parentkey="UDC" msdata:childkey="UDC" msprop:Generator_UserChildTable="RigheListePrelievo" msprop:Generator_ChildPropName="GetRigheListePrelievoRows" msprop:Generator_UserRelationName="FK_RigheListePrelievo_ElencoCartellini" msprop:Generator_RelationVarName="relationFK_RigheListePrelievo_ElencoCartellini" msprop:Generator_UserParentTable="ElencoCartellini" msprop:Generator_ParentPropName="ElencoCartelliniRow" />
+      <msdata:Relationship name="FK_RigheListePrelievo_ElencoListePrelievo11" msdata:parent="ElencoListePrelievo" msdata:child="RigheListePrelievo" msdata:parentkey="CodLista" msdata:childkey="CodLista" msprop:Generator_UserChildTable="RigheListePrelievo" msprop:Generator_ChildPropName="GetRigheListePrelievoRows" msprop:Generator_UserRelationName="FK_RigheListePrelievo_ElencoListePrelievo11" msprop:Generator_RelationVarName="relationFK_RigheListePrelievo_ElencoListePrelievo11" msprop:Generator_UserParentTable="ElencoListePrelievo" msprop:Generator_ParentPropName="_ElencoListePrelievoRow" />
+      <msdata:Relationship name="FK_ElencoListePrelievo_TipoListaPrelievo11" msdata:parent="TipoListaPrelievo" msdata:child="ElencoListePrelievo" msdata:parentkey="CodTipoLista" msdata:childkey="CodTipoLista" msprop:Generator_UserChildTable="ElencoListePrelievo" msprop:Generator_ChildPropName="_GetElencoListePrelievoRows" msprop:Generator_UserRelationName="FK_ElencoListePrelievo_TipoListaPrelievo11" msprop:Generator_RelationVarName="relationFK_ElencoListePrelievo_TipoListaPrelievo11" msprop:Generator_UserParentTable="TipoListaPrelievo" msprop:Generator_ParentPropName="TipoListaPrelievoRow" />
+      <msdata:Relationship name="FK_ElencoCartellini_AnagPosizioni" msdata:parent="AnagPosizioni" msdata:child="ElencoCartellini" msdata:parentkey="IdxPosizione" msdata:childkey="IdxPosizione" msprop:Generator_UserChildTable="ElencoCartellini" msprop:Generator_ChildPropName="GetElencoCartelliniRows" msprop:Generator_UserRelationName="FK_ElencoCartellini_AnagPosizioni" msprop:Generator_RelationVarName="relationFK_ElencoCartellini_AnagPosizioni" msprop:Generator_UserParentTable="AnagPosizioni" msprop:Generator_ParentPropName="AnagPosizioniRow" />
+      <msdata:Relationship name="FK_Celle_TipoCella" msdata:parent="TipoCella" msdata:child="Celle" msdata:parentkey="IdxTipoCella" msdata:childkey="IdxTipoCella" msprop:Generator_UserChildTable="Celle" msprop:Generator_ChildPropName="GetCelleRows" msprop:Generator_UserRelationName="FK_Celle_TipoCella" msprop:Generator_RelationVarName="relationFK_Celle_TipoCella" msprop:Generator_UserParentTable="TipoCella" msprop:Generator_ParentPropName="TipoCellaRow" />
     </xs:appinfo>
   </xs:annotation>
 </xs:schema>
\ No newline at end of file
diff --git a/GMW_data/DS_magazzino.xss b/GMW_data/DS_magazzino.xss
index 183a928c..edff7ca0 100644
--- a/GMW_data/DS_magazzino.xss
+++ b/GMW_data/DS_magazzino.xss
@@ -34,7 +34,7 @@
     <Shape ID="DesignTable:StoricoAzioniOperatore" ZOrder="4" X="104" Y="2017" Height="324" Width="225" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
     <Shape ID="DesignTable:stp_MagFifoByParticolare" ZOrder="3" X="354" Y="2020" Height="229" Width="212" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
     <Shape ID="DesignTable:stp_UDC_FifoByParticolareBlocco" ZOrder="2" X="598" Y="2021" Height="153" Width="190" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
-    <Shape ID="DesignTable:ElencoPostazioni" ZOrder="1" X="817" Y="2069" Height="153" Width="207" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
+    <Shape ID="DesignTable:ElencoPostazioni" ZOrder="1" X="817" Y="2069" Height="172" Width="206" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
   </Shapes>
   <Connectors>
     <Connector ID="DesignRelation:FK_PosizioneUdcCorrente_ElencoCartellini" ZOrder="40" LineWidth="11">
diff --git a/GMW_data/GMW_data.csproj b/GMW_data/GMW_data.csproj
index 2e867764..a3cd53ac 100644
--- a/GMW_data/GMW_data.csproj
+++ b/GMW_data/GMW_data.csproj
@@ -424,6 +424,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="SqlScripts\V1.2\GMW_410_TEKAL\Sincroniz da TK_GMWTest a TK_GMW NON USARE.txt" />
+    <None Include="SqlScripts\V2.1\GMW_00511.sql" />
     <None Include="SqlScripts\V2.1\GMW_00510.sql" />
     <None Include="SqlScripts\Vocabolario\vocab_510.sql" />
     <None Include="SqlScripts\V2.1\GMW_00509.sql" />