diff --git a/GMW/GMW/GMW.csproj b/GMW/GMW/GMW.csproj
index d902878f..004766e9 100644
--- a/GMW/GMW/GMW.csproj
+++ b/GMW/GMW/GMW.csproj
@@ -82,6 +82,7 @@
+
diff --git a/GMW/GMW/Type/Imballo.cs b/GMW/GMW/Type/Imballo.cs
new file mode 100644
index 00000000..248a9ab4
--- /dev/null
+++ b/GMW/GMW/Type/Imballo.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using GMW_data;
+
+namespace GMW.Type
+{
+ public class Imballo
+ {
+ public Imballo()
+ {
+ }
+ public Imballo(DS_Applicazione.AnagImballiRow riga)
+ {
+ CodImballo = riga.CodImballo;
+ DescImballo = riga.DescImballo;
+ ClasseArticolo = riga.ClasseArticolo;
+ }
+
+ ///
+ /// Codice Imballo
+ ///
+ public string CodImballo { get; set; }
+ ///
+ /// Descrizione imballo
+ ///
+ public string DescImballo { get; set; }
+ ///
+ /// Classe Articolo
+ ///
+ public string ClasseArticolo { get; set; }
+
+ ///
+ /// inizializza a partire da una riga impianto tipizzata
+ ///
+ ///
+ public void setFromTabRow(DS_Applicazione.AnagImballiRow riga)
+ {
+
+ CodImballo = riga.CodImballo;
+ DescImballo = riga.DescImballo;
+ ClasseArticolo = riga.ClasseArticolo;
+ }
+
+ }
+}
diff --git a/GMW/GMW/Type/elenchi.cs b/GMW/GMW/Type/elenchi.cs
index 8bce133e..93c7b6b1 100644
--- a/GMW/GMW/Type/elenchi.cs
+++ b/GMW/GMW/Type/elenchi.cs
@@ -184,6 +184,40 @@ namespace GMW.Type
#endregion
+ #region area imballi
+
+ protected Imballo[] _elencoImballi;
+
+ ///
+ /// legge una tab di tipo AnagImballi e la converte ad un array di tipo Imballo[]
+ ///
+ ///
+ public void caricaImballi(DS_Applicazione.AnagImballiDataTable tabImballi)
+ {
+ // conto quanti elementi ha la tab x inizializzare l'array...
+ int numRighe = tabImballi.Rows.Count;
+ _elencoImballi = new Imballo[numRighe];
+ // prendo un obj impianto da valorizzare di volta in volta...
+ Imballo obj;
+ for (int i = 0; i < numRighe; i++)
+ {
+ obj = new Imballo(tabImballi[i]);
+ _elencoImballi[i] = obj;
+ }
+ }
+ ///
+ /// Elenco Imballi
+ ///
+ public Imballo[] elencoImballi
+ {
+ get
+ {
+ return _elencoImballi;
+ }
+ }
+
+ #endregion
+
#region area bilance
protected Bilancia[] _elencoBilance;
diff --git a/GMW/GMW/WS/bilance.asmx.cs b/GMW/GMW/WS/bilance.asmx.cs
index 46d8683f..18050fd0 100644
--- a/GMW/GMW/WS/bilance.asmx.cs
+++ b/GMW/GMW/WS/bilance.asmx.cs
@@ -14,7 +14,7 @@ namespace GMW.WS
///
/// WebService per gestioen sw bilance
///
- [WebService(Namespace = "http://www.steamware.net/", Description = "Web Services che funziona da collettore di tutte le richieste delle applicazioni per le bilance integrate a GMW v.1.0.34")]
+ [WebService(Namespace = "http://www.steamware.net/", Description = "Web Services che funziona da collettore di tutte le richieste delle applicazioni per le bilance integrate a GMW v.1.0.36")]
[WebServiceBinding(ConformsTo = WsiProfiles.BasicProfile1_1)]
[System.ComponentModel.ToolboxItem(false)]
public class bilance : System.Web.Services.WebService
@@ -97,6 +97,15 @@ namespace GMW.WS
return gestEl.elencoImpianti;
}
///
+ /// Elenco anagrafico imballi
+ ///
+ [WebMethod(Description = "Elenco anagrafico imballi")]
+ public GMW.Type.Imballo[] ElencoImballi()
+ {
+ gestEl.caricaImballi(DataProxy.obj.taAnagImballi.GetData());
+ return gestEl.elencoImballi;
+ }
+ ///
/// Elenco anagrafica impianti dati codice company e sito (no dataset)
///
/// Codice company/sito
@@ -107,7 +116,6 @@ namespace GMW.WS
gestEl.caricaImpianti(DataProxy.obj.taAnagImp.stp_getByCodCS(CodCS));
return gestEl.elencoImpianti;
}
-
///
/// fornisce l'anagrafica bilance
///
diff --git a/GMW/GMW/Web.config b/GMW/GMW/Web.config
index b13b683f..0b45c95e 100644
--- a/GMW/GMW/Web.config
+++ b/GMW/GMW/Web.config
@@ -1,4 +1,5 @@
-
+
+
@@ -34,10 +35,11 @@
-
-
-
-
+
+
+
+
+
@@ -87,7 +89,8 @@
-
+
+
diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll
index d99b015a..a4506058 100644
Binary files a/GMW/GMW/bin/GMW.dll and b/GMW/GMW/bin/GMW.dll differ
diff --git a/GMW/GMW/bin/GMW_data.dll b/GMW/GMW/bin/GMW_data.dll
index fa7fd135..c63b5be8 100644
Binary files a/GMW/GMW/bin/GMW_data.dll and b/GMW/GMW/bin/GMW_data.dll differ
diff --git a/GMW/GMW/mazzAppSettings.config b/GMW/GMW/mazzAppSettings.config
index 2c5513ff..3029b5a6 100644
--- a/GMW/GMW/mazzAppSettings.config
+++ b/GMW/GMW/mazzAppSettings.config
@@ -7,6 +7,7 @@
+
diff --git a/GMW/GMW/obj/Debug/GMW.dll b/GMW/GMW/obj/Debug/GMW.dll
index f9591f8b..4aaf4b68 100644
Binary files a/GMW/GMW/obj/Debug/GMW.dll and b/GMW/GMW/obj/Debug/GMW.dll differ
diff --git a/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache b/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache
index 7b910897..eef1b9b9 100644
Binary files a/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache and b/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache differ
diff --git a/GMW/GMW/obj/Release/GMW.dll b/GMW/GMW/obj/Release/GMW.dll
index d99b015a..a4506058 100644
Binary files a/GMW/GMW/obj/Release/GMW.dll and b/GMW/GMW/obj/Release/GMW.dll differ
diff --git a/GMW/GMW/obj/Release/ResolveAssemblyReference.cache b/GMW/GMW/obj/Release/ResolveAssemblyReference.cache
index fe8aee0f..61f4b876 100644
Binary files a/GMW/GMW/obj/Release/ResolveAssemblyReference.cache and b/GMW/GMW/obj/Release/ResolveAssemblyReference.cache differ
diff --git a/GMW/GMW_data/DS_Applicazione.Designer.cs b/GMW/GMW_data/DS_Applicazione.Designer.cs
index abe15dde..5da93157 100644
--- a/GMW/GMW_data/DS_Applicazione.Designer.cs
+++ b/GMW/GMW_data/DS_Applicazione.Designer.cs
@@ -7459,11 +7459,11 @@ namespace GMW_data {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
public string ClasseArticolo {
get {
- try {
- return ((string)(this[this.tableAnagImballi.ClasseArticoloColumn]));
+ if (this.IsClasseArticoloNull()) {
+ return string.Empty;
}
- catch (global::System.InvalidCastException e) {
- throw new global::System.Data.StrongTypingException("The value for column \'ClasseArticolo\' in table \'AnagImballi\' is DBNull.", e);
+ else {
+ return ((string)(this[this.tableAnagImballi.ClasseArticoloColumn]));
}
}
set {
@@ -7474,11 +7474,11 @@ namespace GMW_data {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
public string DescImballo {
get {
- try {
- return ((string)(this[this.tableAnagImballi.DescImballoColumn]));
+ if (this.IsDescImballoNull()) {
+ return string.Empty;
}
- catch (global::System.InvalidCastException e) {
- throw new global::System.Data.StrongTypingException("The value for column \'DescImballo\' in table \'AnagImballi\' is DBNull.", e);
+ else {
+ return ((string)(this[this.tableAnagImballi.DescImballoColumn]));
}
}
set {
diff --git a/GMW/GMW_data/DS_Applicazione.xsd b/GMW/GMW_data/DS_Applicazione.xsd
index 8039ad54..3a477537 100644
--- a/GMW/GMW_data/DS_Applicazione.xsd
+++ b/GMW/GMW_data/DS_Applicazione.xsd
@@ -1364,8 +1364,8 @@ SELECT CodCliente, RagSociale FROM RilPro.AnagClienti WHERE (CodCliente = @CodCl
-
-
+
+
@@ -1378,14 +1378,14 @@ SELECT CodCliente, RagSociale FROM RilPro.AnagClienti WHERE (CodCliente = @CodCl
-
+
-
+
@@ -1398,14 +1398,14 @@ SELECT CodCliente, RagSociale FROM RilPro.AnagClienti WHERE (CodCliente = @CodCl
-
+
-
+
@@ -1418,28 +1418,28 @@ SELECT CodCliente, RagSociale FROM RilPro.AnagClienti WHERE (CodCliente = @CodCl
-
+
-
+
-
+
-
+
@@ -1452,37 +1452,37 @@ SELECT CodCliente, RagSociale FROM RilPro.AnagClienti WHERE (CodCliente = @CodCl
-
+
-
+
-
-
-
+
+
+
-
+
-
+
@@ -1495,82 +1495,82 @@ SELECT CodCliente, RagSociale FROM RilPro.AnagClienti WHERE (CodCliente = @CodCl
-
-
-
+
+
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
+
+
+
+
-
+
-
+
-
+
-
+
@@ -1583,14 +1583,14 @@ SELECT CodCliente, RagSociale FROM RilPro.AnagClienti WHERE (CodCliente = @CodCl
-
+
-
+
@@ -1603,35 +1603,35 @@ SELECT CodCliente, RagSociale FROM RilPro.AnagClienti WHERE (CodCliente = @CodCl
-
+
-
+
-
+
-
+
-
+
@@ -1644,35 +1644,35 @@ SELECT CodCliente, RagSociale FROM RilPro.AnagClienti WHERE (CodCliente = @CodCl
-
+
-
+
-
+
-
+
-
+
@@ -1685,21 +1685,21 @@ SELECT CodCliente, RagSociale FROM RilPro.AnagClienti WHERE (CodCliente = @CodCl
-
+
-
+
-
+
@@ -1712,142 +1712,142 @@ SELECT CodCliente, RagSociale FROM RilPro.AnagClienti WHERE (CodCliente = @CodCl
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
+
+
+
-
+
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
+
-
+
-
+
@@ -1860,96 +1860,96 @@ SELECT CodCliente, RagSociale FROM RilPro.AnagClienti WHERE (CodCliente = @CodCl
-
+
-
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -1962,63 +1962,63 @@ SELECT CodCliente, RagSociale FROM RilPro.AnagClienti WHERE (CodCliente = @CodCl
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -2031,14 +2031,14 @@ SELECT CodCliente, RagSociale FROM RilPro.AnagClienti WHERE (CodCliente = @CodCl
-
+
-
+
diff --git a/GMW/GMW_data/bin/Debug/GMW_data.dll b/GMW/GMW_data/bin/Debug/GMW_data.dll
index 29ec30c9..495c640e 100644
Binary files a/GMW/GMW_data/bin/Debug/GMW_data.dll and b/GMW/GMW_data/bin/Debug/GMW_data.dll differ
diff --git a/GMW/GMW_data/bin/Release/GMW_data.dll b/GMW/GMW_data/bin/Release/GMW_data.dll
index fa7fd135..c63b5be8 100644
Binary files a/GMW/GMW_data/bin/Release/GMW_data.dll and b/GMW/GMW_data/bin/Release/GMW_data.dll differ
diff --git a/GMW/GMW_data/obj/Debug/GMW_data.dll b/GMW/GMW_data/obj/Debug/GMW_data.dll
index 29ec30c9..495c640e 100644
Binary files a/GMW/GMW_data/obj/Debug/GMW_data.dll and b/GMW/GMW_data/obj/Debug/GMW_data.dll differ
diff --git a/GMW/GMW_data/obj/Debug/ResolveAssemblyReference.cache b/GMW/GMW_data/obj/Debug/ResolveAssemblyReference.cache
index 62cf913d..98312802 100644
Binary files a/GMW/GMW_data/obj/Debug/ResolveAssemblyReference.cache and b/GMW/GMW_data/obj/Debug/ResolveAssemblyReference.cache differ
diff --git a/GMW/GMW_data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll b/GMW/GMW_data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll
index da18ee3d..19f13241 100644
Binary files a/GMW/GMW_data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll and b/GMW/GMW_data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll differ
diff --git a/GMW/GMW_data/obj/Release/GMW_data.dll b/GMW/GMW_data/obj/Release/GMW_data.dll
index fa7fd135..c63b5be8 100644
Binary files a/GMW/GMW_data/obj/Release/GMW_data.dll and b/GMW/GMW_data/obj/Release/GMW_data.dll differ
diff --git a/GMW/GMW_data/obj/Release/ResolveAssemblyReference.cache b/GMW/GMW_data/obj/Release/ResolveAssemblyReference.cache
index c2058d91..d9b868da 100644
Binary files a/GMW/GMW_data/obj/Release/ResolveAssemblyReference.cache and b/GMW/GMW_data/obj/Release/ResolveAssemblyReference.cache differ
diff --git a/GMW/GMW_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll b/GMW/GMW_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll
index f4f06220..38e84674 100644
Binary files a/GMW/GMW_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll and b/GMW/GMW_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll differ
diff --git a/GMW/GMW_data/reportPrinter.cs b/GMW/GMW_data/reportPrinter.cs
index 788342be..d6154460 100644
--- a/GMW/GMW_data/reportPrinter.cs
+++ b/GMW/GMW_data/reportPrinter.cs
@@ -156,12 +156,12 @@ public class reportPrinter
{
case reportRichiesto.CartellinoPesa:
report.ReportPath = @".\Reports\CartellinoCompleto.rdlc";
- report.DataSources.Add(new ReportDataSource("GMWDataSet_stp_getStatoByUdc", caricaDati(tipoReport, UDC)));
+ report.DataSources.Add(new ReportDataSource(memLayer.ML.confReadString("ReportDatasource"), caricaDati(tipoReport, UDC)));
deviceInfo = deviceInfoParam.xmlParam;
break;
case reportRichiesto.CartellinoTara:
report.ReportPath = @".\Reports\CartellinoTara.rdlc";
- report.DataSources.Add(new ReportDataSource("GMWDataSet_stp_getStatoByUdc", caricaDati(tipoReport, UDC)));
+ report.DataSources.Add(new ReportDataSource(memLayer.ML.confReadString("ReportDatasource"), caricaDati(tipoReport, UDC)));
deviceInfo = deviceInfoParam.xmlParam;
break;
default:
diff --git a/GMW/GMW_deploy/Release/GMW.csproj b/GMW/GMW_deploy/Release/GMW.csproj
index d902878f..004766e9 100644
--- a/GMW/GMW_deploy/Release/GMW.csproj
+++ b/GMW/GMW_deploy/Release/GMW.csproj
@@ -82,6 +82,7 @@
+
diff --git a/GMW/GMW_deploy/Release/bin/GMW.dll b/GMW/GMW_deploy/Release/bin/GMW.dll
index d99b015a..a4506058 100644
Binary files a/GMW/GMW_deploy/Release/bin/GMW.dll and b/GMW/GMW_deploy/Release/bin/GMW.dll differ
diff --git a/GMW/GMW_deploy/Release/bin/GMW_data.dll b/GMW/GMW_deploy/Release/bin/GMW_data.dll
index fa7fd135..c63b5be8 100644
Binary files a/GMW/GMW_deploy/Release/bin/GMW_data.dll and b/GMW/GMW_deploy/Release/bin/GMW_data.dll differ
diff --git a/GMW/GMW_deploy/Release/mazzAppSettings.config b/GMW/GMW_deploy/Release/mazzAppSettings.config
index 2c5513ff..3029b5a6 100644
--- a/GMW/GMW_deploy/Release/mazzAppSettings.config
+++ b/GMW/GMW_deploy/Release/mazzAppSettings.config
@@ -7,6 +7,7 @@
+
diff --git a/GMW/GMW_deploy/Release/obj/Debug/GMW.dll b/GMW/GMW_deploy/Release/obj/Debug/GMW.dll
index f9591f8b..4aaf4b68 100644
Binary files a/GMW/GMW_deploy/Release/obj/Debug/GMW.dll and b/GMW/GMW_deploy/Release/obj/Debug/GMW.dll differ
diff --git a/GMW/GMW_deploy/Release/obj/Debug/ResolveAssemblyReference.cache b/GMW/GMW_deploy/Release/obj/Debug/ResolveAssemblyReference.cache
index 7b910897..eef1b9b9 100644
Binary files a/GMW/GMW_deploy/Release/obj/Debug/ResolveAssemblyReference.cache and b/GMW/GMW_deploy/Release/obj/Debug/ResolveAssemblyReference.cache differ
diff --git a/GMW/GMW_deploy/Release/obj/Release/GMW.dll b/GMW/GMW_deploy/Release/obj/Release/GMW.dll
index d99b015a..a4506058 100644
Binary files a/GMW/GMW_deploy/Release/obj/Release/GMW.dll and b/GMW/GMW_deploy/Release/obj/Release/GMW.dll differ
diff --git a/GMW/GMW_deploy/Release/obj/Release/ResolveAssemblyReference.cache b/GMW/GMW_deploy/Release/obj/Release/ResolveAssemblyReference.cache
index fe8aee0f..61f4b876 100644
Binary files a/GMW/GMW_deploy/Release/obj/Release/ResolveAssemblyReference.cache and b/GMW/GMW_deploy/Release/obj/Release/ResolveAssemblyReference.cache differ
diff --git a/GMW/GMW_deploy/Release/web.config b/GMW/GMW_deploy/Release/web.config
index 8f10161a..8e41bdcf 100644
--- a/GMW/GMW_deploy/Release/web.config
+++ b/GMW/GMW_deploy/Release/web.config
@@ -1,4 +1,5 @@
-
+
+
@@ -50,26 +51,27 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
diff --git a/GMW/GMW_deploy/Source/GMW.csproj b/GMW/GMW_deploy/Source/GMW.csproj
index d902878f..004766e9 100644
--- a/GMW/GMW_deploy/Source/GMW.csproj
+++ b/GMW/GMW_deploy/Source/GMW.csproj
@@ -82,6 +82,7 @@
+
diff --git a/GMW/GMW_deploy/Source/Type/elenchi.cs b/GMW/GMW_deploy/Source/Type/elenchi.cs
index 8bce133e..93c7b6b1 100644
--- a/GMW/GMW_deploy/Source/Type/elenchi.cs
+++ b/GMW/GMW_deploy/Source/Type/elenchi.cs
@@ -184,6 +184,40 @@ namespace GMW.Type
#endregion
+ #region area imballi
+
+ protected Imballo[] _elencoImballi;
+
+ ///
+ /// legge una tab di tipo AnagImballi e la converte ad un array di tipo Imballo[]
+ ///
+ ///
+ public void caricaImballi(DS_Applicazione.AnagImballiDataTable tabImballi)
+ {
+ // conto quanti elementi ha la tab x inizializzare l'array...
+ int numRighe = tabImballi.Rows.Count;
+ _elencoImballi = new Imballo[numRighe];
+ // prendo un obj impianto da valorizzare di volta in volta...
+ Imballo obj;
+ for (int i = 0; i < numRighe; i++)
+ {
+ obj = new Imballo(tabImballi[i]);
+ _elencoImballi[i] = obj;
+ }
+ }
+ ///
+ /// Elenco Imballi
+ ///
+ public Imballo[] elencoImballi
+ {
+ get
+ {
+ return _elencoImballi;
+ }
+ }
+
+ #endregion
+
#region area bilance
protected Bilancia[] _elencoBilance;
diff --git a/GMW/GMW_deploy/Source/WS/bilance.asmx.cs b/GMW/GMW_deploy/Source/WS/bilance.asmx.cs
index 46d8683f..18050fd0 100644
--- a/GMW/GMW_deploy/Source/WS/bilance.asmx.cs
+++ b/GMW/GMW_deploy/Source/WS/bilance.asmx.cs
@@ -14,7 +14,7 @@ namespace GMW.WS
///
/// WebService per gestioen sw bilance
///
- [WebService(Namespace = "http://www.steamware.net/", Description = "Web Services che funziona da collettore di tutte le richieste delle applicazioni per le bilance integrate a GMW v.1.0.34")]
+ [WebService(Namespace = "http://www.steamware.net/", Description = "Web Services che funziona da collettore di tutte le richieste delle applicazioni per le bilance integrate a GMW v.1.0.36")]
[WebServiceBinding(ConformsTo = WsiProfiles.BasicProfile1_1)]
[System.ComponentModel.ToolboxItem(false)]
public class bilance : System.Web.Services.WebService
@@ -97,6 +97,15 @@ namespace GMW.WS
return gestEl.elencoImpianti;
}
///
+ /// Elenco anagrafico imballi
+ ///
+ [WebMethod(Description = "Elenco anagrafico imballi")]
+ public GMW.Type.Imballo[] ElencoImballi()
+ {
+ gestEl.caricaImballi(DataProxy.obj.taAnagImballi.GetData());
+ return gestEl.elencoImballi;
+ }
+ ///
/// Elenco anagrafica impianti dati codice company e sito (no dataset)
///
/// Codice company/sito
@@ -107,7 +116,6 @@ namespace GMW.WS
gestEl.caricaImpianti(DataProxy.obj.taAnagImp.stp_getByCodCS(CodCS));
return gestEl.elencoImpianti;
}
-
///
/// fornisce l'anagrafica bilance
///
diff --git a/GMW/GMW_deploy/Source/Web.config b/GMW/GMW_deploy/Source/Web.config
index b13b683f..0b45c95e 100644
--- a/GMW/GMW_deploy/Source/Web.config
+++ b/GMW/GMW_deploy/Source/Web.config
@@ -1,4 +1,5 @@
-
+
+
@@ -34,10 +35,11 @@
-
-
-
-
+
+
+
+
+
@@ -87,7 +89,8 @@
-
+
+
diff --git a/GMW/GMW_deploy/Source/bin/GMW.dll b/GMW/GMW_deploy/Source/bin/GMW.dll
index d99b015a..a4506058 100644
Binary files a/GMW/GMW_deploy/Source/bin/GMW.dll and b/GMW/GMW_deploy/Source/bin/GMW.dll differ
diff --git a/GMW/GMW_deploy/Source/bin/GMW_data.dll b/GMW/GMW_deploy/Source/bin/GMW_data.dll
index fa7fd135..c63b5be8 100644
Binary files a/GMW/GMW_deploy/Source/bin/GMW_data.dll and b/GMW/GMW_deploy/Source/bin/GMW_data.dll differ
diff --git a/GMW/GMW_deploy/Source/mazzAppSettings.config b/GMW/GMW_deploy/Source/mazzAppSettings.config
index 2c5513ff..3029b5a6 100644
--- a/GMW/GMW_deploy/Source/mazzAppSettings.config
+++ b/GMW/GMW_deploy/Source/mazzAppSettings.config
@@ -7,6 +7,7 @@
+
diff --git a/GMW/GMW_deploy/Source/obj/Debug/GMW.dll b/GMW/GMW_deploy/Source/obj/Debug/GMW.dll
index f9591f8b..4aaf4b68 100644
Binary files a/GMW/GMW_deploy/Source/obj/Debug/GMW.dll and b/GMW/GMW_deploy/Source/obj/Debug/GMW.dll differ
diff --git a/GMW/GMW_deploy/Source/obj/Debug/ResolveAssemblyReference.cache b/GMW/GMW_deploy/Source/obj/Debug/ResolveAssemblyReference.cache
index 7b910897..eef1b9b9 100644
Binary files a/GMW/GMW_deploy/Source/obj/Debug/ResolveAssemblyReference.cache and b/GMW/GMW_deploy/Source/obj/Debug/ResolveAssemblyReference.cache differ
diff --git a/GMW/GMW_deploy/Source/obj/Release/GMW.dll b/GMW/GMW_deploy/Source/obj/Release/GMW.dll
index d99b015a..a4506058 100644
Binary files a/GMW/GMW_deploy/Source/obj/Release/GMW.dll and b/GMW/GMW_deploy/Source/obj/Release/GMW.dll differ
diff --git a/GMW/GMW_deploy/Source/obj/Release/ResolveAssemblyReference.cache b/GMW/GMW_deploy/Source/obj/Release/ResolveAssemblyReference.cache
index fe8aee0f..61f4b876 100644
Binary files a/GMW/GMW_deploy/Source/obj/Release/ResolveAssemblyReference.cache and b/GMW/GMW_deploy/Source/obj/Release/ResolveAssemblyReference.cache differ
diff --git a/GMW/GMW_installer/GMW_installer.vdproj b/GMW/GMW_installer/GMW_installer.vdproj
index 1e4ffbaf..c69a94fb 100644
--- a/GMW/GMW_installer/GMW_installer.vdproj
+++ b/GMW/GMW_installer/GMW_installer.vdproj
@@ -349,14 +349,14 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:GMW"
- "ProductCode" = "8:{411F1AE9-7396-448A-A8F5-75F30B3A6CB6}"
- "PackageCode" = "8:{5E98BBFD-AFB4-4963-8AFF-70CFA8DF27DD}"
+ "ProductCode" = "8:{19F81382-5942-416D-97C7-2376F9A2C5E3}"
+ "PackageCode" = "8:{4F10731D-12DD-4E01-991C-1C955B66CCCA}"
"UpgradeCode" = "8:{C9BC0732-DC92-4336-BAC9-A05A5D2A97C0}"
"RestartWWWService" = "11:TRUE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE"
- "ProductVersion" = "8:1.0.34"
+ "ProductVersion" = "8:1.0.36"
"Manufacturer" = "8:SteamWare s.r.l."
"ARPHELPTELEPHONE" = "8:+39-035460560"
"ARPHELPLINK" = "8:http://www.steamware.net"
diff --git a/GMW/GMW_installer/Release/GMW_installer.msi b/GMW/GMW_installer/Release/GMW_installer.msi
index 89718aa7..13503f46 100644
Binary files a/GMW/GMW_installer/Release/GMW_installer.msi and b/GMW/GMW_installer/Release/GMW_installer.msi differ