diff --git a/GMW/WebUserControls/mod_PostLiq_DT.ascx.cs b/GMW/WebUserControls/mod_PostLiq_DT.ascx.cs
index 8927f8b9..6a71e6e1 100644
--- a/GMW/WebUserControls/mod_PostLiq_DT.ascx.cs
+++ b/GMW/WebUserControls/mod_PostLiq_DT.ascx.cs
@@ -392,6 +392,43 @@ namespace GMW.WebUserControls
                             doReset();
                         }
                         break;
+                    case tipoCodiceBarcode.UDC:
+                        // controllo se sia un UDC valido...
+                        if (MagClass.magazzino.checkUDC(barcodeIn))
+                        {
+                            // controllo se sia un UDC di finiti LIQ in posizione 4...
+                            DS_magazzino.ElencoCartelliniRow cartUDC = MagClass.magazzino.taCartellini.getByUdc(barcodeIn)[0];
+                            if (cartUDC.CodStato == statoUdcOut && cartUDC.IdxPosizione == memLayer.ML.confReadInt("IdxPosizioneFiniti"))
+                            {
+                                // se è ok RICARICO UDC in posizione corrente...
+                                bool fatto = MagClass.magazzino.liquidiRiprendiInCaricoUDC(barcodeIn, MagClass.magazzino.CodSoggCurrUser, "ALF00" + Postazione.currCodCella, Postazione.currIdxCella);
+                                if (fatto)
+                                {
+                                    Postazione.messaggiText = traduci("RiCaricatoUdcLiq");
+                                    Postazione.warningText = "";
+                                    Postazione.CssClass = "stileComandoOk";
+                                }
+                                else
+                                {
+                                    Postazione.messaggiText = "";
+                                    Postazione.warningText = traduci("ERR-LIQ-001");
+                                    Postazione.CssClass = "stileComandoKo";
+                                }
+                            }
+                            else
+                            {
+                                Postazione.messaggiText = "";
+                                Postazione.warningText = traduci("ERR-LIQ-002");
+                                Postazione.CssClass = "stileComandoKo";
+                            }
+                        }
+                        else
+                        {
+                            Postazione.messaggiText = "";
+                            Postazione.warningText = traduci("ERR-LIQ-003");
+                            Postazione.CssClass = "stileComandoKo";
+                        }
+                        break;
                     case tipoCodiceBarcode.AL:
                         // se linea libera...
                         if (currAL == "")
diff --git a/GMW/WebUserControls/mod_PostTT.ascx b/GMW/WebUserControls/mod_PostTT.ascx
index 794c5510..d7aa69a5 100644
--- a/GMW/WebUserControls/mod_PostTT.ascx
+++ b/GMW/WebUserControls/mod_PostTT.ascx
@@ -92,7 +92,7 @@
                 </div>
             </div>
         </div>
-         <div id="div1" runat="server" class="panel panel-primary panel-sm">
+         <div id="divPunzone" runat="server" class="panel panel-primary panel-sm">
             <div class="panel-heading">
                 <b><%: traduci("CodPunzone") %></b>
             </div>
diff --git a/GMW/WebUserControls/mod_PostTT.ascx.cs b/GMW/WebUserControls/mod_PostTT.ascx.cs
index 6462d948..d9c752b8 100644
--- a/GMW/WebUserControls/mod_PostTT.ascx.cs
+++ b/GMW/WebUserControls/mod_PostTT.ascx.cs
@@ -322,6 +322,7 @@ namespace GMW.WebUserControls
             bool btnVis = (sourceAL != "");
             divNumTratt.Visible = btnVis;
             divDurezza.Visible = btnVis;
+            divPunzone.Visible = btnVis;
             // posso stampare se ho AL, ho num tratt e durezza..
             btnVis = (sourceAL != "" && NumTratt != "" && Durezza);
             divStampa.Visible = btnVis;
@@ -396,6 +397,21 @@ namespace GMW.WebUserControls
         /// <param name="e"></param>
         protected void txtNumTratt_TextChanged(object sender, EventArgs e)
         {
+            // controllo numero trattamento...
+            string codTratt = MagClass.magazzino.getCompTrattamenti(AnnoTratt, NumTratt);
+            // cerco se ci sia già (do errore...)
+            if (MagClass.magazzino.taET.getByTratt(codTratt).Rows.Count > 0)
+            {
+                Postazione.warningText = traduci("ERR-NTT-001");
+                Postazione.CssClass = "stileComandoKo";
+                NumTratt = "";
+            }
+            else
+            {
+                Postazione.warningText = "";
+                Postazione.CssClass = "stileComandoOk";
+            }
+            Postazione.messaggiText = codTratt;
             doUpdate();
         }
         /// <summary>
