diff --git a/GMW/GMW/Web.config b/GMW/GMW/Web.config
index 0d67fb32..2d23e0f5 100644
--- a/GMW/GMW/Web.config
+++ b/GMW/GMW/Web.config
@@ -60,7 +60,7 @@
-
+
@@ -72,7 +72,7 @@
-
+
@@ -217,14 +217,14 @@
-
-
-
-
-
+
+
+
+
+
-
+
diff --git a/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx b/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx
index bb61cacb..58db4e87 100644
--- a/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx
+++ b/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx
@@ -45,8 +45,12 @@
AutoCompleteMode="SuggestAppend" DropDownStyle="DropDownList" AutoPostBack="True"
DataSourceID="odsDestinatario" CssClass="WindowsStyle" MaxLength="0" Style="display: inline;" />
-
+ SelectMethod="getByConditio" TypeName="GMW_data.DS_UtilityTableAdapters.v_selDestinatariListePrelievoTableAdapter">
+
+
+
+
diff --git a/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx.designer.cs b/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx.designer.cs
index 8a641e96..3f096172 100644
--- a/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx.designer.cs
+++ b/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx.designer.cs
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
-// Runtime Version:2.0.50727.4963
+// Runtime Version:2.0.50727.4971
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
diff --git a/GMW/GMW/WebUserControls/mod_menuBottomFullpage.ascx.cs b/GMW/GMW/WebUserControls/mod_menuBottomFullpage.ascx.cs
index 32eb6a6d..fd673825 100644
--- a/GMW/GMW/WebUserControls/mod_menuBottomFullpage.ascx.cs
+++ b/GMW/GMW/WebUserControls/mod_menuBottomFullpage.ascx.cs
@@ -26,7 +26,7 @@ namespace GMW.WebUserControls
///
private void setTimer()
{
- Timer1.Interval = Convert.ToInt32(SteamWare.memLayer.ML.confReadInt("intUpdatePagina_ms") / 10);
+ Timer1.Interval = SteamWare.memLayer.ML.confReadInt("intUpdatePagina_ms");
}
protected void Timer1_Tick(object sender, EventArgs e)
{
diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll
index 0648ce68..6ce4c35f 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 bca64c04..838a9719 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 6d77b305..98d0c22a 100644
--- a/GMW/GMW/mazzAppSettings.config
+++ b/GMW/GMW/mazzAppSettings.config
@@ -7,7 +7,7 @@
-
+
@@ -19,7 +19,7 @@
-
+
diff --git a/GMW/GMW/mazzAppSettingsSP.config b/GMW/GMW/mazzAppSettingsSP.config
index e58f82c2..aca42bd7 100644
--- a/GMW/GMW/mazzAppSettingsSP.config
+++ b/GMW/GMW/mazzAppSettingsSP.config
@@ -7,7 +7,7 @@
-
+
@@ -19,7 +19,7 @@
-
+
diff --git a/GMW/GMW/mazzAppSettingsSP_test.config b/GMW/GMW/mazzAppSettingsSP_test.config
index 7b440101..adcc6956 100644
--- a/GMW/GMW/mazzAppSettingsSP_test.config
+++ b/GMW/GMW/mazzAppSettingsSP_test.config
@@ -7,7 +7,7 @@
-
+
@@ -19,7 +19,7 @@
-
+
diff --git a/GMW/GMW/mazzAppSettingsTK.config b/GMW/GMW/mazzAppSettingsTK.config
index 29ef9091..f33cd5d1 100644
--- a/GMW/GMW/mazzAppSettingsTK.config
+++ b/GMW/GMW/mazzAppSettingsTK.config
@@ -7,7 +7,7 @@
-
+
@@ -19,7 +19,7 @@
-
+
diff --git a/GMW/GMW/mazzAppSettingsTK_test.config b/GMW/GMW/mazzAppSettingsTK_test.config
index 6d77b305..98d0c22a 100644
--- a/GMW/GMW/mazzAppSettingsTK_test.config
+++ b/GMW/GMW/mazzAppSettingsTK_test.config
@@ -7,7 +7,7 @@
-
+
@@ -19,7 +19,7 @@
-
+
diff --git a/GMW/GMW/obj/Release/GMW.dll b/GMW/GMW/obj/Release/GMW.dll
index 7de2af75..be16040b 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 593fb8ef..498e4688 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/bin/Release/GMW_data.dll b/GMW/GMW_data/bin/Release/GMW_data.dll
index e1a2d3c3..f6a29e0f 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/Release/GMW_data.dll b/GMW/GMW_data/obj/Release/GMW_data.dll
index e1a2d3c3..f6a29e0f 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 40e7fe1b..67495d9b 100644
--- a/GMW/GMW_installer/GMW_installer.vdproj
+++ b/GMW/GMW_installer/GMW_installer.vdproj
@@ -391,7 +391,7 @@
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:GMW"
"ProductCode" = "8:{FC1F8B43-87CB-46E0-A0F8-E8340418AE0F}"
- "PackageCode" = "8:{047B80C4-D3CB-4850-A516-E4D23DB074FA}"
+ "PackageCode" = "8:{D834281A-88B2-4471-9549-10F8DE74AD92}"
"UpgradeCode" = "8:{C9BC0732-DC92-4336-BAC9-A05A5D2A97C0}"
"RestartWWWService" = "11:TRUE"
"RemovePreviousVersions" = "11:TRUE"
@@ -870,7 +870,7 @@
}
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_4FD0E5B75A7F47B79080EC0983BE6583"
{
- "SourcePath" = "8:..\\..\\SetDirectoryPermission\\obj\\InstallerSP\\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\\InstallerSP\\IISConsoleVB.exe"
+ "SourcePath" = "8:..\\..\\IISCustomActionVB\\IISConsoleVB\\obj\\InstallerTK\\IISConsoleVB.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_5606017201AE45B480A8ABD8B8D68264"
diff --git a/GMW/GMW_installer/InstallerTK/GMW_installer.msi b/GMW/GMW_installer/InstallerTK/GMW_installer.msi
index de326ae5..9cc853de 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 8558e9ab..dff94629 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:{7FE0D797-2640-4824-A000-A5595CC87571}"
- "PackageCode" = "8:{BF93BE16-D862-4EE8-9ED7-8E43C6E873DF}"
+ "ProductCode" = "8:{A157A9F8-D6CC-47D5-B06C-3CF0D7B01E42}"
+ "PackageCode" = "8:{3530464A-7659-4007-B1B8-D05D84C6F87D}"
"UpgradeCode" = "8:{6FD64E39-D93B-4ADA-ADF3-303A1BCA49C2}"
"RestartWWWService" = "11:TRUE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE"
- "ProductVersion" = "8:1.1.438"
+ "ProductVersion" = "8:1.1.439"
"Manufacturer" = "8:SteamWare s.r.l."
"ARPHELPTELEPHONE" = "8:+39-035460560"
"ARPHELPLINK" = "8:http://www.steamware.net"
diff --git a/GMW/GMW_test_installer/InstallerSP/GMW_test_installer.msi b/GMW/GMW_test_installer/InstallerSP/GMW_test_installer.msi
index 3bd8165f..00de2801 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 14081573..05608874 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