diff --git a/GMW-RT/bin/GMW-RT.dll b/GMW-RT/bin/GMW-RT.dll
index 0d3acbef..83fd0e7e 100644
Binary files a/GMW-RT/bin/GMW-RT.dll and b/GMW-RT/bin/GMW-RT.dll differ
diff --git a/GMW-RT/bin/GMW_data.dll b/GMW-RT/bin/GMW_data.dll
index 30eeafce..44a788b8 100644
Binary files a/GMW-RT/bin/GMW_data.dll and b/GMW-RT/bin/GMW_data.dll differ
diff --git a/GMW-UT/bin/GMW-UT.dll b/GMW-UT/bin/GMW-UT.dll
index 7d7c2ddd..8df12cd4 100644
Binary files a/GMW-UT/bin/GMW-UT.dll and b/GMW-UT/bin/GMW-UT.dll differ
diff --git a/GMW-UT/bin/GMW_data.dll b/GMW-UT/bin/GMW_data.dll
index 30eeafce..44a788b8 100644
Binary files a/GMW-UT/bin/GMW_data.dll and b/GMW-UT/bin/GMW_data.dll differ
diff --git a/GMW/POST_FinitiMult_IN.aspx b/GMW/POST_FinitiMult_IN.aspx
index e2e1a46a..86c012cb 100644
--- a/GMW/POST_FinitiMult_IN.aspx
+++ b/GMW/POST_FinitiMult_IN.aspx
@@ -10,7 +10,7 @@
 <asp:Content ID="Content2" ContentPlaceHolderID="FeaturedContent" runat="server">
 </asp:Content>
 <asp:Content ID="Content3" ContentPlaceHolderID="MCon" runat="server">
-    <uc1:mod_selLineaNtDt ID="mod_selLineaNtDt1" runat="server" urlNT="POST_FinitiMult_IN" urlDT="POST_FinitiMult_OUT" tipoInOut="I" preCodLineNT="W25" preCodLineDT="W25" preCodLinea="W25" CodFamLinea="LFM" cssNormal="btn btn-default btn-lg" cssSelected="btn btn-primary btn-lg active" showSelNtDt="true" lemmaSx="Ingresso" lemmaDx="Uscita" cssBtnSx="glyphicon glyphicon-import" cssBtnDx="glyphicon glyphicon-export" />
+    <uc1:mod_selLineaNtDt ID="mod_selLineaNtDt1" runat="server" urlNT="POST_FinitiMult_IN" urlDT="POST_FinitiMult_OUT" tipoInOut="I" preCodLineNT="W25" preCodLineDT="W25" preCodLinea="W25" CodFamLinea="LFM" resetPostByBlocco="false" cssNormal="btn btn-default btn-lg" cssSelected="btn btn-primary btn-lg active" showSelNtDt="true" lemmaSx="Ingresso" lemmaDx="Uscita" cssBtnSx="glyphicon glyphicon-import" cssBtnDx="glyphicon glyphicon-export" />
     <asp:Panel runat="server" ID="pnlAll" CssClass="stileAttesa">
         <div class="container-fluid">
             <asp:Panel ID="pnlSAO" runat="server" ScrollBars="None" CssClass="nav sidebar ombra" BackColor="#696969">
