diff --git a/GMW/Web.config b/GMW/Web.config index c7010966..c1e95bc9 100644 --- a/GMW/Web.config +++ b/GMW/Web.config @@ -66,7 +66,7 @@ - + diff --git a/GMW/WebUserControls/mod_SterrTagOUT.ascx.cs b/GMW/WebUserControls/mod_SterrTagOUT.ascx.cs index b9063d78..38474db0 100644 --- a/GMW/WebUserControls/mod_SterrTagOUT.ascx.cs +++ b/GMW/WebUserControls/mod_SterrTagOUT.ascx.cs @@ -75,6 +75,7 @@ namespace GMW.WebUserControls fixStorico(); // imposto pos abilitata x cancellazione mod_storicoAzioniOperatore1.idxPosizione2del = memLayer.ML.confReadInt("IdxPosizioneSterrati"); + checkLinea(); } doChecks(); mod_storicoAzioniOperatore1.eh_stampa += new EventHandler(mod_storicoAzioniOperatore1_eh_stampa); @@ -178,7 +179,6 @@ namespace GMW.WebUserControls checkBarcode(); checkStampa(); checkParticolare(); - checkLinea(); } /// /// sistemo labels oggetti @@ -690,6 +690,7 @@ namespace GMW.WebUserControls { Response.Redirect("~/menu.aspx"); } + checkLinea(); doRefreshBloccoPost(); } /// diff --git a/GMW/WebUserControls/mod_lavMeccOUT.ascx.cs b/GMW/WebUserControls/mod_lavMeccOUT.ascx.cs index dbcfcc1a..c480b5b5 100644 --- a/GMW/WebUserControls/mod_lavMeccOUT.ascx.cs +++ b/GMW/WebUserControls/mod_lavMeccOUT.ascx.cs @@ -75,6 +75,7 @@ namespace GMW.WebUserControls fixStorico(); // imposto pos abilitata x cancellazione mod_storicoAzioniOperatore1.idxPosizione2del = memLayer.ML.confReadInt("IdxPosizioneFiniti"); + checkLinea(); } doChecks(); mod_storicoAzioniOperatore1.eh_stampa += new EventHandler(mod_storicoAzioniOperatore1_eh_stampa); @@ -178,7 +179,6 @@ namespace GMW.WebUserControls checkBarcode(); checkStampa(); checkParticolare(); - checkLinea(); } /// /// sistemo labels oggetti @@ -690,6 +690,7 @@ namespace GMW.WebUserControls { Response.Redirect("~/menu.aspx"); } + checkLinea(); doRefreshBloccoPost(); } /// diff --git a/GMW/bin/GMW.dll b/GMW/bin/GMW.dll index c9adda77..ab968ac1 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 57d3b39f..6efca4f0 100644 Binary files a/GMW/bin/GMW_data.dll and b/GMW/bin/GMW_data.dll differ diff --git a/ReleaseClienti/TK_prod/GMW.zip b/ReleaseClienti/TK_prod/GMW.zip index 9dfc1f8d..2a408336 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 5d3e3c69..e148c7d7 100644 Binary files a/ReleaseClienti/TK_test/GMW.zip and b/ReleaseClienti/TK_test/GMW.zip differ