diff --git a/GMW/GMW/Web.config b/GMW/GMW/Web.config
index 19f692b3..9238a8e0 100644
--- a/GMW/GMW/Web.config
+++ b/GMW/GMW/Web.config
@@ -60,7 +60,7 @@
-
+
@@ -146,6 +146,9 @@
+
+
+
@@ -225,14 +228,14 @@
-
+
-
+
-
+
diff --git a/GMW/GMW/Web.config.GMW b/GMW/GMW/Web.config.GMW
index 48d5812f..59a7e54b 100644
--- a/GMW/GMW/Web.config.GMW
+++ b/GMW/GMW/Web.config.GMW
@@ -60,7 +60,7 @@
-
+
@@ -146,6 +146,9 @@
+
+
+
diff --git a/GMW/GMW/Web.config.SP_test b/GMW/GMW/Web.config.SP_test
index 7b71d754..6e482253 100644
--- a/GMW/GMW/Web.config.SP_test
+++ b/GMW/GMW/Web.config.SP_test
@@ -60,7 +60,7 @@
-
+
@@ -146,6 +146,9 @@
+
+
+
diff --git a/GMW/GMW/Web.config.TK_test b/GMW/GMW/Web.config.TK_test
index 89cda632..721e7021 100644
--- a/GMW/GMW/Web.config.TK_test
+++ b/GMW/GMW/Web.config.TK_test
@@ -60,7 +60,7 @@
-
+
@@ -145,6 +145,9 @@
+
+
+
diff --git a/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx.cs b/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx.cs
index 71ec2e87..8c87cc08 100644
--- a/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx.cs
+++ b/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx.cs
@@ -468,7 +468,7 @@ namespace GMW.WebUserControls
if (!UdcExists)
{
// creo UDC
- MagClass.magazzino.creaUdc("TR", "", "", "", "", "", "", "", 0, "", "U", MagClass.magazzino.CodSoggCurrUser, 0, 0, 0, DateTime.Now, 0, "Trattamenti", memLayer.ML.confReadInt("IdxPosizioneTrattamenti"), "IdxPosizioneTrattamenti", memLayer.ML.confReadString("NEW_TRAT"), "LI", newUdcParent, anno, Request.UserHostName);
+ MagClass.magazzino.creaUdc("TR", "", memLayer.ML.confReadString("particTratt"), "", "", "", "", "", 0, "", "U", MagClass.magazzino.CodSoggCurrUser, 0, 0, 0, DateTime.Now, 0, "Trattamenti", memLayer.ML.confReadInt("IdxPosizioneTrattamenti"), "IdxPosizioneTrattamenti", memLayer.ML.confReadString("nuovoUdcTrattamenti"), "LI", newUdcParent, anno, Request.UserHostName);
}
// associo tratt termici e liquidi
MagClass.magazzino.associaUdcParent(newUdcChild, newUdcParent);
diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll
index 9eb3508a..b2773ecc 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 e5eb1365..27016115 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 b51e2042..3768d85c 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 fed351c1..8085a2f5 100644
--- a/GMW/GMW/mazzAppSettings.config
+++ b/GMW/GMW/mazzAppSettings.config
@@ -7,7 +7,7 @@
-
+
@@ -93,6 +93,9 @@
+
+
+
diff --git a/GMW/GMW/mazzAppSettingsSP.config b/GMW/GMW/mazzAppSettingsSP.config
index d9903620..55e0c007 100644
--- a/GMW/GMW/mazzAppSettingsSP.config
+++ b/GMW/GMW/mazzAppSettingsSP.config
@@ -7,7 +7,7 @@
-
+
@@ -93,6 +93,9 @@
+
+
+
diff --git a/GMW/GMW/mazzAppSettingsSP_test.config b/GMW/GMW/mazzAppSettingsSP_test.config
index fed351c1..8085a2f5 100644
--- a/GMW/GMW/mazzAppSettingsSP_test.config
+++ b/GMW/GMW/mazzAppSettingsSP_test.config
@@ -7,7 +7,7 @@
-
+
@@ -93,6 +93,9 @@
+
+
+
diff --git a/GMW/GMW/mazzAppSettingsTK.config b/GMW/GMW/mazzAppSettingsTK.config
index e6f1665e..56833e4f 100644
--- a/GMW/GMW/mazzAppSettingsTK.config
+++ b/GMW/GMW/mazzAppSettingsTK.config
@@ -7,7 +7,7 @@
-
+
@@ -93,6 +93,9 @@
+
+
+
diff --git a/GMW/GMW/mazzAppSettingsTK_test.config b/GMW/GMW/mazzAppSettingsTK_test.config
index 63c075ef..15549160 100644
--- a/GMW/GMW/mazzAppSettingsTK_test.config
+++ b/GMW/GMW/mazzAppSettingsTK_test.config
@@ -7,7 +7,7 @@
-
+
@@ -93,6 +93,9 @@
+
+
+
diff --git a/GMW/GMW/obj/Debug/GMW.dll b/GMW/GMW/obj/Debug/GMW.dll
index 9848ad8f..17349c1b 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 34ed0735..e8636360 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 1e0a3d27..2e486f02 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 4f15b32b..cc6db11d 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 93f2dca5..4f73ae1e 100644
--- a/GMW/GMW_Term/Web.config
+++ b/GMW/GMW_Term/Web.config
@@ -58,7 +58,7 @@
-
+
diff --git a/GMW/GMW_Term/mazzAppSettings.config b/GMW/GMW_Term/mazzAppSettings.config
index ff94e023..dd26d5b0 100644
--- a/GMW/GMW_Term/mazzAppSettings.config
+++ b/GMW/GMW_Term/mazzAppSettings.config
@@ -7,7 +7,7 @@
-
+
diff --git a/GMW/GMW_Term/mazzAppSettingsSP.config b/GMW/GMW_Term/mazzAppSettingsSP.config
index b018c4fb..07f1c4c0 100644
--- a/GMW/GMW_Term/mazzAppSettingsSP.config
+++ b/GMW/GMW_Term/mazzAppSettingsSP.config
@@ -7,7 +7,7 @@
-
+
@@ -83,9 +83,9 @@
-
-
-
+
+
+
diff --git a/GMW/GMW_Term/mazzAppSettingsSP_test.config b/GMW/GMW_Term/mazzAppSettingsSP_test.config
index ea6c83da..3be58a65 100644
--- a/GMW/GMW_Term/mazzAppSettingsSP_test.config
+++ b/GMW/GMW_Term/mazzAppSettingsSP_test.config
@@ -7,7 +7,7 @@
-
+
diff --git a/GMW/GMW_Term/mazzAppSettingsTK.config b/GMW/GMW_Term/mazzAppSettingsTK.config
index e60ed734..96b6bb48 100644
--- a/GMW/GMW_Term/mazzAppSettingsTK.config
+++ b/GMW/GMW_Term/mazzAppSettingsTK.config
@@ -7,7 +7,7 @@
-
+
diff --git a/GMW/GMW_Term/mazzAppSettingsTK_test.config b/GMW/GMW_Term/mazzAppSettingsTK_test.config
index ff94e023..dd26d5b0 100644
--- a/GMW/GMW_Term/mazzAppSettingsTK_test.config
+++ b/GMW/GMW_Term/mazzAppSettingsTK_test.config
@@ -7,7 +7,7 @@
-
+
diff --git a/GMW/GMW_Term/mazzConnectionStringsSP.config b/GMW/GMW_Term/mazzConnectionStringsSP.config
index 320b727d..6c3cef55 100644
--- a/GMW/GMW_Term/mazzConnectionStringsSP.config
+++ b/GMW/GMW_Term/mazzConnectionStringsSP.config
@@ -1,3 +1,3 @@

