+
-
diff --git a/GMW/WebUserControls/mod_consumoAnime.ascx.designer.cs b/GMW/WebUserControls/mod_consumoAnime.ascx.designer.cs
index 1b699a3f..34141ff2 100644
--- a/GMW/WebUserControls/mod_consumoAnime.ascx.designer.cs
+++ b/GMW/WebUserControls/mod_consumoAnime.ascx.designer.cs
@@ -12,6 +12,24 @@ namespace GMW.WebUserControls {
public partial class mod_consumoAnime {
+ ///
+ /// BundleReference1 control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1;
+
+ ///
+ /// BundleReference2 control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2;
+
///
/// pnlAll control.
///
@@ -21,42 +39,6 @@ namespace GMW.WebUserControls {
///
protected global::System.Web.UI.WebControls.Panel pnlAll;
- ///
- /// lblPostazione control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::System.Web.UI.WebControls.Label lblPostazione;
-
- ///
- /// lblPrinter control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::System.Web.UI.WebControls.Label lblPrinter;
-
- ///
- /// lblCurrentPage control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::System.Web.UI.WebControls.Label lblCurrentPage;
-
- ///
- /// hlMenu control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::System.Web.UI.WebControls.HyperLink hlMenu;
-
///
/// lblUdcSel control.
///
@@ -102,15 +84,6 @@ namespace GMW.WebUserControls {
///
protected global::System.Web.UI.WebControls.TextBox txtBarcode;
- ///
- /// aceParticolare control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::AjaxControlToolkit.AutoCompleteExtender aceParticolare;
-
///
/// lblConsuma control.
///
diff --git a/GMW/anime.aspx.cs b/GMW/anime.aspx.cs
index 0ce69c0a..b3bbb059 100644
--- a/GMW/anime.aspx.cs
+++ b/GMW/anime.aspx.cs
@@ -29,10 +29,8 @@ namespace GMW
// update vari...
doUpdate();
mod_storicoAzioniOperatore1.eh_stampa += new EventHandler(mod_storicoAzioniOperatore1_eh_stampa);
-#if false
mod_anime1.doUpdate();
- mod_anime1.eh_reqUpdate += mod_PostRX_NT1_eh_reqUpdate;
-#endif
+ mod_anime1.eh_reqUpdate += mod_PostRX_NT1_eh_reqUpdate;
mod_selLineaNtDt1.eh_lineSelected += mod_selLineaNtDt1_eh_doRefresh;
mod_selLineaNtDt1.eh_showHideStorico += mod_selLineaNtDt1_eh_showHideStorico;
}
@@ -53,9 +51,7 @@ namespace GMW
private void mod_selLineaNtDt1_eh_doRefresh(object sender, EventArgs e)
{
doUpdate();
-#if false
mod_anime1.doUpdate();
-#endif
}
///
/// richiesta update del controllo SAO
diff --git a/GMW/consumoAnime.aspx b/GMW/consumoAnime.aspx
index 6179ad9b..5090ecb5 100644
--- a/GMW/consumoAnime.aspx
+++ b/GMW/consumoAnime.aspx
@@ -1,5 +1,10 @@
-<%@ Page Title="Cons Anime" Language="C#" MasterPageFile="~/WebMasterPages/AjaxSimpleFull.Master" AutoEventWireup="true" CodeBehind="consumoAnime.aspx.cs" Inherits="GMW.consumoAnime" %>
-<%@ Register src="WebUserControls/mod_consumoAnime.ascx" tagname="mod_consumoAnime" tagprefix="uc1" %>
-
+<%@ Page Title="Cons Anime" Language="C#" MasterPageFile="~/FullPage.Master" AutoEventWireup="true" CodeBehind="consumoAnime.aspx.cs" Inherits="GMW.consumoAnime" %>
+
+<%@ Register Src="WebUserControls/mod_consumoAnime.ascx" TagName="mod_consumoAnime" TagPrefix="uc1" %>
+
+
+
+
+
diff --git a/VersGen/GMW.cs b/VersGen/GMW.cs
index a57ba3e4..179dbfff 100644
--- a/VersGen/GMW.cs
+++ b/VersGen/GMW.cs
@@ -5,7 +5,7 @@
using System.Reflection;
-[assembly: AssemblyVersion("2.5.673.1585")]
-[assembly: AssemblyFileVersion("2.5.673.1585")]
+[assembly: AssemblyVersion("2.5.674.1585")]
+[assembly: AssemblyFileVersion("2.5.674.1585")]
[assembly: AssemblyCopyright("Steamware © 2007-2014")]
[assembly: AssemblyCompany("Steamware")]
diff --git a/VersGen/GMW.tt b/VersGen/GMW.tt
index f9221565..bbb712ee 100644
--- a/VersGen/GMW.tt
+++ b/VersGen/GMW.tt
@@ -6,8 +6,8 @@
using System.Reflection;
-[assembly: AssemblyVersion("2.5.673.<#= this.RevisionNumber #>")]
-[assembly: AssemblyFileVersion("2.5.673.<#= this.RevisionNumber #>")]
+[assembly: AssemblyVersion("2.5.674.<#= this.RevisionNumber #>")]
+[assembly: AssemblyFileVersion("2.5.674.<#= this.RevisionNumber #>")]
[assembly: AssemblyCopyright("Steamware © 2007-<#= DateTime.Now.Year #>")]
[assembly: AssemblyCompany("Steamware")]
<#+