diff --git a/GMW/GMW/Web.config b/GMW/GMW/Web.config index 39cb07f4..fc9b34b9 100644 --- a/GMW/GMW/Web.config +++ b/GMW/GMW/Web.config @@ -60,7 +60,7 @@ - + @@ -222,14 +222,14 @@ - + - + - + diff --git a/GMW/GMW/Web.config.GMW b/GMW/GMW/Web.config.GMW index 90662407..0bbd84dc 100644 --- a/GMW/GMW/Web.config.GMW +++ b/GMW/GMW/Web.config.GMW @@ -60,7 +60,7 @@ - + diff --git a/GMW/GMW/Web.config.SP_test b/GMW/GMW/Web.config.SP_test index b67048db..b9abd97f 100644 --- a/GMW/GMW/Web.config.SP_test +++ b/GMW/GMW/Web.config.SP_test @@ -60,7 +60,7 @@ - + diff --git a/GMW/GMW/Web.config.TK_test b/GMW/GMW/Web.config.TK_test index 3f284c6f..d6706def 100644 --- a/GMW/GMW/Web.config.TK_test +++ b/GMW/GMW/Web.config.TK_test @@ -60,7 +60,7 @@ - + diff --git a/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx.cs b/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx.cs index e2fcefa6..398b61ac 100644 --- a/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx.cs @@ -352,12 +352,7 @@ namespace GMW.WebUserControls modo = ctrlMode.standard; } setBtnState(); - // nascondo eventuali dettagli - grView.SelectedIndex = -1; - // aggiorno controllo corrente! - updateOds(); - // ridisegno controllo child! - aggiornaElencoRighe(); + checkFixOds(); } /// /// aggiorno x update selettore date @@ -366,10 +361,8 @@ namespace GMW.WebUserControls /// void mod_periodoAnalisi1_eh_doUpdate(object sender, EventArgs e) { - // aggiorno controllo corrente! - updateOds(); - // ridisegno controllo child! - aggiornaElencoRighe(); + setBtnState(); + checkFixOds(); } /// /// aggiorno x update valori righe prelievo @@ -378,10 +371,8 @@ namespace GMW.WebUserControls /// void mod_viewRigheListaPrelievo1_eh_nuovoValore(object sender, EventArgs e) { - // aggiorno controllo corrente! - updateOds(); - // ridisegno controllo child! - aggiornaElencoRighe(); + setBtnState(); + checkFixOds(); } /// /// svuoto da cache post update @@ -583,8 +574,8 @@ namespace GMW.WebUserControls /// protected void grView_SelectedIndexChanged(object sender, EventArgs e) { - aggiornaElencoRighe(); - grView.DataBind(); + setBtnState(); + checkFixOds(); } /// /// aggiorna visualizzazione @@ -624,7 +615,8 @@ namespace GMW.WebUserControls { SteamWare.memLayer.ML.emptySessionVal(string.Format("{0}_sel", _idxGridView)); grView.SelectedIndex = -1; - grView.DataBind(); + setBtnState(); + checkFixOds(); lblWarning.Visible = false; // nasconde dettagli mod_viewRigheListaPrelievo1.Visible = false; @@ -781,7 +773,6 @@ namespace GMW.WebUserControls } // chiamo procedura che aggiorna ods principale - grView.SelectedIndex = -1; updateOds(); // ridisegno controllo child! aggiornaElencoRighe(); @@ -846,7 +837,9 @@ namespace GMW.WebUserControls { modo = ctrlMode.standard; } + grView.SelectedIndex = -1; setBtnState(); + checkFixOds(); } /// /// mostra controllo per modificare destinatario e tipo lista @@ -863,7 +856,9 @@ namespace GMW.WebUserControls { modo = ctrlMode.standard; } + grView.SelectedIndex = -1; setBtnState(); + checkFixOds(); } /// /// va in modalità scaricamento liste multiple in blocco @@ -880,8 +875,8 @@ namespace GMW.WebUserControls { modo = ctrlMode.standard; } + grView.SelectedIndex = -1; setBtnState(); - // update ods: tolgo le LDP smart e stati != 3 checkFixOds(); } /// diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll index f67d684c..6fc321ba 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 924bede7..a258fff2 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 7d9da2e0..58973a19 100644 Binary files a/GMW/GMW/bin/SteamWare.dll and b/GMW/GMW/bin/SteamWare.dll differ diff --git a/GMW/GMW/mazzAppSettings.config b/GMW/GMW/mazzAppSettings.config index 461acc53..942d291c 100644 --- a/GMW/GMW/mazzAppSettings.config +++ b/GMW/GMW/mazzAppSettings.config @@ -7,7 +7,7 @@ - + diff --git a/GMW/GMW/mazzAppSettingsSP.config b/GMW/GMW/mazzAppSettingsSP.config index 223c5d4d..e6d66388 100644 --- a/GMW/GMW/mazzAppSettingsSP.config +++ b/GMW/GMW/mazzAppSettingsSP.config @@ -7,7 +7,7 @@ - + diff --git a/GMW/GMW/mazzAppSettingsSP_test.config b/GMW/GMW/mazzAppSettingsSP_test.config index f8c4c9a1..a0959314 100644 --- a/GMW/GMW/mazzAppSettingsSP_test.config +++ b/GMW/GMW/mazzAppSettingsSP_test.config @@ -7,7 +7,7 @@ - + diff --git a/GMW/GMW/mazzAppSettingsTK.config b/GMW/GMW/mazzAppSettingsTK.config index 288b60f9..fe9884d8 100644 --- a/GMW/GMW/mazzAppSettingsTK.config +++ b/GMW/GMW/mazzAppSettingsTK.config @@ -7,7 +7,7 @@ - + diff --git a/GMW/GMW/mazzAppSettingsTK_test.config b/GMW/GMW/mazzAppSettingsTK_test.config index 461acc53..942d291c 100644 --- a/GMW/GMW/mazzAppSettingsTK_test.config +++ b/GMW/GMW/mazzAppSettingsTK_test.config @@ -7,7 +7,7 @@ - + diff --git a/GMW/GMW/obj/Debug/GMW.dll b/GMW/GMW/obj/Debug/GMW.dll index c5bee9f9..88e70c2b 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 bedb044a..64e77377 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 ef97632f..eda5a4cf 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 d885cacf..13007a4e 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/MagClass.cs b/GMW/GMW_data/MagClass.cs index 674e3522..4ee92b42 100644 --- a/GMW/GMW_data/MagClass.cs +++ b/GMW/GMW_data/MagClass.cs @@ -551,13 +551,13 @@ namespace GMW_data // insert con calcolo UDC tabUdc = DataProxy.obj.taCartellini.stp_insNewFull(CodCS, CodBilanciaTrim, annoTrim, CodClienteTrim, ParticolareTrim, CodImpiantoTrim, CodStampoTrim, EsponenteTrim, FiguraTrim, DataRif, TurnoRif, CodImballoTrim, CodSoggettoTrim, Tara, IdxPosizione, CodTipoDichiarazioneTrim, codEventoTrim, Quantita, PesoTot, PesoCad, CodStatoTrim, UDC_ParentTrim, doDeleteUdcTara, noteTrim); } + // leggo la riga + answ = tabUdc[0].UDC; // solo se UDC parent != vuoto... if (UDC_ParentTrim != "") { try { - // leggo la riga - answ = tabUdc[0].UDC; // salvo associazione parent-child tra UDC! DataProxy.obj.taRelazUDC.Insert(UDC_ParentTrim, answ); } diff --git a/GMW/GMW_data/bin/Debug/GMW_data.dll b/GMW/GMW_data/bin/Debug/GMW_data.dll index 02744320..50bfda73 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 4fb42a53..4972ab8d 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 02744320..50bfda73 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/Release/GMW_data.dll b/GMW/GMW_data/obj/Release/GMW_data.dll index 4fb42a53..4972ab8d 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_deploy/InstallerSP/Web.config.GMW b/GMW/GMW_deploy/InstallerSP/Web.config.GMW index 90662407..5cf39ac2 100644 --- a/GMW/GMW_deploy/InstallerSP/Web.config.GMW +++ b/GMW/GMW_deploy/InstallerSP/Web.config.GMW @@ -60,7 +60,7 @@ - + diff --git a/GMW/GMW_deploy/InstallerSP/Web.config.SP_test b/GMW/GMW_deploy/InstallerSP/Web.config.SP_test index b67048db..61775038 100644 --- a/GMW/GMW_deploy/InstallerSP/Web.config.SP_test +++ b/GMW/GMW_deploy/InstallerSP/Web.config.SP_test @@ -60,7 +60,7 @@ - + diff --git a/GMW/GMW_deploy/InstallerSP/Web.config.TK_test b/GMW/GMW_deploy/InstallerSP/Web.config.TK_test index 3f284c6f..df20fe5e 100644 --- a/GMW/GMW_deploy/InstallerSP/Web.config.TK_test +++ b/GMW/GMW_deploy/InstallerSP/Web.config.TK_test @@ -60,7 +60,7 @@ - + diff --git a/GMW/GMW_deploy/InstallerTK/Web.config.GMW b/GMW/GMW_deploy/InstallerTK/Web.config.GMW index 90662407..0bbd84dc 100644 --- a/GMW/GMW_deploy/InstallerTK/Web.config.GMW +++ b/GMW/GMW_deploy/InstallerTK/Web.config.GMW @@ -60,7 +60,7 @@ - + diff --git a/GMW/GMW_deploy/InstallerTK/Web.config.SP_test b/GMW/GMW_deploy/InstallerTK/Web.config.SP_test index b67048db..b9abd97f 100644 --- a/GMW/GMW_deploy/InstallerTK/Web.config.SP_test +++ b/GMW/GMW_deploy/InstallerTK/Web.config.SP_test @@ -60,7 +60,7 @@ - + diff --git a/GMW/GMW_deploy/InstallerTK/Web.config.TK_test b/GMW/GMW_deploy/InstallerTK/Web.config.TK_test index 3f284c6f..d6706def 100644 --- a/GMW/GMW_deploy/InstallerTK/Web.config.TK_test +++ b/GMW/GMW_deploy/InstallerTK/Web.config.TK_test @@ -60,7 +60,7 @@ - + diff --git a/GMW/GMW_deploy/Source/Web.config.GMW b/GMW/GMW_deploy/Source/Web.config.GMW index 90662407..0bbd84dc 100644 --- a/GMW/GMW_deploy/Source/Web.config.GMW +++ b/GMW/GMW_deploy/Source/Web.config.GMW @@ -60,7 +60,7 @@ - + diff --git a/GMW/GMW_deploy/Source/Web.config.SP_test b/GMW/GMW_deploy/Source/Web.config.SP_test index b67048db..b9abd97f 100644 --- a/GMW/GMW_deploy/Source/Web.config.SP_test +++ b/GMW/GMW_deploy/Source/Web.config.SP_test @@ -60,7 +60,7 @@ - + diff --git a/GMW/GMW_deploy/Source/Web.config.TK_test b/GMW/GMW_deploy/Source/Web.config.TK_test index 3f284c6f..d6706def 100644 --- a/GMW/GMW_deploy/Source/Web.config.TK_test +++ b/GMW/GMW_deploy/Source/Web.config.TK_test @@ -60,7 +60,7 @@ - + diff --git a/GMW/GMW_installer/GMW_installer.vdproj b/GMW/GMW_installer/GMW_installer.vdproj index fa01c365..4b062e51 100644 --- a/GMW/GMW_installer/GMW_installer.vdproj +++ b/GMW/GMW_installer/GMW_installer.vdproj @@ -390,14 +390,14 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:GMW" - "ProductCode" = "8:{BC0DBBF2-F2B2-4AF6-9DFB-0DFB415262A4}" - "PackageCode" = "8:{EAB3E2C6-6CF0-4132-B25C-C827D8E42C1C}" + "ProductCode" = "8:{65168814-C218-4F0B-A82E-2A2D36369ABA}" + "PackageCode" = "8:{972DA9E6-B883-47C0-B632-5EA4C73925E5}" "UpgradeCode" = "8:{C9BC0732-DC92-4336-BAC9-A05A5D2A97C0}" "RestartWWWService" = "11:TRUE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:2.0.453" + "ProductVersion" = "8:2.0.456" "Manufacturer" = "8:SteamWare s.r.l." "ARPHELPTELEPHONE" = "8:+39-035460560" "ARPHELPLINK" = "8:http://www.steamware.net" @@ -870,7 +870,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_4FD0E5B75A7F47B79080EC0983BE6583" { - "SourcePath" = "8:..\\..\\SetDirectoryPermission\\obj\\Debug\\SetDirectoryPermission.exe" + "SourcePath" = "8:..\\..\\SetDirectoryPermission\\obj\\InstallerTK\\SetDirectoryPermission.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_5606017201AE45B480A8ABD8B8D68264" @@ -898,7 +898,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_8BDD7AA9D46A46EC80880F83F13C902E" { - "SourcePath" = "8:..\\..\\IISCustomActionVB\\IISConsoleVB\\obj\\Debug\\IISConsoleVB.exe" + "SourcePath" = "8:..\\..\\IISCustomActionVB\\IISConsoleVB\\obj\\InstallerTK\\IISConsoleVB.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_5606017201AE45B480A8ABD8B8D68264" diff --git a/GMW/GMW_installer/InstallerSP/GMW_installer.msi b/GMW/GMW_installer/InstallerSP/GMW_installer.msi index 2fa7dec3..ca03ce70 100644 Binary files a/GMW/GMW_installer/InstallerSP/GMW_installer.msi and b/GMW/GMW_installer/InstallerSP/GMW_installer.msi differ diff --git a/GMW/GMW_installer/InstallerTK/GMW_installer.msi b/GMW/GMW_installer/InstallerTK/GMW_installer.msi index b8a69ff5..716f19d7 100644 Binary files a/GMW/GMW_installer/InstallerTK/GMW_installer.msi and b/GMW/GMW_installer/InstallerTK/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 65136a63..81967322 100644 --- a/GMW/GMW_test_installer/GMW_test_installer.vdproj +++ b/GMW/GMW_test_installer/GMW_test_installer.vdproj @@ -375,14 +375,14 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:GMW_test" - "ProductCode" = "8:{7FC426D5-1247-4397-8224-F49505C88C26}" - "PackageCode" = "8:{BE2C7B2D-B4A5-4F91-8ABF-4D7EABA2BE04}" + "ProductCode" = "8:{F768B3F0-314D-408A-9249-DFBA51EB0815}" + "PackageCode" = "8:{56DD6E77-56CE-41E4-A6C6-B3AA4552EE9F}" "UpgradeCode" = "8:{6FD64E39-D93B-4ADA-ADF3-303A1BCA49C2}" "RestartWWWService" = "11:TRUE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:2.0.453" + "ProductVersion" = "8:2.0.456" "Manufacturer" = "8:SteamWare s.r.l." "ARPHELPTELEPHONE" = "8:+39-035460560" "ARPHELPLINK" = "8:http://www.steamware.net" @@ -827,7 +827,7 @@ { "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_110D6612090D4EDA92F772F593B23D78" { - "SourcePath" = "8:..\\..\\IISCustomActionVB\\IISConsoleVB\\obj\\Debug\\IISConsoleVB.exe" + "SourcePath" = "8:..\\..\\IISCustomActionVB\\IISConsoleVB\\obj\\InstallerTK\\IISConsoleVB.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_D4983B53F0234BFF98835BF3AFECBB8D" @@ -855,7 +855,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_179F2C709A0749C4A5EBA956FADE7EE3" { - "SourcePath" = "8:..\\..\\SetDirectoryPermission\\obj\\Debug\\SetDirectoryPermission.exe" + "SourcePath" = "8:..\\..\\SetDirectoryPermission\\obj\\InstallerTK\\SetDirectoryPermission.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_D4983B53F0234BFF98835BF3AFECBB8D" diff --git a/GMW/GMW_test_installer/InstallerSP/GMW_test_installer.msi b/GMW/GMW_test_installer/InstallerSP/GMW_test_installer.msi index 80d7562a..a9b363c0 100644 Binary files a/GMW/GMW_test_installer/InstallerSP/GMW_test_installer.msi and b/GMW/GMW_test_installer/InstallerSP/GMW_test_installer.msi differ diff --git a/GMW/GMW_test_installer/InstallerTK/GMW_test_installer.msi b/GMW/GMW_test_installer/InstallerTK/GMW_test_installer.msi index 152a9f20..fe185048 100644 Binary files a/GMW/GMW_test_installer/InstallerTK/GMW_test_installer.msi and b/GMW/GMW_test_installer/InstallerTK/GMW_test_installer.msi differ