diff --git a/GMW/WebUserControls/mod_PostRX_NT.ascx.cs b/GMW/WebUserControls/mod_PostRX_NT.ascx.cs
index 413598e2..9e4a3fd9 100644
--- a/GMW/WebUserControls/mod_PostRX_NT.ascx.cs
+++ b/GMW/WebUserControls/mod_PostRX_NT.ascx.cs
@@ -6,6 +6,7 @@ using System.Web.UI;
using System.Web.UI.WebControls;
using SteamWare;
using GMW_data;
+using System.Globalization;
namespace GMW.WebUserControls
{
@@ -44,6 +45,7 @@ namespace GMW.WebUserControls
if (!Page.IsPostBack)
{
currParticolare = ""; Postazione.messaggiText = "";
+ lblDTFus.Text = string.Format("{0:ddd dd/MM/yyyy, HH:mm}", dataFus);
Postazione.warningText = "";
fixTipoInput();
fixCella();
@@ -73,6 +75,29 @@ namespace GMW.WebUserControls
}
}
///
+ /// data fusione impostata SALVATA SU DB...
+ ///
+ public DateTime dataFus
+ {
+ get
+ {
+ DateTime answ = Convert.ToDateTime("1900-01-01");
+ try
+ {
+
+ answ = Convert.ToDateTime(utils.obj.taRTPV.getByPageChiave(user_std.pagCorrente, "dataFus" + Postazione.currCodLinea)[0].valore);
+ }
+ catch
+ { }
+ return answ;
+ }
+ set
+ {
+ utils.obj.taRTPV.upsert(user_std.pagCorrente, "dataFus" + Postazione.currCodLinea, string.Format("{0:yyyy/MM/dd HH:mm}", value));
+ lblDTFus.Text = string.Format("{0:ddd dd/MM/yyyy, HH:mm}", value);
+ }
+ }
+ ///
/// aggiorna visualizzazioen dati particolare
///
private void updatePart()
@@ -202,6 +227,13 @@ namespace GMW.WebUserControls
Postazione.messaggiText = string.Format("{0}: {1}", traduci("BCodeIns"), barcodeIn);
switch (MagClass.tipoBCode(barcodeIn))
{
+ case tipoCodiceBarcode.DateTime:
+ // imposto NUOVA dataora fusione...
+ dataFus = DateTime.ParseExact(barcodeIn.Replace(memLayer.ML.confReadString("prefDateTime"), ""), "yyMMddHHmm", CultureInfo.InvariantCulture);
+ Postazione.messaggiText = traduci("SetDataFus");
+ Postazione.warningText = "";
+ Postazione.CssClass = "stileComandoOk";
+ break;
case tipoCodiceBarcode.Particolare:
// imposto il particolare corrente
currParticolare = barcodeIn;
@@ -249,6 +281,8 @@ namespace GMW.WebUserControls
{
fixCella();
grView.DataBind();
+ // fix dataFus
+ lblDTFus.Text = string.Format("{0:ddd dd/MM/yyyy, HH:mm}", dataFus);
updatePart();
// raise dell'evento
if (eh_reqUpdate != null)
@@ -479,6 +513,10 @@ namespace GMW.WebUserControls
Postazione.CssClass = "stileAttesa";
Postazione.warningText = "";
Postazione.messaggiText = traduci("partAdded");
+
+ // 2014.07.10 aggiungo attributo della data di fusione...
+ MagClass.magazzino.taAtt2UDC.upsertVal(newUdcChild, "DF", string.Format("{0:yyyy/MM/dd HH:mm}", dataFus), DateTime.Now, MagClass.magazzino.CodSoggCurrUser);
+
currParticolare = "";
doUpdate();
}
diff --git a/GMW/WebUserControls/mod_PostRX_NT.ascx.designer.cs b/GMW/WebUserControls/mod_PostRX_NT.ascx.designer.cs
index 3d66ebf9..804629c7 100644
--- a/GMW/WebUserControls/mod_PostRX_NT.ascx.designer.cs
+++ b/GMW/WebUserControls/mod_PostRX_NT.ascx.designer.cs
@@ -66,6 +66,15 @@ namespace GMW.WebUserControls {
///
protected global::System.Web.UI.WebControls.Label lblNumRec;
+ ///
+ /// lblDTFus control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Label lblDTFus;
+
///
/// lblParticolareAttivo control.
///
diff --git a/GMW/bin/GMW.dll b/GMW/bin/GMW.dll
index cc3d69e6..d766b492 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 b8ba42ba..c45ed52c 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 63599fa7..6fa4432b 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 0c3c2659..b1e1667b 100644
Binary files a/GMW/bin/VersGen.dll and b/GMW/bin/VersGen.dll differ
diff --git a/GMW_data/DS_Utility.Designer.cs b/GMW_data/DS_Utility.Designer.cs
index 42abf298..aceca2c6 100644
--- a/GMW_data/DS_Utility.Designer.cs
+++ b/GMW_data/DS_Utility.Designer.cs
@@ -16525,7 +16525,7 @@ SELECT PageUrl, chiave, valore FROM RT_PageVal WHERE (PageUrl = @PageUrl) AND (c
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
private void InitCommandCollection() {
- this._commandCollection = new global::System.Data.SqlClient.SqlCommand[3];
+ this._commandCollection = new global::System.Data.SqlClient.SqlCommand[4];
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].CommandText = "SELECT PageUrl, chiave, valore FROM dbo.RT_PageVal";
@@ -16538,12 +16538,19 @@ SELECT PageUrl, chiave, valore FROM RT_PageVal WHERE (PageUrl = @PageUrl) AND (c
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PageUrl", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 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 = "dbo.stp_RTPV_upsert";
+ this._commandCollection[2].CommandText = "dbo.stp_RTPV_getByPageChiave";
this._commandCollection[2].CommandType = global::System.Data.CommandType.StoredProcedure;
this._commandCollection[2].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[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PageUrl", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@chiave", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@valore", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Chiave", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand();
+ this._commandCollection[3].Connection = this.Connection;
+ this._commandCollection[3].CommandText = "dbo.stp_RTPV_upsert";
+ this._commandCollection[3].CommandType = global::System.Data.CommandType.StoredProcedure;
+ this._commandCollection[3].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[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PageUrl", 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("@chiave", 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("@valore", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -16587,6 +16594,29 @@ SELECT PageUrl, chiave, valore FROM RT_PageVal WHERE (PageUrl = @PageUrl) AND (c
return dataTable;
}
+ [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")]
+ [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
+ public virtual DS_Utility.RT_PageValDataTable getByPageChiave(string PageUrl, string Chiave) {
+ this.Adapter.SelectCommand = this.CommandCollection[2];
+ if ((PageUrl == null)) {
+ this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
+ }
+ else {
+ this.Adapter.SelectCommand.Parameters[1].Value = ((string)(PageUrl));
+ }
+ if ((Chiave == null)) {
+ this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value;
+ }
+ else {
+ this.Adapter.SelectCommand.Parameters[2].Value = ((string)(Chiave));
+ }
+ DS_Utility.RT_PageValDataTable dataTable = new DS_Utility.RT_PageValDataTable();
+ this.Adapter.Fill(dataTable);
+ return dataTable;
+ }
+
[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")]
@@ -16767,7 +16797,7 @@ SELECT PageUrl, chiave, valore FROM RT_PageVal WHERE (PageUrl = @PageUrl) AND (c
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
public virtual int upsert(string PageUrl, string chiave, string valore) {
- global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[2];
+ global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[3];
if ((PageUrl == null)) {
command.Parameters[1].Value = global::System.DBNull.Value;
}
diff --git a/GMW_data/DS_Utility.xsd b/GMW_data/DS_Utility.xsd
index e49e4acb..0d4c3884 100644
--- a/GMW_data/DS_Utility.xsd
+++ b/GMW_data/DS_Utility.xsd
@@ -945,6 +945,18 @@ SELECT PageUrl, chiave, valore FROM RT_PageVal WHERE (PageUrl = @PageUrl) AND (c
+
+
+
+ dbo.stp_RTPV_getByPageChiave
+
+
+
+
+
+
+
+
@@ -1371,7 +1383,7 @@ SELECT PageUrl, chiave, valore FROM RT_PageVal WHERE (PageUrl = @PageUrl) AND (c
-
+
@@ -1392,7 +1404,7 @@ SELECT PageUrl, chiave, valore FROM RT_PageVal WHERE (PageUrl = @PageUrl) AND (c
-
+
@@ -1413,7 +1425,7 @@ SELECT PageUrl, chiave, valore FROM RT_PageVal WHERE (PageUrl = @PageUrl) AND (c
-
+
@@ -1433,7 +1445,7 @@ SELECT PageUrl, chiave, valore FROM RT_PageVal WHERE (PageUrl = @PageUrl) AND (c
-
+
@@ -1454,7 +1466,7 @@ SELECT PageUrl, chiave, valore FROM RT_PageVal WHERE (PageUrl = @PageUrl) AND (c
-
+
@@ -1475,7 +1487,7 @@ SELECT PageUrl, chiave, valore FROM RT_PageVal WHERE (PageUrl = @PageUrl) AND (c
-
+
@@ -1502,7 +1514,7 @@ SELECT PageUrl, chiave, valore FROM RT_PageVal WHERE (PageUrl = @PageUrl) AND (c
-
+
@@ -1522,7 +1534,7 @@ SELECT PageUrl, chiave, valore FROM RT_PageVal WHERE (PageUrl = @PageUrl) AND (c
-
+
@@ -1549,7 +1561,7 @@ SELECT PageUrl, chiave, valore FROM RT_PageVal WHERE (PageUrl = @PageUrl) AND (c
-
+
@@ -1576,7 +1588,7 @@ SELECT PageUrl, chiave, valore FROM RT_PageVal WHERE (PageUrl = @PageUrl) AND (c
-
+
@@ -1603,7 +1615,7 @@ SELECT PageUrl, chiave, valore FROM RT_PageVal WHERE (PageUrl = @PageUrl) AND (c
-
+
diff --git a/GMW_data/DS_Utility.xss b/GMW_data/DS_Utility.xss
index 4d74db2d..f45860ac 100644
--- a/GMW_data/DS_Utility.xss
+++ b/GMW_data/DS_Utility.xss
@@ -4,7 +4,7 @@
Changes to this file may cause incorrect behavior and will be lost if
the code is regenerated.
-->
-
+
@@ -29,7 +29,7 @@
-
+
diff --git a/GMW_data/DS_magazzino.Designer.cs b/GMW_data/DS_magazzino.Designer.cs
index 6da136dc..8d800fa2 100644
--- a/GMW_data/DS_magazzino.Designer.cs
+++ b/GMW_data/DS_magazzino.Designer.cs
@@ -39432,7 +39432,7 @@ SELECT idxAttr, UDC, CodAttr, ValAttr, DateAttr, CodSoggetto FROM Attr2UDC WHERE
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
private void InitCommandCollection() {
- this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2];
+ this._commandCollection = new global::System.Data.SqlClient.SqlCommand[3];
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].CommandText = "SELECT * FROM dbo.Attr2UDC";
@@ -39443,6 +39443,16 @@ SELECT idxAttr, UDC, CodAttr, ValAttr, DateAttr, CodSoggetto FROM Attr2UDC WHERE
this._commandCollection[1].CommandType = global::System.Data.CommandType.StoredProcedure;
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("@UDC", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 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 = "dbo.stp_A2U_upsertVal";
+ this._commandCollection[2].CommandType = global::System.Data.CommandType.StoredProcedure;
+ this._commandCollection[2].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[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UDC", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodAttr", global::System.Data.SqlDbType.NVarChar, 2, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ValAttr", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DateAttr", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodSoggetto", global::System.Data.SqlDbType.NVarChar, 17, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -39692,6 +39702,58 @@ SELECT idxAttr, UDC, CodAttr, ValAttr, DateAttr, CodSoggetto FROM Attr2UDC WHERE
public virtual int Update(string UDC, string CodAttr, string ValAttr, System.DateTime DateAttr, string CodSoggetto, int Original_idxAttr, string Original_UDC, string Original_CodAttr, string Original_ValAttr, System.DateTime Original_DateAttr, string Original_CodSoggetto) {
return this.Update(UDC, CodAttr, ValAttr, DateAttr, CodSoggetto, Original_idxAttr, Original_UDC, Original_CodAttr, Original_ValAttr, Original_DateAttr, Original_CodSoggetto, Original_idxAttr);
}
+
+ [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 upsertVal(string UDC, string CodAttr, string ValAttr, global::System.Nullable DateAttr, string CodSoggetto) {
+ global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[2];
+ if ((UDC == null)) {
+ command.Parameters[1].Value = global::System.DBNull.Value;
+ }
+ else {
+ command.Parameters[1].Value = ((string)(UDC));
+ }
+ if ((CodAttr == null)) {
+ command.Parameters[2].Value = global::System.DBNull.Value;
+ }
+ else {
+ command.Parameters[2].Value = ((string)(CodAttr));
+ }
+ if ((ValAttr == null)) {
+ command.Parameters[3].Value = global::System.DBNull.Value;
+ }
+ else {
+ command.Parameters[3].Value = ((string)(ValAttr));
+ }
+ if ((DateAttr.HasValue == true)) {
+ command.Parameters[4].Value = ((System.DateTime)(DateAttr.Value));
+ }
+ else {
+ command.Parameters[4].Value = global::System.DBNull.Value;
+ }
+ if ((CodSoggetto == null)) {
+ command.Parameters[5].Value = global::System.DBNull.Value;
+ }
+ else {
+ command.Parameters[5].Value = ((string)(CodSoggetto));
+ }
+ global::System.Data.ConnectionState previousConnectionState = command.Connection.State;
+ if (((command.Connection.State & global::System.Data.ConnectionState.Open)
+ != global::System.Data.ConnectionState.Open)) {
+ command.Connection.Open();
+ }
+ int returnValue;
+ try {
+ returnValue = command.ExecuteNonQuery();
+ }
+ finally {
+ if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) {
+ command.Connection.Close();
+ }
+ }
+ return returnValue;
+ }
}
///
diff --git a/GMW_data/DS_magazzino.xsd b/GMW_data/DS_magazzino.xsd
index 29a415e1..4fa87e87 100644
--- a/GMW_data/DS_magazzino.xsd
+++ b/GMW_data/DS_magazzino.xsd
@@ -3640,6 +3640,21 @@ SELECT idxAttr, UDC, CodAttr, ValAttr, DateAttr, CodSoggetto FROM Attr2UDC WHERE
+
+
+
+ dbo.stp_A2U_upsertVal
+
+
+
+
+
+
+
+
+
+
+
@@ -5269,7 +5284,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur,
-
+
@@ -5326,7 +5341,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur,
-
+
@@ -5358,7 +5373,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur,
-
+
@@ -5380,7 +5395,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur,
-
+
@@ -5407,7 +5422,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur,
-
+
@@ -5456,14 +5471,14 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur,
-
+
-
+
@@ -5499,7 +5514,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur,
-
+
@@ -5556,7 +5571,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur,
-
+
@@ -5584,7 +5599,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur,
-
+
@@ -5631,7 +5646,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur,
-
+
@@ -5825,21 +5840,21 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/GMW_data/DS_magazzino.xss b/GMW_data/DS_magazzino.xss
index 0e598281..2794462e 100644
--- a/GMW_data/DS_magazzino.xss
+++ b/GMW_data/DS_magazzino.xss
@@ -4,7 +4,7 @@
Changes to this file may cause incorrect behavior and will be lost if
the code is regenerated.
-->
-
+
@@ -37,7 +37,7 @@
-
+
@@ -187,12 +187,12 @@
- 174
+ 176
230
- 174
- 201
+ 176
+ 194
diff --git a/VersGen/GMW.cs b/VersGen/GMW.cs
index 7b10591b..4a42daa2 100644
--- a/VersGen/GMW.cs
+++ b/VersGen/GMW.cs
@@ -5,7 +5,7 @@
using System.Reflection;
-[assembly: AssemblyVersion("2.5.718.1651")]
-[assembly: AssemblyFileVersion("2.5.718.1651")]
+[assembly: AssemblyVersion("2.5.719.1651")]
+[assembly: AssemblyFileVersion("2.5.719.1651")]
[assembly: AssemblyCopyright("Steamware © 2007-2014")]
[assembly: AssemblyCompany("Steamware")]
diff --git a/VersGen/GMW.tt b/VersGen/GMW.tt
index 970bc2b6..4554b980 100644
--- a/VersGen/GMW.tt
+++ b/VersGen/GMW.tt
@@ -6,8 +6,8 @@
using System.Reflection;
-[assembly: AssemblyVersion("2.5.718.<#= this.RevisionNumber #>")]
-[assembly: AssemblyFileVersion("2.5.718.<#= this.RevisionNumber #>")]
+[assembly: AssemblyVersion("2.5.719.<#= this.RevisionNumber #>")]
+[assembly: AssemblyFileVersion("2.5.719.<#= this.RevisionNumber #>")]
[assembly: AssemblyCopyright("Steamware © 2007-<#= DateTime.Now.Year #>")]
[assembly: AssemblyCompany("Steamware")]
<#+