diff --git a/GMW/WebUserControls/mod_PostTT.ascx b/GMW/WebUserControls/mod_PostTT.ascx
index 9d011069..1a60c9bf 100644
--- a/GMW/WebUserControls/mod_PostTT.ascx
+++ b/GMW/WebUserControls/mod_PostTT.ascx
@@ -77,7 +77,7 @@
             </div>
             <div class="panel-body">
                 <asp:TextBox runat="server" ID="txtAnno" Width="100%" Font-Size="28pt" Style="text-align: center" TabIndex="1" placeholder="Anno" />
-                <asp:TextBox runat="server" ID="txtNumTratt" Width="100%" Font-Size="28pt" Style="text-align: center"  TabIndex="2" placeholder="Num" />
+                <asp:TextBox runat="server" ID="txtNumTratt" Width="100%" Font-Size="28pt" Style="text-align: center" TabIndex="2" placeholder="Num" />
             </div>
         </div>
         <div id="divDurezza" runat="server" class="panel panel-primary panel-sm">
@@ -85,7 +85,11 @@
                 <b><%: traduci("Durezza") %></b>(AL)
             </div>
             <div class="panel-body">
-                <asp:TextBox runat="server" ID="txtDurezza" Width="100%" Font-Size="28pt" Style="text-align: center" AutoPostBack="True" OnTextChanged="txtDurezza_TextChanged" TabIndex="3" />
+                <div class="btn-group" style="width: 100%;">
+                    <label id="lblDurezza" runat="server" class="btn btn-danger" style="width: 100%;">
+                        <asp:CheckBox runat="server" ID="chkDurezza" AutoPostBack="true" TabIndex="3" OnCheckedChanged="chkDurezza_CheckedChanged" Text="KO" Width="100%" />
+                    </label>
+                </div>
             </div>
         </div>
     </div>
diff --git a/GMW/WebUserControls/mod_PostTT.ascx.cs b/GMW/WebUserControls/mod_PostTT.ascx.cs
index afa2ee36..a007e0ed 100644
--- a/GMW/WebUserControls/mod_PostTT.ascx.cs
+++ b/GMW/WebUserControls/mod_PostTT.ascx.cs
@@ -70,17 +70,17 @@ namespace GMW.WebUserControls
             }
         }
         /// <summary>
-        /// Durezza
+        /// Durezza (ok/ko)
         /// </summary>
-        public string Durezza
+        public bool Durezza
         {
             get
             {
-                return txtDurezza.Text.Trim();
+                return chkDurezza.Checked;
             }
             set
             {
-                txtDurezza.Text = value;
+                chkDurezza.Checked = value;
             }
         }
         /// <summary>
@@ -104,7 +104,7 @@ namespace GMW.WebUserControls
             AnnoTratt = DateTime.Now.Year.ToString();
             sourceAL = "";
             NumTratt = "";
-            Durezza = "";
+            Durezza = false;
             txtNote.Text = "";
         }
         /// <summary>
@@ -281,9 +281,9 @@ namespace GMW.WebUserControls
                 }
                 else
                 {
-                    if (Durezza == "")
+                    if (!Durezza)
                     {
-                        txtDurezza.Focus();
+                        chkDurezza.Focus();
                     }
                     else
                     {
@@ -309,7 +309,7 @@ namespace GMW.WebUserControls
             divNumTratt.Visible = btnVis;
             divDurezza.Visible = btnVis;
             // posso stampare se ho AL, ho num tratt e durezza..
-            btnVis = (sourceAL != "" && NumTratt != "" && Durezza != "");
+            btnVis = (sourceAL != "" && NumTratt != "" && Durezza);
             divStampa.Visible = btnVis;
         }
         /// <summary>
@@ -349,7 +349,7 @@ namespace GMW.WebUserControls
             // creazione AL ed associazione UDC / spostamento...
             try
             {
-                AL = MagClass.magazzino.creaAssociaAlTT(sourceAL, tipoAL.AL_TT, MagClass.magazzino.CodSoggCurrUser, noteTrim, codTratt, Durezza);
+                AL = MagClass.magazzino.creaAssociaAlTT(sourceAL, tipoAL.AL_TT, MagClass.magazzino.CodSoggCurrUser, noteTrim, codTratt, Convert.ToInt32(Durezza));
             }
             catch
             { }
@@ -383,12 +383,24 @@ namespace GMW.WebUserControls
             doUpdate();
         }
         /// <summary>
-        /// inserita durezza
+        /// modificata durezza
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        protected void txtDurezza_TextChanged(object sender, EventArgs e)
+        protected void chkDurezza_CheckedChanged(object sender, EventArgs e)
         {
+            if (Durezza)
+            {
+                chkDurezza.Text = "OK";
+                lblDurezza.Attributes.Remove("class");
+                lblDurezza.Attributes.Add("class","btn btn-success");
+            }
+            else
+            {
+                chkDurezza.Text = "KO";
+                lblDurezza.Attributes.Remove("class");
+                lblDurezza.Attributes.Add("class", "btn btn-danger");
+            }
             doUpdate();
         }
     }
diff --git a/GMW/WebUserControls/mod_PostTT.ascx.designer.cs b/GMW/WebUserControls/mod_PostTT.ascx.designer.cs
index 22f65dab..d087118c 100644
--- a/GMW/WebUserControls/mod_PostTT.ascx.designer.cs
+++ b/GMW/WebUserControls/mod_PostTT.ascx.designer.cs
@@ -139,12 +139,21 @@ namespace GMW.WebUserControls {
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl divDurezza;
         
         /// <summary>
-        /// txtDurezza control.
+        /// lblDurezza control.
         /// </summary>
         /// <remarks>
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected global::System.Web.UI.WebControls.TextBox txtDurezza;
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl lblDurezza;
+        
+        /// <summary>
+        /// chkDurezza control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.CheckBox chkDurezza;
     }
 }