diff --git a/GMW/WebUserControls/mod_PostTT.ascx.designer.cs b/GMW/WebUserControls/mod_PostTT.ascx.designer.cs
index 7dfb74af..17700de6 100644
--- a/GMW/WebUserControls/mod_PostTT.ascx.designer.cs
+++ b/GMW/WebUserControls/mod_PostTT.ascx.designer.cs
@@ -157,13 +157,13 @@ namespace GMW.WebUserControls {
         protected global::System.Web.UI.WebControls.CheckBox chkDurezza;
         
         /// <summary>
-        /// div1 control.
+        /// divPunzone control.
         /// </summary>
         /// <remarks>
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl div1;
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl divPunzone;
         
         /// <summary>
         /// txtPunzone control.
diff --git a/GMW/bin/GMW.dll b/GMW/bin/GMW.dll
index 12436bd2..61b561e2 100644
Binary files a/GMW/bin/GMW.dll and b/GMW/bin/GMW.dll differ
diff --git a/GMW/bin/GMW_data.dll b/GMW/bin/GMW_data.dll
index 2c7d9d1d..2452a9f7 100644
Binary files a/GMW/bin/GMW_data.dll and b/GMW/bin/GMW_data.dll differ
diff --git a/GMW/bin/SteamWare.dll b/GMW/bin/SteamWare.dll
index 3a3270e0..892a11a4 100644
Binary files a/GMW/bin/SteamWare.dll and b/GMW/bin/SteamWare.dll differ
diff --git a/GMW/bin/VersGen.dll b/GMW/bin/VersGen.dll
index 898627d7..586c1591 100644
Binary files a/GMW/bin/VersGen.dll and b/GMW/bin/VersGen.dll differ
diff --git a/GMW_data/DS_magazzino.Designer.cs b/GMW_data/DS_magazzino.Designer.cs
index d5559bf5..1b40eacf 100644
--- a/GMW_data/DS_magazzino.Designer.cs
+++ b/GMW_data/DS_magazzino.Designer.cs
@@ -23055,7 +23055,7 @@ SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, Disegno
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
         private void InitCommandCollection() {
-            this._commandCollection = new global::System.Data.SqlClient.SqlCommand[17];
+            this._commandCollection = new global::System.Data.SqlClient.SqlCommand[18];
             this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[0].Connection = this.Connection;
             this._commandCollection[0].CommandText = "SELECT *\r\nFROM dbo.ElencoCartellini";
@@ -23163,30 +23163,40 @@ SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, Disegno
             this._commandCollection[13].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodSoggetto", global::System.Data.SqlDbType.NVarChar, 17, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[14] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[14].Connection = this.Connection;
-            this._commandCollection[14].CommandText = "dbo.stp_UDC_updateIdxPosizione";
+            this._commandCollection[14].CommandText = "dbo.stp_UDC_Liq_Ricarica";
             this._commandCollection[14].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[14].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[14].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UDC", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[14].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxPosizione", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[14].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxCellaTo", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[14].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@tempAL", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[14].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataOra", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[14].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodSoggetto", global::System.Data.SqlDbType.NVarChar, 17, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[15] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[15].Connection = this.Connection;
-            this._commandCollection[15].CommandText = "dbo.stp_UDC_updateNote";
+            this._commandCollection[15].CommandText = "dbo.stp_UDC_updateIdxPosizione";
             this._commandCollection[15].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[15].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[15].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UDC", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[15].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[15].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UDC", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[15].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxPosizione", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[15].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodSoggetto", global::System.Data.SqlDbType.NVarChar, 17, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[16] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[16].Connection = this.Connection;
-            this._commandCollection[16].CommandText = "dbo.stp_UDC_updateQty";
+            this._commandCollection[16].CommandText = "dbo.stp_UDC_updateNote";
             this._commandCollection[16].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[16].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[16].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UDC", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[16].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[16].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodTipoDichiaraz", global::System.Data.SqlDbType.Char, 1, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[16].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodEvento", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[16].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Qta", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 10, 2, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[16].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UDC", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[16].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[16].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodSoggetto", global::System.Data.SqlDbType.NVarChar, 17, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[17] = new global::System.Data.SqlClient.SqlCommand();
+            this._commandCollection[17].Connection = this.Connection;
+            this._commandCollection[17].CommandText = "dbo.stp_UDC_updateQty";
+            this._commandCollection[17].CommandType = global::System.Data.CommandType.StoredProcedure;
+            this._commandCollection[17].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[17].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UDC", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[17].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[17].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodTipoDichiaraz", global::System.Data.SqlDbType.Char, 1, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[17].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodEvento", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[17].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Qta", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 10, 2, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
         }
         
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -23512,7 +23522,7 @@ SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, Disegno
         [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.Select, false)]
