diff --git a/GMW-RT/bin/GMW-RT.dll b/GMW-RT/bin/GMW-RT.dll
index bc57a9e8..ba339092 100644
Binary files a/GMW-RT/bin/GMW-RT.dll and b/GMW-RT/bin/GMW-RT.dll differ
diff --git a/GMW-RT/bin/GMW_data.dll b/GMW-RT/bin/GMW_data.dll
index c43b4466..94b8f06c 100644
Binary files a/GMW-RT/bin/GMW_data.dll and b/GMW-RT/bin/GMW_data.dll differ
diff --git a/GMW-RT/bin/SteamWare.dll b/GMW-RT/bin/SteamWare.dll
index 543035b5..9e1a2944 100644
Binary files a/GMW-RT/bin/SteamWare.dll and b/GMW-RT/bin/SteamWare.dll differ
diff --git a/GMW-UT/bin/GMW-UT.dll b/GMW-UT/bin/GMW-UT.dll
index 3894df36..60816824 100644
Binary files a/GMW-UT/bin/GMW-UT.dll and b/GMW-UT/bin/GMW-UT.dll differ
diff --git a/GMW-UT/bin/GMW_data.dll b/GMW-UT/bin/GMW_data.dll
index c43b4466..94b8f06c 100644
Binary files a/GMW-UT/bin/GMW_data.dll and b/GMW-UT/bin/GMW_data.dll differ
diff --git a/GMW-UT/bin/SteamWare.dll b/GMW-UT/bin/SteamWare.dll
index 543035b5..9e1a2944 100644
Binary files a/GMW-UT/bin/SteamWare.dll and b/GMW-UT/bin/SteamWare.dll differ
diff --git a/GMW/WebUserControls/mod_specDmtx.ascx b/GMW/WebUserControls/mod_specDmtx.ascx
index e49bc0dd..7cf2c143 100644
--- a/GMW/WebUserControls/mod_specDmtx.ascx
+++ b/GMW/WebUserControls/mod_specDmtx.ascx
@@ -3,7 +3,7 @@
{ %>
<% } %>
-
+
@@ -125,6 +125,7 @@
+
@@ -146,6 +147,7 @@
+
diff --git a/GMW/bin/GMW.dll b/GMW/bin/GMW.dll
index 47e9a873..08fbb5ed 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 c43b4466..94b8f06c 100644
Binary files a/GMW/bin/GMW_data.dll and b/GMW/bin/GMW_data.dll differ
diff --git a/GMW/bin/SteamWare.dll b/GMW/bin/SteamWare.dll
index 543035b5..9e1a2944 100644
Binary files a/GMW/bin/SteamWare.dll and b/GMW/bin/SteamWare.dll differ
diff --git a/GMW/bin/VersGen.dll b/GMW/bin/VersGen.dll
index 26a76e0f..0fdca104 100644
Binary files a/GMW/bin/VersGen.dll and b/GMW/bin/VersGen.dll differ
diff --git a/GMW_data/DS_DataMatrix.xsd b/GMW_data/DS_DataMatrix.xsd
index 62c5330c..d016cf97 100644
--- a/GMW_data/DS_DataMatrix.xsd
+++ b/GMW_data/DS_DataMatrix.xsd
@@ -1087,6 +1087,7 @@ SELECT FormatoDtmx, CodSpec, ValoreStr, ValoreInt, Note, Peso, Attivo FROM TabSp
+
@@ -1115,6 +1116,7 @@ SELECT FormatoDtmx, CodSpec, ValoreStr, ValoreInt, Note, Peso, Attivo FROM TabSp
+
diff --git a/GMW_data/DS_DataMatrix.xss b/GMW_data/DS_DataMatrix.xss
index 0de0aa3c..ed96524d 100644
--- a/GMW_data/DS_DataMatrix.xss
+++ b/GMW_data/DS_DataMatrix.xss
@@ -19,14 +19,14 @@
-
+
-
-
-
-
+
+
+
+
@@ -53,7 +53,7 @@
-
+
1510
diff --git a/GMW_data/DS_DataMatrix1.Designer.cs b/GMW_data/DS_DataMatrix1.Designer.cs
index b0ce9f7e..cf5e976c 100644
--- a/GMW_data/DS_DataMatrix1.Designer.cs
+++ b/GMW_data/DS_DataMatrix1.Designer.cs
@@ -16558,6 +16558,7 @@ SELECT FormatoDtmx, CodSpec, ValoreStr, ValoreInt, Note, Peso, Attivo FROM TabSp
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_FormatoDtmx", global::System.Data.SqlDbType.NVarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodSpec", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ValoreInt", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[2].Connection = this.Connection;
this._commandCollection[2].CommandText = "dmtx.stp_getSpecDmtxByTipo";
@@ -16576,6 +16577,7 @@ SELECT FormatoDtmx, CodSpec, ValoreStr, ValoreInt, Note, Peso, Attivo FROM TabSp
this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Attivo", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_FormatoDtmx", global::System.Data.SqlDbType.NVarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodSpec", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ValoreInt", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -16623,7 +16625,7 @@ SELECT FormatoDtmx, CodSpec, ValoreStr, ValoreInt, Note, Peso, Attivo FROM TabSp
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
- public virtual DS_DataMatrix.TabSpecDtxDataTable updateQuery(string ValoreStr, global::System.Nullable ValoreInt, string Note, global::System.Nullable Peso, global::System.Nullable Attivo, string Original_FormatoDtmx, string Original_CodSpec) {
+ public virtual DS_DataMatrix.TabSpecDtxDataTable updateQuery(string ValoreStr, global::System.Nullable ValoreInt, string Note, global::System.Nullable Peso, global::System.Nullable Attivo, string Original_FormatoDtmx, string Original_CodSpec, global::System.Nullable Original_ValoreInt) {
this.Adapter.SelectCommand = this.CommandCollection[3];
if ((ValoreStr == null)) {
this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
@@ -16667,6 +16669,12 @@ SELECT FormatoDtmx, CodSpec, ValoreStr, ValoreInt, Note, Peso, Attivo FROM TabSp
else {
this.Adapter.SelectCommand.Parameters[7].Value = ((string)(Original_CodSpec));
}
+ if ((Original_ValoreInt.HasValue == true)) {
+ this.Adapter.SelectCommand.Parameters[8].Value = ((int)(Original_ValoreInt.Value));
+ }
+ else {
+ this.Adapter.SelectCommand.Parameters[8].Value = global::System.DBNull.Value;
+ }
DS_DataMatrix.TabSpecDtxDataTable dataTable = new DS_DataMatrix.TabSpecDtxDataTable();
this.Adapter.Fill(dataTable);
return dataTable;
@@ -16883,7 +16891,7 @@ SELECT FormatoDtmx, CodSpec, ValoreStr, ValoreInt, Note, Peso, Attivo FROM TabSp
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
- public virtual int deleteQuery(string Original_FormatoDtmx, string Original_CodSpec) {
+ public virtual int deleteQuery(string Original_FormatoDtmx, string Original_CodSpec, global::System.Nullable Original_ValoreInt) {
global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[1];
if ((Original_FormatoDtmx == null)) {
command.Parameters[1].Value = global::System.DBNull.Value;
@@ -16897,6 +16905,12 @@ SELECT FormatoDtmx, CodSpec, ValoreStr, ValoreInt, Note, Peso, Attivo FROM TabSp
else {
command.Parameters[2].Value = ((string)(Original_CodSpec));
}
+ if ((Original_ValoreInt.HasValue == true)) {
+ command.Parameters[3].Value = ((int)(Original_ValoreInt.Value));
+ }
+ else {
+ command.Parameters[3].Value = global::System.DBNull.Value;
+ }
global::System.Data.ConnectionState previousConnectionState = command.Connection.State;
if (((command.Connection.State & global::System.Data.ConnectionState.Open)
!= global::System.Data.ConnectionState.Open)) {
diff --git a/VersGen/GMW.cs b/VersGen/GMW.cs
index 07381c4b..9d744638 100644
--- a/VersGen/GMW.cs
+++ b/VersGen/GMW.cs
@@ -5,7 +5,7 @@
using System.Reflection;
-[assembly: AssemblyVersion("3.5.874.2400")]
-[assembly: AssemblyFileVersion("3.5.874.2400")]
+[assembly: AssemblyVersion("3.5.884.2401")]
+[assembly: AssemblyFileVersion("3.5.884.2401")]
[assembly: AssemblyCopyright("Steamware © 2007-2016")]
[assembly: AssemblyCompany("Steamware")]
diff --git a/VersGen/GMW.tt b/VersGen/GMW.tt
index 0dda0e78..34420976 100644
--- a/VersGen/GMW.tt
+++ b/VersGen/GMW.tt
@@ -6,8 +6,8 @@
using System.Reflection;
-[assembly: AssemblyVersion("3.5.874.<#= this.RevisionNumber #>")]
-[assembly: AssemblyFileVersion("3.5.874.<#= this.RevisionNumber #>")]
+[assembly: AssemblyVersion("3.5.884.<#= this.RevisionNumber #>")]
+[assembly: AssemblyFileVersion("3.5.884.<#= this.RevisionNumber #>")]
[assembly: AssemblyCopyright("Steamware © 2007-<#= DateTime.Now.Year #>")]
[assembly: AssemblyCompany("Steamware")]
<#+