diff --git a/GMW/GMW.suo b/GMW/GMW.suo
index a53eaac3..5526cf23 100644
Binary files a/GMW/GMW.suo and b/GMW/GMW.suo differ
diff --git a/GMW/GMW/GMW.csproj b/GMW/GMW/GMW.csproj
index f59e76b4..d149c51f 100644
--- a/GMW/GMW/GMW.csproj
+++ b/GMW/GMW/GMW.csproj
@@ -95,6 +95,9 @@
   <ItemGroup>
     <Content Include="mazzConnectionStrings.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Reports\" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v9.0\WebApplications\Microsoft.WebApplication.targets" Condition="" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/GMW/GMW/WS/bilance.asmx.cs b/GMW/GMW/WS/bilance.asmx.cs
index 06d11089..05951735 100644
--- a/GMW/GMW/WS/bilance.asmx.cs
+++ b/GMW/GMW/WS/bilance.asmx.cs
@@ -10,7 +10,7 @@ namespace GMW.WS
     /// <summary>
     /// Summary description for bilance
     /// </summary>
-    [WebService(Namespace = "http://www.steamware.net/", Description = "Web Services che funziona da collettore di tutte le richieste delle applicazioni per le bilance integrate a <b>GMW</b> v.1")]
+    [WebService(Namespace = "http://www.steamware.net/", Description = "Web Services che funziona da collettore di tutte le richieste delle applicazioni per le bilance integrate a <b>GMW</b> v.0.9.9")]
     [WebServiceBinding(ConformsTo = WsiProfiles.BasicProfile1_1)]
     [System.ComponentModel.ToolboxItem(false)]
     public class bilance : System.Web.Services.WebService
@@ -46,7 +46,14 @@ namespace GMW.WS
         {
             return DataProxy.obj.taAnagImp.GetData();
         }
-
+        /// <summary>
+        /// fornisce l'anagrafica impianti dati codice company e sito
+        /// </summary>
+        [WebMethod(Description = "Elenco anagrafico impianti dati codice company e sito")]
+        public GMW_data.DS_Applicazione.AnagImpiantiDataTable AnagImpiantiByCompanySito(string CodCompany, string CodSito)
+        {
+            return DataProxy.obj.taAnagImp.getByCompanySito(CodCompany, CodSito);
+        }
         #endregion
 
         #region area gestione stati & UDC
@@ -60,6 +67,16 @@ namespace GMW.WS
             return DataProxy.obj.taImp2Art.GetData();
         }
         /// <summary>
+        /// fornisce l'elenco di impianti ed articoli attualmente in produzione (per codice anagrafico)
+        /// </summary>
+        /// <param name="CodImpianto">CodImpianto come da anagrafica</param>
+        /// <returns></returns>
+        [WebMethod(Description = "Elenco impianti ed articoli attualmente in produzione (per codice anagrafico)")]
+        public GMW_data.DS_Applicazione.Impianti2ArticoliDataTable Art4Impianto(string CodImpianto)
+        {
+            return DataProxy.obj.taImp2Art.getCurrByImpianto(CodImpianto);
+        }
+        /// <summary>
         /// Fornisce un UDC a partire dalla richiesta e salva i dati
         /// </summary>
         /// <param name="place">posizione che effettua la richiesta (codice della pesa)</param>
@@ -69,16 +86,34 @@ namespace GMW.WS
         public string UdcGetNew(string place, float tara)
         {
             // genero un codice pseudo-casuale formattato
-            return string.Format("PS{0:yyMMddHHmmss}", DateTime.Now);
+            return string.Format("AM{0}{1:yy}{2}", place.Substring(0,2), (DateTime.Now.Ticks/100).ToString().Substring(0,6));
+            /*
+             * aabbcc123456
+aa= company
+bb= postaz
+cc=anno
+123456= progressivo
+             * */
+        }
+        /// <summary>
+        /// Richiede la tara per l'UDC indicato
+        /// </summary>
+        /// <param name="UDC">codice dell'UDC</param>
+        /// <returns>restituisce la tara salvata in precedenza</returns>
+        [WebMethod(Description = "Richiede la tara per l'UDC indicato")]
+        public float UdcGetTara(string UDC)
+        {
+            return 100;
         }
         /// <summary>
         /// Salva i dati aggiornati per l'UDC in quanto a numero pezzi associati
         /// </summary>
         /// <param name="UDC">codice dell'UDC</param>
+        /// <param name="CodArticolo">codice dell'articolo + figura</param>
         /// <param name="numPezzi">numero pezzi associati all'UDC</param>
         /// <returns>restituisce true/false a seconda che sia riuscito a salvare o meno i dati</returns>
         [WebMethod(Description = "Salva i dati aggiornati per l'UDC in quanto a numero pezzi associati")]
-        public bool UdcUpdate(string UDC, int numPezzi)
+        public bool UdcUpdate(string UDC, string CodArticolo, int numPezzi)
         {
             bool answ = true;
             // qui dovrei salvare sia nel log delle info che nello stato UDC le informazioni fornitemi
@@ -86,7 +121,6 @@ namespace GMW.WS
             return answ;
         }
 
-
         #endregion
 
         #region area stampe
@@ -94,11 +128,12 @@ namespace GMW.WS
         /// <summary>
         /// Stampa un cartellino dato tipo e codice UDC
         /// </summary>
+        /// <param name="place">posizione che effettua la richiesta (codice della pesa)</param>
         /// <param name="cartellino">tipo di cartellino richiesto</param>
         /// <param name="UDC">codice UDC univoco</param>
         /// <returns>restituisce true/false a seconda che sia riuscito a stampare o meno</returns>
         [WebMethod(Description = "Effettua la stampa richiesta per l'UDC indicato")]
