diff --git a/MP-MAG/MP-MAG.csproj b/MP-MAG/MP-MAG.csproj index b21c0956..29f8bc73 100644 --- a/MP-MAG/MP-MAG.csproj +++ b/MP-MAG/MP-MAG.csproj @@ -785,7 +785,9 @@ - + + PreserveNewest + @@ -852,15 +854,15 @@ - + Always - - + + Always - - + + Always - + diff --git a/MP-MAG/WebUserControls/cmp_elencoPedane.ascx b/MP-MAG/WebUserControls/cmp_elencoPedane.ascx index 5e5c228d..3dc000c6 100644 --- a/MP-MAG/WebUserControls/cmp_elencoPedane.ascx +++ b/MP-MAG/WebUserControls/cmp_elencoPedane.ascx @@ -13,7 +13,7 @@
- Report + Report
diff --git a/MP-TAB/WebUserControls/mod_ODL.ascx.cs b/MP-TAB/WebUserControls/mod_ODL.ascx.cs index fed7665a..5f7a7527 100644 --- a/MP-TAB/WebUserControls/mod_ODL.ascx.cs +++ b/MP-TAB/WebUserControls/mod_ODL.ascx.cs @@ -450,7 +450,9 @@ namespace MoonProTablet.WebUserControls // di default rendo abilitato / disabilitato tutto in base al valore "isEnabled" lbtShowSplitODL.Enabled = isEnabled && enableRiattrezzaggio; lbtSplitODL.Enabled = isEnabled; - chkCloseOdl.Enabled = isEnabled; + chkCloseOdl.Enabled = isEnabled && chkCloseOdlVal; + chkCloseOdl.Visible = showChkCloseOdlVal; + fixWCtrStatus(lbtShowSplitODL); fixWCtrStatus(lbtSplitODL); fixWCtrStatus(chkCloseOdl);