diff --git a/GMW/GMW.suo b/GMW/GMW.suo
index 6aef9a1b..4b43bbd4 100644
Binary files a/GMW/GMW.suo and b/GMW/GMW.suo differ
diff --git a/GMW/GMW/Web.config b/GMW/GMW/Web.config
index 568230fd..338d3496 100644
--- a/GMW/GMW/Web.config
+++ b/GMW/GMW/Web.config
@@ -60,7 +60,7 @@
-
+
@@ -213,7 +213,7 @@
-
+
diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll
index 8c52a5db..afd29f8f 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 5dfb0764..28eb0666 100644
Binary files a/GMW/GMW/bin/GMW_data.dll and b/GMW/GMW/bin/GMW_data.dll differ
diff --git a/GMW/GMW/mazzAppSettings.config b/GMW/GMW/mazzAppSettings.config
index 1276f65e..44fb787f 100644
--- a/GMW/GMW/mazzAppSettings.config
+++ b/GMW/GMW/mazzAppSettings.config
@@ -1,13 +1,13 @@
-
+
-
+
-
+
@@ -27,7 +27,7 @@
-
+
@@ -41,23 +41,23 @@
-
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
@@ -65,7 +65,7 @@
-
+
@@ -75,13 +75,13 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -89,52 +89,51 @@
-
+
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -153,20 +152,20 @@
-
+
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/GMW/GMW/mazzAppSettingsSP.config b/GMW/GMW/mazzAppSettingsSP.config
index 8d8414f6..d465da74 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 eb7c8e1d..30cb9242 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 b18caeb8..d5d106ea 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 7d86e197..b60e28ab 100644
--- a/GMW/GMW/mazzAppSettingsTK_test.config
+++ b/GMW/GMW/mazzAppSettingsTK_test.config
@@ -7,7 +7,7 @@
-
+
diff --git a/GMW/GMW/mazzConnectionStrings.config b/GMW/GMW/mazzConnectionStrings.config
index f929e9ae..2d681ba2 100644
--- a/GMW/GMW/mazzConnectionStrings.config
+++ b/GMW/GMW/mazzConnectionStrings.config
@@ -1,3 +1,3 @@
-
+
\ No newline at end of file
diff --git a/GMW/GMW/obj/Debug/GMW.dll b/GMW/GMW/obj/Debug/GMW.dll
index 8c52a5db..2aac98a6 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 cc00e580..a0a19659 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 34c0750b..afd29f8f 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 6ebe2bf7..ccad8f59 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/bin/GMW_Term.dll b/GMW/GMW_Term/bin/GMW_Term.dll
index 3b1d4900..8d4ed843 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 1736fd1c..28eb0666 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/mazzAppSettings.config b/GMW/GMW_Term/mazzAppSettings.config
index 68458c74..96c390de 100644
--- a/GMW/GMW_Term/mazzAppSettings.config
+++ b/GMW/GMW_Term/mazzAppSettings.config
@@ -1,11 +1,11 @@
-
+
-
+
@@ -27,7 +27,7 @@
-
+
@@ -48,42 +48,42 @@
-
-
+
+
-
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
+
+
+
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/GMW/GMW_Term/mazzAppSettingsSP_test.config b/GMW/GMW_Term/mazzAppSettingsSP_test.config
index dda98d85..03cd03bb 100644
--- a/GMW/GMW_Term/mazzAppSettingsSP_test.config
+++ b/GMW/GMW_Term/mazzAppSettingsSP_test.config
@@ -16,6 +16,7 @@
+
@@ -80,9 +81,9 @@
-
+
-
+
diff --git a/GMW/GMW_Term/mazzAppSettingsTK_test.config b/GMW/GMW_Term/mazzAppSettingsTK_test.config
index 483d4adc..96c390de 100644
--- a/GMW/GMW_Term/mazzAppSettingsTK_test.config
+++ b/GMW/GMW_Term/mazzAppSettingsTK_test.config
@@ -16,6 +16,7 @@
+
diff --git a/GMW/GMW_Term/mazzConnectionStrings.config b/GMW/GMW_Term/mazzConnectionStrings.config
index 583aed61..090a45c1 100644
--- a/GMW/GMW_Term/mazzConnectionStrings.config
+++ b/GMW/GMW_Term/mazzConnectionStrings.config
@@ -1,3 +1,3 @@
-
+
\ No newline at end of file
diff --git a/GMW/GMW_Term/mazzConnectionStringsSP_test.config b/GMW/GMW_Term/mazzConnectionStringsSP_test.config
index 583aed61..3ced6e0c 100644
--- a/GMW/GMW_Term/mazzConnectionStringsSP_test.config
+++ b/GMW/GMW_Term/mazzConnectionStringsSP_test.config
@@ -1,3 +1,3 @@
-
+
\ No newline at end of file
diff --git a/GMW/GMW_Term_installer/GMW_Term_installer.vdproj b/GMW/GMW_Term_installer/GMW_Term_installer.vdproj
index 161995ba..e165fb6f 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:{C860CE0C-0113-4035-B96D-9DB18A75A179}"
- "PackageCode" = "8:{C9D6FFE9-4074-473E-B403-ACF54DF6B4E2}"
+ "ProductCode" = "8:{BC31FB88-9ECA-4E48-99BC-EDB1EC4D6530}"
+ "PackageCode" = "8:{DAEBCC1A-9DF4-4A22-94E7-9B00135833E9}"
"UpgradeCode" = "8:{B348C50D-8DAD-4430-AEF0-60800C94CB78}"
"RestartWWWService" = "11:TRUE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE"
- "ProductVersion" = "8:1.1.430"
+ "ProductVersion" = "8:1.1.431"
"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 0a1f9268..19f0bf6d 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 25970e65..9f844b03 100644
--- a/GMW/GMW_data/GMW_data.csproj
+++ b/GMW/GMW_data/GMW_data.csproj
@@ -271,6 +271,7 @@
+
diff --git a/GMW/GMW_data/SqlScripts/V1.2/GMW_00430.sql b/GMW/GMW_data/SqlScripts/V1.2/GMW_00430.sql
new file mode 100644
index 00000000..a48709fb
--- /dev/null
+++ b/GMW/GMW_data/SqlScripts/V1.2/GMW_00430.sql
@@ -0,0 +1,220 @@
+/* fix gestione tipo lista --> tipo particolare prelevabile */
+set xact_abort on;
+go
+
+begin transaction;
+go
+
+alter table TipoListaPrelievo add
+ codTipoObj nchar(1) constraint DF_TipoListaPrelievo_codTipoObj default ('');
+go
+
+exec sp_addextendedproperty 'MS_Description', 'tipo oggetto ("A" = anime, "P" = particolari)', 'SCHEMA', 'dbo', 'TABLE', 'TipoListaPrelievo', 'COLUMN', 'codTipoObj';
+go
+
+update TipoListaPrelievo set codTipoObj=('');
+go
+
+set ANSI_NULLS on;
+go
+
+alter VIEW v_selTipoLista
+AS
+SELECT CodTipoLista AS value, DescrLista AS label, codTipoObj AS conditio
+FROM dbo.TipoListaPrelievo
+WHERE (enabled = 1)
+go
+
+exec sp_updateextendedproperty 'MS_DiagramPane1', '[0E232FF0-B466-11cf-A24F-00AA00A3EFFF, 1.00]
+Begin DesignProperties =
+ Begin PaneConfigurations =
+ Begin PaneConfiguration = 0
+ NumPanes = 4
+ Configuration = "(H (1[40] 4[20] 2[20] 3) )"
+ End
+ Begin PaneConfiguration = 1
+ NumPanes = 3
+ Configuration = "(H (1 [50] 4 [25] 3))"
+ End
+ Begin PaneConfiguration = 2
+ NumPanes = 3
+ Configuration = "(H (1 [50] 2 [25] 3))"
+ End
+ Begin PaneConfiguration = 3
+ NumPanes = 3
+ Configuration = "(H (4 [30] 2 [40] 3))"
+ End
+ Begin PaneConfiguration = 4
+ NumPanes = 2
+ Configuration = "(H (1 [56] 3))"
+ End
+ Begin PaneConfiguration = 5
+ NumPanes = 2
+ Configuration = "(H (2 [66] 3))"
+ End
+ Begin PaneConfiguration = 6
+ NumPanes = 2
+ Configuration = "(H (4 [50] 3))"
+ End
+ Begin PaneConfiguration = 7
+ NumPanes = 1
+ Configuration = "(V (3))"
+ End
+ Begin PaneConfiguration = 8
+ NumPanes = 3
+ Configuration = "(H (1[56] 4[18] 2) )"
+ End
+ Begin PaneConfiguration = 9
+ NumPanes = 2
+ Configuration = "(H (1 [75] 4))"
+ End
+ Begin PaneConfiguration = 10
+ NumPanes = 2
+ Configuration = "(H (1[66] 2) )"
+ End
+ Begin PaneConfiguration = 11
+ NumPanes = 2
+ Configuration = "(H (4 [60] 2))"
+ End
+ Begin PaneConfiguration = 12
+ NumPanes = 1
+ Configuration = "(H (1) )"
+ End
+ Begin PaneConfiguration = 13
+ NumPanes = 1
+ Configuration = "(V (4))"
+ End
+ Begin PaneConfiguration = 14
+ NumPanes = 1
+ Configuration = "(V (2))"
+ End
+ ActivePaneConfig = 0
+ End
+ Begin DiagramPane =
+ Begin Origin =
+ Top = 0
+ Left = 0
+ End
+ Begin Tables =
+ Begin Table = "TipoListaPrelievo"
+ Begin Extent =
+ Top = 6
+ Left = 38
+ Bottom = 243
+ Right = 208
+ End
+ DisplayFlags = 280
+ TopColumn = 0
+ End
+ End
+ End
+ Begin SQLPane =
+ End
+ Begin DataPane =
+ Begin ParameterDefaults = ""
+ End
+ Begin ColumnWidths = 9
+ Width = 284
+ Width = 1500
+ Width = 1500
+ Width = 1500
+ Width = 1500
+ Width = 1500
+ Width = 1500
+ Width = 1500
+ Width = 1500
+ End
+ End
+ Begin CriteriaPane =
+ Begin ColumnWidths = 11
+ Column = 1440
+ Alias = 900
+ Table = 1170
+ Output = 720
+ Append = 1400
+ NewValue = 1170
+ SortType = 1350
+ SortOrder = 1410
+ GroupBy = 1350
+ Filter = 1350
+ Or = 1350
+ Or = 1350
+ Or = 1350
+ End
+ End
+End
+', 'SCHEMA', 'dbo', 'VIEW', 'v_selTipoLista';
+go
+
+commit;
+go
+
+/* aggiorno dati contenuti */
+set xact_abort on
+go
+
+begin transaction
+go
+
+UPDATE dbo.TipoListaPrelievo SET
+ codTipoObj=N'P'
+ WHERE CodTipoLista=N'00-Smart'
+UPDATE dbo.TipoListaPrelievo SET
+ codTipoObj=N'A'
+ WHERE CodTipoLista=N'01-PreAnim'
+UPDATE dbo.TipoListaPrelievo SET
+ enabled=1, codTipoObj=N'P'
+ WHERE CodTipoLista=N'01-PreFus'
+UPDATE dbo.TipoListaPrelievo SET
+ toAs400=0, codTipoObj=N'P'
+ WHERE CodTipoLista=N'02-PreCli'
+UPDATE dbo.TipoListaPrelievo SET
+ codTipoObj=N'P'
+ WHERE CodTipoLista=N'03-TerWip'
+UPDATE dbo.TipoListaPrelievo SET
+ codTipoObj=N'P'
+ WHERE CodTipoLista=N'04-OdetTK'
+
+commit transaction
+go
+
+set xact_abort on;
+go
+
+begin transaction;
+go
+
+set ANSI_NULLS on;
+go
+
+/***************************************
+* STORED stp_selTipoLista_getByIdx
+*
+* Steamware, S.E.L.
+* mod: 2012.04.27
+*
+************************************/
+create PROCEDURE stp_selTipoLista_getByIdx
+(
+ @value NVARCHAR(50)
+)
+AS
+
+SELECT *
+FROM v_selTipoLista
+WHERE value = @value
+
+RETURN
+go
+
+commit;
+go
+
+
+
+
+
+
+-- registro versione...
+INSERT INTO [dbo].[LogUpdateDb] ([Versione],[Data]) VALUES(430, GETDATE())
+GO
diff --git a/GMW/GMW_data/bin/Debug/GMW_data.dll b/GMW/GMW_data/bin/Debug/GMW_data.dll
index 5dfb0764..f604cd04 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 1736fd1c..28eb0666 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/bin/Release/GMW_data.dll.config b/GMW/GMW_data/bin/Release/GMW_data.dll.config
index 136a4cb4..fc1e47b7 100644
--- a/GMW/GMW_data/bin/Release/GMW_data.dll.config
+++ b/GMW/GMW_data/bin/Release/GMW_data.dll.config
@@ -4,7 +4,7 @@
-
+
\ No newline at end of file
diff --git a/GMW/GMW_deploy/Source/mazzConnectionStrings.config b/GMW/GMW_deploy/Source/mazzConnectionStrings.config
index f929e9ae..2d681ba2 100644
--- a/GMW/GMW_deploy/Source/mazzConnectionStrings.config
+++ b/GMW/GMW_deploy/Source/mazzConnectionStrings.config
@@ -1,3 +1,3 @@
-
+
\ No newline at end of file
diff --git a/GMW/GMW_test_installer/GMW_test_installer.vdproj b/GMW/GMW_test_installer/GMW_test_installer.vdproj
index 056fd491..e2ab5a25 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:{CA627061-3039-422F-926C-3FC8C98E71CA}"
- "PackageCode" = "8:{1F9AF7CF-7DC7-4E4C-A54E-390B7FEACE58}"
+ "ProductCode" = "8:{EE9A2B35-42ED-4E33-8817-6186449E8709}"
+ "PackageCode" = "8:{698D5F38-916A-41DC-BA59-9254A66A07BF}"
"UpgradeCode" = "8:{6FD64E39-D93B-4ADA-ADF3-303A1BCA49C2}"
"RestartWWWService" = "11:TRUE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE"
- "ProductVersion" = "8:1.1.428"
+ "ProductVersion" = "8:1.1.431"
"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 cb898ed4..5a249e75 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