-        public virtual DS_magazzino.ElencoCartelliniDataTable updateIdxPosizione(string UDC, global::System.Nullable<int> IdxPosizione, string CodSoggetto) {
+        public virtual DS_magazzino.ElencoCartelliniDataTable UdcLiqRicarica(string UDC, global::System.Nullable<int> idxCellaTo, string tempAL, global::System.Nullable<global::System.DateTime> DataOra, string CodSoggetto) {
             this.Adapter.SelectCommand = this.CommandCollection[14];
             if ((UDC == null)) {
                 this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
@@ -23520,6 +23530,47 @@ SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, Disegno
             else {
                 this.Adapter.SelectCommand.Parameters[1].Value = ((string)(UDC));
             }
+            if ((idxCellaTo.HasValue == true)) {
+                this.Adapter.SelectCommand.Parameters[2].Value = ((int)(idxCellaTo.Value));
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value;
+            }
+            if ((tempAL == null)) {
+                this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[3].Value = ((string)(tempAL));
+            }
+            if ((DataOra.HasValue == true)) {
+                this.Adapter.SelectCommand.Parameters[4].Value = ((System.DateTime)(DataOra.Value));
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[4].Value = global::System.DBNull.Value;
+            }
+            if ((CodSoggetto == null)) {
+                this.Adapter.SelectCommand.Parameters[5].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[5].Value = ((string)(CodSoggetto));
+            }
+            DS_magazzino.ElencoCartelliniDataTable dataTable = new DS_magazzino.ElencoCartelliniDataTable();
+            this.Adapter.Fill(dataTable);
+            return dataTable;
+        }
+        
+        [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")]
+        [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
+        public virtual DS_magazzino.ElencoCartelliniDataTable updateIdxPosizione(string UDC, global::System.Nullable<int> IdxPosizione, string CodSoggetto) {
+            this.Adapter.SelectCommand = this.CommandCollection[15];
+            if ((UDC == null)) {
+                this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[1].Value = ((string)(UDC));
+            }
             if ((IdxPosizione.HasValue == true)) {
                 this.Adapter.SelectCommand.Parameters[2].Value = ((int)(IdxPosizione.Value));
             }
@@ -23542,7 +23593,7 @@ SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, Disegno
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
         public virtual DS_magazzino.ElencoCartelliniDataTable updateQty(string UDC, string CodSoggetto, string CodTipoDichiaraz, string CodEvento, global::System.Nullable<decimal> Qta) {
-            this.Adapter.SelectCommand = this.CommandCollection[16];
+            this.Adapter.SelectCommand = this.CommandCollection[17];
             if ((UDC == null)) {
                 this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
             }
@@ -24647,7 +24698,7 @@ SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, Disegno
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         public virtual int updateNote(string UDC, string note, string CodSoggetto) {
-            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[15];
+            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[16];
             if ((UDC == null)) {
                 command.Parameters[1].Value = global::System.DBNull.Value;
             }
diff --git a/GMW_data/DS_magazzino.xsd b/GMW_data/DS_magazzino.xsd
index 1b967037..b7e1e69b 100644
--- a/GMW_data/DS_magazzino.xsd
+++ b/GMW_data/DS_magazzino.xsd
@@ -391,6 +391,21 @@ SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, Disegno
                   </DbCommand>
                 </SelectCommand>
               </DbSource>
+              <DbSource ConnectionRef="GMWConnectionString (Settings)" DbObjectName="GMW.dbo.stp_UDC_Liq_Ricarica" DbObjectType="StoredProcedure" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="UdcLiqRicarica" GetMethodModifier="Public" GetMethodName="UdcLiqRicarica" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="UdcLiqRicarica" UserSourceName="UdcLiqRicarica">
+                <SelectCommand>
+                  <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
+                    <CommandText>dbo.stp_UDC_Liq_Ricarica</CommandText>
+                    <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="@UDC" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idxCellaTo" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="varchar" DbType="AnsiString" Direction="Input" ParameterName="@tempAL" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@DataOra" Precision="23" ProviderType="DateTime" Scale="3" Size="8" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@CodSoggetto" Precision="0" ProviderType="NVarChar" Scale="0" Size="17" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
               <DbSource ConnectionRef="GMWConnectionString (Settings)" DbObjectName="SP_GMWTest.dbo.stp_UDC_updateIdxPosizione" DbObjectType="StoredProcedure" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="updateIdxPosizione" GetMethodModifier="Public" GetMethodName="updateIdxPosizione" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="updateIdxPosizione" UserSourceName="updateIdxPosizione">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
@@ -5184,7 +5199,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur,
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <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: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: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" />
@@ -5241,7 +5256,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur,
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <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: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: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" />
@@ -5273,7 +5288,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur,
             </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_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: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:complexType>
             <xs:sequence>
               <xs:element name="UDC" msprop:Generator_ColumnVarNameInTable="columnUDC" msprop:Generator_ColumnPropNameInRow="UDC" msprop:Generator_ColumnPropNameInTable="UDCColumn" msprop:Generator_UserColumnName="UDC">
@@ -5295,7 +5310,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur,
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <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: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:complexType>
             <xs:sequence>
               <xs:element name="codPostazione" msprop:Generator_ColumnVarNameInTable="columncodPostazione" msprop:Generator_ColumnPropNameInRow="codPostazione" msprop:Generator_ColumnPropNameInTable="codPostazioneColumn" msprop:Generator_UserColumnName="codPostazione">
@@ -5322,7 +5337,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur,
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <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: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:complexType>
             <xs:sequence>
               <xs:element name="CodLinea" msprop:Generator_ColumnVarNameInTable="columnCodLinea" msprop:Generator_ColumnPropNameInRow="CodLinea" msprop:Generator_ColumnPropNameInTable="CodLineaColumn" msprop:Generator_UserColumnName="CodLinea">
@@ -5371,14 +5386,14 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur,
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <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: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: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_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: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: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" />
@@ -5414,7 +5429,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur,
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <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: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:complexType>
             <xs:sequence>
               <xs:element name="AL" msprop:Generator_ColumnVarNameInTable="columnAL" msprop:Generator_ColumnPropNameInRow="AL" msprop:Generator_ColumnPropNameInTable="ALColumn" msprop:Generator_UserColumnName="AL">
@@ -5471,7 +5486,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur,
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <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: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:complexType>
             <xs:sequence>
               <xs:element name="AL" msprop:Generator_ColumnVarNameInTable="columnAL" msprop:Generator_ColumnPropNameInRow="AL" msprop:Generator_ColumnPropNameInTable="ALColumn" msprop:Generator_UserColumnName="AL">
@@ -5499,7 +5514,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur,
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <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: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:complexType>
             <xs:sequence>
               <xs:element name="Trattamento" msprop:Generator_ColumnVarNameInTable="columnTrattamento" msprop:Generator_ColumnPropNameInRow="Trattamento" msprop:Generator_ColumnPropNameInTable="TrattamentoColumn" msprop:Generator_UserColumnName="Trattamento">
@@ -5546,7 +5561,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur,
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <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: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:complexType>
             <xs:sequence>
               <xs:element name="AL" msprop:Generator_ColumnVarNameInTable="columnAL" msprop:Generator_ColumnPropNameInRow="AL" msprop:Generator_ColumnPropNameInTable="ALColumn" msprop:Generator_UserColumnName="AL">
@@ -5740,21 +5755,21 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur,
   </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_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" />
+      <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_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_RelationVarName="relationFK_ElencoTrattamenti_ElencoAssiemi" msprop:Generator_UserParentTable="ElencoAssiemi" msprop:Generator_ParentPropName="ElencoAssiemiRow" />
     </xs:appinfo>
   </xs:annotation>
 </xs:schema>
\ No newline at end of file
diff --git a/GMW_data/DS_magazzino.xss b/GMW_data/DS_magazzino.xss
index 7dcbf23a..12080cfe 100644
--- a/GMW_data/DS_magazzino.xss
+++ b/GMW_data/DS_magazzino.xss
@@ -6,7 +6,7 @@
 </autogenerated>-->
 <DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-153" ViewPortY="-47" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
-    <Shape ID="DesignTable:ElencoCartellini" ZOrder="6" X="87" Y="230" Height="495" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="368" />
+    <Shape ID="DesignTable:ElencoCartellini" ZOrder="1" 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" />
@@ -38,10 +38,10 @@
     <Shape ID="DesignTable:AnagLinee" ZOrder="16" X="1119" Y="2077" Height="362" Width="240" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
     <Shape ID="DesignTable:stp_ParticolareInOutOk" ZOrder="15" X="474" Y="2283" Height="96" Width="199" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="46" />
     <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="209" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
-    <Shape ID="DesignTable:AL2UDC" ZOrder="3" X="-138" Y="289" Height="210" Width="190" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
-    <Shape ID="DesignTable:ElencoTrattamenti" ZOrder="2" X="-138" Y="928" Height="362" Width="217" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
-    <Shape ID="DesignTable:v_A2U2D" ZOrder="5" X="-143" Y="1320" Height="210" Width="197" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
+    <Shape ID="DesignTable:ElencoAssiemi" ZOrder="2" X="-137" Y="550" Height="343" Width="209" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
+    <Shape ID="DesignTable:AL2UDC" ZOrder="4" X="-138" Y="289" Height="210" Width="190" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
+    <Shape ID="DesignTable:ElencoTrattamenti" ZOrder="3" X="-138" Y="928" Height="362" Width="217" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
+    <Shape ID="DesignTable:v_A2U2D" ZOrder="6" 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="4" LineWidth="11">
+    <Connector ID="DesignRelation:FK_ElencoTrattamenti_ElencoAssiemi" ZOrder="5" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>-47</X>
diff --git a/GMW_data/MagClass.cs b/GMW_data/MagClass.cs
index 1660e74f..c0ab79cd 100644
--- a/GMW_data/MagClass.cs
+++ b/GMW_data/MagClass.cs
@@ -374,7 +374,7 @@ namespace GMW_data
             {
                 taEA.eliminaEmpty(AL, DateTime.Now, CodSoggetto);
             }
-            catch(Exception exc)
+            catch (Exception exc)
             {
                 logger.lg.scriviLog(string.Format("Errore in eliminazione AL non vuoto: {0}{1}", Environment.NewLine, exc), tipoLog.EXCEPTION);
             }
@@ -613,7 +613,7 @@ namespace GMW_data
             return answ;
         }
         /// <summary>
-        /// Sistema il cartellino finito liquidi
+        /// Sistema il cartellino finito liquidi per la stampa
         /// </summary>
         /// <param name="SourceAL">AL sorgente in postazione (ATL)</param>
         /// <param name="TipoAlAnc">Tipo cart da legare (TT)</param>
@@ -634,6 +634,26 @@ namespace GMW_data
             return answ;
         }
         /// <summary>
+        /// Riprende in carico alla psotazioen un cartellino liquidi FINITO valido
+        /// </summary>
+        /// <param name="UDC">Cod UDC da processare</param>
+        /// <param name="CodSoggetto">Cod soggetto</param>
+        /// <param name="tempAL">AL (temporaneo) di destinazione</param>
+        /// <param name="idxCella">Cod cella di destinazione</param>
+        /// <returns></returns>
+        public bool liquidiRiprendiInCaricoUDC(string UDC, string CodSoggetto, string tempAL, int idxCella)
+        {
+            bool answ = false;
+            try
+            {
+                DS_magazzino.ElencoCartelliniRow riga = taCartellini.UdcLiqRicarica(UDC, idxCella, tempAL, DateTime.Now, CodSoggetto)[0];
+                answ = true;
+            }
+            catch
+            { }
+            return answ;
+        }
+        /// <summary>
         /// verifica se l'UDC indicato sia valido, ovvero esistente
         /// </summary>
         /// <param name="UDC"></param>
diff --git a/VersGen/GMW.cs b/VersGen/GMW.cs
index f3324897..68e369de 100644
--- a/VersGen/GMW.cs
+++ b/VersGen/GMW.cs
@@ -5,7 +5,7 @@
 
 using System.Reflection;
 
-[assembly: AssemblyVersion("2.5.650.1552")]
-[assembly: AssemblyFileVersion("2.5.650.1552")]
+[assembly: AssemblyVersion("2.5.651.1552")]
+[assembly: AssemblyFileVersion("2.5.651.1552")]
 //[assembly: AssemblyCopyright("© Steamware 2007-2014")]
 //[assembly: AssemblyCompany("Steamware")]
diff --git a/VersGen/GMW.tt b/VersGen/GMW.tt
index b4cd6493..3e46a5f5 100644
--- a/VersGen/GMW.tt
+++ b/VersGen/GMW.tt
@@ -6,8 +6,8 @@
 
 using System.Reflection;
 
-[assembly: AssemblyVersion("2.5.650.<#= this.RevisionNumber #>")]
-[assembly: AssemblyFileVersion("2.5.650.<#= this.RevisionNumber #>")]
+[assembly: AssemblyVersion("2.5.651.<#= this.RevisionNumber #>")]
+[assembly: AssemblyFileVersion("2.5.651.<#= this.RevisionNumber #>")]
 //[assembly: AssemblyCopyright("© Steamware 2007-<#= DateTime.Now.Year #>")]
 //[assembly: AssemblyCompany("Steamware")]
 <#+