diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll index d5335c05..7c163d01 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 e31c3bcb..065e5f94 100644 Binary files a/GMW/GMW/bin/GMW_data.dll and b/GMW/GMW/bin/GMW_data.dll differ diff --git a/GMW/GMW/obj/Debug/GMW.dll b/GMW/GMW/obj/Debug/GMW.dll index 0bba6202..7c163d01 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 e30869a2..376d3548 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 d5335c05..5bc36d5b 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 a46b0735..f020ccab 100644 Binary files a/GMW/GMW/obj/Release/ResolveAssemblyReference.cache and b/GMW/GMW/obj/Release/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW_Term/Web.config b/GMW/GMW_Term/Web.config index 29b0d533..6d45e25f 100644 --- a/GMW/GMW_Term/Web.config +++ b/GMW/GMW_Term/Web.config @@ -123,6 +123,8 @@ + + diff --git a/GMW/GMW_Term/WebUserControls/mod_makeMov.ascx b/GMW/GMW_Term/WebUserControls/mod_makeMov.ascx index 86c22928..8a044b02 100644 --- a/GMW/GMW_Term/WebUserControls/mod_makeMov.ascx +++ b/GMW/GMW_Term/WebUserControls/mod_makeMov.ascx @@ -1 +1,51 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_makeMov.ascx.cs" Inherits="GMW_Term.WebUserControls.mod_makeMov" %> +
+
+
+ +
+ + + +
+
+ +
+ + + +
+
+
+
+
+
+ +
+
+
+
+ +
+
+
+
+
+
+ + + + +
+
+ + + + +
+
+
diff --git a/GMW/GMW_Term/WebUserControls/mod_makeMov.ascx.cs b/GMW/GMW_Term/WebUserControls/mod_makeMov.ascx.cs index c052db04..629b38d2 100644 --- a/GMW/GMW_Term/WebUserControls/mod_makeMov.ascx.cs +++ b/GMW/GMW_Term/WebUserControls/mod_makeMov.ascx.cs @@ -4,14 +4,124 @@ using System.Linq; using System.Web; using System.Web.UI; using System.Web.UI.WebControls; +using SteamWare; +using GMW_data; namespace GMW_Term.WebUserControls { public partial class mod_makeMov : System.Web.UI.UserControl { + /// + /// wrapper traduzione termini + /// + /// + /// + public string traduci(string lemma) + { + return user_std.UtSn.Traduci(lemma); + } + /// + /// chiamata principale + /// + /// + /// protected void Page_Load(object sender, EventArgs e) { - + updateMakeMov(); } + /// + /// aggiorna lo stato dell'operazione di movimentazione + /// + public void updateMakeMov() + { + // recupero barcode e controllo sia valido + string _UDC = memLayer.ML.StringSessionObj("UDC_sel"); + int _idxCella = memLayer.ML.IntSessionObj("IdxCella_sel"); + string _codCella = memLayer.ML.StringSessionObj("codCella_sel"); + // aggiorno labels standard + lblCella.Text = traduci("lblCella"); + lblUDC.Text = traduci("lblUDC"); + btnConferma.Text = traduci("btnConferma"); + btnAnnulla.Text = traduci("btnAnnulla"); + // aggiorno labels valori + lblCodCella.Text = _codCella; + lblCodUDC.Text = _UDC; + // controllo se ci siano UDC/Cella validi + if (_UDC != "" && _codCella != "") + { + // SE cella vuota procedo! + if (!MagClass.magazzino.cellaPiena(memLayer.ML.confReadString("codCS"), _idxCella)) + { + spostaUdc(_UDC, _idxCella, _codCella); + } + else + { + // se cella piena chiedo conferma + btnConferma.Visible = true; + btnAnnulla.Visible = true; + } + } + else + { + btnConferma.Visible = false; + btnAnnulla.Visible = false; + } + } + /// + /// effettua spostamento UDC sparato da barcode + /// + /// + /// + /// + private void spostaUdc(string _UDC, int _idxCella, string _codCella) + { + MagClass.magazzino.spostaUDC(memLayer.ML.confReadString("codCS"), _UDC, _idxCella, false); + btnConferma.Visible = false; + btnAnnulla.Visible = false; + lblEsito.Text = string.Format("{0} {1} --> {2} ", traduci("ConfermaSpostatoUDC"), _UDC, _codCella); + resetAndUpdate(); + } + /// + /// CONFERMA associazione UDC/CELLA + /// + /// + /// + protected void btnConferma_Click(object sender, EventArgs e) + { + // calcolo valori + string _UDC = memLayer.ML.StringSessionObj("UDC_sel"); + int _idxCella = memLayer.ML.IntSessionObj("IdxCella_sel"); + string _codCella = memLayer.ML.StringSessionObj("codCella_sel"); + // sposto UDC precedente in posizione preimpostata da web.config + string codCellaErroriAnime = memLayer.ML.confReadString("codCellaErroriAnime"); + int idxCellaTo = MagClass.magazzino.taCelle.getByCodCella(codCellaErroriAnime)[0].IdxCella; + string udc2move = MagClass.magazzino.udcInCella(memLayer.ML.confReadString("codCS"), _idxCella); + MagClass.magazzino.spostaUDC(memLayer.ML.confReadString("codCS"), udc2move, idxCellaTo, false); + lblEsito.Text = string.Format("{0} {1} --> {2} ", traduci("ConfermaSpostatoUDC"), _UDC, _codCella); + spostaUdc(_UDC, _idxCella, _codCella); + resetAndUpdate(); + } + /// + /// aggiorna visualizzazioni e resetta + /// + private void resetAndUpdate() + { + memLayer.ML.emptySessionVal("UDC_sel"); + memLayer.ML.emptySessionVal("IdxCella_sel"); + memLayer.ML.emptySessionVal("codCella_sel"); + // aggiorno visualizzazione + updateMakeMov(); + lblErrore.Visible = false; + } + /// + /// annulla associazione UDC / CELLA + /// + /// + /// + protected void btnAnnulla_Click(object sender, EventArgs e) + { + resetAndUpdate(); + } + } } \ No newline at end of file diff --git a/GMW/GMW_Term/WebUserControls/mod_makeMov.ascx.designer.cs b/GMW/GMW_Term/WebUserControls/mod_makeMov.ascx.designer.cs index c8cf04de..b99bf00c 100644 --- a/GMW/GMW_Term/WebUserControls/mod_makeMov.ascx.designer.cs +++ b/GMW/GMW_Term/WebUserControls/mod_makeMov.ascx.designer.cs @@ -1,18 +1,106 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.42 +// Runtime Version:2.0.50727.4963 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. // //------------------------------------------------------------------------------ -namespace GMW_Term.WebUserControls -{ - - - public partial class mod_makeMov - { +namespace GMW_Term.WebUserControls { + + + public partial class mod_makeMov { + + /// + /// lblCella control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblCella; + + /// + /// lblCodCella control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblCodCella; + + /// + /// lblUDC control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblUDC; + + /// + /// lblCodUDC control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblCodUDC; + + /// + /// lblErrore control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblErrore; + + /// + /// lblEsito control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblEsito; + + /// + /// btnConferma control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton btnConferma; + + /// + /// lblGeneraListe control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblGeneraListe; + + /// + /// btnAnnulla control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton btnAnnulla; + + /// + /// lblResetListe control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblResetListe; } } diff --git a/GMW/GMW_Term/WebUserControls/mod_smartList.ascx.cs b/GMW/GMW_Term/WebUserControls/mod_smartList.ascx.cs index 4c3c3584..8f42b70a 100644 --- a/GMW/GMW_Term/WebUserControls/mod_smartList.ascx.cs +++ b/GMW/GMW_Term/WebUserControls/mod_smartList.ascx.cs @@ -11,7 +11,6 @@ namespace GMW_Term.WebUserControls { public partial class mod_smartList : System.Web.UI.UserControl { - /// /// wrapper traduzione termini /// @@ -178,11 +177,4 @@ namespace GMW_Term.WebUserControls } } - - /* - * RIFARE - * - gestione LDP temporanee... - * + vanno create e devono poter essere cancellate da sito (elenco di quelle aperte) - * */ - } \ No newline at end of file diff --git a/GMW/GMW_Term/bin/GMW_Term.dll b/GMW/GMW_Term/bin/GMW_Term.dll index dfa91005..2d1c6d02 100644 Binary files a/GMW/GMW_Term/bin/GMW_Term.dll and b/GMW/GMW_Term/bin/GMW_Term.dll differ diff --git a/GMW/GMW_Term/bin/GMW_data.dll b/GMW/GMW_Term/bin/GMW_data.dll index 5731312d..927a5d72 100644 Binary files a/GMW/GMW_Term/bin/GMW_data.dll and b/GMW/GMW_Term/bin/GMW_data.dll differ diff --git a/GMW/GMW_Term/makeMov.aspx.cs b/GMW/GMW_Term/makeMov.aspx.cs index f2ee953f..2bf5366f 100644 --- a/GMW/GMW_Term/makeMov.aspx.cs +++ b/GMW/GMW_Term/makeMov.aspx.cs @@ -11,7 +11,20 @@ namespace GMW_Term { protected void Page_Load(object sender, EventArgs e) { - + // imposto valori visibilità barcode specifici (nascondo testo...) + mod_barcode1.showHeaderText = true; + mod_barcode1.showNoteText = true; + // imposto controllo valori scansionati + mod_barcode1.eh_scannedUdc += new EventHandler(mod_barcode1_eh_scannedUdc); + mod_barcode1.eh_scannedCella += new EventHandler(mod_barcode1_eh_scannedCella); + } + void mod_barcode1_eh_scannedCella(object sender, EventArgs e) + { + Response.Redirect("~/makeMov.aspx"); + } + void mod_barcode1_eh_scannedUdc(object sender, EventArgs e) + { + Response.Redirect("~/makeMov.aspx"); } } } diff --git a/GMW/GMW_Term/mazzAppSettings.config b/GMW/GMW_Term/mazzAppSettings.config index 2d553c4b..837ec3ee 100644 --- a/GMW/GMW_Term/mazzAppSettings.config +++ b/GMW/GMW_Term/mazzAppSettings.config @@ -54,11 +54,9 @@ - - @@ -74,6 +72,8 @@ + + diff --git a/GMW/GMW_Term/mazzAppSettingsSP.config b/GMW/GMW_Term/mazzAppSettingsSP.config index b5351464..19251889 100644 --- a/GMW/GMW_Term/mazzAppSettingsSP.config +++ b/GMW/GMW_Term/mazzAppSettingsSP.config @@ -20,6 +20,7 @@ + @@ -42,6 +43,7 @@ + @@ -70,6 +72,8 @@ + + diff --git a/GMW/GMW_Term/mazzAppSettingsTK.config b/GMW/GMW_Term/mazzAppSettingsTK.config index c984bfbf..eb09d8fc 100644 --- a/GMW/GMW_Term/mazzAppSettingsTK.config +++ b/GMW/GMW_Term/mazzAppSettingsTK.config @@ -43,6 +43,7 @@ + @@ -71,6 +72,8 @@ + + diff --git a/GMW/GMW_Term/mazzAppSettingsTK_test.config b/GMW/GMW_Term/mazzAppSettingsTK_test.config index 2d553c4b..837ec3ee 100644 --- a/GMW/GMW_Term/mazzAppSettingsTK_test.config +++ b/GMW/GMW_Term/mazzAppSettingsTK_test.config @@ -54,11 +54,9 @@ - - @@ -74,6 +72,8 @@ + + diff --git a/GMW/GMW_Term/obj/Debug/GMW_Term.dll b/GMW/GMW_Term/obj/Debug/GMW_Term.dll index 8519bc56..dada6bab 100644 Binary files a/GMW/GMW_Term/obj/Debug/GMW_Term.dll and b/GMW/GMW_Term/obj/Debug/GMW_Term.dll differ diff --git a/GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache b/GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache index 91e5073d..829c2e72 100644 Binary files a/GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache and b/GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW_Term_installer/GMW_Term_installer.vdproj b/GMW/GMW_Term_installer/GMW_Term_installer.vdproj index ac9f2e5b..b1ca1160 100644 --- a/GMW/GMW_Term_installer/GMW_Term_installer.vdproj +++ b/GMW/GMW_Term_installer/GMW_Term_installer.vdproj @@ -344,14 +344,14 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:GMWT" - "ProductCode" = "8:{393246EB-9764-4C35-82D7-A8138F15F4D0}" - "PackageCode" = "8:{E29237BF-E721-41FC-A133-80063888E914}" + "ProductCode" = "8:{FA3C0ABA-85AA-4657-8986-F628BBD906C8}" + "PackageCode" = "8:{5B95E951-C332-450D-9217-A74ED78E85A6}" "UpgradeCode" = "8:{B348C50D-8DAD-4430-AEF0-60800C94CB78}" "RestartWWWService" = "11:TRUE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:1.1.425" + "ProductVersion" = "8:1.1.426" "Manufacturer" = "8:SteamWare s.r.l." "ARPHELPTELEPHONE" = "8:+39-035460560" "ARPHELPLINK" = "8:http://www.steamware.net" diff --git a/GMW/GMW_Term_installer/Release/GMW_Term_installer.msi b/GMW/GMW_Term_installer/Release/GMW_Term_installer.msi index f6719578..9f7d2378 100644 Binary files a/GMW/GMW_Term_installer/Release/GMW_Term_installer.msi and b/GMW/GMW_Term_installer/Release/GMW_Term_installer.msi differ diff --git a/GMW/GMW_data/GMW_data.csproj b/GMW/GMW_data/GMW_data.csproj index edc9ce74..ddbe132e 100644 --- a/GMW/GMW_data/GMW_data.csproj +++ b/GMW/GMW_data/GMW_data.csproj @@ -271,6 +271,7 @@ + @@ -285,6 +286,7 @@ + diff --git a/GMW/GMW_data/MagClass.cs b/GMW/GMW_data/MagClass.cs index b599967d..6a071efa 100644 --- a/GMW/GMW_data/MagClass.cs +++ b/GMW/GMW_data/MagClass.cs @@ -775,6 +775,23 @@ namespace GMW_data return answ; } /// + /// restituisce cod UDC associato ad una cella + /// + /// Codice company/sito + /// + /// + public string udcInCella(string CodCS, int IdxCella) + { + string answ = ""; + try + { + answ = taPosUdcCorr.getByIdxCella(IdxCella)[0].UDC; + } + catch + { } + return answ; + } + /// /// verifica la cella indicata sia valida, ovvero esistente /// /// diff --git a/GMW/GMW_data/SqlScripts/V1.2/GMW_00426.sql b/GMW/GMW_data/SqlScripts/V1.2/GMW_00426.sql new file mode 100644 index 00000000..10f49aeb --- /dev/null +++ b/GMW/GMW_data/SqlScripts/V1.2/GMW_00426.sql @@ -0,0 +1,71 @@ +set xact_abort on +go + +begin transaction +go + +set identity_insert dbo.Blocchi on +go + +INSERT INTO dbo.Blocchi + (IdxBlocco, CodMag, CodCS, CodBlocco, DescBlocco, NumX, NumY, NumZ) + VALUES (62, N'2', N'TK', N'S00', N'Anime - errori magazzino', 1, 1, 1) +go + +set identity_insert dbo.Blocchi off +go + +commit transaction +go + +set xact_abort on +go + +begin transaction +go + +set identity_insert dbo.TipoCella on +go + +INSERT INTO dbo.TipoCella + (IdxTipoCella, CodMag, CodCS, Quantita, Capienza, Max_X, Max_Y, Max_Z, Max_Kg, CheckPiena, SetMag) + VALUES (27, N'2', N'TK', 1, 1000, 850, 900, 1300, 1000, 0, 0) +go + +set identity_insert dbo.TipoCella off +go + +commit transaction +go + + +set xact_abort on +go + +begin transaction +go + +set identity_insert dbo.Celle on +go + +INSERT INTO dbo.Celle + (IdxCella, CodCS, CodCella, IdxTipoCella, Descrizione, Attiva, Piena, IdxBlocco, X, Y, Z) + VALUES (6198, N'TK', N'LPA010101', 13, N'-', 1, 0, 59, 1, 1, 1) +INSERT INTO dbo.Celle + (IdxCella, CodCS, CodCella, IdxTipoCella, Descrizione, Attiva, Piena, IdxBlocco, X, Y, Z) + VALUES (6199, N'TK', N'S00010101', 27, N'-', 1, 0, 62, 1, 1, 1) +go + +set identity_insert dbo.Celle off +go + +commit transaction +go + + + + + +-- registro versione... +INSERT INTO [dbo].[LogUpdateDb] ([Versione],[Data]) VALUES(426, GETDATE()) +GO diff --git a/GMW/GMW_data/SqlScripts/Vocabolario/vocab_426.sql b/GMW/GMW_data/SqlScripts/Vocabolario/vocab_426.sql new file mode 100644 index 00000000..8fc5fa79 --- /dev/null +++ b/GMW/GMW_data/SqlScripts/Vocabolario/vocab_426.sql @@ -0,0 +1,51 @@ +set xact_abort on +go + +begin transaction +go + +UPDATE dbo.Vocabolario SET + Traduzione=N'Codice non riconosciuto' + WHERE Lingua=N'EN' and Lemma=N'BarcodeNonValidoLDP' +INSERT INTO dbo.Vocabolario + VALUES (N'EN', N'btnConferma', N'Conferma') +INSERT INTO dbo.Vocabolario + VALUES (N'EN', N'ConfermaSpostatoUDC', N'Conferma: spostato UDC') +UPDATE dbo.Vocabolario SET + Traduzione=N'Creaz F18' + WHERE Lingua=N'EN' and Lemma=N'CreazF18' +INSERT INTO dbo.Vocabolario + VALUES (N'EN', N'lblCella', N'CodCella') +INSERT INTO dbo.Vocabolario + VALUES (N'EN', N'lblUDC', N'UDC') +UPDATE dbo.Vocabolario SET + Traduzione=N'Postazione Liquidi' + WHERE Lingua=N'EN' and Lemma=N'PostLiquidi' +UPDATE dbo.Vocabolario SET + Traduzione=N'Codice non riconosciuto' + WHERE Lingua=N'IT' and Lemma=N'BarcodeNonValidoLDP' +INSERT INTO dbo.Vocabolario + VALUES (N'IT', N'btnConferma', N'Conferma') +INSERT INTO dbo.Vocabolario + VALUES (N'IT', N'ConfermaSpostatoUDC', N'Conferma: spostato UDC') +UPDATE dbo.Vocabolario SET + Traduzione=N'Creaz F18' + WHERE Lingua=N'IT' and Lemma=N'CreazF18' +INSERT INTO dbo.Vocabolario + VALUES (N'IT', N'lblCella', N'CodCella') +INSERT INTO dbo.Vocabolario + VALUES (N'IT', N'lblUDC', N'UDC') +UPDATE dbo.Vocabolario SET + Traduzione=N'Postazione Liquidi' + WHERE Lingua=N'IT' and Lemma=N'PostLiquidi' +go + +commit transaction +go + + + + +-- registro versione... +INSERT INTO [dbo].[LogUpdateDb] ([Versione],[Data]) VALUES(426, GETDATE()) +GO diff --git a/GMW/GMW_data/bin/Debug/GMW_data.dll b/GMW/GMW_data/bin/Debug/GMW_data.dll index 59f48eea..065e5f94 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 e31c3bcb..927a5d72 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 59f48eea..065e5f94 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/Refactor/GMW_data.dll b/GMW/GMW_data/obj/Debug/Refactor/GMW_data.dll index e58fd58c..a7ccf906 100644 Binary files a/GMW/GMW_data/obj/Debug/Refactor/GMW_data.dll and b/GMW/GMW_data/obj/Debug/Refactor/GMW_data.dll differ diff --git a/GMW/GMW_data/obj/Release/GMW_data.dll b/GMW/GMW_data/obj/Release/GMW_data.dll index e31c3bcb..927a5d72 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_installer/GMW_installer.vdproj b/GMW/GMW_installer/GMW_installer.vdproj index 745e33b1..64656e24 100644 --- a/GMW/GMW_installer/GMW_installer.vdproj +++ b/GMW/GMW_installer/GMW_installer.vdproj @@ -307,7 +307,7 @@ "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:GMW" "ProductCode" = "8:{FC1F8B43-87CB-46E0-A0F8-E8340418AE0F}" - "PackageCode" = "8:{A9F60597-8E35-46CF-B977-4835FC3DD76F}" + "PackageCode" = "8:{ADC688D8-DF87-421A-B41B-0407AC137271}" "UpgradeCode" = "8:{C9BC0732-DC92-4336-BAC9-A05A5D2A97C0}" "RestartWWWService" = "11:TRUE" "RemovePreviousVersions" = "11:TRUE" diff --git a/GMW/GMW_installer/Release/GMW_installer.msi b/GMW/GMW_installer/Release/GMW_installer.msi index d4f92f2c..62fd18c6 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_test_installer/GMW_test_installer.vdproj b/GMW/GMW_test_installer/GMW_test_installer.vdproj index debbd252..f1516875 100644 --- a/GMW/GMW_test_installer/GMW_test_installer.vdproj +++ b/GMW/GMW_test_installer/GMW_test_installer.vdproj @@ -301,14 +301,14 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:GMW_test" - "ProductCode" = "8:{18908B8C-591C-4A2F-9BDE-65CD5F96E1C7}" - "PackageCode" = "8:{FFDF3564-57D5-40ED-AB27-0E737E3E1601}" + "ProductCode" = "8:{B2CB0FAC-4475-48F8-8881-A0B82EF5456C}" + "PackageCode" = "8:{1D1C061C-BA9B-4E2C-A74A-3B3CBE0C783A}" "UpgradeCode" = "8:{6FD64E39-D93B-4ADA-ADF3-303A1BCA49C2}" "RestartWWWService" = "11:TRUE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:1.1.425" + "ProductVersion" = "8:1.1.426" "Manufacturer" = "8:SteamWare s.r.l." "ARPHELPTELEPHONE" = "8:+39-035460560" "ARPHELPLINK" = "8:http://www.steamware.net" diff --git a/GMW/GMW_test_installer/Release/GMW_test_installer.msi b/GMW/GMW_test_installer/Release/GMW_test_installer.msi index 8b402f56..91444765 100644 Binary files a/GMW/GMW_test_installer/Release/GMW_test_installer.msi and b/GMW/GMW_test_installer/Release/GMW_test_installer.msi differ