diff --git a/GMW/POST_FinitiMult_IN.aspx.designer.cs b/GMW/POST_FinitiMult_IN.aspx.designer.cs
index 9722f0c5..2057ad6b 100644
--- a/GMW/POST_FinitiMult_IN.aspx.designer.cs
+++ b/GMW/POST_FinitiMult_IN.aspx.designer.cs
@@ -12,15 +12,6 @@ namespace GMW {
     
     public partial class POST_FinitiMult_IN {
         
-        /// <summary>
-        /// dlSelCodBlocco 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.DropDownList dlSelCodBlocco;
-        
         /// <summary>
         /// mod_selLineaNtDt1 control.
         /// </summary>
diff --git a/GMW/POST_FinitiMult_OUT.aspx b/GMW/POST_FinitiMult_OUT.aspx
index a2da4c28..3faac56f 100644
--- a/GMW/POST_FinitiMult_OUT.aspx
+++ b/GMW/POST_FinitiMult_OUT.aspx
@@ -10,7 +10,7 @@
 <asp:Content ID="Content2" ContentPlaceHolderID="FeaturedContent" runat="server">
 </asp:Content>
 <asp:Content ID="Content3" ContentPlaceHolderID="MCon" runat="server">
-    <uc1:mod_selLineaNtDt ID="mod_selLineaNtDt1" runat="server" urlNT="POST_FinitiMult_IN" urlDT="POST_FinitiMult_OUT" tipoInOut="O" preCodLineNT="W25" preCodLineDT="W25" CodFamLinea="LFM" cssNormal="btn btn-default btn-lg" cssSelected="btn btn-primary btn-lg active" showSelNtDt="true" lemmaSx="Ingresso" lemmaDx="Uscita" cssBtnSx="glyphicon glyphicon-import" cssBtnDx="glyphicon glyphicon-export" />
+    <uc1:mod_selLineaNtDt ID="mod_selLineaNtDt1" runat="server" urlNT="POST_FinitiMult_IN" urlDT="POST_FinitiMult_OUT" tipoInOut="O" preCodLineNT="W25" preCodLineDT="W25" CodFamLinea="LFM" resetPostByBlocco="false" cssNormal="btn btn-default btn-lg" cssSelected="btn btn-primary btn-lg active" showSelNtDt="true" lemmaSx="Ingresso" lemmaDx="Uscita" cssBtnSx="glyphicon glyphicon-import" cssBtnDx="glyphicon glyphicon-export" />
     <asp:Panel runat="server" ID="pnlAll" CssClass="stileAttesa">
         <div class="container-fluid">
             <asp:Panel ID="pnlSAO" runat="server" ScrollBars="None" CssClass="nav sidebar ombra" BackColor="#696969">
diff --git a/GMW/POST_FinitiMult_OUT.aspx.cs b/GMW/POST_FinitiMult_OUT.aspx.cs
index 23dd5769..96ad1601 100644
--- a/GMW/POST_FinitiMult_OUT.aspx.cs
+++ b/GMW/POST_FinitiMult_OUT.aspx.cs
@@ -42,7 +42,13 @@ namespace GMW
         private void setTempiAttr()
         {
             // imposto tempi MIN/MAX attraversamento CERCANDO riga puntuale
-            DS_magazzino.AnagLineeRow riga = MagClass.magazzino.taAL.getByKey(Postazione.currCodLinea)[0];
+            DS_magazzino.AnagLineeRow riga = null;
+            try
+            {
+                riga = MagClass.magazzino.taAL.getByKey(Postazione.currCodLinea)[0];
+            }
+            catch
+            { }
             if (riga != null)
             {
                 mod_PostFinMultOUT.minTime = riga.minTime;
diff --git a/GMW/POST_Finiti_IN.aspx b/GMW/POST_Finiti_IN.aspx
index c0dc2ffd..a2695767 100644
--- a/GMW/POST_Finiti_IN.aspx
+++ b/GMW/POST_Finiti_IN.aspx
@@ -22,7 +22,7 @@
             </asp:ObjectDataSource>
         </div>
     </div>
-    <uc1:mod_selLineaNtDt ID="mod_selLineaNtDt1" runat="server" urlNT="POST_Finiti_IN" urlDT="POST_Finiti_OUT" tipoInOut="I" CodFamLinea="FIO" cssNormal="btn btn-default btn-lg" cssSelected="btn btn-primary btn-lg active" showSelNtDt="true" lemmaSx="Ingresso" lemmaDx="Uscita" cssBtnSx="glyphicon glyphicon-import" cssBtnDx="glyphicon glyphicon-export" />
+    <uc1:mod_selLineaNtDt ID="mod_selLineaNtDt1" runat="server" urlNT="POST_Finiti_IN" urlDT="POST_Finiti_OUT" tipoInOut="I" CodFamLinea="FIO" resetPostByBlocco="false" cssNormal="btn btn-default btn-lg" cssSelected="btn btn-primary btn-lg active" showSelNtDt="true" lemmaSx="Ingresso" lemmaDx="Uscita" cssBtnSx="glyphicon glyphicon-import" cssBtnDx="glyphicon glyphicon-export" />
     <asp:Panel runat="server" ID="pnlAll" CssClass="stileAttesa">
         <div class="container-fluid">
             <asp:Panel ID="pnlSAO" runat="server" ScrollBars="None" CssClass="nav sidebar ombra" BackColor="#696969">
diff --git a/GMW/POST_Finiti_IN.aspx.cs b/GMW/POST_Finiti_IN.aspx.cs
index 9c2c79f3..0e831b5c 100644
--- a/GMW/POST_Finiti_IN.aspx.cs
+++ b/GMW/POST_Finiti_IN.aspx.cs
@@ -155,6 +155,7 @@ namespace GMW
         {
             // cambio codBlocco x selettore...
             mod_selLineaNtDt1.preCodLineNT = dlSelCodBlocco.SelectedValue;
+            mod_selLineaNtDt1.preCodLineDT = dlSelCodBlocco.SelectedValue;
             mod_selLineaNtDt1.preCodLinea = dlSelCodBlocco.SelectedValue;
             mod_selLineaNtDt1.doUpdate();
         }
@@ -169,7 +170,7 @@ namespace GMW
                 string answ = "";
                 try
                 {
-                    answ = utils.obj.taRTPV.getByPageChiave(user_std.pagCorrente, "CodBlocco" + Postazione.IP)[0].valore;
+                    answ = utils.obj.taRTPV.getByPageChiave(user_std.pagCorrente, "CodBlocco_" + Postazione.IP)[0].valore;
                     //answ = utils.obj.taRTPV.getByPageChiave(user_std.pagCorrente, "CodBlocco" + Postazione.currCodLinea)[0].valore;
                 }
                 catch
@@ -182,7 +183,7 @@ namespace GMW
             }
             set
             {
-                utils.obj.taRTPV.upsert(user_std.pagCorrente, "CodBlocco" + Postazione.IP, value);
+                utils.obj.taRTPV.upsert(user_std.pagCorrente, "CodBlocco_" + Postazione.IP, value);
                 //dlSelCodBlocco.SelectedValue = value;
             }
         }
diff --git a/GMW/POST_Finiti_OUT.aspx b/GMW/POST_Finiti_OUT.aspx
index 4b04e4be..b0042fe8 100644
--- a/GMW/POST_Finiti_OUT.aspx
+++ b/GMW/POST_Finiti_OUT.aspx
@@ -22,7 +22,7 @@
             </asp:ObjectDataSource>
         </div>
     </div>
-    <uc1:mod_selLineaNtDt ID="mod_selLineaNtDt1" runat="server" urlNT="POST_Finiti_IN" urlDT="POST_Finiti_OUT" tipoInOut="O" CodFamLinea="FIO" cssNormal="btn btn-default btn-lg" cssSelected="btn btn-primary btn-lg active" showSelNtDt="true" lemmaSx="Ingresso" lemmaDx="Uscita" cssBtnSx="glyphicon glyphicon-import" cssBtnDx="glyphicon glyphicon-export" />
+    <uc1:mod_selLineaNtDt ID="mod_selLineaNtDt1" runat="server" urlNT="POST_Finiti_IN" urlDT="POST_Finiti_OUT" tipoInOut="O" CodFamLinea="FIO" resetPostByBlocco="false" cssNormal="btn btn-default btn-lg" cssSelected="btn btn-primary btn-lg active" showSelNtDt="true" lemmaSx="Ingresso" lemmaDx="Uscita" cssBtnSx="glyphicon glyphicon-import" cssBtnDx="glyphicon glyphicon-export" />
     <asp:Panel runat="server" ID="pnlAll" CssClass="stileAttesa">
         <div class="container-fluid">
             <asp:Panel ID="pnlSAO" runat="server" ScrollBars="None" CssClass="nav sidebar ombra" BackColor="#696969">
diff --git a/GMW/POST_Finiti_OUT.aspx.cs b/GMW/POST_Finiti_OUT.aspx.cs
index 45a603c1..b4ccacf5 100644
--- a/GMW/POST_Finiti_OUT.aspx.cs
+++ b/GMW/POST_Finiti_OUT.aspx.cs
@@ -38,7 +38,13 @@ namespace GMW
         private void setTempiAttr()
         {
             // imposto tempi MIN/MAX attraversamento CERCANDO riga puntuale
-            DS_magazzino.AnagLineeRow riga = MagClass.magazzino.taAL.getByKey(Postazione.currCodLinea)[0];
+            DS_magazzino.AnagLineeRow riga = null;
+            try
+            {
+                riga = MagClass.magazzino.taAL.getByKey(Postazione.currCodLinea)[0];
+            }
+            catch
+            { }
             if (riga != null)
             {
                 mod_PostFinMultOUT.minTime = riga.minTime;
@@ -170,6 +176,7 @@ namespace GMW
         private void refreshBloccoChild()
         {
             // cambio codBlocco x selettore...
+            mod_selLineaNtDt1.preCodLineNT = dlSelCodBlocco.SelectedValue;
             mod_selLineaNtDt1.preCodLineDT = dlSelCodBlocco.SelectedValue;
             mod_selLineaNtDt1.preCodLinea = dlSelCodBlocco.SelectedValue;
             mod_selLineaNtDt1.doUpdate();
@@ -185,7 +192,7 @@ namespace GMW
                 string answ = "";
                 try
                 {
-                    answ = utils.obj.taRTPV.getByPageChiave(user_std.pagCorrente, "CodBlocco" + Postazione.IP)[0].valore;
+                    answ = utils.obj.taRTPV.getByPageChiave(user_std.pagCorrente, "CodBlocco_" + Postazione.IP)[0].valore;
                     //answ = utils.obj.taRTPV.getByPageChiave(user_std.pagCorrente, "CodBlocco" + Postazione.currCodLinea)[0].valore;
                 }
                 catch
@@ -198,7 +205,7 @@ namespace GMW
             }
             set
             {
-                utils.obj.taRTPV.upsert(user_std.pagCorrente, "CodBlocco" + Postazione.IP, value);
+                utils.obj.taRTPV.upsert(user_std.pagCorrente, "CodBlocco_" + Postazione.IP, value);
                 //dlSelCodBlocco.SelectedValue = value;
             }
         }
diff --git a/GMW/POST_Finiti_OUT.aspx.designer.cs b/GMW/POST_Finiti_OUT.aspx.designer.cs
index ff76823d..a46fdbf1 100644
--- a/GMW/POST_Finiti_OUT.aspx.designer.cs
+++ b/GMW/POST_Finiti_OUT.aspx.designer.cs
@@ -21,6 +21,15 @@ namespace GMW {
         /// </remarks>
         protected global::System.Web.UI.WebControls.DropDownList dlSelCodBlocco;
         
+        /// <summary>
+        /// odsFamLinea 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.ObjectDataSource odsFamLinea;
+        
         /// <summary>
         /// mod_selLineaNtDt1 control.
         /// </summary>
diff --git a/GMW/WebUserControls/mod_selLineaNtDt.ascx b/GMW/WebUserControls/mod_selLineaNtDt.ascx
index dcbed8e9..e55ed803 100644
--- a/GMW/WebUserControls/mod_selLineaNtDt.ascx
+++ b/GMW/WebUserControls/mod_selLineaNtDt.ascx
@@ -21,6 +21,7 @@
             <asp:TextBox runat="server" ID="txtFormatoDmtx" Visible="false" />
             <asp:TextBox runat="server" ID="txtCodFam" Visible="false" />
             <asp:TextBox runat="server" ID="txtTipoInOut" Visible="false" />
+            <asp:TextBox runat="server" ID="txtResetBlocco" Visible="false" />
         </div>
         <div class="col-sm-4">
             <div id="divDtNt" runat="server" class="btn-group" style="width: 100%;">
diff --git a/GMW/WebUserControls/mod_selLineaNtDt.ascx.cs b/GMW/WebUserControls/mod_selLineaNtDt.ascx.cs
index d389ed61..be429c4d 100644
--- a/GMW/WebUserControls/mod_selLineaNtDt.ascx.cs
+++ b/GMW/WebUserControls/mod_selLineaNtDt.ascx.cs
@@ -165,8 +165,7 @@ namespace GMW.WebUserControls
             else
             {
                 // resetto uso postazione...
-                MagClass.magazzino.taAL.resetPostBlocco(Postazione.name, preCodLinea); // resetto solo x blocco!
-                //MagClass.magazzino.taAL.resetPost(Postazione.name);
+                resetPostazione();
             }
         }
         /// <summary>
@@ -268,6 +267,27 @@ namespace GMW.WebUserControls
             }
         }
         /// <summary>
+        /// determina se deve resettare SOLO BLOCCO o tutto (default=blocco)
+        /// </summary>
+        public bool resetPostByBlocco
+        {
+            get
+            {
+                bool answ = true;
+                try
+                {
+                    answ = Convert.ToBoolean(txtResetBlocco.Text);
+                }
+                catch
+                { }
+                return answ;
+            }
+            set
+            {
+                txtResetBlocco.Text = value.ToString();
+            }
+        }
+        /// <summary>
         /// valore per filtraggio selezione linee
         /// </summary>
         public string formatoDmtx
@@ -422,8 +442,7 @@ namespace GMW.WebUserControls
                         Postazione.currCodCella = "";
                         Postazione.currNomeLinea = "";
                         Postazione.currIdxCella = 0;
-                        MagClass.magazzino.taAL.resetPostBlocco(Postazione.name, preCodLinea); // resetto solo x blocco!
-                                                                                               //MagClass.magazzino.taAL.resetPost(Postazione.name);
+                        resetPostazione();
                     }
                 }
             }