diff --git a/GMW_data/DS_magazzino.Designer.cs b/GMW_data/DS_magazzino.Designer.cs
index 2024ccf2..7b6e0482 100644
--- a/GMW_data/DS_magazzino.Designer.cs
+++ b/GMW_data/DS_magazzino.Designer.cs
@@ -14094,8 +14094,16 @@ namespace GMW_data {
             
             private global::System.Data.DataColumn columnDurezza;
             
+            private global::System.Data.DataColumn columnDataDur;
+            
+            private global::System.Data.DataColumn columnCodSoggettoDur;
+            
             private global::System.Data.DataColumn columnProveMecc;
             
+            private global::System.Data.DataColumn columnDataPM;
+            
+            private global::System.Data.DataColumn columnCodSoggettoPM;
+            
             private global::System.Data.DataColumn columnHasDtx;
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -14163,6 +14171,22 @@ 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 DataDurColumn {
+                get {
+                    return this.columnDataDur;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public global::System.Data.DataColumn CodSoggettoDurColumn {
+                get {
+                    return this.columnCodSoggettoDur;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
             public global::System.Data.DataColumn ProveMeccColumn {
@@ -14171,6 +14195,22 @@ 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 DataPMColumn {
+                get {
+                    return this.columnDataPM;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public global::System.Data.DataColumn CodSoggettoPMColumn {
+                get {
+                    return this.columnCodSoggettoPM;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
             public global::System.Data.DataColumn HasDtxColumn {
@@ -14216,14 +14256,18 @@ namespace GMW_data {
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
-            public ElencoTrattamentiRow AddElencoTrattamentiRow(string Trattamento, ElencoAssiemiRow parentElencoAssiemiRowByFK_ElencoTrattamenti_ElencoAssiemi, System.DateTime DataTrattEnd, decimal Durezza, decimal ProveMecc, bool HasDtx) {
+            public ElencoTrattamentiRow AddElencoTrattamentiRow(string Trattamento, ElencoAssiemiRow parentElencoAssiemiRowByFK_ElencoTrattamenti_ElencoAssiemi, System.DateTime DataTrattEnd, int Durezza, System.DateTime DataDur, string CodSoggettoDur, int ProveMecc, System.DateTime DataPM, string CodSoggettoPM, bool HasDtx) {
                 ElencoTrattamentiRow rowElencoTrattamentiRow = ((ElencoTrattamentiRow)(this.NewRow()));
                 object[] columnValuesArray = new object[] {
                         Trattamento,
                         null,
                         DataTrattEnd,
                         Durezza,
+                        DataDur,
+                        CodSoggettoDur,
                         ProveMecc,
+                        DataPM,
+                        CodSoggettoPM,
                         HasDtx};
                 if ((parentElencoAssiemiRowByFK_ElencoTrattamenti_ElencoAssiemi != null)) {
                     columnValuesArray[1] = parentElencoAssiemiRowByFK_ElencoTrattamenti_ElencoAssiemi[0];
@@ -14261,7 +14305,11 @@ namespace GMW_data {
                 this.columnAL = base.Columns["AL"];
                 this.columnDataTrattEnd = base.Columns["DataTrattEnd"];
                 this.columnDurezza = base.Columns["Durezza"];
+                this.columnDataDur = base.Columns["DataDur"];
+                this.columnCodSoggettoDur = base.Columns["CodSoggettoDur"];
                 this.columnProveMecc = base.Columns["ProveMecc"];
+                this.columnDataPM = base.Columns["DataPM"];
+                this.columnCodSoggettoPM = base.Columns["CodSoggettoPM"];
                 this.columnHasDtx = base.Columns["HasDtx"];
             }
             
@@ -14274,10 +14322,18 @@ namespace GMW_data {
                 base.Columns.Add(this.columnAL);
                 this.columnDataTrattEnd = new global::System.Data.DataColumn("DataTrattEnd", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columnDataTrattEnd);
-                this.columnDurezza = new global::System.Data.DataColumn("Durezza", typeof(decimal), null, global::System.Data.MappingType.Element);
+                this.columnDurezza = new global::System.Data.DataColumn("Durezza", typeof(int), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columnDurezza);
-                this.columnProveMecc = new global::System.Data.DataColumn("ProveMecc", typeof(decimal), null, global::System.Data.MappingType.Element);
+                this.columnDataDur = new global::System.Data.DataColumn("DataDur", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnDataDur);
+                this.columnCodSoggettoDur = new global::System.Data.DataColumn("CodSoggettoDur", typeof(string), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnCodSoggettoDur);
+                this.columnProveMecc = new global::System.Data.DataColumn("ProveMecc", typeof(int), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columnProveMecc);
+                this.columnDataPM = new global::System.Data.DataColumn("DataPM", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnDataPM);
+                this.columnCodSoggettoPM = new global::System.Data.DataColumn("CodSoggettoPM", typeof(string), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnCodSoggettoPM);
                 this.columnHasDtx = new global::System.Data.DataColumn("HasDtx", typeof(bool), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columnHasDtx);
                 this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
@@ -14289,7 +14345,11 @@ namespace GMW_data {
                 this.columnAL.MaxLength = 50;
                 this.columnDataTrattEnd.AllowDBNull = false;
                 this.columnDurezza.AllowDBNull = false;
+                this.columnCodSoggettoDur.AllowDBNull = false;
+                this.columnCodSoggettoDur.MaxLength = 17;
                 this.columnProveMecc.AllowDBNull = false;
+                this.columnCodSoggettoPM.AllowDBNull = false;
+                this.columnCodSoggettoPM.MaxLength = 17;
                 this.columnHasDtx.AllowDBNull = false;
             }
             
@@ -21101,9 +21161,9 @@ namespace GMW_data {
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
-            public decimal Durezza {
+            public int Durezza {
                 get {
-                    return ((decimal)(this[this.tableElencoTrattamenti.DurezzaColumn]));
+                    return ((int)(this[this.tableElencoTrattamenti.DurezzaColumn]));
                 }
                 set {
                     this[this.tableElencoTrattamenti.DurezzaColumn] = value;
@@ -21112,15 +21172,69 @@ namespace GMW_data {
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
-            public decimal ProveMecc {
+            public System.DateTime DataDur {
                 get {
-                    return ((decimal)(this[this.tableElencoTrattamenti.ProveMeccColumn]));
+                    try {
+                        return ((global::System.DateTime)(this[this.tableElencoTrattamenti.DataDurColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'DataDur\' in table \'ElencoTrattamenti\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableElencoTrattamenti.DataDurColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public string CodSoggettoDur {
+                get {
+                    return ((string)(this[this.tableElencoTrattamenti.CodSoggettoDurColumn]));
+                }
+                set {
+                    this[this.tableElencoTrattamenti.CodSoggettoDurColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public int ProveMecc {
+                get {
+                    return ((int)(this[this.tableElencoTrattamenti.ProveMeccColumn]));
                 }
                 set {
                     this[this.tableElencoTrattamenti.ProveMeccColumn] = value;
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public System.DateTime DataPM {
+                get {
+                    try {
+                        return ((global::System.DateTime)(this[this.tableElencoTrattamenti.DataPMColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'DataPM\' in table \'ElencoTrattamenti\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableElencoTrattamenti.DataPMColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public string CodSoggettoPM {
+                get {
+                    return ((string)(this[this.tableElencoTrattamenti.CodSoggettoPMColumn]));
+                }
+                set {
+                    this[this.tableElencoTrattamenti.CodSoggettoPMColumn] = value;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
             public bool HasDtx {
@@ -21142,6 +21256,30 @@ namespace GMW_data {
                     this.SetParentRow(value, this.Table.ParentRelations["FK_ElencoTrattamenti_ElencoAssiemi"]);
                 }
             }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public bool IsDataDurNull() {
+                return this.IsNull(this.tableElencoTrattamenti.DataDurColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public void SetDataDurNull() {
+                this[this.tableElencoTrattamenti.DataDurColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public bool IsDataPMNull() {
+                return this.IsNull(this.tableElencoTrattamenti.DataPMColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public void SetDataPMNull() {
+                this[this.tableElencoTrattamenti.DataPMColumn] = global::System.Convert.DBNull;
+            }
         }
         
         /// <summary>
@@ -39363,7 +39501,7 @@ SELECT AL, TipoAL, Numero, Cesta, Attivo, DataCreaz, CodSoggetto, CodDtx_start,
             this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodSoggetto", global::System.Data.SqlDbType.VarChar, 17, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Note", global::System.Data.SqlDbType.NVarChar, 500, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NumTratt", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Durezza", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Durezza", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@AL", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.InputOutput, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
         }
         
@@ -39938,7 +40076,7 @@ SELECT AL, TipoAL, Numero, Cesta, Attivo, DataCreaz, CodSoggetto, CodDtx_start,
         [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 object insertNewTT(string SourceAL, string TipoAl, global::System.Nullable<global::System.DateTime> DataCreaz, string CodSoggetto, string Note, string NumTratt, string Durezza, ref string AL) {
+        public virtual object insertNewTT(string SourceAL, string TipoAl, global::System.Nullable<global::System.DateTime> DataCreaz, string CodSoggetto, string Note, string NumTratt, global::System.Nullable<int> Durezza, ref string AL) {
             global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[7];
             if ((SourceAL == null)) {
                 command.Parameters[1].Value = global::System.DBNull.Value;
@@ -39976,11 +40114,11 @@ SELECT AL, TipoAL, Numero, Cesta, Attivo, DataCreaz, CodSoggetto, CodDtx_start,
             else {
                 command.Parameters[6].Value = ((string)(NumTratt));
             }
-            if ((Durezza == null)) {
-                command.Parameters[7].Value = global::System.DBNull.Value;
+            if ((Durezza.HasValue == true)) {
+                command.Parameters[7].Value = ((int)(Durezza.Value));
             }
             else {
-                command.Parameters[7].Value = ((string)(Durezza));
+                command.Parameters[7].Value = global::System.DBNull.Value;
             }
             if ((AL == null)) {
                 command.Parameters[8].Value = global::System.DBNull.Value;
@@ -40640,46 +40778,70 @@ SELECT AL, UDC, DataCreaz, CodSoggetto FROM AL2UDC WHERE (AL = @AL) AND (UDC = @
             tableMapping.ColumnMappings.Add("AL", "AL");
             tableMapping.ColumnMappings.Add("DataTrattEnd", "DataTrattEnd");
             tableMapping.ColumnMappings.Add("Durezza", "Durezza");
+            tableMapping.ColumnMappings.Add("DataDur", "DataDur");
+            tableMapping.ColumnMappings.Add("CodSoggettoDur", "CodSoggettoDur");
             tableMapping.ColumnMappings.Add("ProveMecc", "ProveMecc");
+            tableMapping.ColumnMappings.Add("DataPM", "DataPM");
+            tableMapping.ColumnMappings.Add("CodSoggettoPM", "CodSoggettoPM");
             tableMapping.ColumnMappings.Add("HasDtx", "HasDtx");
             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 [dbo].[ElencoTrattamenti] WHERE (([Trattamento] = @Original_Trattamento) AND ([AL] = @Original_AL) AND ([DataTrattEnd] = @Original_DataTrattEnd) AND ([Durezza] = @Original_Durezza) AND ([ProveMecc] = @Original_ProveMecc) AND ([HasDtx] = @Original_HasDtx))";
+            this._adapter.DeleteCommand.CommandText = @"DELETE FROM [ElencoTrattamenti] WHERE (([Trattamento] = @Original_Trattamento) AND ([AL] = @Original_AL) AND ([DataTrattEnd] = @Original_DataTrattEnd) AND ([Durezza] = @Original_Durezza) AND ((@IsNull_DataDur = 1 AND [DataDur] IS NULL) OR ([DataDur] = @Original_DataDur)) AND ([CodSoggettoDur] = @Original_CodSoggettoDur) AND ([ProveMecc] = @Original_ProveMecc) AND ((@IsNull_DataPM = 1 AND [DataPM] IS NULL) OR ([DataPM] = @Original_DataPM)) AND ([CodSoggettoPM] = @Original_CodSoggettoPM) AND ([HasDtx] = @Original_HasDtx))";
             this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text;
             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Trattamento", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Trattamento", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_AL", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "AL", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_DataTrattEnd", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DataTrattEnd", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
-            this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Durezza", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 18, 6, "Durezza", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
-            this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ProveMecc", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 18, 6, "ProveMecc", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Durezza", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Durezza", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_DataDur", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DataDur", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+            this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_DataDur", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DataDur", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodSoggettoDur", global::System.Data.SqlDbType.NChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodSoggettoDur", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ProveMecc", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ProveMecc", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_DataPM", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DataPM", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+            this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_DataPM", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DataPM", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodSoggettoPM", global::System.Data.SqlDbType.NChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodSoggettoPM", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_HasDtx", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "HasDtx", 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 [dbo].[ElencoTrattamenti] ([Trattamento], [AL], [DataTrattEnd], [Durezza], [ProveMecc], [HasDtx]) VALUES (@Trattamento, @AL, @DataTrattEnd, @Durezza, @ProveMecc, @HasDtx);
-SELECT Trattamento, AL, DataTrattEnd, Durezza, ProveMecc, HasDtx FROM ElencoTrattamenti WHERE (Trattamento = @Trattamento)";
+            this._adapter.InsertCommand.CommandText = @"INSERT INTO [ElencoTrattamenti] ([Trattamento], [AL], [DataTrattEnd], [Durezza], [DataDur], [CodSoggettoDur], [ProveMecc], [DataPM], [CodSoggettoPM], [HasDtx]) VALUES (@Trattamento, @AL, @DataTrattEnd, @Durezza, @DataDur, @CodSoggettoDur, @ProveMecc, @DataPM, @CodSoggettoPM, @HasDtx);
+SELECT Trattamento, AL, DataTrattEnd, Durezza, DataDur, CodSoggettoDur, ProveMecc, DataPM, CodSoggettoPM, HasDtx FROM ElencoTrattamenti WHERE (Trattamento = @Trattamento)";
             this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text;
             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Trattamento", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Trattamento", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@AL", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "AL", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataTrattEnd", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DataTrattEnd", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Durezza", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 18, 6, "Durezza", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ProveMecc", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 18, 6, "ProveMecc", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Durezza", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Durezza", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataDur", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DataDur", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodSoggettoDur", global::System.Data.SqlDbType.NChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodSoggettoDur", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ProveMecc", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ProveMecc", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataPM", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DataPM", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodSoggettoPM", global::System.Data.SqlDbType.NChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodSoggettoPM", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@HasDtx", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "HasDtx", 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 [dbo].[ElencoTrattamenti] SET [Trattamento] = @Trattamento, [AL] = @AL, [DataTrattEnd] = @DataTrattEnd, [Durezza] = @Durezza, [ProveMecc] = @ProveMecc, [HasDtx] = @HasDtx WHERE (([Trattamento] = @Original_Trattamento) AND ([AL] = @Original_AL) AND ([DataTrattEnd] = @Original_DataTrattEnd) AND ([Durezza] = @Original_Durezza) AND ([ProveMecc] = @Original_ProveMecc) AND ([HasDtx] = @Original_HasDtx));
-SELECT Trattamento, AL, DataTrattEnd, Durezza, ProveMecc, HasDtx FROM ElencoTrattamenti WHERE (Trattamento = @Trattamento)";
+            this._adapter.UpdateCommand.CommandText = @"UPDATE [ElencoTrattamenti] SET [Trattamento] = @Trattamento, [AL] = @AL, [DataTrattEnd] = @DataTrattEnd, [Durezza] = @Durezza, [DataDur] = @DataDur, [CodSoggettoDur] = @CodSoggettoDur, [ProveMecc] = @ProveMecc, [DataPM] = @DataPM, [CodSoggettoPM] = @CodSoggettoPM, [HasDtx] = @HasDtx WHERE (([Trattamento] = @Original_Trattamento) AND ([AL] = @Original_AL) AND ([DataTrattEnd] = @Original_DataTrattEnd) AND ([Durezza] = @Original_Durezza) AND ((@IsNull_DataDur = 1 AND [DataDur] IS NULL) OR ([DataDur] = @Original_DataDur)) AND ([CodSoggettoDur] = @Original_CodSoggettoDur) AND ([ProveMecc] = @Original_ProveMecc) AND ((@IsNull_DataPM = 1 AND [DataPM] IS NULL) OR ([DataPM] = @Original_DataPM)) AND ([CodSoggettoPM] = @Original_CodSoggettoPM) AND ([HasDtx] = @Original_HasDtx));
+SELECT Trattamento, AL, DataTrattEnd, Durezza, DataDur, CodSoggettoDur, ProveMecc, DataPM, CodSoggettoPM, HasDtx FROM ElencoTrattamenti WHERE (Trattamento = @Trattamento)";
             this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text;
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Trattamento", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Trattamento", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@AL", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "AL", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataTrattEnd", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DataTrattEnd", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Durezza", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 18, 6, "Durezza", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ProveMecc", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 18, 6, "ProveMecc", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Durezza", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Durezza", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataDur", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DataDur", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodSoggettoDur", global::System.Data.SqlDbType.NChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodSoggettoDur", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ProveMecc", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ProveMecc", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataPM", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DataPM", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodSoggettoPM", global::System.Data.SqlDbType.NChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodSoggettoPM", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@HasDtx", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "HasDtx", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Trattamento", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Trattamento", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_AL", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "AL", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_DataTrattEnd", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DataTrattEnd", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Durezza", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 18, 6, "Durezza", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ProveMecc", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 18, 6, "ProveMecc", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Durezza", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Durezza", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_DataDur", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DataDur", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_DataDur", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DataDur", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodSoggettoDur", global::System.Data.SqlDbType.NChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodSoggettoDur", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ProveMecc", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ProveMecc", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_DataPM", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DataPM", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_DataPM", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DataPM", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodSoggettoPM", global::System.Data.SqlDbType.NChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodSoggettoPM", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_HasDtx", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "HasDtx", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
         }
         
@@ -40696,8 +40858,8 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, ProveMecc, HasDtx FROM ElencoTrat
             this._commandCollection = new global::System.Data.SqlClient.SqlCommand[5];
             this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[0].Connection = this.Connection;
-            this._commandCollection[0].CommandText = "SELECT Trattamento, AL, DataTrattEnd, Durezza, ProveMecc, HasDtx FROM dbo.ElencoT" +
-                "rattamenti";
+            this._commandCollection[0].CommandText = "SELECT        Trattamento, AL, DataTrattEnd, Durezza, DataDur, CodSoggettoDur, Pr" +
+                "oveMecc, DataPM, CodSoggettoPM, HasDtx\r\nFROM            ElencoTrattamenti";
             this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
             this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[1].Connection = this.Connection;
@@ -40726,9 +40888,9 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, ProveMecc, HasDtx FROM ElencoTrat
             this._commandCollection[4].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Trattamento", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ProveMecc", global::System.Data.SqlDbType.Decimal, 5, global::System.Data.ParameterDirection.Input, 9, 6, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataCreaz", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodSoggetto", global::System.Data.SqlDbType.VarChar, 17, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ProveMecc", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataPM", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodSoggettoPM", global::System.Data.SqlDbType.VarChar, 17, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
         }
         
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -40857,7 +41019,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, ProveMecc, HasDtx FROM ElencoTrat
         [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_Trattamento, string Original_AL, System.DateTime Original_DataTrattEnd, decimal Original_Durezza, decimal Original_ProveMecc, bool Original_HasDtx) {
+        public virtual int Delete(string Original_Trattamento, string Original_AL, System.DateTime Original_DataTrattEnd, int Original_Durezza, global::System.Nullable<global::System.DateTime> Original_DataDur, string Original_CodSoggettoDur, int Original_ProveMecc, global::System.Nullable<global::System.DateTime> Original_DataPM, string Original_CodSoggettoPM, bool Original_HasDtx) {
             if ((Original_Trattamento == null)) {
                 throw new global::System.ArgumentNullException("Original_Trattamento");
             }
@@ -40871,9 +41033,37 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, ProveMecc, HasDtx FROM ElencoTrat
                 this.Adapter.DeleteCommand.Parameters[1].Value = ((string)(Original_AL));
             }
             this.Adapter.DeleteCommand.Parameters[2].Value = ((System.DateTime)(Original_DataTrattEnd));
-            this.Adapter.DeleteCommand.Parameters[3].Value = ((decimal)(Original_Durezza));
-            this.Adapter.DeleteCommand.Parameters[4].Value = ((decimal)(Original_ProveMecc));
-            this.Adapter.DeleteCommand.Parameters[5].Value = ((bool)(Original_HasDtx));
+            this.Adapter.DeleteCommand.Parameters[3].Value = ((int)(Original_Durezza));
+            if ((Original_DataDur.HasValue == true)) {
+                this.Adapter.DeleteCommand.Parameters[4].Value = ((object)(0));
+                this.Adapter.DeleteCommand.Parameters[5].Value = ((System.DateTime)(Original_DataDur.Value));
+            }
+            else {
+                this.Adapter.DeleteCommand.Parameters[4].Value = ((object)(1));
+                this.Adapter.DeleteCommand.Parameters[5].Value = global::System.DBNull.Value;
+            }
+            if ((Original_CodSoggettoDur == null)) {
+                throw new global::System.ArgumentNullException("Original_CodSoggettoDur");
+            }
+            else {
+                this.Adapter.DeleteCommand.Parameters[6].Value = ((string)(Original_CodSoggettoDur));
+            }
+            this.Adapter.DeleteCommand.Parameters[7].Value = ((int)(Original_ProveMecc));
+            if ((Original_DataPM.HasValue == true)) {
+                this.Adapter.DeleteCommand.Parameters[8].Value = ((object)(0));
+                this.Adapter.DeleteCommand.Parameters[9].Value = ((System.DateTime)(Original_DataPM.Value));
+            }
+            else {
+                this.Adapter.DeleteCommand.Parameters[8].Value = ((object)(1));
+                this.Adapter.DeleteCommand.Parameters[9].Value = global::System.DBNull.Value;
+            }
+            if ((Original_CodSoggettoPM == null)) {
+                throw new global::System.ArgumentNullException("Original_CodSoggettoPM");
+            }
+            else {
+                this.Adapter.DeleteCommand.Parameters[10].Value = ((string)(Original_CodSoggettoPM));
+            }
+            this.Adapter.DeleteCommand.Parameters[11].Value = ((bool)(Original_HasDtx));
             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)) {
@@ -40894,7 +41084,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, ProveMecc, HasDtx FROM ElencoTrat
         [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 Trattamento, string AL, System.DateTime DataTrattEnd, decimal Durezza, decimal ProveMecc, bool HasDtx) {
+        public virtual int Insert(string Trattamento, string AL, System.DateTime DataTrattEnd, int Durezza, global::System.Nullable<global::System.DateTime> DataDur, string CodSoggettoDur, int ProveMecc, global::System.Nullable<global::System.DateTime> DataPM, string CodSoggettoPM, bool HasDtx) {
             if ((Trattamento == null)) {
                 throw new global::System.ArgumentNullException("Trattamento");
             }
@@ -40908,9 +41098,33 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, ProveMecc, HasDtx FROM ElencoTrat
                 this.Adapter.InsertCommand.Parameters[1].Value = ((string)(AL));
             }
             this.Adapter.InsertCommand.Parameters[2].Value = ((System.DateTime)(DataTrattEnd));
-            this.Adapter.InsertCommand.Parameters[3].Value = ((decimal)(Durezza));
-            this.Adapter.InsertCommand.Parameters[4].Value = ((decimal)(ProveMecc));
-            this.Adapter.InsertCommand.Parameters[5].Value = ((bool)(HasDtx));
+            this.Adapter.InsertCommand.Parameters[3].Value = ((int)(Durezza));
+            if ((DataDur.HasValue == true)) {
+                this.Adapter.InsertCommand.Parameters[4].Value = ((System.DateTime)(DataDur.Value));
+            }
+            else {
+                this.Adapter.InsertCommand.Parameters[4].Value = global::System.DBNull.Value;
+            }
+            if ((CodSoggettoDur == null)) {
+                throw new global::System.ArgumentNullException("CodSoggettoDur");
+            }
+            else {
+                this.Adapter.InsertCommand.Parameters[5].Value = ((string)(CodSoggettoDur));
+            }
+            this.Adapter.InsertCommand.Parameters[6].Value = ((int)(ProveMecc));
+            if ((DataPM.HasValue == true)) {
+                this.Adapter.InsertCommand.Parameters[7].Value = ((System.DateTime)(DataPM.Value));
+            }
+            else {
+                this.Adapter.InsertCommand.Parameters[7].Value = global::System.DBNull.Value;
+            }
+            if ((CodSoggettoPM == null)) {
+                throw new global::System.ArgumentNullException("CodSoggettoPM");
+            }
+            else {
+                this.Adapter.InsertCommand.Parameters[8].Value = ((string)(CodSoggettoPM));
+            }
+            this.Adapter.InsertCommand.Parameters[9].Value = ((bool)(HasDtx));
             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)) {
@@ -40931,7 +41145,27 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, ProveMecc, HasDtx FROM ElencoTrat
         [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 Trattamento, string AL, System.DateTime DataTrattEnd, decimal Durezza, decimal ProveMecc, bool HasDtx, string Original_Trattamento, string Original_AL, System.DateTime Original_DataTrattEnd, decimal Original_Durezza, decimal Original_ProveMecc, bool Original_HasDtx) {
+        public virtual int Update(
+                    string Trattamento, 
+                    string AL, 
+                    System.DateTime DataTrattEnd, 
+                    int Durezza, 
+                    global::System.Nullable<global::System.DateTime> DataDur, 
+                    string CodSoggettoDur, 
+                    int ProveMecc, 
+                    global::System.Nullable<global::System.DateTime> DataPM, 
+                    string CodSoggettoPM, 
+                    bool HasDtx, 
+                    string Original_Trattamento, 
+                    string Original_AL, 
+                    System.DateTime Original_DataTrattEnd, 
+                    int Original_Durezza, 
+                    global::System.Nullable<global::System.DateTime> Original_DataDur, 
+                    string Original_CodSoggettoDur, 
+                    int Original_ProveMecc, 
+                    global::System.Nullable<global::System.DateTime> Original_DataPM, 
+                    string Original_CodSoggettoPM, 
+                    bool Original_HasDtx) {
             if ((Trattamento == null)) {
                 throw new global::System.ArgumentNullException("Trattamento");
             }
@@ -40945,25 +41179,77 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, ProveMecc, HasDtx FROM ElencoTrat
                 this.Adapter.UpdateCommand.Parameters[1].Value = ((string)(AL));
             }
             this.Adapter.UpdateCommand.Parameters[2].Value = ((System.DateTime)(DataTrattEnd));
-            this.Adapter.UpdateCommand.Parameters[3].Value = ((decimal)(Durezza));
-            this.Adapter.UpdateCommand.Parameters[4].Value = ((decimal)(ProveMecc));
-            this.Adapter.UpdateCommand.Parameters[5].Value = ((bool)(HasDtx));
+            this.Adapter.UpdateCommand.Parameters[3].Value = ((int)(Durezza));
+            if ((DataDur.HasValue == true)) {
+                this.Adapter.UpdateCommand.Parameters[4].Value = ((System.DateTime)(DataDur.Value));
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[4].Value = global::System.DBNull.Value;
+            }
+            if ((CodSoggettoDur == null)) {
+                throw new global::System.ArgumentNullException("CodSoggettoDur");
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[5].Value = ((string)(CodSoggettoDur));
+            }
+            this.Adapter.UpdateCommand.Parameters[6].Value = ((int)(ProveMecc));
+            if ((DataPM.HasValue == true)) {
+                this.Adapter.UpdateCommand.Parameters[7].Value = ((System.DateTime)(DataPM.Value));
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[7].Value = global::System.DBNull.Value;
+            }
+            if ((CodSoggettoPM == null)) {
+                throw new global::System.ArgumentNullException("CodSoggettoPM");
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[8].Value = ((string)(CodSoggettoPM));
+            }
+            this.Adapter.UpdateCommand.Parameters[9].Value = ((bool)(HasDtx));
             if ((Original_Trattamento == null)) {
                 throw new global::System.ArgumentNullException("Original_Trattamento");
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[6].Value = ((string)(Original_Trattamento));
+                this.Adapter.UpdateCommand.Parameters[10].Value = ((string)(Original_Trattamento));
             }
             if ((Original_AL == null)) {
                 throw new global::System.ArgumentNullException("Original_AL");
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[7].Value = ((string)(Original_AL));
+                this.Adapter.UpdateCommand.Parameters[11].Value = ((string)(Original_AL));
             }
-            this.Adapter.UpdateCommand.Parameters[8].Value = ((System.DateTime)(Original_DataTrattEnd));
-            this.Adapter.UpdateCommand.Parameters[9].Value = ((decimal)(Original_Durezza));
-            this.Adapter.UpdateCommand.Parameters[10].Value = ((decimal)(Original_ProveMecc));
-            this.Adapter.UpdateCommand.Parameters[11].Value = ((bool)(Original_HasDtx));
+            this.Adapter.UpdateCommand.Parameters[12].Value = ((System.DateTime)(Original_DataTrattEnd));
+            this.Adapter.UpdateCommand.Parameters[13].Value = ((int)(Original_Durezza));
+            if ((Original_DataDur.HasValue == true)) {
+                this.Adapter.UpdateCommand.Parameters[14].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[15].Value = ((System.DateTime)(Original_DataDur.Value));
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[14].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[15].Value = global::System.DBNull.Value;
+            }
+            if ((Original_CodSoggettoDur == null)) {
+                throw new global::System.ArgumentNullException("Original_CodSoggettoDur");
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[16].Value = ((string)(Original_CodSoggettoDur));
+            }
+            this.Adapter.UpdateCommand.Parameters[17].Value = ((int)(Original_ProveMecc));
+            if ((Original_DataPM.HasValue == true)) {
+                this.Adapter.UpdateCommand.Parameters[18].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[19].Value = ((System.DateTime)(Original_DataPM.Value));
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[18].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[19].Value = global::System.DBNull.Value;
+            }
+            if ((Original_CodSoggettoPM == null)) {
+                throw new global::System.ArgumentNullException("Original_CodSoggettoPM");
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[20].Value = ((string)(Original_CodSoggettoPM));
+            }
+            this.Adapter.UpdateCommand.Parameters[21].Value = ((bool)(Original_HasDtx));
             global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State;
             if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open) 
                         != global::System.Data.ConnectionState.Open)) {
@@ -40984,14 +41270,33 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, ProveMecc, HasDtx FROM ElencoTrat
         [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 AL, System.DateTime DataTrattEnd, decimal Durezza, decimal ProveMecc, bool HasDtx, string Original_Trattamento, string Original_AL, System.DateTime Original_DataTrattEnd, decimal Original_Durezza, decimal Original_ProveMecc, bool Original_HasDtx) {
-            return this.Update(Original_Trattamento, AL, DataTrattEnd, Durezza, ProveMecc, HasDtx, Original_Trattamento, Original_AL, Original_DataTrattEnd, Original_Durezza, Original_ProveMecc, Original_HasDtx);
+        public virtual int Update(
+                    string AL, 
+                    System.DateTime DataTrattEnd, 
+                    int Durezza, 
+                    global::System.Nullable<global::System.DateTime> DataDur, 
+                    string CodSoggettoDur, 
+                    int ProveMecc, 
+                    global::System.Nullable<global::System.DateTime> DataPM, 
+                    string CodSoggettoPM, 
+                    bool HasDtx, 
+                    string Original_Trattamento, 
+                    string Original_AL, 
+                    System.DateTime Original_DataTrattEnd, 
+                    int Original_Durezza, 
+                    global::System.Nullable<global::System.DateTime> Original_DataDur, 
+                    string Original_CodSoggettoDur, 
+                    int Original_ProveMecc, 
+                    global::System.Nullable<global::System.DateTime> Original_DataPM, 
+                    string Original_CodSoggettoPM, 
+                    bool Original_HasDtx) {
+            return this.Update(Original_Trattamento, AL, DataTrattEnd, Durezza, DataDur, CodSoggettoDur, ProveMecc, DataPM, CodSoggettoPM, HasDtx, Original_Trattamento, Original_AL, Original_DataTrattEnd, Original_Durezza, Original_DataDur, Original_CodSoggettoDur, Original_ProveMecc, Original_DataPM, Original_CodSoggettoPM, Original_HasDtx);
         }
         
         [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 updatePM(string Trattamento, global::System.Nullable<decimal> ProveMecc, global::System.Nullable<global::System.DateTime> DataCreaz, string CodSoggetto) {
+        public virtual int updatePM(string Trattamento, global::System.Nullable<int> ProveMecc, global::System.Nullable<global::System.DateTime> DataPM, string CodSoggettoPM) {
             global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[4];
             if ((Trattamento == null)) {
                 command.Parameters[1].Value = global::System.DBNull.Value;
@@ -41000,22 +41305,22 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, ProveMecc, HasDtx FROM ElencoTrat
                 command.Parameters[1].Value = ((string)(Trattamento));
             }
             if ((ProveMecc.HasValue == true)) {
-                command.Parameters[2].Value = ((decimal)(ProveMecc.Value));
+                command.Parameters[2].Value = ((int)(ProveMecc.Value));
             }
             else {
                 command.Parameters[2].Value = global::System.DBNull.Value;
             }
-            if ((DataCreaz.HasValue == true)) {
-                command.Parameters[3].Value = ((System.DateTime)(DataCreaz.Value));
+            if ((DataPM.HasValue == true)) {
+                command.Parameters[3].Value = ((System.DateTime)(DataPM.Value));
             }
             else {
                 command.Parameters[3].Value = global::System.DBNull.Value;
             }
-            if ((CodSoggetto == null)) {
+            if ((CodSoggettoPM == null)) {
                 command.Parameters[4].Value = global::System.DBNull.Value;
             }
             else {
-                command.Parameters[4].Value = ((string)(CodSoggetto));
+                command.Parameters[4].Value = ((string)(CodSoggettoPM));
             }
             global::System.Data.ConnectionState previousConnectionState = command.Connection.State;
             if (((command.Connection.State & global::System.Data.ConnectionState.Open) 
diff --git a/GMW_data/DS_magazzino.xsd b/GMW_data/DS_magazzino.xsd
index 29502494..26e6fda4 100644
--- a/GMW_data/DS_magazzino.xsd
+++ b/GMW_data/DS_magazzino.xsd
@@ -3639,7 +3639,7 @@ SELECT AL, TipoAL, Numero, Cesta, Attivo, DataCreaz, CodSoggetto, CodDtx_start,
               <Mapping SourceColumn="CodDtx_end" DataSetColumn="CodDtx_end" />
             </Mappings>
             <Sources>
-              <DbSource ConnectionRef="GMWConnectionString (Settings)" DbObjectName="GMW.dbo.stp_UAL_Disattiva" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="DisattivaAL" Modifier="Public" Name="DisattivaAL" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy3" UserSourceName="DisattivaAL">
+              <DbSource ConnectionRef="GMWConnectionString (Settings)" DbObjectName="GMW.dbo.stp_UAL_Disattiva" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="DisattivaAL" Modifier="Public" Name="DisattivaAL" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="DisattivaAL">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
                     <CommandText>dbo.stp_UAL_Disattiva</CommandText>
@@ -3650,7 +3650,7 @@ SELECT AL, TipoAL, Numero, Cesta, Attivo, DataCreaz, CodSoggetto, CodDtx_start,
                   </DbCommand>
                 </SelectCommand>
               </DbSource>
-              <DbSource ConnectionRef="GMWConnectionString (Settings)" DbObjectName="GMW.dbo.stp_UAL_eliminaEmpty" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="eliminaEmpty" Modifier="Public" Name="eliminaEmpty" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy4" UserSourceName="eliminaEmpty">
+              <DbSource ConnectionRef="GMWConnectionString (Settings)" DbObjectName="GMW.dbo.stp_UAL_eliminaEmpty" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="eliminaEmpty" Modifier="Public" Name="eliminaEmpty" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy1" UserSourceName="eliminaEmpty">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
                     <CommandText>dbo.stp_UAL_eliminaEmpty</CommandText>
@@ -3686,7 +3686,7 @@ SELECT AL, TipoAL, Numero, Cesta, Attivo, DataCreaz, CodSoggetto, CodDtx_start,
                   </DbCommand>
                 </SelectCommand>
               </DbSource>
-              <DbSource ConnectionRef="GMWConnectionString (Settings)" DbObjectName="GMW.dbo.stp_UAL_insertNewRX" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorGetMethodName="insertNew" GeneratorSourceName="insertNewRX" Modifier="Public" Name="insertNewRX" QueryType="Scalar" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="insertNewRX">
+              <DbSource ConnectionRef="GMWConnectionString (Settings)" DbObjectName="GMW.dbo.stp_UAL_insertNewRX" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorGetMethodName="insertNew" GeneratorSourceName="insertNewRX" Modifier="Public" Name="insertNewRX" QueryType="Scalar" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy2" UserSourceName="insertNewRX">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
                     <CommandText>dbo.stp_UAL_insertNewRX</CommandText>
@@ -3710,7 +3710,7 @@ SELECT AL, TipoAL, Numero, Cesta, Attivo, DataCreaz, CodSoggetto, CodDtx_start,
                   </DbCommand>
                 </SelectCommand>
               </DbSource>
-              <DbSource ConnectionRef="GMWConnectionString (Settings)" DbObjectName="GMW.dbo.stp_UAL_insertNewTL" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="insertNewTL" Modifier="Public" Name="insertNewTL" QueryType="Scalar" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy1" UserSourceName="insertNewTL">
+              <DbSource ConnectionRef="GMWConnectionString (Settings)" DbObjectName="GMW.dbo.stp_UAL_insertNewTL" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="insertNewTL" Modifier="Public" Name="insertNewTL" QueryType="Scalar" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy3" UserSourceName="insertNewTL">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
                     <CommandText>dbo.stp_UAL_insertNewTL</CommandText>
@@ -3725,7 +3725,7 @@ SELECT AL, TipoAL, Numero, Cesta, Attivo, DataCreaz, CodSoggetto, CodDtx_start,
                   </DbCommand>
                 </SelectCommand>
               </DbSource>
-              <DbSource ConnectionRef="GMWConnectionString (Settings)" DbObjectName="GMW.dbo.stp_UAL_insertNewTT" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="insertNewTT" Modifier="Public" Name="insertNewTT" QueryType="Scalar" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy2" UserSourceName="insertNewTT">
+              <DbSource ConnectionRef="GMWConnectionString (Settings)" DbObjectName="GMW.dbo.stp_UAL_insertNewTT" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="insertNewTT" Modifier="Public" Name="insertNewTT" QueryType="Scalar" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy4" UserSourceName="insertNewTT">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
                     <CommandText>dbo.stp_UAL_insertNewTT</CommandText>
@@ -3737,7 +3737,7 @@ SELECT AL, TipoAL, Numero, Cesta, Attivo, DataCreaz, CodSoggetto, CodDtx_start,
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="varchar" DbType="AnsiString" Direction="Input" ParameterName="@CodSoggetto" Precision="0" ProviderType="VarChar" Scale="0" Size="17" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@Note" Precision="0" ProviderType="NVarChar" Scale="0" Size="500" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@NumTratt" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@Durezza" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Durezza" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="varchar" DbType="AnsiString" Direction="InputOutput" ParameterName="@AL" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
@@ -3847,53 +3847,74 @@ SELECT AL, UDC, DataCreaz, CodSoggetto FROM AL2UDC WHERE (AL = @AL) AND (UDC = @
               <DbSource ConnectionRef="GMWConnectionString (Settings)" DbObjectName="GMW.dbo.ElencoTrattamenti" 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 [dbo].[ElencoTrattamenti] WHERE (([Trattamento] = @Original_Trattamento) AND ([AL] = @Original_AL) AND ([DataTrattEnd] = @Original_DataTrattEnd) AND ([Durezza] = @Original_Durezza) AND ([ProveMecc] = @Original_ProveMecc) AND ([HasDtx] = @Original_HasDtx))</CommandText>
+                    <CommandText>DELETE FROM [ElencoTrattamenti] WHERE (([Trattamento] = @Original_Trattamento) AND ([AL] = @Original_AL) AND ([DataTrattEnd] = @Original_DataTrattEnd) AND ([Durezza] = @Original_Durezza) AND ((@IsNull_DataDur = 1 AND [DataDur] IS NULL) OR ([DataDur] = @Original_DataDur)) AND ([CodSoggettoDur] = @Original_CodSoggettoDur) AND ([ProveMecc] = @Original_ProveMecc) AND ((@IsNull_DataPM = 1 AND [DataPM] IS NULL) OR ([DataPM] = @Original_DataPM)) AND ([CodSoggettoPM] = @Original_CodSoggettoPM) AND ([HasDtx] = @Original_HasDtx))</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_Trattamento" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="Trattamento" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_AL" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="AL" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_DataTrattEnd" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="DataTrattEnd" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Decimal" Direction="Input" ParameterName="@Original_Durezza" Precision="18" ProviderType="Decimal" Scale="6" Size="0" SourceColumn="Durezza" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Decimal" Direction="Input" ParameterName="@Original_ProveMecc" Precision="18" ProviderType="Decimal" Scale="6" Size="0" SourceColumn="ProveMecc" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_Durezza" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="Durezza" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_DataDur" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="DataDur" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_DataDur" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="DataDur" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="StringFixedLength" Direction="Input" ParameterName="@Original_CodSoggettoDur" Precision="0" ProviderType="NChar" Scale="0" Size="0" SourceColumn="CodSoggettoDur" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_ProveMecc" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="ProveMecc" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_DataPM" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="DataPM" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_DataPM" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="DataPM" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="StringFixedLength" Direction="Input" ParameterName="@Original_CodSoggettoPM" Precision="0" ProviderType="NChar" Scale="0" Size="0" SourceColumn="CodSoggettoPM" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_HasDtx" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="HasDtx" SourceColumnNullMapping="false" SourceVersion="Original" />
                     </Parameters>
                   </DbCommand>
                 </DeleteCommand>
                 <InsertCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>INSERT INTO [dbo].[ElencoTrattamenti] ([Trattamento], [AL], [DataTrattEnd], [Durezza], [ProveMecc], [HasDtx]) VALUES (@Trattamento, @AL, @DataTrattEnd, @Durezza, @ProveMecc, @HasDtx);
-SELECT Trattamento, AL, DataTrattEnd, Durezza, ProveMecc, HasDtx FROM ElencoTrattamenti WHERE (Trattamento = @Trattamento)</CommandText>
+                    <CommandText>INSERT INTO [ElencoTrattamenti] ([Trattamento], [AL], [DataTrattEnd], [Durezza], [DataDur], [CodSoggettoDur], [ProveMecc], [DataPM], [CodSoggettoPM], [HasDtx]) VALUES (@Trattamento, @AL, @DataTrattEnd, @Durezza, @DataDur, @CodSoggettoDur, @ProveMecc, @DataPM, @CodSoggettoPM, @HasDtx);
+SELECT Trattamento, AL, DataTrattEnd, Durezza, DataDur, CodSoggettoDur, ProveMecc, DataPM, CodSoggettoPM, HasDtx FROM ElencoTrattamenti WHERE (Trattamento = @Trattamento)</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Trattamento" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="Trattamento" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@AL" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="AL" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@DataTrattEnd" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="DataTrattEnd" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Decimal" Direction="Input" ParameterName="@Durezza" Precision="18" ProviderType="Decimal" Scale="6" Size="0" SourceColumn="Durezza" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Decimal" Direction="Input" ParameterName="@ProveMecc" Precision="18" ProviderType="Decimal" Scale="6" Size="0" SourceColumn="ProveMecc" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Durezza" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="Durezza" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@DataDur" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="DataDur" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="StringFixedLength" Direction="Input" ParameterName="@CodSoggettoDur" Precision="0" ProviderType="NChar" Scale="0" Size="0" SourceColumn="CodSoggettoDur" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@ProveMecc" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="ProveMecc" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@DataPM" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="DataPM" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="StringFixedLength" Direction="Input" ParameterName="@CodSoggettoPM" Precision="0" ProviderType="NChar" Scale="0" Size="0" SourceColumn="CodSoggettoPM" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@HasDtx" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="HasDtx" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </InsertCommand>
                 <SelectCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>SELECT Trattamento, AL, DataTrattEnd, Durezza, ProveMecc, HasDtx FROM dbo.ElencoTrattamenti</CommandText>
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                    <CommandText>SELECT        Trattamento, AL, DataTrattEnd, Durezza, DataDur, CodSoggettoDur, ProveMecc, DataPM, CodSoggettoPM, HasDtx
+FROM            ElencoTrattamenti</CommandText>
                     <Parameters />
                   </DbCommand>
                 </SelectCommand>
                 <UpdateCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>UPDATE [dbo].[ElencoTrattamenti] SET [Trattamento] = @Trattamento, [AL] = @AL, [DataTrattEnd] = @DataTrattEnd, [Durezza] = @Durezza, [ProveMecc] = @ProveMecc, [HasDtx] = @HasDtx WHERE (([Trattamento] = @Original_Trattamento) AND ([AL] = @Original_AL) AND ([DataTrattEnd] = @Original_DataTrattEnd) AND ([Durezza] = @Original_Durezza) AND ([ProveMecc] = @Original_ProveMecc) AND ([HasDtx] = @Original_HasDtx));
-SELECT Trattamento, AL, DataTrattEnd, Durezza, ProveMecc, HasDtx FROM ElencoTrattamenti WHERE (Trattamento = @Trattamento)</CommandText>
+                    <CommandText>UPDATE [ElencoTrattamenti] SET [Trattamento] = @Trattamento, [AL] = @AL, [DataTrattEnd] = @DataTrattEnd, [Durezza] = @Durezza, [DataDur] = @DataDur, [CodSoggettoDur] = @CodSoggettoDur, [ProveMecc] = @ProveMecc, [DataPM] = @DataPM, [CodSoggettoPM] = @CodSoggettoPM, [HasDtx] = @HasDtx WHERE (([Trattamento] = @Original_Trattamento) AND ([AL] = @Original_AL) AND ([DataTrattEnd] = @Original_DataTrattEnd) AND ([Durezza] = @Original_Durezza) AND ((@IsNull_DataDur = 1 AND [DataDur] IS NULL) OR ([DataDur] = @Original_DataDur)) AND ([CodSoggettoDur] = @Original_CodSoggettoDur) AND ([ProveMecc] = @Original_ProveMecc) AND ((@IsNull_DataPM = 1 AND [DataPM] IS NULL) OR ([DataPM] = @Original_DataPM)) AND ([CodSoggettoPM] = @Original_CodSoggettoPM) AND ([HasDtx] = @Original_HasDtx));
+SELECT Trattamento, AL, DataTrattEnd, Durezza, DataDur, CodSoggettoDur, ProveMecc, DataPM, CodSoggettoPM, HasDtx FROM ElencoTrattamenti WHERE (Trattamento = @Trattamento)</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Trattamento" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="Trattamento" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@AL" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="AL" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@DataTrattEnd" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="DataTrattEnd" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Decimal" Direction="Input" ParameterName="@Durezza" Precision="18" ProviderType="Decimal" Scale="6" Size="0" SourceColumn="Durezza" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Decimal" Direction="Input" ParameterName="@ProveMecc" Precision="18" ProviderType="Decimal" Scale="6" Size="0" SourceColumn="ProveMecc" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Durezza" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="Durezza" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@DataDur" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="DataDur" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="StringFixedLength" Direction="Input" ParameterName="@CodSoggettoDur" Precision="0" ProviderType="NChar" Scale="0" Size="0" SourceColumn="CodSoggettoDur" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@ProveMecc" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="ProveMecc" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@DataPM" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="DataPM" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="StringFixedLength" Direction="Input" ParameterName="@CodSoggettoPM" Precision="0" ProviderType="NChar" Scale="0" Size="0" SourceColumn="CodSoggettoPM" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@HasDtx" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="HasDtx" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_Trattamento" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="Trattamento" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_AL" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="AL" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_DataTrattEnd" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="DataTrattEnd" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Decimal" Direction="Input" ParameterName="@Original_Durezza" Precision="18" ProviderType="Decimal" Scale="6" Size="0" SourceColumn="Durezza" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Decimal" Direction="Input" ParameterName="@Original_ProveMecc" Precision="18" ProviderType="Decimal" Scale="6" Size="0" SourceColumn="ProveMecc" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_Durezza" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="Durezza" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_DataDur" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="DataDur" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_DataDur" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="DataDur" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="StringFixedLength" Direction="Input" ParameterName="@Original_CodSoggettoDur" Precision="0" ProviderType="NChar" Scale="0" Size="0" SourceColumn="CodSoggettoDur" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_ProveMecc" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="ProveMecc" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_DataPM" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="DataPM" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_DataPM" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="DataPM" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="StringFixedLength" Direction="Input" ParameterName="@Original_CodSoggettoPM" Precision="0" ProviderType="NChar" Scale="0" Size="0" SourceColumn="CodSoggettoPM" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_HasDtx" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="HasDtx" SourceColumnNullMapping="false" SourceVersion="Original" />
                     </Parameters>
                   </DbCommand>
@@ -3905,7 +3926,11 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, ProveMecc, HasDtx FROM ElencoTrat
               <Mapping SourceColumn="AL" DataSetColumn="AL" />
               <Mapping SourceColumn="DataTrattEnd" DataSetColumn="DataTrattEnd" />
               <Mapping SourceColumn="Durezza" DataSetColumn="Durezza" />
+              <Mapping SourceColumn="DataDur" DataSetColumn="DataDur" />
+              <Mapping SourceColumn="CodSoggettoDur" DataSetColumn="CodSoggettoDur" />
               <Mapping SourceColumn="ProveMecc" DataSetColumn="ProveMecc" />
+              <Mapping SourceColumn="DataPM" DataSetColumn="DataPM" />
+              <Mapping SourceColumn="CodSoggettoPM" DataSetColumn="CodSoggettoPM" />
               <Mapping SourceColumn="HasDtx" DataSetColumn="HasDtx" />
             </Mappings>
             <Sources>
@@ -3952,9 +3977,9 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, ProveMecc, HasDtx FROM ElencoTrat
                     <Parameters>
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="ReturnValue" ParameterName="@RETURN_VALUE" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="varchar" DbType="AnsiString" Direction="Input" ParameterName="@Trattamento" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="decimal" DbType="Decimal" Direction="Input" ParameterName="@ProveMecc" Precision="9" ProviderType="Decimal" Scale="6" Size="5" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@DataCreaz" Precision="23" ProviderType="DateTime" Scale="3" Size="8" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="varchar" DbType="AnsiString" Direction="Input" ParameterName="@CodSoggetto" Precision="0" ProviderType="VarChar" Scale="0" Size="17" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@ProveMecc" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@DataPM" Precision="23" ProviderType="DateTime" Scale="3" Size="8" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="varchar" DbType="AnsiString" Direction="Input" ParameterName="@CodSoggettoPM" Precision="0" ProviderType="VarChar" Scale="0" Size="17" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </SelectCommand>
@@ -5106,7 +5131,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, ProveMecc, HasDtx FROM ElencoTrat
             </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" />
@@ -5163,7 +5188,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, ProveMecc, HasDtx FROM ElencoTrat
             </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" />
@@ -5195,7 +5220,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, ProveMecc, HasDtx FROM ElencoTrat
             </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">
@@ -5217,7 +5242,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, ProveMecc, HasDtx FROM ElencoTrat
             </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">
@@ -5244,7 +5269,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, ProveMecc, HasDtx FROM ElencoTrat
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="AnagLinee" msprop:Generator_TableClassName="AnagLineeDataTable" msprop:Generator_TableVarName="tableAnagLinee" msprop:Generator_RowChangedName="AnagLineeRowChanged" msprop:Generator_TablePropName="AnagLinee" msprop:Generator_RowDeletingName="AnagLineeRowDeleting" msprop:Generator_RowChangingName="AnagLineeRowChanging" msprop:Generator_RowEvHandlerName="AnagLineeRowChangeEventHandler" msprop:Generator_RowDeletedName="AnagLineeRowDeleted" msprop:Generator_RowClassName="AnagLineeRow" msprop:Generator_UserTableName="AnagLinee" msprop:Generator_RowEvArgName="AnagLineeRowChangeEvent">
+        <xs:element name="AnagLinee" msprop:Generator_TableClassName="AnagLineeDataTable" msprop:Generator_TableVarName="tableAnagLinee" msprop:Generator_TablePropName="AnagLinee" msprop:Generator_RowDeletingName="AnagLineeRowDeleting" msprop:Generator_RowChangingName="AnagLineeRowChanging" msprop:Generator_RowEvHandlerName="AnagLineeRowChangeEventHandler" msprop:Generator_RowDeletedName="AnagLineeRowDeleted" msprop:Generator_UserTableName="AnagLinee" msprop:Generator_RowChangedName="AnagLineeRowChanged" msprop:Generator_RowEvArgName="AnagLineeRowChangeEvent" msprop:Generator_RowClassName="AnagLineeRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="CodLinea" msprop:Generator_ColumnVarNameInTable="columnCodLinea" msprop:Generator_ColumnPropNameInRow="CodLinea" msprop:Generator_ColumnPropNameInTable="CodLineaColumn" msprop:Generator_UserColumnName="CodLinea">
@@ -5293,14 +5318,14 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, ProveMecc, HasDtx FROM ElencoTrat
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="stp_ParticolareInOutOk" msprop:Generator_TableClassName="stp_ParticolareInOutOkDataTable" msprop:Generator_TableVarName="tablestp_ParticolareInOutOk" msprop:Generator_TablePropName="stp_ParticolareInOutOk" msprop:Generator_RowDeletingName="stp_ParticolareInOutOkRowDeleting" msprop:Generator_RowChangingName="stp_ParticolareInOutOkRowChanging" msprop:Generator_RowEvHandlerName="stp_ParticolareInOutOkRowChangeEventHandler" msprop:Generator_RowDeletedName="stp_ParticolareInOutOkRowDeleted" msprop:Generator_UserTableName="stp_ParticolareInOutOk" msprop:Generator_RowChangedName="stp_ParticolareInOutOkRowChanged" msprop:Generator_RowEvArgName="stp_ParticolareInOutOkRowChangeEvent" msprop:Generator_RowClassName="stp_ParticolareInOutOkRow">
+        <xs:element name="stp_ParticolareInOutOk" msprop:Generator_TableClassName="stp_ParticolareInOutOkDataTable" msprop:Generator_TableVarName="tablestp_ParticolareInOutOk" msprop:Generator_RowChangedName="stp_ParticolareInOutOkRowChanged" msprop:Generator_TablePropName="stp_ParticolareInOutOk" msprop:Generator_RowDeletingName="stp_ParticolareInOutOkRowDeleting" msprop:Generator_RowChangingName="stp_ParticolareInOutOkRowChanging" msprop:Generator_RowEvHandlerName="stp_ParticolareInOutOkRowChangeEventHandler" msprop:Generator_RowDeletedName="stp_ParticolareInOutOkRowDeleted" msprop:Generator_RowClassName="stp_ParticolareInOutOkRow" msprop:Generator_UserTableName="stp_ParticolareInOutOk" msprop:Generator_RowEvArgName="stp_ParticolareInOutOkRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="Trovati" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnTrovati" msprop:Generator_ColumnPropNameInRow="Trovati" msprop:Generator_ColumnPropNameInTable="TrovatiColumn" msprop:Generator_UserColumnName="Trovati" type="xs:int" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="Attr2UDC" msprop:Generator_TableClassName="Attr2UDCDataTable" msprop:Generator_TableVarName="tableAttr2UDC" msprop:Generator_RowChangedName="Attr2UDCRowChanged" msprop:Generator_TablePropName="Attr2UDC" msprop:Generator_RowDeletingName="Attr2UDCRowDeleting" msprop:Generator_RowChangingName="Attr2UDCRowChanging" msprop:Generator_RowEvHandlerName="Attr2UDCRowChangeEventHandler" msprop:Generator_RowDeletedName="Attr2UDCRowDeleted" msprop:Generator_RowClassName="Attr2UDCRow" msprop:Generator_UserTableName="Attr2UDC" msprop:Generator_RowEvArgName="Attr2UDCRowChangeEvent">
+        <xs:element name="Attr2UDC" msprop:Generator_TableClassName="Attr2UDCDataTable" msprop:Generator_TableVarName="tableAttr2UDC" msprop:Generator_TablePropName="Attr2UDC" msprop:Generator_RowDeletingName="Attr2UDCRowDeleting" msprop:Generator_RowChangingName="Attr2UDCRowChanging" msprop:Generator_RowEvHandlerName="Attr2UDCRowChangeEventHandler" msprop:Generator_RowDeletedName="Attr2UDCRowDeleted" msprop:Generator_UserTableName="Attr2UDC" msprop:Generator_RowChangedName="Attr2UDCRowChanged" msprop:Generator_RowEvArgName="Attr2UDCRowChangeEvent" msprop:Generator_RowClassName="Attr2UDCRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="idxAttr" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidxAttr" msprop:Generator_ColumnPropNameInRow="idxAttr" msprop:Generator_ColumnPropNameInTable="idxAttrColumn" msprop:Generator_UserColumnName="idxAttr" type="xs:int" />
@@ -5336,7 +5361,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, ProveMecc, HasDtx FROM ElencoTrat
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="ElencoAssiemi" msprop:Generator_TableClassName="ElencoAssiemiDataTable" msprop:Generator_TableVarName="tableElencoAssiemi" msprop:Generator_RowChangedName="ElencoAssiemiRowChanged" msprop:Generator_TablePropName="ElencoAssiemi" msprop:Generator_RowDeletingName="ElencoAssiemiRowDeleting" msprop:Generator_RowChangingName="ElencoAssiemiRowChanging" msprop:Generator_RowEvHandlerName="ElencoAssiemiRowChangeEventHandler" msprop:Generator_RowDeletedName="ElencoAssiemiRowDeleted" msprop:Generator_RowClassName="ElencoAssiemiRow" msprop:Generator_UserTableName="ElencoAssiemi" msprop:Generator_RowEvArgName="ElencoAssiemiRowChangeEvent">
+        <xs:element name="ElencoAssiemi" msprop:Generator_TableClassName="ElencoAssiemiDataTable" msprop:Generator_TableVarName="tableElencoAssiemi" msprop:Generator_TablePropName="ElencoAssiemi" msprop:Generator_RowDeletingName="ElencoAssiemiRowDeleting" msprop:Generator_RowChangingName="ElencoAssiemiRowChanging" msprop:Generator_RowEvHandlerName="ElencoAssiemiRowChangeEventHandler" msprop:Generator_RowDeletedName="ElencoAssiemiRowDeleted" msprop:Generator_UserTableName="ElencoAssiemi" msprop:Generator_RowChangedName="ElencoAssiemiRowChanged" msprop:Generator_RowEvArgName="ElencoAssiemiRowChangeEvent" msprop:Generator_RowClassName="ElencoAssiemiRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="AL" msprop:Generator_ColumnVarNameInTable="columnAL" msprop:Generator_ColumnPropNameInRow="AL" msprop:Generator_ColumnPropNameInTable="ALColumn" msprop:Generator_UserColumnName="AL">
@@ -5393,7 +5418,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, ProveMecc, HasDtx FROM ElencoTrat
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="AL2UDC" msprop:Generator_TableClassName="AL2UDCDataTable" msprop:Generator_TableVarName="tableAL2UDC" msprop:Generator_RowChangedName="AL2UDCRowChanged" msprop:Generator_TablePropName="AL2UDC" msprop:Generator_RowDeletingName="AL2UDCRowDeleting" msprop:Generator_RowChangingName="AL2UDCRowChanging" msprop:Generator_RowEvHandlerName="AL2UDCRowChangeEventHandler" msprop:Generator_RowDeletedName="AL2UDCRowDeleted" msprop:Generator_RowClassName="AL2UDCRow" msprop:Generator_UserTableName="AL2UDC" msprop:Generator_RowEvArgName="AL2UDCRowChangeEvent">
+        <xs:element name="AL2UDC" msprop:Generator_TableClassName="AL2UDCDataTable" msprop:Generator_TableVarName="tableAL2UDC" msprop:Generator_TablePropName="AL2UDC" msprop:Generator_RowDeletingName="AL2UDCRowDeleting" msprop:Generator_RowChangingName="AL2UDCRowChanging" msprop:Generator_RowEvHandlerName="AL2UDCRowChangeEventHandler" msprop:Generator_RowDeletedName="AL2UDCRowDeleted" msprop:Generator_UserTableName="AL2UDC" msprop:Generator_RowChangedName="AL2UDCRowChanged" msprop:Generator_RowEvArgName="AL2UDCRowChangeEvent" msprop:Generator_RowClassName="AL2UDCRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="AL" msprop:Generator_ColumnVarNameInTable="columnAL" msprop:Generator_ColumnPropNameInRow="AL" msprop:Generator_ColumnPropNameInTable="ALColumn" msprop:Generator_UserColumnName="AL">
@@ -5421,7 +5446,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, ProveMecc, HasDtx FROM ElencoTrat
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="ElencoTrattamenti" msprop:Generator_TableClassName="ElencoTrattamentiDataTable" msprop:Generator_TableVarName="tableElencoTrattamenti" msprop:Generator_TablePropName="ElencoTrattamenti" msprop:Generator_RowDeletingName="ElencoTrattamentiRowDeleting" msprop:Generator_RowChangingName="ElencoTrattamentiRowChanging" msprop:Generator_RowEvHandlerName="ElencoTrattamentiRowChangeEventHandler" msprop:Generator_RowDeletedName="ElencoTrattamentiRowDeleted" msprop:Generator_UserTableName="ElencoTrattamenti" msprop:Generator_RowChangedName="ElencoTrattamentiRowChanged" msprop:Generator_RowEvArgName="ElencoTrattamentiRowChangeEvent" msprop:Generator_RowClassName="ElencoTrattamentiRow">
+        <xs:element name="ElencoTrattamenti" msprop:Generator_TableClassName="ElencoTrattamentiDataTable" msprop:Generator_TableVarName="tableElencoTrattamenti" msprop:Generator_RowChangedName="ElencoTrattamentiRowChanged" msprop:Generator_TablePropName="ElencoTrattamenti" msprop:Generator_RowDeletingName="ElencoTrattamentiRowDeleting" msprop:Generator_RowChangingName="ElencoTrattamentiRowChanging" msprop:Generator_RowEvHandlerName="ElencoTrattamentiRowChangeEventHandler" msprop:Generator_RowDeletedName="ElencoTrattamentiRowDeleted" msprop:Generator_RowClassName="ElencoTrattamentiRow" msprop:Generator_UserTableName="ElencoTrattamenti" msprop:Generator_RowEvArgName="ElencoTrattamentiRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="Trattamento" msprop:Generator_ColumnVarNameInTable="columnTrattamento" msprop:Generator_ColumnPropNameInRow="Trattamento" msprop:Generator_ColumnPropNameInTable="TrattamentoColumn" msprop:Generator_UserColumnName="Trattamento">
@@ -5439,13 +5464,29 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, ProveMecc, HasDtx FROM ElencoTrat
                 </xs:simpleType>
               </xs:element>
               <xs:element name="DataTrattEnd" msprop:Generator_ColumnVarNameInTable="columnDataTrattEnd" msprop:Generator_ColumnPropNameInRow="DataTrattEnd" msprop:Generator_ColumnPropNameInTable="DataTrattEndColumn" msprop:Generator_UserColumnName="DataTrattEnd" type="xs:dateTime" />
-              <xs:element name="Durezza" msprop:Generator_ColumnVarNameInTable="columnDurezza" msprop:Generator_ColumnPropNameInRow="Durezza" msprop:Generator_ColumnPropNameInTable="DurezzaColumn" msprop:Generator_UserColumnName="Durezza" type="xs:decimal" />
-              <xs:element name="ProveMecc" msprop:Generator_ColumnVarNameInTable="columnProveMecc" msprop:Generator_ColumnPropNameInRow="ProveMecc" msprop:Generator_ColumnPropNameInTable="ProveMeccColumn" msprop:Generator_UserColumnName="ProveMecc" type="xs:decimal" />
+              <xs:element name="Durezza" msprop:Generator_ColumnVarNameInTable="columnDurezza" msprop:Generator_ColumnPropNameInRow="Durezza" msprop:Generator_ColumnPropNameInTable="DurezzaColumn" msprop:Generator_UserColumnName="Durezza" type="xs:int" />
+              <xs:element name="DataDur" msprop:Generator_ColumnVarNameInTable="columnDataDur" msprop:Generator_ColumnPropNameInRow="DataDur" msprop:Generator_ColumnPropNameInTable="DataDurColumn" msprop:Generator_UserColumnName="DataDur" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="CodSoggettoDur" msprop:Generator_ColumnVarNameInTable="columnCodSoggettoDur" msprop:Generator_ColumnPropNameInRow="CodSoggettoDur" msprop:Generator_ColumnPropNameInTable="CodSoggettoDurColumn" msprop:Generator_UserColumnName="CodSoggettoDur">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="17" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="ProveMecc" msprop:Generator_ColumnVarNameInTable="columnProveMecc" msprop:Generator_ColumnPropNameInRow="ProveMecc" msprop:Generator_ColumnPropNameInTable="ProveMeccColumn" msprop:Generator_UserColumnName="ProveMecc" type="xs:int" />
+              <xs:element name="DataPM" msprop:Generator_ColumnVarNameInTable="columnDataPM" msprop:Generator_ColumnPropNameInRow="DataPM" msprop:Generator_ColumnPropNameInTable="DataPMColumn" msprop:Generator_UserColumnName="DataPM" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="CodSoggettoPM" msprop:Generator_ColumnVarNameInTable="columnCodSoggettoPM" msprop:Generator_ColumnPropNameInRow="CodSoggettoPM" msprop:Generator_ColumnPropNameInTable="CodSoggettoPMColumn" msprop:Generator_UserColumnName="CodSoggettoPM">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="17" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
               <xs:element name="HasDtx" msprop:Generator_ColumnVarNameInTable="columnHasDtx" msprop:Generator_ColumnPropNameInRow="HasDtx" msprop:Generator_ColumnPropNameInTable="HasDtxColumn" msprop:Generator_UserColumnName="HasDtx" type="xs:boolean" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="v_A2U2D" msprop:Generator_TableClassName="v_A2U2DDataTable" msprop:Generator_TableVarName="tablev_A2U2D" msprop:Generator_TablePropName="v_A2U2D" msprop:Generator_RowDeletingName="v_A2U2DRowDeleting" msprop:Generator_RowChangingName="v_A2U2DRowChanging" msprop:Generator_RowEvHandlerName="v_A2U2DRowChangeEventHandler" msprop:Generator_RowDeletedName="v_A2U2DRowDeleted" msprop:Generator_UserTableName="v_A2U2D" msprop:Generator_RowChangedName="v_A2U2DRowChanged" msprop:Generator_RowEvArgName="v_A2U2DRowChangeEvent" msprop:Generator_RowClassName="v_A2U2DRow">
+        <xs:element name="v_A2U2D" msprop:Generator_TableClassName="v_A2U2DDataTable" msprop:Generator_TableVarName="tablev_A2U2D" msprop:Generator_RowChangedName="v_A2U2DRowChanged" msprop:Generator_TablePropName="v_A2U2D" msprop:Generator_RowDeletingName="v_A2U2DRowDeleting" msprop:Generator_RowChangingName="v_A2U2DRowChanging" msprop:Generator_RowEvHandlerName="v_A2U2DRowChangeEventHandler" msprop:Generator_RowDeletedName="v_A2U2DRowDeleted" msprop:Generator_RowClassName="v_A2U2DRow" msprop:Generator_UserTableName="v_A2U2D" msprop:Generator_RowEvArgName="v_A2U2DRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="AL" msprop:Generator_ColumnVarNameInTable="columnAL" msprop:Generator_ColumnPropNameInRow="AL" msprop:Generator_ColumnPropNameInTable="ALColumn" msprop:Generator_UserColumnName="AL">
@@ -5639,20 +5680,20 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, ProveMecc, HasDtx FROM ElencoTrat
   </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_Attr2UDC_ElencoCartellini" msdata:parent="ElencoCartellini" msdata:child="Attr2UDC" msdata:parentkey="UDC" msdata:childkey="UDC" msprop:Generator_UserChildTable="Attr2UDC" msprop:Generator_ChildPropName="GetAttr2UDCRows" msprop:Generator_UserRelationName="FK_Attr2UDC_ElencoCartellini" msprop:Generator_RelationVarName="relationFK_Attr2UDC_ElencoCartellini" msprop:Generator_UserParentTable="ElencoCartellini" msprop:Generator_ParentPropName="ElencoCartelliniRow" />
-      <msdata:Relationship name="FK_AL2UDC_ElencoAssiemi" msdata:parent="ElencoAssiemi" msdata:child="AL2UDC" msdata:parentkey="AL" msdata:childkey="AL" msprop:Generator_UserChildTable="AL2UDC" msprop:Generator_ChildPropName="GetAL2UDCRows" msprop:Generator_UserRelationName="FK_AL2UDC_ElencoAssiemi" msprop:Generator_RelationVarName="relationFK_AL2UDC_ElencoAssiemi" msprop:Generator_UserParentTable="ElencoAssiemi" msprop:Generator_ParentPropName="ElencoAssiemiRow" />
-      <msdata:Relationship name="FK_AL2UDC_ElencoCartellini" msdata:parent="ElencoCartellini" msdata:child="AL2UDC" msdata:parentkey="UDC" msdata:childkey="UDC" msprop:Generator_UserChildTable="AL2UDC" msprop:Generator_ChildPropName="GetAL2UDCRows" msprop:Generator_UserRelationName="FK_AL2UDC_ElencoCartellini" msprop:Generator_RelationVarName="relationFK_AL2UDC_ElencoCartellini" msprop:Generator_UserParentTable="ElencoCartellini" msprop:Generator_ParentPropName="ElencoCartelliniRow" />
+      <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" />
+      <msdata:Relationship name="FK_Attr2UDC_ElencoCartellini" msdata:parent="ElencoCartellini" msdata:child="Attr2UDC" msdata:parentkey="UDC" msdata:childkey="UDC" msprop:Generator_UserChildTable="Attr2UDC" msprop:Generator_ChildPropName="GetAttr2UDCRows" msprop:Generator_UserRelationName="FK_Attr2UDC_ElencoCartellini" msprop:Generator_ParentPropName="ElencoCartelliniRow" msprop:Generator_RelationVarName="relationFK_Attr2UDC_ElencoCartellini" msprop:Generator_UserParentTable="ElencoCartellini" />
+      <msdata:Relationship name="FK_AL2UDC_ElencoAssiemi" msdata:parent="ElencoAssiemi" msdata:child="AL2UDC" msdata:parentkey="AL" msdata:childkey="AL" msprop:Generator_UserChildTable="AL2UDC" msprop:Generator_ChildPropName="GetAL2UDCRows" msprop:Generator_UserRelationName="FK_AL2UDC_ElencoAssiemi" msprop:Generator_ParentPropName="ElencoAssiemiRow" msprop:Generator_RelationVarName="relationFK_AL2UDC_ElencoAssiemi" msprop:Generator_UserParentTable="ElencoAssiemi" />
+      <msdata:Relationship name="FK_AL2UDC_ElencoCartellini" msdata:parent="ElencoCartellini" msdata:child="AL2UDC" msdata:parentkey="UDC" msdata:childkey="UDC" msprop:Generator_UserChildTable="AL2UDC" msprop:Generator_ChildPropName="GetAL2UDCRows" msprop:Generator_UserRelationName="FK_AL2UDC_ElencoCartellini" msprop:Generator_ParentPropName="ElencoCartelliniRow" msprop:Generator_RelationVarName="relationFK_AL2UDC_ElencoCartellini" msprop:Generator_UserParentTable="ElencoCartellini" />
       <msdata:Relationship name="FK_ElencoTrattamenti_ElencoAssiemi" msdata:parent="ElencoAssiemi" msdata:child="ElencoTrattamenti" msdata:parentkey="AL" msdata:childkey="AL" msprop:Generator_UserChildTable="ElencoTrattamenti" msprop:Generator_ChildPropName="GetElencoTrattamentiRows" msprop:Generator_UserRelationName="FK_ElencoTrattamenti_ElencoAssiemi" msprop:Generator_ParentPropName="ElencoAssiemiRow" msprop:Generator_RelationVarName="relationFK_ElencoTrattamenti_ElencoAssiemi" msprop:Generator_UserParentTable="ElencoAssiemi" />
     </xs:appinfo>
   </xs:annotation>
diff --git a/GMW_data/DS_magazzino.xss b/GMW_data/DS_magazzino.xss
index df78a0f2..4253a900 100644
--- a/GMW_data/DS_magazzino.xss
+++ b/GMW_data/DS_magazzino.xss
@@ -4,9 +4,9 @@
      Changes to this file may cause incorrect behavior and will be lost if
      the code is regenerated.
 </autogenerated>-->
-<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-148" ViewPortY="-47" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-148" ViewPortY="550" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
-    <Shape ID="DesignTable:ElencoCartellini" ZOrder="2" X="87" Y="230" Height="495" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="368" />
+    <Shape ID="DesignTable:ElencoCartellini" ZOrder="5" X="87" Y="230" Height="495" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="368" />
     <Shape ID="DesignTable:AnagMag" ZOrder="25" X="1047" Y="389" Height="229" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
     <Shape ID="DesignTable:PosizioneUdcCorrente" ZOrder="22" X="409" Y="544" Height="286" Width="245" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
     <Shape ID="DesignTable:PosizioneUdcStorico" ZOrder="50" X="412" Y="310" Height="168" Width="257" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
@@ -40,8 +40,8 @@
     <Shape ID="DesignTable:Attr2UDC" ZOrder="11" X="85" Y="-9" Height="210" Width="200" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
     <Shape ID="DesignTable:ElencoAssiemi" ZOrder="1" X="-137" Y="550" Height="343" Width="207" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
     <Shape ID="DesignTable:AL2UDC" ZOrder="8" X="-138" Y="289" Height="210" Width="190" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
-    <Shape ID="DesignTable:ElencoTrattamenti" ZOrder="4" X="-138" Y="928" Height="267" Width="211" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
-    <Shape ID="DesignTable:v_A2U2D" ZOrder="3" X="-145" Y="1245" Height="210" Width="197" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
+    <Shape ID="DesignTable:ElencoTrattamenti" ZOrder="2" X="-138" Y="928" Height="343" Width="198" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
+    <Shape ID="DesignTable:v_A2U2D" ZOrder="4" X="-143" Y="1320" Height="210" Width="197" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
   </Shapes>
   <Connectors>
     <Connector ID="DesignRelation:FK_PosizioneUdcCorrente_ElencoCartellini" ZOrder="51" LineWidth="11">
@@ -220,7 +220,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_ElencoTrattamenti_ElencoAssiemi" ZOrder="5" LineWidth="11">
+    <Connector ID="DesignRelation:FK_ElencoTrattamenti_ElencoAssiemi" ZOrder="3" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>-47</X>
diff --git a/GMW_data/MagClass.cs b/GMW_data/MagClass.cs
index 59b3a9a0..ea3bd6d2 100644
--- a/GMW_data/MagClass.cs
+++ b/GMW_data/MagClass.cs
@@ -293,7 +293,7 @@ namespace GMW_data
         /// <param name="NumTratt">Numero Trattamento</param>
         /// <param name="Durezza">Durezza rilevata</param>
         /// <returns></returns>
-        public string creaAssociaAlTT(string SourceAL, tipoAL tipologia, string CodSoggetto, string note, string NumTratt, string Durezza)
+        public string creaAssociaAlTT(string SourceAL, tipoAL tipologia, string CodSoggetto, string note, string NumTratt, int Durezza)
         {
             // imposto valori default
             string TipoAL = "";