-        public bool UdcPrintLabel(tipoCartellino cartellino, string UDC)
+        public bool UdcPrintLabel(string place, tipoCartellino cartellino, string UDC)
         {
             bool answ = true;
             // qui dovrei lanciare la stampa a seconda del tipo cartellino...
diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll
index 15cca330..2e918b9d 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 91b7bfaa..26ec2dcd 100644
Binary files a/GMW/GMW/bin/GMW_data.dll and b/GMW/GMW/bin/GMW_data.dll differ
diff --git a/GMW/GMW/bin/SteamWare.dll b/GMW/GMW/bin/SteamWare.dll
index 6980cf83..2a90c2c0 100644
Binary files a/GMW/GMW/bin/SteamWare.dll and b/GMW/GMW/bin/SteamWare.dll differ
diff --git a/GMW/GMW/obj/Debug/GMW.dll b/GMW/GMW/obj/Debug/GMW.dll
index 8f7b700a..2e918b9d 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 d03f1892..9c8fef65 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 15cca330..1876c9eb 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 986e787f..1fb0661c 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 e8557c69..dcf89c48 100644
--- a/GMW/GMW_data/DS_Applicazione.Designer.cs
+++ b/GMW/GMW_data/DS_Applicazione.Designer.cs
@@ -629,6 +629,8 @@ namespace GMW_data {
             
             private global::System.Data.DataColumn columnDescrArticolo;
             
+            private global::System.Data.DataColumn columnFigura;
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             public AnagArticoliDataTable() {
                 this.TableName = "AnagArticoli";
@@ -673,6 +675,13 @@ namespace GMW_data {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public global::System.Data.DataColumn FiguraColumn {
+                get {
+                    return this.columnFigura;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.ComponentModel.Browsable(false)]
             public int Count {
@@ -702,11 +711,12 @@ namespace GMW_data {
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            public AnagArticoliRow AddAnagArticoliRow(string CodArticolo, string DescrArticolo) {
+            public AnagArticoliRow AddAnagArticoliRow(string CodArticolo, string DescrArticolo, string Figura) {
                 AnagArticoliRow rowAnagArticoliRow = ((AnagArticoliRow)(this.NewRow()));
                 object[] columnValuesArray = new object[] {
                         CodArticolo,
-                        DescrArticolo};
+                        DescrArticolo,
+                        Figura};
                 rowAnagArticoliRow.ItemArray = columnValuesArray;
                 this.Rows.Add(rowAnagArticoliRow);
                 return rowAnagArticoliRow;
@@ -734,6 +744,7 @@ namespace GMW_data {
             internal void InitVars() {
                 this.columnCodArticolo = base.Columns["CodArticolo"];
                 this.columnDescrArticolo = base.Columns["DescrArticolo"];
+                this.columnFigura = base.Columns["Figura"];
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -742,12 +753,15 @@ namespace GMW_data {
                 base.Columns.Add(this.columnCodArticolo);
                 this.columnDescrArticolo = new global::System.Data.DataColumn("DescrArticolo", typeof(string), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columnDescrArticolo);
+                this.columnFigura = new global::System.Data.DataColumn("Figura", typeof(string), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnFigura);
                 this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
                                 this.columnCodArticolo}, true));
                 this.columnCodArticolo.AllowDBNull = false;
                 this.columnCodArticolo.Unique = true;
                 this.columnCodArticolo.MaxLength = 50;
                 this.columnDescrArticolo.MaxLength = 50;
+                this.columnFigura.MaxLength = 50;
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -877,6 +891,10 @@ namespace GMW_data {
             
             private global::System.Data.DataColumn columnDescrImpianto;
             
+            private global::System.Data.DataColumn columnCodCompany;
+            
+            private global::System.Data.DataColumn columnCodSito;
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             public AnagImpiantiDataTable() {
                 this.TableName = "AnagImpianti";
@@ -921,6 +939,20 @@ namespace GMW_data {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public global::System.Data.DataColumn CodCompanyColumn {
+                get {
+                    return this.columnCodCompany;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public global::System.Data.DataColumn CodSitoColumn {
+                get {
+                    return this.columnCodSito;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.ComponentModel.Browsable(false)]
             public int Count {
@@ -950,11 +982,13 @@ namespace GMW_data {
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            public AnagImpiantiRow AddAnagImpiantiRow(string CodImpianto, string DescrImpianto) {
+            public AnagImpiantiRow AddAnagImpiantiRow(string CodImpianto, string DescrImpianto, string CodCompany, string CodSito) {
                 AnagImpiantiRow rowAnagImpiantiRow = ((AnagImpiantiRow)(this.NewRow()));
                 object[] columnValuesArray = new object[] {
                         CodImpianto,
-                        DescrImpianto};
+                        DescrImpianto,
+                        CodCompany,
+                        CodSito};
                 rowAnagImpiantiRow.ItemArray = columnValuesArray;
                 this.Rows.Add(rowAnagImpiantiRow);
                 return rowAnagImpiantiRow;
@@ -982,6 +1016,8 @@ namespace GMW_data {
             internal void InitVars() {
                 this.columnCodImpianto = base.Columns["CodImpianto"];
                 this.columnDescrImpianto = base.Columns["DescrImpianto"];
+                this.columnCodCompany = base.Columns["CodCompany"];
+                this.columnCodSito = base.Columns["CodSito"];
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -990,12 +1026,18 @@ namespace GMW_data {
                 base.Columns.Add(this.columnCodImpianto);
                 this.columnDescrImpianto = new global::System.Data.DataColumn("DescrImpianto", typeof(string), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columnDescrImpianto);
+                this.columnCodCompany = new global::System.Data.DataColumn("CodCompany", typeof(string), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnCodCompany);
+                this.columnCodSito = new global::System.Data.DataColumn("CodSito", typeof(string), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnCodSito);
                 this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
                                 this.columnCodImpianto}, true));
                 this.columnCodImpianto.AllowDBNull = false;
                 this.columnCodImpianto.Unique = true;
                 this.columnCodImpianto.MaxLength = 50;
                 this.columnDescrImpianto.MaxLength = 50;
+                this.columnCodCompany.MaxLength = 4;
+                this.columnCodSito.MaxLength = 10;
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -1242,6 +1284,21 @@ namespace GMW_data {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public string Figura {
+                get {
+                    try {
+                        return ((string)(this[this.tableAnagArticoli.FiguraColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'Figura\' in table \'AnagArticoli\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableAnagArticoli.FiguraColumn] = value;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             public bool IsDescrArticoloNull() {
                 return this.IsNull(this.tableAnagArticoli.DescrArticoloColumn);
@@ -1252,6 +1309,16 @@ namespace GMW_data {
                 this[this.tableAnagArticoli.DescrArticoloColumn] = global::System.Convert.DBNull;
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public bool IsFiguraNull() {
+                return this.IsNull(this.tableAnagArticoli.FiguraColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public void SetFiguraNull() {
+                this[this.tableAnagArticoli.FiguraColumn] = global::System.Convert.DBNull;
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             public Impianti2ArticoliRow[] GetImpianti2ArticoliRows() {
                 if ((this.Table.ChildRelations["FK_Impianti2Articoli_AnagArticoli"] == null)) {
@@ -1302,6 +1369,36 @@ namespace GMW_data {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public string CodCompany {
+                get {
+                    try {
+                        return ((string)(this[this.tableAnagImpianti.CodCompanyColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'CodCompany\' in table \'AnagImpianti\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableAnagImpianti.CodCompanyColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public string CodSito {
+                get {
+                    try {
+                        return ((string)(this[this.tableAnagImpianti.CodSitoColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'CodSito\' in table \'AnagImpianti\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableAnagImpianti.CodSitoColumn] = value;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             public bool IsDescrImpiantoNull() {
                 return this.IsNull(this.tableAnagImpianti.DescrImpiantoColumn);
@@ -1312,6 +1409,26 @@ namespace GMW_data {
                 this[this.tableAnagImpianti.DescrImpiantoColumn] = global::System.Convert.DBNull;
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public bool IsCodCompanyNull() {
+                return this.IsNull(this.tableAnagImpianti.CodCompanyColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public void SetCodCompanyNull() {
+                this[this.tableAnagImpianti.CodCompanyColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public bool IsCodSitoNull() {
+                return this.IsNull(this.tableAnagImpianti.CodSitoColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public void SetCodSitoNull() {
+                this[this.tableAnagImpianti.CodSitoColumn] = global::System.Convert.DBNull;
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             public Impianti2ArticoliRow[] GetImpianti2ArticoliRows() {
                 if ((this.Table.ChildRelations["FK_Impianti2Articoli_AnagImpianti"] == null)) {
@@ -1582,7 +1699,7 @@ SELECT CodImpianto, CodArticolo, InizioProd, FineProd FROM Impianti2Articoli WHE
         
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         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 CodImpianto, CodArticolo, InizioProd, FineProd FROM dbo.Impianti2Articoli";
@@ -1590,8 +1707,14 @@ SELECT CodImpianto, CodArticolo, InizioProd, FineProd FROM Impianti2Articoli WHE
             this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[1].Connection = this.Connection;
             this._commandCollection[1].CommandText = "SELECT        CodImpianto, CodArticolo, InizioProd, FineProd\r\nFROM            Imp" +
-                "ianti2Articoli\r\nWHERE        (FineProd IS NULL)";
+                "ianti2Articoli\r\nWHERE        (FineProd IS NULL)\r\nAND CodImpianto= @CodImpianto";
             this._commandCollection[1].CommandType = global::System.Data.CommandType.Text;
+            this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodImpianto", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "CodImpianto", 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 = "SELECT        CodImpianto, CodArticolo, InizioProd, FineProd\r\nFROM            Imp" +
+                "ianti2Articoli\r\nWHERE        (FineProd IS NULL)";
+            this._commandCollection[2].CommandType = global::System.Data.CommandType.Text;
         }
         
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -1619,8 +1742,24 @@ SELECT CodImpianto, CodArticolo, InizioProd, FineProd FROM Impianti2Articoli WHE
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
-        public virtual DS_Applicazione.Impianti2ArticoliDataTable getCurrProd() {
+        public virtual DS_Applicazione.Impianti2ArticoliDataTable getCurrByImpianto(string CodImpianto) {
             this.Adapter.SelectCommand = this.CommandCollection[1];
+            if ((CodImpianto == null)) {
+                throw new global::System.ArgumentNullException("CodImpianto");
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[0].Value = ((string)(CodImpianto));
+            }
+            DS_Applicazione.Impianti2ArticoliDataTable dataTable = new DS_Applicazione.Impianti2ArticoliDataTable();
+            this.Adapter.Fill(dataTable);
+            return dataTable;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+        [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
+        public virtual DS_Applicazione.Impianti2ArticoliDataTable getCurrProd() {
+            this.Adapter.SelectCommand = this.CommandCollection[2];
             DS_Applicazione.Impianti2ArticoliDataTable dataTable = new DS_Applicazione.Impianti2ArticoliDataTable();
             this.Adapter.Fill(dataTable);
             return dataTable;
@@ -1916,34 +2055,39 @@ SELECT CodImpianto, CodArticolo, InizioProd, FineProd FROM Impianti2Articoli WHE
             tableMapping.DataSetTable = "AnagArticoli";
             tableMapping.ColumnMappings.Add("CodArticolo", "CodArticolo");
             tableMapping.ColumnMappings.Add("DescrArticolo", "DescrArticolo");
+            tableMapping.ColumnMappings.Add("Figura", "Figura");
             this._adapter.TableMappings.Add(tableMapping);
             this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand();
             this._adapter.DeleteCommand.Connection = this.Connection;
-            this._adapter.DeleteCommand.CommandText = "DELETE FROM [dbo].[AnagArticoli] WHERE (([CodArticolo] = @Original_CodArticolo) A" +
-                "ND ((@IsNull_DescrArticolo = 1 AND [DescrArticolo] IS NULL) OR ([DescrArticolo] " +
-                "= @Original_DescrArticolo)))";
+            this._adapter.DeleteCommand.CommandText = @"DELETE FROM [dbo].[AnagArticoli] WHERE (([CodArticolo] = @Original_CodArticolo) AND ((@IsNull_DescrArticolo = 1 AND [DescrArticolo] IS NULL) OR ([DescrArticolo] = @Original_DescrArticolo)) AND ((@IsNull_Figura = 1 AND [Figura] IS NULL) OR ([Figura] = @Original_Figura)))";
             this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text;
             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodArticolo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodArticolo", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_DescrArticolo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DescrArticolo", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_DescrArticolo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DescrArticolo", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_Figura", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Figura", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+            this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Figura", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Figura", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
             this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand();
             this._adapter.InsertCommand.Connection = this.Connection;
-            this._adapter.InsertCommand.CommandText = "INSERT INTO [dbo].[AnagArticoli] ([CodArticolo], [DescrArticolo]) VALUES (@CodArt" +
-                "icolo, @DescrArticolo);\r\nSELECT CodArticolo, DescrArticolo FROM AnagArticoli WHE" +
-                "RE (CodArticolo = @CodArticolo)";
+            this._adapter.InsertCommand.CommandText = "INSERT INTO [dbo].[AnagArticoli] ([CodArticolo], [DescrArticolo], [Figura]) VALUE" +
+                "S (@CodArticolo, @DescrArticolo, @Figura);\r\nSELECT CodArticolo, DescrArticolo, F" +
+                "igura FROM AnagArticoli WHERE (CodArticolo = @CodArticolo)";
             this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text;
             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodArticolo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodArticolo", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DescrArticolo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DescrArticolo", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Figura", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Figura", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand();
             this._adapter.UpdateCommand.Connection = this.Connection;
-            this._adapter.UpdateCommand.CommandText = @"UPDATE [dbo].[AnagArticoli] SET [CodArticolo] = @CodArticolo, [DescrArticolo] = @DescrArticolo WHERE (([CodArticolo] = @Original_CodArticolo) AND ((@IsNull_DescrArticolo = 1 AND [DescrArticolo] IS NULL) OR ([DescrArticolo] = @Original_DescrArticolo)));
-SELECT CodArticolo, DescrArticolo FROM AnagArticoli WHERE (CodArticolo = @CodArticolo)";
+            this._adapter.UpdateCommand.CommandText = @"UPDATE [dbo].[AnagArticoli] SET [CodArticolo] = @CodArticolo, [DescrArticolo] = @DescrArticolo, [Figura] = @Figura WHERE (([CodArticolo] = @Original_CodArticolo) AND ((@IsNull_DescrArticolo = 1 AND [DescrArticolo] IS NULL) OR ([DescrArticolo] = @Original_DescrArticolo)) AND ((@IsNull_Figura = 1 AND [Figura] IS NULL) OR ([Figura] = @Original_Figura)));
+SELECT CodArticolo, DescrArticolo, Figura FROM AnagArticoli WHERE (CodArticolo = @CodArticolo)";
             this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text;
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodArticolo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodArticolo", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DescrArticolo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DescrArticolo", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Figura", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Figura", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodArticolo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodArticolo", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_DescrArticolo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DescrArticolo", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_DescrArticolo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DescrArticolo", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_Figura", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Figura", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Figura", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Figura", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
         }
         
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -1957,7 +2101,7 @@ SELECT CodArticolo, DescrArticolo FROM AnagArticoli WHERE (CodArticolo = @CodArt
             this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1];
             this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[0].Connection = this.Connection;
-            this._commandCollection[0].CommandText = "SELECT CodArticolo, DescrArticolo FROM dbo.AnagArticoli";
+            this._commandCollection[0].CommandText = "SELECT * FROM dbo.AnagArticoli";
             this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
         }
         
@@ -2011,7 +2155,7 @@ SELECT CodArticolo, DescrArticolo FROM AnagArticoli WHERE (CodArticolo = @CodArt
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Delete, true)]
-        public virtual int Delete(string Original_CodArticolo, string Original_DescrArticolo) {
+        public virtual int Delete(string Original_CodArticolo, string Original_DescrArticolo, string Original_Figura) {
             if ((Original_CodArticolo == null)) {
                 throw new global::System.ArgumentNullException("Original_CodArticolo");
             }
@@ -2026,6 +2170,14 @@ SELECT CodArticolo, DescrArticolo FROM AnagArticoli WHERE (CodArticolo = @CodArt
                 this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(0));
                 this.Adapter.DeleteCommand.Parameters[2].Value = ((string)(Original_DescrArticolo));
             }
+            if ((Original_Figura == null)) {
+                this.Adapter.DeleteCommand.Parameters[3].Value = ((object)(1));
+                this.Adapter.DeleteCommand.Parameters[4].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.DeleteCommand.Parameters[3].Value = ((object)(0));
+                this.Adapter.DeleteCommand.Parameters[4].Value = ((string)(Original_Figura));
+            }
             global::System.Data.ConnectionState previousConnectionState = this.Adapter.DeleteCommand.Connection.State;
             if (((this.Adapter.DeleteCommand.Connection.State & global::System.Data.ConnectionState.Open) 
                         != global::System.Data.ConnectionState.Open)) {
@@ -2045,7 +2197,7 @@ SELECT CodArticolo, DescrArticolo FROM AnagArticoli WHERE (CodArticolo = @CodArt
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Insert, true)]
-        public virtual int Insert(string CodArticolo, string DescrArticolo) {
+        public virtual int Insert(string CodArticolo, string DescrArticolo, string Figura) {
             if ((CodArticolo == null)) {
                 throw new global::System.ArgumentNullException("CodArticolo");
             }
@@ -2058,6 +2210,12 @@ SELECT CodArticolo, DescrArticolo FROM AnagArticoli WHERE (CodArticolo = @CodArt
             else {
                 this.Adapter.InsertCommand.Parameters[1].Value = ((string)(DescrArticolo));
             }
+            if ((Figura == null)) {
+                this.Adapter.InsertCommand.Parameters[2].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.InsertCommand.Parameters[2].Value = ((string)(Figura));
+            }
             global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State;
             if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open) 
                         != global::System.Data.ConnectionState.Open)) {
@@ -2077,7 +2235,7 @@ SELECT CodArticolo, DescrArticolo FROM AnagArticoli WHERE (CodArticolo = @CodArt
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, true)]
-        public virtual int Update(string CodArticolo, string DescrArticolo, string Original_CodArticolo, string Original_DescrArticolo) {
+        public virtual int Update(string CodArticolo, string DescrArticolo, string Figura, string Original_CodArticolo, string Original_DescrArticolo, string Original_Figura) {
             if ((CodArticolo == null)) {
                 throw new global::System.ArgumentNullException("CodArticolo");
             }
@@ -2090,19 +2248,33 @@ SELECT CodArticolo, DescrArticolo FROM AnagArticoli WHERE (CodArticolo = @CodArt
             else {
                 this.Adapter.UpdateCommand.Parameters[1].Value = ((string)(DescrArticolo));
             }
+            if ((Figura == null)) {
+                this.Adapter.UpdateCommand.Parameters[2].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[2].Value = ((string)(Figura));
+            }
             if ((Original_CodArticolo == null)) {
                 throw new global::System.ArgumentNullException("Original_CodArticolo");
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[2].Value = ((string)(Original_CodArticolo));
+                this.Adapter.UpdateCommand.Parameters[3].Value = ((string)(Original_CodArticolo));
             }
             if ((Original_DescrArticolo == null)) {
-                this.Adapter.UpdateCommand.Parameters[3].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[4].Value = global::System.DBNull.Value;
+                this.Adapter.UpdateCommand.Parameters[4].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[5].Value = global::System.DBNull.Value;
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[3].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[4].Value = ((string)(Original_DescrArticolo));
+                this.Adapter.UpdateCommand.Parameters[4].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[5].Value = ((string)(Original_DescrArticolo));
+            }
+            if ((Original_Figura == null)) {
+                this.Adapter.UpdateCommand.Parameters[6].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[7].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[6].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[7].Value = ((string)(Original_Figura));
             }
             global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State;
             if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open) 
@@ -2123,8 +2295,8 @@ SELECT CodArticolo, DescrArticolo FROM AnagArticoli WHERE (CodArticolo = @CodArt
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, true)]
-        public virtual int Update(string DescrArticolo, string Original_CodArticolo, string Original_DescrArticolo) {
-            return this.Update(Original_CodArticolo, DescrArticolo, Original_CodArticolo, Original_DescrArticolo);
+        public virtual int Update(string DescrArticolo, string Figura, string Original_CodArticolo, string Original_DescrArticolo, string Original_Figura) {
+            return this.Update(Original_CodArticolo, DescrArticolo, Figura, Original_CodArticolo, Original_DescrArticolo, Original_Figura);
         }
     }
     
@@ -2245,34 +2417,45 @@ SELECT CodArticolo, DescrArticolo FROM AnagArticoli WHERE (CodArticolo = @CodArt
             tableMapping.DataSetTable = "AnagImpianti";
             tableMapping.ColumnMappings.Add("CodImpianto", "CodImpianto");
             tableMapping.ColumnMappings.Add("DescrImpianto", "DescrImpianto");
+            tableMapping.ColumnMappings.Add("CodCompany", "CodCompany");
+            tableMapping.ColumnMappings.Add("CodSito", "CodSito");
             this._adapter.TableMappings.Add(tableMapping);
             this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand();
             this._adapter.DeleteCommand.Connection = this.Connection;
-            this._adapter.DeleteCommand.CommandText = "DELETE FROM [dbo].[AnagImpianti] WHERE (([CodImpianto] = @Original_CodImpianto) A" +
-                "ND ((@IsNull_DescrImpianto = 1 AND [DescrImpianto] IS NULL) OR ([DescrImpianto] " +
-                "= @Original_DescrImpianto)))";
+            this._adapter.DeleteCommand.CommandText = @"DELETE FROM [dbo].[AnagImpianti] WHERE (([CodImpianto] = @Original_CodImpianto) AND ((@IsNull_DescrImpianto = 1 AND [DescrImpianto] IS NULL) OR ([DescrImpianto] = @Original_DescrImpianto)) AND ((@IsNull_CodCompany = 1 AND [CodCompany] IS NULL) OR ([CodCompany] = @Original_CodCompany)) AND ((@IsNull_CodSito = 1 AND [CodSito] IS NULL) OR ([CodSito] = @Original_CodSito)))";
             this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text;
             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodImpianto", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodImpianto", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_DescrImpianto", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DescrImpianto", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_DescrImpianto", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DescrImpianto", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_CodCompany", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodCompany", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+            this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodCompany", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodCompany", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_CodSito", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodSito", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+            this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodSito", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodSito", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
             this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand();
             this._adapter.InsertCommand.Connection = this.Connection;
-            this._adapter.InsertCommand.CommandText = "INSERT INTO [dbo].[AnagImpianti] ([CodImpianto], [DescrImpianto]) VALUES (@CodImp" +
-                "ianto, @DescrImpianto);\r\nSELECT CodImpianto, DescrImpianto FROM AnagImpianti WHE" +
-                "RE (CodImpianto = @CodImpianto)";
+            this._adapter.InsertCommand.CommandText = @"INSERT INTO [dbo].[AnagImpianti] ([CodImpianto], [DescrImpianto], [CodCompany], [CodSito]) VALUES (@CodImpianto, @DescrImpianto, @CodCompany, @CodSito);
+SELECT CodImpianto, DescrImpianto, CodCompany, CodSito FROM AnagImpianti WHERE (CodImpianto = @CodImpianto)";
             this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text;
             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodImpianto", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodImpianto", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DescrImpianto", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DescrImpianto", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodCompany", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodCompany", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodSito", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodSito", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand();
             this._adapter.UpdateCommand.Connection = this.Connection;
-            this._adapter.UpdateCommand.CommandText = @"UPDATE [dbo].[AnagImpianti] SET [CodImpianto] = @CodImpianto, [DescrImpianto] = @DescrImpianto WHERE (([CodImpianto] = @Original_CodImpianto) AND ((@IsNull_DescrImpianto = 1 AND [DescrImpianto] IS NULL) OR ([DescrImpianto] = @Original_DescrImpianto)));
-SELECT CodImpianto, DescrImpianto FROM AnagImpianti WHERE (CodImpianto = @CodImpianto)";
+            this._adapter.UpdateCommand.CommandText = @"UPDATE [dbo].[AnagImpianti] SET [CodImpianto] = @CodImpianto, [DescrImpianto] = @DescrImpianto, [CodCompany] = @CodCompany, [CodSito] = @CodSito WHERE (([CodImpianto] = @Original_CodImpianto) AND ((@IsNull_DescrImpianto = 1 AND [DescrImpianto] IS NULL) OR ([DescrImpianto] = @Original_DescrImpianto)) AND ((@IsNull_CodCompany = 1 AND [CodCompany] IS NULL) OR ([CodCompany] = @Original_CodCompany)) AND ((@IsNull_CodSito = 1 AND [CodSito] IS NULL) OR ([CodSito] = @Original_CodSito)));
+SELECT CodImpianto, DescrImpianto, CodCompany, CodSito FROM AnagImpianti WHERE (CodImpianto = @CodImpianto)";
             this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text;
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodImpianto", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodImpianto", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DescrImpianto", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DescrImpianto", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodCompany", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodCompany", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodSito", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodSito", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodImpianto", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodImpianto", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_DescrImpianto", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DescrImpianto", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_DescrImpianto", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DescrImpianto", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_CodCompany", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodCompany", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodCompany", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodCompany", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_CodSito", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodSito", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodSito", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodSito", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
         }
         
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -2283,11 +2466,18 @@ SELECT CodImpianto, DescrImpianto FROM AnagImpianti WHERE (CodImpianto = @CodImp
         
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         private void InitCommandCollection() {
-            this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1];
+            this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2];
             this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[0].Connection = this.Connection;
-            this._commandCollection[0].CommandText = "SELECT CodImpianto, DescrImpianto FROM dbo.AnagImpianti";
+            this._commandCollection[0].CommandText = "SELECT  * FROM dbo.AnagImpianti";
             this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
+            this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand();
+            this._commandCollection[1].Connection = this.Connection;
+            this._commandCollection[1].CommandText = "SELECT        CodImpianto, DescrImpianto, CodCompany, CodSito\r\nFROM            An" +
+                "agImpianti\r\nWHERE        (CodCompany = @CodCompany) AND (CodSito = @CodSito)";
+            this._commandCollection[1].CommandType = global::System.Data.CommandType.Text;
+            this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodCompany", global::System.Data.SqlDbType.NVarChar, 4, global::System.Data.ParameterDirection.Input, 0, 0, "CodCompany", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodSito", global::System.Data.SqlDbType.NVarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "CodSito", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
         }
         
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -2312,6 +2502,28 @@ SELECT CodImpianto, DescrImpianto FROM AnagImpianti WHERE (CodImpianto = @CodImp
             return dataTable;
         }
         
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+        [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
+        public virtual DS_Applicazione.AnagImpiantiDataTable getByCompanySito(string CodCompany, string CodSito) {
+            this.Adapter.SelectCommand = this.CommandCollection[1];
+            if ((CodCompany == null)) {
+                this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[0].Value = ((string)(CodCompany));
+            }
+            if ((CodSito == null)) {
+                this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[1].Value = ((string)(CodSito));
+            }
+            DS_Applicazione.AnagImpiantiDataTable dataTable = new DS_Applicazione.AnagImpiantiDataTable();
+            this.Adapter.Fill(dataTable);
+            return dataTable;
+        }
+        
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         public virtual int Update(DS_Applicazione.AnagImpiantiDataTable dataTable) {
@@ -2340,7 +2552,7 @@ SELECT CodImpianto, DescrImpianto FROM AnagImpianti WHERE (CodImpianto = @CodImp
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Delete, true)]
-        public virtual int Delete(string Original_CodImpianto, string Original_DescrImpianto) {
+        public virtual int Delete(string Original_CodImpianto, string Original_DescrImpianto, string Original_CodCompany, string Original_CodSito) {
             if ((Original_CodImpianto == null)) {
                 throw new global::System.ArgumentNullException("Original_CodImpianto");
             }
@@ -2355,6 +2567,22 @@ SELECT CodImpianto, DescrImpianto FROM AnagImpianti WHERE (CodImpianto = @CodImp
                 this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(0));
                 this.Adapter.DeleteCommand.Parameters[2].Value = ((string)(Original_DescrImpianto));
             }
+            if ((Original_CodCompany == null)) {
+                this.Adapter.DeleteCommand.Parameters[3].Value = ((object)(1));
+                this.Adapter.DeleteCommand.Parameters[4].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.DeleteCommand.Parameters[3].Value = ((object)(0));
+                this.Adapter.DeleteCommand.Parameters[4].Value = ((string)(Original_CodCompany));
+            }
+            if ((Original_CodSito == null)) {
+                this.Adapter.DeleteCommand.Parameters[5].Value = ((object)(1));
+                this.Adapter.DeleteCommand.Parameters[6].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.DeleteCommand.Parameters[5].Value = ((object)(0));
+                this.Adapter.DeleteCommand.Parameters[6].Value = ((string)(Original_CodSito));
+            }
             global::System.Data.ConnectionState previousConnectionState = this.Adapter.DeleteCommand.Connection.State;
             if (((this.Adapter.DeleteCommand.Connection.State & global::System.Data.ConnectionState.Open) 
                         != global::System.Data.ConnectionState.Open)) {
@@ -2374,7 +2602,7 @@ SELECT CodImpianto, DescrImpianto FROM AnagImpianti WHERE (CodImpianto = @CodImp
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Insert, true)]
-        public virtual int Insert(string CodImpianto, string DescrImpianto) {
+        public virtual int Insert(string CodImpianto, string DescrImpianto, string CodCompany, string CodSito) {
             if ((CodImpianto == null)) {
                 throw new global::System.ArgumentNullException("CodImpianto");
             }
@@ -2387,6 +2615,18 @@ SELECT CodImpianto, DescrImpianto FROM AnagImpianti WHERE (CodImpianto = @CodImp
             else {
                 this.Adapter.InsertCommand.Parameters[1].Value = ((string)(DescrImpianto));
             }
+            if ((CodCompany == null)) {
+                this.Adapter.InsertCommand.Parameters[2].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.InsertCommand.Parameters[2].Value = ((string)(CodCompany));
+            }
+            if ((CodSito == null)) {
+                this.Adapter.InsertCommand.Parameters[3].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.InsertCommand.Parameters[3].Value = ((string)(CodSito));
+            }
             global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State;
             if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open) 
                         != global::System.Data.ConnectionState.Open)) {
@@ -2406,7 +2646,7 @@ SELECT CodImpianto, DescrImpianto FROM AnagImpianti WHERE (CodImpianto = @CodImp
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, true)]
-        public virtual int Update(string CodImpianto, string DescrImpianto, string Original_CodImpianto, string Original_DescrImpianto) {
+        public virtual int Update(string CodImpianto, string DescrImpianto, string CodCompany, string CodSito, string Original_CodImpianto, string Original_DescrImpianto, string Original_CodCompany, string Original_CodSito) {
             if ((CodImpianto == null)) {
                 throw new global::System.ArgumentNullException("CodImpianto");
             }
@@ -2419,19 +2659,47 @@ SELECT CodImpianto, DescrImpianto FROM AnagImpianti WHERE (CodImpianto = @CodImp
             else {
                 this.Adapter.UpdateCommand.Parameters[1].Value = ((string)(DescrImpianto));
             }
+            if ((CodCompany == null)) {
+                this.Adapter.UpdateCommand.Parameters[2].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[2].Value = ((string)(CodCompany));
+            }
+            if ((CodSito == null)) {
+                this.Adapter.UpdateCommand.Parameters[3].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[3].Value = ((string)(CodSito));
+            }
             if ((Original_CodImpianto == null)) {
                 throw new global::System.ArgumentNullException("Original_CodImpianto");
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[2].Value = ((string)(Original_CodImpianto));
+                this.Adapter.UpdateCommand.Parameters[4].Value = ((string)(Original_CodImpianto));
             }
             if ((Original_DescrImpianto == null)) {
-                this.Adapter.UpdateCommand.Parameters[3].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[4].Value = global::System.DBNull.Value;
+                this.Adapter.UpdateCommand.Parameters[5].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[6].Value = global::System.DBNull.Value;
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[3].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[4].Value = ((string)(Original_DescrImpianto));
+                this.Adapter.UpdateCommand.Parameters[5].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[6].Value = ((string)(Original_DescrImpianto));
+            }
+            if ((Original_CodCompany == null)) {
+                this.Adapter.UpdateCommand.Parameters[7].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[8].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[7].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[8].Value = ((string)(Original_CodCompany));
+            }
+            if ((Original_CodSito == null)) {
+                this.Adapter.UpdateCommand.Parameters[9].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[10].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[9].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[10].Value = ((string)(Original_CodSito));
             }
             global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State;
             if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open) 
@@ -2452,8 +2720,8 @@ SELECT CodImpianto, DescrImpianto FROM AnagImpianti WHERE (CodImpianto = @CodImp
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, true)]
-        public virtual int Update(string DescrImpianto, string Original_CodImpianto, string Original_DescrImpianto) {
-            return this.Update(Original_CodImpianto, DescrImpianto, Original_CodImpianto, Original_DescrImpianto);
+        public virtual int Update(string DescrImpianto, string CodCompany, string CodSito, string Original_CodImpianto, string Original_DescrImpianto, string Original_CodCompany, string Original_CodSito) {
+            return this.Update(Original_CodImpianto, DescrImpianto, CodCompany, CodSito, Original_CodImpianto, Original_DescrImpianto, Original_CodCompany, Original_CodSito);
         }
     }
     
diff --git a/GMW/GMW_data/DS_Applicazione.cs b/GMW/GMW_data/DS_Applicazione.cs
new file mode 100644
index 00000000..35d19f7f
--- /dev/null
+++ b/GMW/GMW_data/DS_Applicazione.cs
@@ -0,0 +1,14 @@
+namespace GMW_data {
+    
+    
+    public partial class DS_Applicazione {
+    }
+}
+
+namespace GMW_data.DS_ApplicazioneTableAdapters
+{
+    
+    
+    public partial class Impianti2ArticoliTableAdapter {
+    }
+}
diff --git a/GMW/GMW_data/DS_Applicazione.xsd b/GMW/GMW_data/DS_Applicazione.xsd
index 912e1876..88a090b9 100644
--- a/GMW/GMW_data/DS_Applicazione.xsd
+++ b/GMW/GMW_data/DS_Applicazione.xsd
@@ -66,6 +66,19 @@ SELECT CodImpianto, CodArticolo, InizioProd, FineProd FROM Impianti2Articoli WHE
               <Mapping SourceColumn="FineProd" DataSetColumn="FineProd" />
             </Mappings>
             <Sources>
+              <DbSource ConnectionRef="GMWConnectionString (Settings)" DbObjectName="GMW.dbo.Impianti2Articoli" DbObjectType="Table" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="getCurrByImpianto" GetMethodModifier="Public" GetMethodName="getCurrByImpianto" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="getCurrByImpianto" UserSourceName="getCurrByImpianto">
+                <SelectCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                    <CommandText>SELECT        CodImpianto, CodArticolo, InizioProd, FineProd
+FROM            Impianti2Articoli
+WHERE        (FineProd IS NULL)
+AND CodImpianto= @CodImpianto</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="false" AutogeneratedName="CodImpianto" ColumnName="CodImpianto" DataSourceName="GMW.dbo.Impianti2Articoli" DataTypeServer="nvarchar(50)" DbType="String" Direction="Input" ParameterName="@CodImpianto" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumn="CodImpianto" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
               <DbSource ConnectionRef="GMWConnectionString (Settings)" DbObjectName="GMW.dbo.Impianti2Articoli" DbObjectType="Table" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="getCurrProd" GetMethodModifier="Public" GetMethodName="getCurrProd" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="getCurrProd" UserSourceName="getCurrProd">
                 <SelectCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="true">
@@ -83,40 +96,46 @@ WHERE        (FineProd IS NULL)</CommandText>
               <DbSource ConnectionRef="GMWConnectionString (Settings)" DbObjectName="GMW.dbo.AnagArticoli" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
                 <DeleteCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>DELETE FROM [dbo].[AnagArticoli] WHERE (([CodArticolo] = @Original_CodArticolo) AND ((@IsNull_DescrArticolo = 1 AND [DescrArticolo] IS NULL) OR ([DescrArticolo] = @Original_DescrArticolo)))</CommandText>
+                    <CommandText>DELETE FROM [dbo].[AnagArticoli] WHERE (([CodArticolo] = @Original_CodArticolo) AND ((@IsNull_DescrArticolo = 1 AND [DescrArticolo] IS NULL) OR ([DescrArticolo] = @Original_DescrArticolo)) AND ((@IsNull_Figura = 1 AND [Figura] IS NULL) OR ([Figura] = @Original_Figura)))</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_CodArticolo" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="CodArticolo" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_DescrArticolo" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="DescrArticolo" SourceColumnNullMapping="true" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_DescrArticolo" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="DescrArticolo" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_Figura" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="Figura" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_Figura" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="Figura" SourceColumnNullMapping="false" SourceVersion="Original" />
                     </Parameters>
                   </DbCommand>
                 </DeleteCommand>
                 <InsertCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>INSERT INTO [dbo].[AnagArticoli] ([CodArticolo], [DescrArticolo]) VALUES (@CodArticolo, @DescrArticolo);
-SELECT CodArticolo, DescrArticolo FROM AnagArticoli WHERE (CodArticolo = @CodArticolo)</CommandText>
+                    <CommandText>INSERT INTO [dbo].[AnagArticoli] ([CodArticolo], [DescrArticolo], [Figura]) VALUES (@CodArticolo, @DescrArticolo, @Figura);
+SELECT CodArticolo, DescrArticolo, Figura FROM AnagArticoli WHERE (CodArticolo = @CodArticolo)</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@CodArticolo" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="CodArticolo" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@DescrArticolo" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="DescrArticolo" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Figura" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="Figura" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </InsertCommand>
                 <SelectCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>SELECT CodArticolo, DescrArticolo FROM dbo.AnagArticoli</CommandText>
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                    <CommandText>SELECT * FROM dbo.AnagArticoli</CommandText>
                     <Parameters />
                   </DbCommand>
                 </SelectCommand>
                 <UpdateCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>UPDATE [dbo].[AnagArticoli] SET [CodArticolo] = @CodArticolo, [DescrArticolo] = @DescrArticolo WHERE (([CodArticolo] = @Original_CodArticolo) AND ((@IsNull_DescrArticolo = 1 AND [DescrArticolo] IS NULL) OR ([DescrArticolo] = @Original_DescrArticolo)));
-SELECT CodArticolo, DescrArticolo FROM AnagArticoli WHERE (CodArticolo = @CodArticolo)</CommandText>
+                    <CommandText>UPDATE [dbo].[AnagArticoli] SET [CodArticolo] = @CodArticolo, [DescrArticolo] = @DescrArticolo, [Figura] = @Figura WHERE (([CodArticolo] = @Original_CodArticolo) AND ((@IsNull_DescrArticolo = 1 AND [DescrArticolo] IS NULL) OR ([DescrArticolo] = @Original_DescrArticolo)) AND ((@IsNull_Figura = 1 AND [Figura] IS NULL) OR ([Figura] = @Original_Figura)));
+SELECT CodArticolo, DescrArticolo, Figura FROM AnagArticoli WHERE (CodArticolo = @CodArticolo)</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@CodArticolo" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="CodArticolo" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@DescrArticolo" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="DescrArticolo" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Figura" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="Figura" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_CodArticolo" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="CodArticolo" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_DescrArticolo" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="DescrArticolo" SourceColumnNullMapping="true" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_DescrArticolo" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="DescrArticolo" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_Figura" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="Figura" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_Figura" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="Figura" SourceColumnNullMapping="false" SourceVersion="Original" />
                     </Parameters>
                   </DbCommand>
                 </UpdateCommand>
@@ -125,6 +144,7 @@ SELECT CodArticolo, DescrArticolo FROM AnagArticoli WHERE (CodArticolo = @CodArt
             <Mappings>
               <Mapping SourceColumn="CodArticolo" DataSetColumn="CodArticolo" />
               <Mapping SourceColumn="DescrArticolo" DataSetColumn="DescrArticolo" />
+              <Mapping SourceColumn="Figura" DataSetColumn="Figura" />
             </Mappings>
             <Sources />
           </TableAdapter>
@@ -133,40 +153,52 @@ SELECT CodArticolo, DescrArticolo FROM AnagArticoli WHERE (CodArticolo = @CodArt
               <DbSource ConnectionRef="GMWConnectionString (Settings)" DbObjectName="GMW.dbo.AnagImpianti" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
                 <DeleteCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>DELETE FROM [dbo].[AnagImpianti] WHERE (([CodImpianto] = @Original_CodImpianto) AND ((@IsNull_DescrImpianto = 1 AND [DescrImpianto] IS NULL) OR ([DescrImpianto] = @Original_DescrImpianto)))</CommandText>
+                    <CommandText>DELETE FROM [dbo].[AnagImpianti] WHERE (([CodImpianto] = @Original_CodImpianto) AND ((@IsNull_DescrImpianto = 1 AND [DescrImpianto] IS NULL) OR ([DescrImpianto] = @Original_DescrImpianto)) AND ((@IsNull_CodCompany = 1 AND [CodCompany] IS NULL) OR ([CodCompany] = @Original_CodCompany)) AND ((@IsNull_CodSito = 1 AND [CodSito] IS NULL) OR ([CodSito] = @Original_CodSito)))</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_CodImpianto" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="CodImpianto" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_DescrImpianto" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="DescrImpianto" SourceColumnNullMapping="true" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_DescrImpianto" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="DescrImpianto" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_CodCompany" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="CodCompany" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_CodCompany" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="CodCompany" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_CodSito" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="CodSito" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_CodSito" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="CodSito" SourceColumnNullMapping="false" SourceVersion="Original" />
                     </Parameters>
                   </DbCommand>
                 </DeleteCommand>
                 <InsertCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>INSERT INTO [dbo].[AnagImpianti] ([CodImpianto], [DescrImpianto]) VALUES (@CodImpianto, @DescrImpianto);
-SELECT CodImpianto, DescrImpianto FROM AnagImpianti WHERE (CodImpianto = @CodImpianto)</CommandText>
+                    <CommandText>INSERT INTO [dbo].[AnagImpianti] ([CodImpianto], [DescrImpianto], [CodCompany], [CodSito]) VALUES (@CodImpianto, @DescrImpianto, @CodCompany, @CodSito);
+SELECT CodImpianto, DescrImpianto, CodCompany, CodSito FROM AnagImpianti WHERE (CodImpianto = @CodImpianto)</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@CodImpianto" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="CodImpianto" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@DescrImpianto" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="DescrImpianto" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@CodCompany" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="CodCompany" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@CodSito" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="CodSito" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </InsertCommand>
                 <SelectCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>SELECT CodImpianto, DescrImpianto FROM dbo.AnagImpianti</CommandText>
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                    <CommandText>SELECT  * FROM dbo.AnagImpianti</CommandText>
                     <Parameters />
                   </DbCommand>
                 </SelectCommand>
                 <UpdateCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>UPDATE [dbo].[AnagImpianti] SET [CodImpianto] = @CodImpianto, [DescrImpianto] = @DescrImpianto WHERE (([CodImpianto] = @Original_CodImpianto) AND ((@IsNull_DescrImpianto = 1 AND [DescrImpianto] IS NULL) OR ([DescrImpianto] = @Original_DescrImpianto)));
-SELECT CodImpianto, DescrImpianto FROM AnagImpianti WHERE (CodImpianto = @CodImpianto)</CommandText>
+                    <CommandText>UPDATE [dbo].[AnagImpianti] SET [CodImpianto] = @CodImpianto, [DescrImpianto] = @DescrImpianto, [CodCompany] = @CodCompany, [CodSito] = @CodSito WHERE (([CodImpianto] = @Original_CodImpianto) AND ((@IsNull_DescrImpianto = 1 AND [DescrImpianto] IS NULL) OR ([DescrImpianto] = @Original_DescrImpianto)) AND ((@IsNull_CodCompany = 1 AND [CodCompany] IS NULL) OR ([CodCompany] = @Original_CodCompany)) AND ((@IsNull_CodSito = 1 AND [CodSito] IS NULL) OR ([CodSito] = @Original_CodSito)));
+SELECT CodImpianto, DescrImpianto, CodCompany, CodSito FROM AnagImpianti WHERE (CodImpianto = @CodImpianto)</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@CodImpianto" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="CodImpianto" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@DescrImpianto" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="DescrImpianto" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@CodCompany" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="CodCompany" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@CodSito" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="CodSito" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_CodImpianto" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="CodImpianto" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_DescrImpianto" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="DescrImpianto" SourceColumnNullMapping="true" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_DescrImpianto" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="DescrImpianto" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_CodCompany" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="CodCompany" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_CodCompany" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="CodCompany" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_CodSito" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="CodSito" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_CodSito" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="CodSito" SourceColumnNullMapping="false" SourceVersion="Original" />
                     </Parameters>
                   </DbCommand>
                 </UpdateCommand>
@@ -175,50 +207,73 @@ SELECT CodImpianto, DescrImpianto FROM AnagImpianti WHERE (CodImpianto = @CodImp
             <Mappings>
               <Mapping SourceColumn="CodImpianto" DataSetColumn="CodImpianto" />
               <Mapping SourceColumn="DescrImpianto" DataSetColumn="DescrImpianto" />
+              <Mapping SourceColumn="CodCompany" DataSetColumn="CodCompany" />
+              <Mapping SourceColumn="CodSito" DataSetColumn="CodSito" />
             </Mappings>
-            <Sources />
+            <Sources>
+              <DbSource ConnectionRef="GMWConnectionString (Settings)" DbObjectName="GMW.dbo.AnagImpianti" DbObjectType="Table" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="getByCompanySito" GetMethodModifier="Public" GetMethodName="getByCompanySito" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="getByCompanySito" UserSourceName="getByCompanySito">
+                <SelectCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                    <CommandText>SELECT        CodImpianto, DescrImpianto, CodCompany, CodSito
+FROM            AnagImpianti
+WHERE        (CodCompany = @CodCompany) AND (CodSito = @CodSito)</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="true" AutogeneratedName="CodCompany" ColumnName="CodCompany" DataSourceName="GMW.dbo.AnagImpianti" DataTypeServer="nvarchar(4)" DbType="String" Direction="Input" ParameterName="@CodCompany" Precision="0" ProviderType="NVarChar" Scale="0" Size="4" SourceColumn="CodCompany" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="CodSito" ColumnName="CodSito" DataSourceName="GMW.dbo.AnagImpianti" DataTypeServer="nvarchar(10)" DbType="String" Direction="Input" ParameterName="@CodSito" Precision="0" ProviderType="NVarChar" Scale="0" Size="10" SourceColumn="CodSito" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
+            </Sources>
           </TableAdapter>
         </Tables>
         <Sources />
       </DataSource>
     </xs:appinfo>
   </xs:annotation>
-  <xs:element name="DS_Applicazione" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:Generator_DataSetName="DS_Applicazione" msprop:Generator_UserDSName="DS_Applicazione" msprop:EnableTableAdapterManager="true">
+  <xs:element name="DS_Applicazione" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:Generator_UserDSName="DS_Applicazione" msprop:Generator_DataSetName="DS_Applicazione" msprop:EnableTableAdapterManager="true">
     <xs:complexType>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element name="Impianti2Articoli" msprop:Generator_UserTableName="Impianti2Articoli" msprop:Generator_RowDeletedName="Impianti2ArticoliRowDeleted" msprop:Generator_TableClassName="Impianti2ArticoliDataTable" msprop:Generator_RowChangedName="Impianti2ArticoliRowChanged" msprop:Generator_RowClassName="Impianti2ArticoliRow" msprop:Generator_RowChangingName="Impianti2ArticoliRowChanging" msprop:Generator_RowEvArgName="Impianti2ArticoliRowChangeEvent" msprop:Generator_RowEvHandlerName="Impianti2ArticoliRowChangeEventHandler" msprop:Generator_TablePropName="Impianti2Articoli" msprop:Generator_TableVarName="tableImpianti2Articoli" msprop:Generator_RowDeletingName="Impianti2ArticoliRowDeleting">
+        <xs:element name="Impianti2Articoli" msprop:Generator_UserTableName="Impianti2Articoli" msprop:Generator_RowDeletedName="Impianti2ArticoliRowDeleted" msprop:Generator_RowChangedName="Impianti2ArticoliRowChanged" msprop:Generator_RowClassName="Impianti2ArticoliRow" msprop:Generator_RowChangingName="Impianti2ArticoliRowChanging" msprop:Generator_RowEvArgName="Impianti2ArticoliRowChangeEvent" msprop:Generator_RowEvHandlerName="Impianti2ArticoliRowChangeEventHandler" msprop:Generator_TableClassName="Impianti2ArticoliDataTable" msprop:Generator_TableVarName="tableImpianti2Articoli" msprop:Generator_RowDeletingName="Impianti2ArticoliRowDeleting" msprop:Generator_TablePropName="Impianti2Articoli">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="CodImpianto" msprop:Generator_UserColumnName="CodImpianto" msprop:Generator_ColumnPropNameInRow="CodImpianto" msprop:Generator_ColumnVarNameInTable="columnCodImpianto" msprop:Generator_ColumnPropNameInTable="CodImpiantoColumn">
+              <xs:element name="CodImpianto" msprop:Generator_UserColumnName="CodImpianto" msprop:Generator_ColumnVarNameInTable="columnCodImpianto" msprop:Generator_ColumnPropNameInRow="CodImpianto" msprop:Generator_ColumnPropNameInTable="CodImpiantoColumn">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="CodArticolo" msprop:Generator_UserColumnName="CodArticolo" msprop:Generator_ColumnPropNameInRow="CodArticolo" msprop:Generator_ColumnVarNameInTable="columnCodArticolo" msprop:Generator_ColumnPropNameInTable="CodArticoloColumn">
+              <xs:element name="CodArticolo" msprop:Generator_UserColumnName="CodArticolo" msprop:Generator_ColumnVarNameInTable="columnCodArticolo" msprop:Generator_ColumnPropNameInRow="CodArticolo" msprop:Generator_ColumnPropNameInTable="CodArticoloColumn">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="InizioProd" msprop:Generator_UserColumnName="InizioProd" msprop:Generator_ColumnPropNameInRow="InizioProd" msprop:Generator_ColumnVarNameInTable="columnInizioProd" msprop:Generator_ColumnPropNameInTable="InizioProdColumn" type="xs:dateTime" />
-              <xs:element name="FineProd" msprop:Generator_UserColumnName="FineProd" msprop:Generator_ColumnPropNameInRow="FineProd" msprop:Generator_ColumnVarNameInTable="columnFineProd" msprop:Generator_ColumnPropNameInTable="FineProdColumn" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="InizioProd" msprop:Generator_UserColumnName="InizioProd" msprop:Generator_ColumnVarNameInTable="columnInizioProd" msprop:Generator_ColumnPropNameInRow="InizioProd" msprop:Generator_ColumnPropNameInTable="InizioProdColumn" type="xs:dateTime" />
+              <xs:element name="FineProd" msprop:Generator_UserColumnName="FineProd" msprop:Generator_ColumnVarNameInTable="columnFineProd" msprop:Generator_ColumnPropNameInRow="FineProd" msprop:Generator_ColumnPropNameInTable="FineProdColumn" type="xs:dateTime" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="AnagArticoli" msprop:Generator_UserTableName="AnagArticoli" msprop:Generator_RowDeletedName="AnagArticoliRowDeleted" msprop:Generator_TableClassName="AnagArticoliDataTable" msprop:Generator_RowChangedName="AnagArticoliRowChanged" msprop:Generator_RowClassName="AnagArticoliRow" msprop:Generator_RowChangingName="AnagArticoliRowChanging" msprop:Generator_RowEvArgName="AnagArticoliRowChangeEvent" msprop:Generator_RowEvHandlerName="AnagArticoliRowChangeEventHandler" msprop:Generator_TablePropName="AnagArticoli" msprop:Generator_TableVarName="tableAnagArticoli" msprop:Generator_RowDeletingName="AnagArticoliRowDeleting">
+        <xs:element name="AnagArticoli" msprop:Generator_UserTableName="AnagArticoli" msprop:Generator_RowDeletedName="AnagArticoliRowDeleted" msprop:Generator_RowChangedName="AnagArticoliRowChanged" msprop:Generator_RowClassName="AnagArticoliRow" msprop:Generator_RowChangingName="AnagArticoliRowChanging" msprop:Generator_RowEvArgName="AnagArticoliRowChangeEvent" msprop:Generator_RowEvHandlerName="AnagArticoliRowChangeEventHandler" msprop:Generator_TableClassName="AnagArticoliDataTable" msprop:Generator_TableVarName="tableAnagArticoli" msprop:Generator_RowDeletingName="AnagArticoliRowDeleting" msprop:Generator_TablePropName="AnagArticoli">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="CodArticolo" msprop:Generator_UserColumnName="CodArticolo" msprop:Generator_ColumnPropNameInRow="CodArticolo" msprop:Generator_ColumnVarNameInTable="columnCodArticolo" msprop:Generator_ColumnPropNameInTable="CodArticoloColumn">
+              <xs:element name="CodArticolo" msprop:Generator_UserColumnName="CodArticolo" msprop:Generator_ColumnVarNameInTable="columnCodArticolo" msprop:Generator_ColumnPropNameInRow="CodArticolo" msprop:Generator_ColumnPropNameInTable="CodArticoloColumn">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="DescrArticolo" msprop:Generator_UserColumnName="DescrArticolo" msprop:Generator_ColumnPropNameInRow="DescrArticolo" msprop:Generator_ColumnVarNameInTable="columnDescrArticolo" msprop:Generator_ColumnPropNameInTable="DescrArticoloColumn" minOccurs="0">
+              <xs:element name="DescrArticolo" msprop:Generator_UserColumnName="DescrArticolo" msprop:Generator_ColumnVarNameInTable="columnDescrArticolo" msprop:Generator_ColumnPropNameInRow="DescrArticolo" msprop:Generator_ColumnPropNameInTable="DescrArticoloColumn" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="Figura" msprop:Generator_UserColumnName="Figura" msprop:Generator_ColumnPropNameInRow="Figura" msprop:Generator_ColumnVarNameInTable="columnFigura" msprop:Generator_ColumnPropNameInTable="FiguraColumn" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
@@ -228,23 +283,37 @@ SELECT CodImpianto, DescrImpianto FROM AnagImpianti WHERE (CodImpianto = @CodImp
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="AnagImpianti" msprop:Generator_UserTableName="AnagImpianti" msprop:Generator_RowDeletedName="AnagImpiantiRowDeleted" msprop:Generator_TableClassName="AnagImpiantiDataTable" msprop:Generator_RowChangedName="AnagImpiantiRowChanged" msprop:Generator_RowClassName="AnagImpiantiRow" msprop:Generator_RowChangingName="AnagImpiantiRowChanging" msprop:Generator_RowEvArgName="AnagImpiantiRowChangeEvent" msprop:Generator_RowEvHandlerName="AnagImpiantiRowChangeEventHandler" msprop:Generator_TablePropName="AnagImpianti" msprop:Generator_TableVarName="tableAnagImpianti" msprop:Generator_RowDeletingName="AnagImpiantiRowDeleting">
+        <xs:element name="AnagImpianti" msprop:Generator_UserTableName="AnagImpianti" msprop:Generator_RowDeletedName="AnagImpiantiRowDeleted" msprop:Generator_RowChangedName="AnagImpiantiRowChanged" msprop:Generator_RowClassName="AnagImpiantiRow" msprop:Generator_RowChangingName="AnagImpiantiRowChanging" msprop:Generator_RowEvArgName="AnagImpiantiRowChangeEvent" msprop:Generator_RowEvHandlerName="AnagImpiantiRowChangeEventHandler" msprop:Generator_TableClassName="AnagImpiantiDataTable" msprop:Generator_TableVarName="tableAnagImpianti" msprop:Generator_RowDeletingName="AnagImpiantiRowDeleting" msprop:Generator_TablePropName="AnagImpianti">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="CodImpianto" msprop:Generator_UserColumnName="CodImpianto" msprop:Generator_ColumnPropNameInRow="CodImpianto" msprop:Generator_ColumnVarNameInTable="columnCodImpianto" msprop:Generator_ColumnPropNameInTable="CodImpiantoColumn">
+              <xs:element name="CodImpianto" msprop:Generator_UserColumnName="CodImpianto" msprop:Generator_ColumnVarNameInTable="columnCodImpianto" msprop:Generator_ColumnPropNameInRow="CodImpianto" msprop:Generator_ColumnPropNameInTable="CodImpiantoColumn">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="DescrImpianto" msprop:Generator_UserColumnName="DescrImpianto" msprop:Generator_ColumnPropNameInRow="DescrImpianto" msprop:Generator_ColumnVarNameInTable="columnDescrImpianto" msprop:Generator_ColumnPropNameInTable="DescrImpiantoColumn" minOccurs="0">
+              <xs:element name="DescrImpianto" msprop:Generator_UserColumnName="DescrImpianto" msprop:Generator_ColumnVarNameInTable="columnDescrImpianto" msprop:Generator_ColumnPropNameInRow="DescrImpianto" msprop:Generator_ColumnPropNameInTable="DescrImpiantoColumn" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
+              <xs:element name="CodCompany" msprop:Generator_UserColumnName="CodCompany" msprop:Generator_ColumnPropNameInRow="CodCompany" msprop:Generator_ColumnVarNameInTable="columnCodCompany" msprop:Generator_ColumnPropNameInTable="CodCompanyColumn" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="4" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="CodSito" msprop:Generator_UserColumnName="CodSito" msprop:Generator_ColumnPropNameInRow="CodSito" msprop:Generator_ColumnVarNameInTable="columnCodSito" msprop:Generator_ColumnPropNameInTable="CodSitoColumn" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="10" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
diff --git a/GMW/GMW_data/DS_Applicazione.xss b/GMW/GMW_data/DS_Applicazione.xss
index 3f050f75..bbcca394 100644
--- a/GMW/GMW_data/DS_Applicazione.xss
+++ b/GMW/GMW_data/DS_Applicazione.xss
@@ -6,9 +6,9 @@
 </autogenerated>-->
 <DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="0" ViewPortY="0" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
-    <Shape ID="DesignTable:Impianti2Articoli" ZOrder="5" X="471" Y="77" Height="172" Width="243" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
-    <Shape ID="DesignTable:AnagArticoli" ZOrder="4" X="160" Y="86" Height="115" Width="217" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
-    <Shape ID="DesignTable:AnagImpianti" ZOrder="1" X="830" Y="90" Height="115" Width="224" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
+    <Shape ID="DesignTable:Impianti2Articoli" ZOrder="5" X="471" Y="77" Height="191" Width="243" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
+    <Shape ID="DesignTable:AnagArticoli" ZOrder="4" X="160" Y="86" Height="134" Width="217" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
+    <Shape ID="DesignTable:AnagImpianti" ZOrder="1" X="830" Y="90" Height="172" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
   </Shapes>
   <Connectors>
     <Connector ID="DesignRelation:FK_Impianti2Articoli_AnagArticoli" ZOrder="3" LineWidth="11">
diff --git a/GMW/GMW_data/GMW_data.csproj b/GMW/GMW_data/GMW_data.csproj
index 406b0aaf..ac601b08 100644
--- a/GMW/GMW_data/GMW_data.csproj
+++ b/GMW/GMW_data/GMW_data.csproj
@@ -46,6 +46,10 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="DataProxy.cs" />
+    <Compile Include="DS_Applicazione.cs">
+      <DependentUpon>DS_Applicazione.xsd</DependentUpon>
+      <SubType>Component</SubType>
+    </Compile>
     <Compile Include="DS_Applicazione.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
diff --git a/GMW/GMW_data/bin/Debug/GMW_data.dll b/GMW/GMW_data/bin/Debug/GMW_data.dll
index fab611ff..26ec2dcd 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 91b7bfaa..0a918e17 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 fab611ff..26ec2dcd 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/TempPE/DS_Applicazione.Designer.cs.dll b/GMW/GMW_data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll
index 40a63b85..60fbb2fc 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 91b7bfaa..0a918e17 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/TempPE/DS_Applicazione.Designer.cs.dll b/GMW/GMW_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll
index bf8b72ea..c41780c6 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_deploy/Release/GMW.csproj b/GMW/GMW_deploy/Release/GMW.csproj
index f59e76b4..d149c51f 100644
--- a/GMW/GMW_deploy/Release/GMW.csproj
+++ b/GMW/GMW_deploy/Release/GMW.csproj
@@ -95,6 +95,9 @@
   <ItemGroup>
     <Content Include="mazzConnectionStrings.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Reports\" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v9.0\WebApplications\Microsoft.WebApplication.targets" Condition="" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/GMW/GMW_deploy/Release/bin/GMW.dll b/GMW/GMW_deploy/Release/bin/GMW.dll
index 15cca330..1876c9eb 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 91b7bfaa..0a918e17 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/obj/Debug/GMW.dll b/GMW/GMW_deploy/Release/obj/Debug/GMW.dll
index 8f7b700a..96305b22 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 d03f1892..b0d32dc2 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 15cca330..1876c9eb 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 986e787f..1fb0661c 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/Source/GMW.csproj b/GMW/GMW_deploy/Source/GMW.csproj
index f59e76b4..d149c51f 100644
--- a/GMW/GMW_deploy/Source/GMW.csproj
+++ b/GMW/GMW_deploy/Source/GMW.csproj
@@ -95,6 +95,9 @@
   <ItemGroup>
     <Content Include="mazzConnectionStrings.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Reports\" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v9.0\WebApplications\Microsoft.WebApplication.targets" Condition="" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/GMW/GMW_deploy/Source/WS/bilance.asmx.cs b/GMW/GMW_deploy/Source/WS/bilance.asmx.cs
index 06d11089..a9aa5709 100644
--- a/GMW/GMW_deploy/Source/WS/bilance.asmx.cs
+++ b/GMW/GMW_deploy/Source/WS/bilance.asmx.cs
@@ -10,7 +10,7 @@ namespace GMW.WS
     /// <summary>
     /// Summary description for bilance
     /// </summary>
-    [WebService(Namespace = "http://www.steamware.net/", Description = "Web Services che funziona da collettore di tutte le richieste delle applicazioni per le bilance integrate a <b>GMW</b> v.1")]
+    [WebService(Namespace = "http://www.steamware.net/", Description = "Web Services che funziona da collettore di tutte le richieste delle applicazioni per le bilance integrate a <b>GMW</b> v.0.9.7")]
     [WebServiceBinding(ConformsTo = WsiProfiles.BasicProfile1_1)]
     [System.ComponentModel.ToolboxItem(false)]
     public class bilance : System.Web.Services.WebService
@@ -72,6 +72,16 @@ namespace GMW.WS
             return string.Format("PS{0:yyMMddHHmmss}", DateTime.Now);
         }
         /// <summary>
+        /// Richiede la tara per l'UDC indicato
+        /// </summary>
+        /// <param name="UDC">codice dell'UDC</param>
+        /// <returns>restituisce la tara salvata in precedenza</returns>
+        [WebMethod(Description = "Richiede la tara per l'UDC indicato")]
+        public float UdcGetTara(string UDC)
+        {
+            return 100;
+        }
+        /// <summary>
         /// Salva i dati aggiornati per l'UDC in quanto a numero pezzi associati
         /// </summary>
         /// <param name="UDC">codice dell'UDC</param>
@@ -94,11 +104,12 @@ namespace GMW.WS
         /// <summary>
         /// Stampa un cartellino dato tipo e codice UDC
         /// </summary>
+        /// <param name="place">posizione che effettua la richiesta (codice della pesa)</param>
         /// <param name="cartellino">tipo di cartellino richiesto</param>
         /// <param name="UDC">codice UDC univoco</param>
         /// <returns>restituisce true/false a seconda che sia riuscito a stampare o meno</returns>
         [WebMethod(Description = "Effettua la stampa richiesta per l'UDC indicato")]
-        public bool UdcPrintLabel(tipoCartellino cartellino, string UDC)
+        public bool UdcPrintLabel(string place, tipoCartellino cartellino, string UDC)
         {
             bool answ = true;
             // qui dovrei lanciare la stampa a seconda del tipo cartellino...
diff --git a/GMW/GMW_deploy/Source/bin/GMW.dll b/GMW/GMW_deploy/Source/bin/GMW.dll
index 15cca330..1876c9eb 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 91b7bfaa..0a918e17 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/obj/Debug/GMW.dll b/GMW/GMW_deploy/Source/obj/Debug/GMW.dll
index 8f7b700a..96305b22 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 d03f1892..b0d32dc2 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 15cca330..1876c9eb 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 986e787f..1fb0661c 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 1423f684..eea5b5c3 100644
--- a/GMW/GMW_installer/GMW_installer.vdproj
+++ b/GMW/GMW_installer/GMW_installer.vdproj
@@ -74,6 +74,19 @@
             "PrerequisitesLocation" = "2:1"
             "Url" = "8:http://localhost/GMW"
             "ComponentsUrl" = "8:"
+                "Items"
+                {
+                    "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Net.Framework.3.5.SP1"
+                    {
+                    "Name" = "8:.NET Framework 3.5 SP1"
+                    "ProductCode" = "8:Microsoft.Net.Framework.3.5.SP1"
+                    }
+                    "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Windows.Installer.3.1"
+                    {
+                    "Name" = "8:Windows Installer 3.1"
+                    "ProductCode" = "8:Microsoft.Windows.Installer.3.1"
+                    }
+                }
             }
         }
         "Release"
@@ -336,14 +349,14 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:GMW"
-        "ProductCode" = "8:{3BB71ADC-00CE-493A-BD20-8F03F12248F5}"
-        "PackageCode" = "8:{DAD7E1ED-B1FE-4725-A264-123033929A95}"
+        "ProductCode" = "8:{A57A686C-DB1E-480E-966A-8D9125396D53}"
+        "PackageCode" = "8:{527FE409-6071-43DA-80BE-A7F927F4BC49}"
         "UpgradeCode" = "8:{C9BC0732-DC92-4336-BAC9-A05A5D2A97C0}"
         "RestartWWWService" = "11:TRUE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:0.9.7"
+        "ProductVersion" = "8:0.9.9"
         "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 431d0baa..79c982cf 100644
Binary files a/GMW/GMW_installer/Release/GMW_installer.msi and b/GMW/GMW_installer/Release/GMW_installer.msi differ
diff --git a/GMW/GMW_installer/Release/GMW_installer.piz b/GMW/GMW_installer/Release/GMW_installer.piz
index db72f09a..25c0d8f6 100644
Binary files a/GMW/GMW_installer/Release/GMW_installer.piz and b/GMW/GMW_installer/Release/GMW_installer.piz differ