@@ -432,8 +451,7 @@ namespace GMW.WebUserControls
                 Postazione.currCodCella = "";
                 Postazione.currNomeLinea = "";
                 Postazione.currIdxCella = 0;
-                MagClass.magazzino.taAL.resetPostBlocco(Postazione.name, preCodLinea); // resetto solo x blocco!
-                //MagClass.magazzino.taAL.resetPost(Postazione.name);
+                resetPostazione();
                 // mostro errore
                 Postazione.messaggiText = string.Format("Errore: linea {0} già impegnata, sbloccare postazione o attendere timeout!", codLinea);
                 Postazione.CssClass = "stileComandoKo";
@@ -445,6 +463,21 @@ namespace GMW.WebUserControls
                 eh_lineSelected(this, new EventArgs());
             }
         }
+        /// <summary>
+        /// Reset postazione occupata
+        /// </summary>
+        private void resetPostazione()
+        {
+            if (resetPostByBlocco)
+            {
+                MagClass.magazzino.taAL.resetPostBlocco(Postazione.name, preCodLinea); // resetto solo x blocco!
+            }
+            else
+            {
+                MagClass.magazzino.taAL.resetPost(Postazione.name);
+            }
+        }
+
         /// <summary>
         /// effettua refresh (su db) del blocco postazione
         /// </summary>
