-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ OnDataBound="grView_DataBound"
+ DataKeyNames="UDC" DataSourceID="ods" OnPageIndexChanged="grView_PageIndexChanged"
+ OnSorted="grView_Sorted" Width="100%">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/GMW/WebUserControls/mod_lavMeccIN.ascx.cs b/GMW/WebUserControls/mod_lavMeccIN.ascx.cs
index 5f3c9a01..a2cd1ea5 100644
--- a/GMW/WebUserControls/mod_lavMeccIN.ascx.cs
+++ b/GMW/WebUserControls/mod_lavMeccIN.ascx.cs
@@ -368,6 +368,16 @@ namespace GMW.WebUserControls
salvaCerca();
}
///
+ /// effettuato reset
+ ///
+ ///
+ ///
+ protected void lnkReset_Click(object sender, EventArgs e)
+ {
+ testoRicerca = "";
+ salvaCerca();
+ }
+ ///
/// pressione del button di ricerca
///
///
diff --git a/GMW/WebUserControls/mod_lavMeccIN.ascx.designer.cs b/GMW/WebUserControls/mod_lavMeccIN.ascx.designer.cs
index a2f0bce4..ee778a50 100644
--- a/GMW/WebUserControls/mod_lavMeccIN.ascx.designer.cs
+++ b/GMW/WebUserControls/mod_lavMeccIN.ascx.designer.cs
@@ -75,6 +75,15 @@ namespace GMW.WebUserControls {
///
protected global::System.Web.UI.WebControls.TextBox txtBarcode;
+ ///
+ /// btnCerca control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Button btnCerca;
+
///
/// txtCerca control.
///
@@ -85,13 +94,13 @@ namespace GMW.WebUserControls {
protected global::System.Web.UI.WebControls.TextBox txtCerca;
///
- /// btnCerca control.
+ /// lnkReset control.
///
///
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
///
- protected global::System.Web.UI.WebControls.Button btnCerca;
+ protected global::System.Web.UI.WebControls.LinkButton lnkReset;
///
/// grView control.
diff --git a/GMW/WebUserControls/mod_lavMeccOUT.ascx.cs b/GMW/WebUserControls/mod_lavMeccOUT.ascx.cs
index 271c458e..a6a945cc 100644
--- a/GMW/WebUserControls/mod_lavMeccOUT.ascx.cs
+++ b/GMW/WebUserControls/mod_lavMeccOUT.ascx.cs
@@ -808,6 +808,16 @@ namespace GMW.WebUserControls
salvaCerca();
}
///
+ /// effettuato reset
+ ///
+ ///
+ ///
+ protected void lnkReset_Click(object sender, EventArgs e)
+ {
+ testoRicerca = "";
+ salvaCerca();
+ }
+ ///
/// pressione del button di ricerca
///
///
diff --git a/GMW/bin/GMW.dll b/GMW/bin/GMW.dll
index 3d0d1e75..533cd8b2 100644
Binary files a/GMW/bin/GMW.dll and b/GMW/bin/GMW.dll differ
diff --git a/VersGen/GMW.cs b/VersGen/GMW.cs
index 56b04530..3abc1c39 100644
--- a/VersGen/GMW.cs
+++ b/VersGen/GMW.cs
@@ -5,7 +5,7 @@
using System.Reflection;
-[assembly: AssemblyVersion("2.5.689.1589")]
-[assembly: AssemblyFileVersion("2.5.689.1589")]
+[assembly: AssemblyVersion("2.5.690.1599")]
+[assembly: AssemblyFileVersion("2.5.690.1599")]
[assembly: AssemblyCopyright("Steamware © 2007-2014")]
[assembly: AssemblyCompany("Steamware")]
diff --git a/VersGen/GMW.tt b/VersGen/GMW.tt
index 5e3c0820..63463b4b 100644
--- a/VersGen/GMW.tt
+++ b/VersGen/GMW.tt
@@ -6,8 +6,8 @@
using System.Reflection;
-[assembly: AssemblyVersion("2.5.689.<#= this.RevisionNumber #>")]
-[assembly: AssemblyFileVersion("2.5.689.<#= this.RevisionNumber #>")]
+[assembly: AssemblyVersion("2.5.690.<#= this.RevisionNumber #>")]
+[assembly: AssemblyFileVersion("2.5.690.<#= this.RevisionNumber #>")]
[assembly: AssemblyCopyright("Steamware © 2007-<#= DateTime.Now.Year #>")]
[assembly: AssemblyCompany("Steamware")]
<#+