diff --git a/CMS-SC-Data/bin/Debug/CMS-SC-Data.dll b/CMS-SC-Data/bin/Debug/CMS-SC-Data.dll index 7dd5f70..9e1453f 100644 Binary files a/CMS-SC-Data/bin/Debug/CMS-SC-Data.dll and b/CMS-SC-Data/bin/Debug/CMS-SC-Data.dll differ diff --git a/CMS-SC-Data/bin/Debug/SteamWare.dll b/CMS-SC-Data/bin/Debug/SteamWare.dll index f57518a..c25bdfe 100644 Binary files a/CMS-SC-Data/bin/Debug/SteamWare.dll and b/CMS-SC-Data/bin/Debug/SteamWare.dll differ diff --git a/CMS-SC-Data/obj/Debug/CMS-SC-Data.dll b/CMS-SC-Data/obj/Debug/CMS-SC-Data.dll index 7dd5f70..9e1453f 100644 Binary files a/CMS-SC-Data/obj/Debug/CMS-SC-Data.dll and b/CMS-SC-Data/obj/Debug/CMS-SC-Data.dll differ diff --git a/CMS_SC/SchemaCollFamMacc.aspx b/CMS_SC/SchemaCollFamMacc.aspx index ac70545..73fdce0 100644 --- a/CMS_SC/SchemaCollFamMacc.aspx +++ b/CMS_SC/SchemaCollFamMacc.aspx @@ -28,6 +28,8 @@
+
+ <%: traduci("SelectFM_CSV_2ins") %>
diff --git a/CMS_SC/SchemaCollFamMacc.aspx.cs b/CMS_SC/SchemaCollFamMacc.aspx.cs index c06557d..096a612 100644 --- a/CMS_SC/SchemaCollFamMacc.aspx.cs +++ b/CMS_SC/SchemaCollFamMacc.aspx.cs @@ -65,7 +65,8 @@ namespace CMS_SC memLayer.ML.setSessionVal("filtByScheda", chkFiltCodSchedaVers.Checked); mod_selFamMaccUrl.Visible = chkFilFamMacc.Checked; mod_selSchedaUrl.Visible = chkFiltCodSchedaVers.Checked; - btnAddNew.Visible = addNewEnabled; + btnAddNew.Enabled= addNewEnabled; + //btnAddNew.Visible = addNewEnabled; mod_SchemaCollFamMacc.doUpdate(); // mostro clona SE sto guardando una famiglia...! diff --git a/CMS_SC/SchemaCollFamMacc.aspx.designer.cs b/CMS_SC/SchemaCollFamMacc.aspx.designer.cs index 0dc1ef9..494627d 100644 --- a/CMS_SC/SchemaCollFamMacc.aspx.designer.cs +++ b/CMS_SC/SchemaCollFamMacc.aspx.designer.cs @@ -57,6 +57,15 @@ namespace CMS_SC { /// protected global::System.Web.UI.WebControls.Button btnAddNew; + /// + /// lblHelp control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblHelp; + /// /// btnClonaConfFamMacch control. /// diff --git a/CMS_SC/bin/CMS-SC-Data.dll b/CMS_SC/bin/CMS-SC-Data.dll index 7dd5f70..9e1453f 100644 Binary files a/CMS_SC/bin/CMS-SC-Data.dll and b/CMS_SC/bin/CMS-SC-Data.dll differ diff --git a/CMS_SC/bin/CMS_SC.dll b/CMS_SC/bin/CMS_SC.dll index 490b31a..10f7b77 100644 Binary files a/CMS_SC/bin/CMS_SC.dll and b/CMS_SC/bin/CMS_SC.dll differ diff --git a/CMS_SC/bin/SteamWare.dll b/CMS_SC/bin/SteamWare.dll index f57518a..c25bdfe 100644 Binary files a/CMS_SC/bin/SteamWare.dll and b/CMS_SC/bin/SteamWare.dll differ diff --git a/VersGen/CMS_SC.cs b/VersGen/CMS_SC.cs index 704e567..65afa21 100644 --- a/VersGen/CMS_SC.cs +++ b/VersGen/CMS_SC.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("1.8.081.354")] -[assembly: AssemblyFileVersion("1.8.081.354")] +[assembly: AssemblyVersion("1.8.082.354")] +[assembly: AssemblyFileVersion("1.8.082.354")] [assembly: AssemblyCopyright("Steamware © 2009-2015")] [assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/CMS_SC.tt b/VersGen/CMS_SC.tt index 02ba206..477fef2 100644 --- a/VersGen/CMS_SC.tt +++ b/VersGen/CMS_SC.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("1.8.081.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("1.8.081.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("1.8.082.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("1.8.082.<#= this.RevisionNumber #>")] [assembly: AssemblyCopyright("Steamware © 2009-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware")] <#+ diff --git a/VersGen/bin/Debug/VersGen.dll b/VersGen/bin/Debug/VersGen.dll index 926eaf4..8750a8a 100644 Binary files a/VersGen/bin/Debug/VersGen.dll and b/VersGen/bin/Debug/VersGen.dll differ