-
+
\ No newline at end of file
diff --git a/GMW/GMW_data/GMW_data.csproj b/GMW/GMW_data/GMW_data.csproj
index 3a12669d..bc2b08a2 100644
--- a/GMW/GMW_data/GMW_data.csproj
+++ b/GMW/GMW_data/GMW_data.csproj
@@ -342,6 +342,7 @@
+
diff --git a/GMW/GMW_data/SqlScripts/V2.0/GMW_00463_SP_test.sql b/GMW/GMW_data/SqlScripts/V2.0/GMW_00463_SP_test.sql
new file mode 100644
index 00000000..ac942011
--- /dev/null
+++ b/GMW/GMW_data/SqlScripts/V2.0/GMW_00463_SP_test.sql
@@ -0,0 +1,66 @@
+/* riallineamento di SP_test versus TK */
+
+-- INDICI!!!!
+
+set xact_abort on;
+go
+
+begin transaction;
+go
+
+drop index i_dataRap on RilPro.RapQual;
+go
+
+create index i_dataRap on RilPro.RapQual(DataRapQual)
+ include(BenesQual,CodFor,CodLega,nRapQual,Qta,UDC);
+go
+
+commit;
+go
+
+
+set xact_abort on;
+go
+
+begin transaction;
+go
+
+drop index i_idxPosizione on ElencoCartellini;
+go
+
+create index i_idxPosizione on ElencoCartellini(IdxPosizione,CodCS)
+ include(Particolare);
+go
+
+create index i_CodStato_IdxPosizione on ElencoCartellini(CodStato,IdxPosizione);
+go
+
+commit;
+go
+
+
+-- DA VERIFICARE: c'è differenza, ma verificqre se sia giusta conf attuale (toExt=0) o la modifica di eguito commentata (toExt=1), credo sia giusta versione attuale (=0)
+/*
+set xact_abort on
+go
+
+begin transaction
+go
+
+UPDATE dbo.TabSyncMovMag SET
+ toExt=1
+ WHERE CodCS=N'SP' and CodStatoFrom=N'FinGBox' and CodStatoTo=N'FinGBox' and IdxPosizioneFrom=4 and IdxPosizioneTo=4
+go
+
+commit transaction
+go
+*/
+
+
+
+
+
+
+-- registro versione...
+INSERT INTO [dbo].[LogUpdateDb] ([Versione],[Data]) VALUES(463, GETDATE())
+GO
diff --git a/GMW/GMW_data/bin/Debug/GMW_data.dll b/GMW/GMW_data/bin/Debug/GMW_data.dll
index a6330041..0c5c1822 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/Debug/GMW_data.dll.config b/GMW/GMW_data/bin/Debug/GMW_data.dll.config
index aa16a075..66515964 100644
--- a/GMW/GMW_data/bin/Debug/GMW_data.dll.config
+++ b/GMW/GMW_data/bin/Debug/GMW_data.dll.config
@@ -4,7 +4,7 @@
-
+
@@ -146,6 +146,9 @@
+
+
+
diff --git a/GMW/GMW_deploy/InstallerSP/Web.config.SP_test b/GMW/GMW_deploy/InstallerSP/Web.config.SP_test
index 7b71d754..6e482253 100644
--- a/GMW/GMW_deploy/InstallerSP/Web.config.SP_test
+++ b/GMW/GMW_deploy/InstallerSP/Web.config.SP_test
@@ -60,7 +60,7 @@
-
+
@@ -146,6 +146,9 @@
+
+
+
diff --git a/GMW/GMW_deploy/InstallerSP/Web.config.TK_test b/GMW/GMW_deploy/InstallerSP/Web.config.TK_test
index 89cda632..721e7021 100644
--- a/GMW/GMW_deploy/InstallerSP/Web.config.TK_test
+++ b/GMW/GMW_deploy/InstallerSP/Web.config.TK_test
@@ -60,7 +60,7 @@
-
+
@@ -145,6 +145,9 @@
+
+
+
diff --git a/GMW/GMW_deploy/Source/Web.config.GMW b/GMW/GMW_deploy/Source/Web.config.GMW
index 48d5812f..59a7e54b 100644
--- a/GMW/GMW_deploy/Source/Web.config.GMW
+++ b/GMW/GMW_deploy/Source/Web.config.GMW
@@ -60,7 +60,7 @@
-
+
@@ -146,6 +146,9 @@
+
+
+
diff --git a/GMW/GMW_deploy/Source/Web.config.SP_test b/GMW/GMW_deploy/Source/Web.config.SP_test
index 7b71d754..6e482253 100644
--- a/GMW/GMW_deploy/Source/Web.config.SP_test
+++ b/GMW/GMW_deploy/Source/Web.config.SP_test
@@ -60,7 +60,7 @@
-
+
@@ -146,6 +146,9 @@
+
+
+
diff --git a/GMW/GMW_deploy/Source/Web.config.TK_test b/GMW/GMW_deploy/Source/Web.config.TK_test
index 89cda632..721e7021 100644
--- a/GMW/GMW_deploy/Source/Web.config.TK_test
+++ b/GMW/GMW_deploy/Source/Web.config.TK_test
@@ -60,7 +60,7 @@
-
+
@@ -145,6 +145,9 @@
+
+
+
diff --git a/GMW/GMW_installer/GMW_installer.vdproj b/GMW/GMW_installer/GMW_installer.vdproj
index 62c957b6..0de7263a 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:{86470EBD-1200-4E32-8EAE-1F19E5B1F203}"
- "PackageCode" = "8:{0DBA4322-802B-4E0F-9DB4-482D95642733}"
+ "ProductCode" = "8:{218F38F5-1FFB-4DAA-BF61-99C43F4D19A5}"
+ "PackageCode" = "8:{1C825F71-85E4-4308-A6E4-0C1EBA53E91E}"
"UpgradeCode" = "8:{C9BC0732-DC92-4336-BAC9-A05A5D2A97C0}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE"
- "ProductVersion" = "8:2.0.463"
+ "ProductVersion" = "8:2.0.465"
"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\\Release\\SetDirectoryPermission.exe"
+ "SourcePath" = "8:..\\..\\SetDirectoryPermission\\obj\\InstallerSP\\SetDirectoryPermission.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_5606017201AE45B480A8ABD8B8D68264"
@@ -898,7 +898,7 @@
}
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_8BDD7AA9D46A46EC80880F83F13C902E"
{
- "SourcePath" = "8:..\\..\\IISCustomActionVB\\IISConsoleVB\\obj\\Release\\IISConsoleVB.exe"
+ "SourcePath" = "8:..\\..\\IISCustomActionVB\\IISConsoleVB\\obj\\InstallerSP\\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 70a15d53..3b108e4f 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_test_installer/GMW_test_installer.vdproj b/GMW/GMW_test_installer/GMW_test_installer.vdproj
index 2e644c91..f1c3a176 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:{615A650C-5E1D-4FBA-BAFC-1A4E027182D2}"
- "PackageCode" = "8:{013C4D9C-9E80-4FAB-B7CA-82C918DD2767}"
+ "ProductCode" = "8:{5EB92C14-5F45-47A9-9BCD-2068347E6C0D}"
+ "PackageCode" = "8:{FD14BBFC-221A-44AE-B3E5-2C9035AF1596}"
"UpgradeCode" = "8:{6FD64E39-D93B-4ADA-ADF3-303A1BCA49C2}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE"
- "ProductVersion" = "8:2.0.463"
+ "ProductVersion" = "8:2.0.465"
"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\\Release\\IISConsoleVB.exe"
+ "SourcePath" = "8:..\\..\\IISCustomActionVB\\IISConsoleVB\\obj\\InstallerSP\\IISConsoleVB.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_D4983B53F0234BFF98835BF3AFECBB8D"
@@ -855,7 +855,7 @@
}
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_179F2C709A0749C4A5EBA956FADE7EE3"
{
- "SourcePath" = "8:..\\..\\SetDirectoryPermission\\obj\\Release\\SetDirectoryPermission.exe"
+ "SourcePath" = "8:..\\..\\SetDirectoryPermission\\obj\\InstallerSP\\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 8e431e2a..70c3de25 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