@@ -452,8 +485,7 @@ namespace GMW.WebUserControls
         public void refreshBloccoPost(string codLinea)
         {
             // resetto usi linee precedenti..
-            MagClass.magazzino.taAL.resetPostBlocco(Postazione.name, preCodLinea); // resetto solo x blocco!
-            //MagClass.magazzino.taAL.resetPost(Postazione.name);
+            resetPostazione();
             if (codLinea != "")
             {
                 // se la linea non è "base" = "Sel linea", finisce x "0"
diff --git a/GMW/WebUserControls/mod_selLineaNtDt.ascx.designer.cs b/GMW/WebUserControls/mod_selLineaNtDt.ascx.designer.cs
index 992aa7fb..f5eafed7 100644
--- a/GMW/WebUserControls/mod_selLineaNtDt.ascx.designer.cs
+++ b/GMW/WebUserControls/mod_selLineaNtDt.ascx.designer.cs
@@ -93,6 +93,15 @@ namespace GMW.WebUserControls {
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox txtTipoInOut;
         
+        /// <summary>
+        /// txtResetBlocco 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 txtResetBlocco;
+        
         /// <summary>
         /// divDtNt control.
         /// </summary>
diff --git a/GMW/bin/GMW.dll b/GMW/bin/GMW.dll
index fcb4286a..f505a4d1 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 30eeafce..44a788b8 100644
Binary files a/GMW/bin/GMW_data.dll and b/GMW/bin/GMW_data.dll differ
diff --git a/GMW/bin/VersGen.dll b/GMW/bin/VersGen.dll
index a0d1db01..0cdec64b 100644
Binary files a/GMW/bin/VersGen.dll and b/GMW/bin/VersGen.dll differ
diff --git a/ReleaseClienti/TK_prod/GMW.zip b/ReleaseClienti/TK_prod/GMW.zip
index 9a4885b1..d84bcac5 100644
Binary files a/ReleaseClienti/TK_prod/GMW.zip and b/ReleaseClienti/TK_prod/GMW.zip differ
diff --git a/ReleaseClienti/TK_test/GMW.zip b/ReleaseClienti/TK_test/GMW.zip
index 9b173017..91f62a5c 100644
Binary files a/ReleaseClienti/TK_test/GMW.zip and b/ReleaseClienti/TK_test/GMW.zip differ
diff --git a/VersGen/GMW.cs b/VersGen/GMW.cs
index 9628c27f..36833b0e 100644
--- a/VersGen/GMW.cs
+++ b/VersGen/GMW.cs
@@ -5,7 +5,7 @@
 
 using System.Reflection;
 
-[assembly: AssemblyVersion("3.5.913.2448")]
-[assembly: AssemblyFileVersion("3.5.913.2448")]
+[assembly: AssemblyVersion("3.5.914.2448")]
+[assembly: AssemblyFileVersion("3.5.914.2448")]
 [assembly: AssemblyCopyright("Steamware © 2007-2016")]
 [assembly: AssemblyCompany("Steamware")]
diff --git a/VersGen/GMW.tt b/VersGen/GMW.tt
index 9891140d..93e20bc1 100644
--- a/VersGen/GMW.tt
+++ b/VersGen/GMW.tt
@@ -6,8 +6,8 @@
 
 using System.Reflection;
 
-[assembly: AssemblyVersion("3.5.913.<#= this.RevisionNumber #>")]
-[assembly: AssemblyFileVersion("3.5.913.<#= this.RevisionNumber #>")]
+[assembly: AssemblyVersion("3.5.914.<#= this.RevisionNumber #>")]
+[assembly: AssemblyFileVersion("3.5.914.<#= this.RevisionNumber #>")]
 [assembly: AssemblyCopyright("Steamware © 2007-<#= DateTime.Now.Year #>")]
 [assembly: AssemblyCompany("Steamware")]
 <#+