diff --git a/GMW/GMW_Term/Web.config b/GMW/GMW_Term/Web.config
index 385eb4cf..41598cc6 100644
--- a/GMW/GMW_Term/Web.config
+++ b/GMW/GMW_Term/Web.config
@@ -58,7 +58,7 @@
-
+
@@ -132,14 +132,14 @@
-
-
-
-
-
+
+
+
+
+
-
+
diff --git a/GMW/GMW_Term/WebUserControls/mod_smartList.ascx.cs b/GMW/GMW_Term/WebUserControls/mod_smartList.ascx.cs
index d456176e..8b4a85a1 100644
--- a/GMW/GMW_Term/WebUserControls/mod_smartList.ascx.cs
+++ b/GMW/GMW_Term/WebUserControls/mod_smartList.ascx.cs
@@ -28,6 +28,8 @@ namespace GMW_Term.WebUserControls
protected void Page_Load(object sender, EventArgs e)
{
updatePackListStatus();
+ // resetto!
+ resetAndUpdate();
}
///
/// aggiorna lo stato della packing list corrente
@@ -112,9 +114,7 @@ namespace GMW_Term.WebUserControls
lblTotColli.Text = traduci("lblTotColli");
lblNumColli.Text = string.Format("{0} UDC", MagClass.magazzino.taRigheListePrelievo.getOpenByUserTipo(MagClass.magazzino.CodSoggCurrUser, "00-Smart").Rows.Count);
lblParticolari.Text = traduci("lblParticolari");
- lblNumPart.Text = string.Format("{0} {1}", MagClass.magazzino.taElencoListePrelievo.getOpenByUserTipo(MagClass.magazzino.CodSoggCurrUser, "00-Smart").Rows.Count, traduci("Particolari"));
- // resetto!
- resetAndUpdate();
+ lblNumPart.Text = string.Format("{0} {1}", MagClass.magazzino.taElencoListePrelievo.getOpenByUserTipo(MagClass.magazzino.CodSoggCurrUser, "00-Smart").Rows.Count, traduci("Particolari"));
}
///
/// Generazione delle liste di prelievo
@@ -143,8 +143,8 @@ namespace GMW_Term.WebUserControls
{
//memLayer.ML.emptySessionVal("UDC_sel");
GMW_data.TermClass.Ter.resetScanBarcode(true, false, false);
- //// aggiorno visualizzazione
- //updatePackListStatus();
+ // aggiorno visualizzazione
+ updatePackListStatus();
//lblErrore.Visible = false;
}
///
@@ -165,7 +165,8 @@ namespace GMW_Term.WebUserControls
MagClass.magazzino.taElencoListePrelievo.DeleteQuery(riga.CodLista);
// elimino task attivo e cod lista attuale
memLayer.ML.emptySessionVal("CodListaAttiva");
- memLayer.ML.emptySessionVal("activeTask");
+ memLayer.ML.emptySessionVal("activeTask");
+ lblErrore.Visible = false;
}
catch
{ }
diff --git a/GMW/GMW_Term/bin/GMW_Term.dll b/GMW/GMW_Term/bin/GMW_Term.dll
index 9d3629f7..4f17472d 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 0658cc9e..1fd3541f 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/bin/SteamWare.dll b/GMW/GMW_Term/bin/SteamWare.dll
index b1888291..3f62ecd0 100644
Binary files a/GMW/GMW_Term/bin/SteamWare.dll and b/GMW/GMW_Term/bin/SteamWare.dll differ
diff --git a/GMW/GMW_Term/mazzAppSettings.config b/GMW/GMW_Term/mazzAppSettings.config
index 93495758..6d843408 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 a2da8122..ccd069d8 100644
--- a/GMW/GMW_Term/mazzAppSettingsSP.config
+++ b/GMW/GMW_Term/mazzAppSettingsSP.config
@@ -7,7 +7,7 @@
-
+
diff --git a/GMW/GMW_Term/mazzAppSettingsSP_test.config b/GMW/GMW_Term/mazzAppSettingsSP_test.config
index b5ce034d..b9029c9f 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 051c8114..9cf27e1c 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 93495758..6d843408 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/obj/InstallerSP/ResolveAssemblyReference.cache b/GMW/GMW_Term/obj/InstallerSP/ResolveAssemblyReference.cache
index 79d2e78d..50b66c85 100644
Binary files a/GMW/GMW_Term/obj/InstallerSP/ResolveAssemblyReference.cache and b/GMW/GMW_Term/obj/InstallerSP/ResolveAssemblyReference.cache differ
diff --git a/GMW/GMW_Term/obj/InstallerTK/ResolveAssemblyReference.cache b/GMW/GMW_Term/obj/InstallerTK/ResolveAssemblyReference.cache
index 0c61e0db..8ac78bff 100644
Binary files a/GMW/GMW_Term/obj/InstallerTK/ResolveAssemblyReference.cache and b/GMW/GMW_Term/obj/InstallerTK/ResolveAssemblyReference.cache differ
diff --git a/GMW/GMW_Term_test_installer/GMW_Term_test_installer.vdproj b/GMW/GMW_Term_test_installer/GMW_Term_test_installer.vdproj
index 54d64976..c97d3d31 100644
--- a/GMW/GMW_Term_test_installer/GMW_Term_test_installer.vdproj
+++ b/GMW/GMW_Term_test_installer/GMW_Term_test_installer.vdproj
@@ -375,14 +375,14 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:GMWT_test"
- "ProductCode" = "8:{D9C9C711-118C-4DDE-BBBB-FC0FC5BDA23D}"
- "PackageCode" = "8:{56E6F972-17F1-46C2-AF1F-7C809FC4238D}"
+ "ProductCode" = "8:{F4FA0C27-3DDE-48E8-B9EF-4631F9DF5BDD}"
+ "PackageCode" = "8:{1A81BDF3-C0FA-4C42-A43C-35155427D357}"
"UpgradeCode" = "8:{9A41FB02-98D0-48FB-9924-75BB2A5649A0}"
"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_Term_test_installer/InstallerSP/GMW_Term_test_installer.msi b/GMW/GMW_Term_test_installer/InstallerSP/GMW_Term_test_installer.msi
index c78590cc..27e84135 100644
Binary files a/GMW/GMW_Term_test_installer/InstallerSP/GMW_Term_test_installer.msi and b/GMW/GMW_Term_test_installer/InstallerSP/GMW_Term_test_installer.msi differ
diff --git a/GMW/GMW_Term_test_installer/InstallerTK/GMW_Term_test_installer.msi b/GMW/GMW_Term_test_installer/InstallerTK/GMW_Term_test_installer.msi
index a4c6d1c7..0a9ef433 100644
Binary files a/GMW/GMW_Term_test_installer/InstallerTK/GMW_Term_test_installer.msi and b/GMW/GMW_Term_test_installer/InstallerTK/GMW_Term_test_installer.msi differ
diff --git a/GMW/GMW_data/DS_Applicazione.Designer.cs b/GMW/GMW_data/DS_Applicazione.Designer.cs
index 4f134040..ed9aef2f 100644
--- a/GMW/GMW_data/DS_Applicazione.Designer.cs
+++ b/GMW/GMW_data/DS_Applicazione.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_data/DS_DataMatrix.Designer.cs b/GMW/GMW_data/DS_DataMatrix.Designer.cs
index 2d49fa98..79c8dac2 100644
--- a/GMW/GMW_data/DS_DataMatrix.Designer.cs
+++ b/GMW/GMW_data/DS_DataMatrix.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.
@@ -2228,7 +2228,7 @@ SELECT NumDisegno, EsponenteDisegno, Particolare FROM TranscodificaParticolari W
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
private void InitConnection() {
this._connection = new global::System.Data.SqlClient.SqlConnection();
- this._connection.ConnectionString = global::GMW_data.Properties.Settings.Default.SP_produzioneConnectionString;
+ this._connection.ConnectionString = global::GMW_data.Properties.Settings.Default.TK_produzioneConnectionString;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
diff --git a/GMW/GMW_data/DS_Odette.Designer.cs b/GMW/GMW_data/DS_Odette.Designer.cs
index 0dfbb06d..41c42ffb 100644
--- a/GMW/GMW_data/DS_Odette.Designer.cs
+++ b/GMW/GMW_data/DS_Odette.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_data/DS_SM.Designer.cs b/GMW/GMW_data/DS_SM.Designer.cs
index b7536b5e..20089bfe 100644
--- a/GMW/GMW_data/DS_SM.Designer.cs
+++ b/GMW/GMW_data/DS_SM.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_data/DS_Utility.Designer.cs b/GMW/GMW_data/DS_Utility.Designer.cs
index 9025a261..566d3695 100644
--- a/GMW/GMW_data/DS_Utility.Designer.cs
+++ b/GMW/GMW_data/DS_Utility.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_data/DS_cartellini.Designer.cs b/GMW/GMW_data/DS_cartellini.Designer.cs
index a037511d..f61ac8a7 100644
--- a/GMW/GMW_data/DS_cartellini.Designer.cs
+++ b/GMW/GMW_data/DS_cartellini.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_data/DS_magazzino.Designer.cs b/GMW/GMW_data/DS_magazzino.Designer.cs
index 9f9e81ea..339dc442 100644
--- a/GMW/GMW_data/DS_magazzino.Designer.cs
+++ b/GMW/GMW_data/DS_magazzino.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_data/Properties/Settings.Designer.cs b/GMW/GMW_data/Properties/Settings.Designer.cs
index 5628f922..79c8c496 100644
--- a/GMW/GMW_data/Properties/Settings.Designer.cs
+++ b/GMW/GMW_data/Properties/Settings.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.
@@ -37,11 +37,11 @@ namespace GMW_data.Properties {
[global::System.Configuration.ApplicationScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)]
- [global::System.Configuration.DefaultSettingValueAttribute("Data Source=10.74.82.217\\SQL2008R2;Initial Catalog=SP_produzione;Persist Security" +
+ [global::System.Configuration.DefaultSettingValueAttribute("Data Source=10.74.82.217\\SQL2008R2;Initial Catalog=TK_produzione;Persist Security" +
" Info=True;User ID=sa;Password=keyhammer")]
- public string SP_produzioneConnectionString {
+ public string TK_produzioneConnectionString {
get {
- return ((string)(this["SP_produzioneConnectionString"]));
+ return ((string)(this["TK_produzioneConnectionString"]));
}
}
}
diff --git a/GMW/GMW_data/bin/Release/GMW_data.dll b/GMW/GMW_data/bin/Release/GMW_data.dll
index f6a29e0f..35ac286f 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/SteamWare.dll b/GMW/GMW_data/bin/Release/SteamWare.dll
index 8395e7a9..5dac904a 100644
Binary files a/GMW/GMW_data/bin/Release/SteamWare.dll and b/GMW/GMW_data/bin/Release/SteamWare.dll differ
diff --git a/GMW/GMW_data/obj/Release/GMW_data.dll b/GMW/GMW_data/obj/Release/GMW_data.dll
index f6a29e0f..35ac286f 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_data/obj/Release/ResolveAssemblyReference.cache b/GMW/GMW_data/obj/Release/ResolveAssemblyReference.cache
index c86d81a5..1faf4f35 100644
Binary files a/GMW/GMW_data/obj/Release/ResolveAssemblyReference.cache and b/GMW/GMW_data/obj/Release/ResolveAssemblyReference.cache differ
diff --git a/GMW/GMW_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll b/GMW/GMW_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll
index 6b0df50a..bc62d492 100644
Binary files a/GMW/GMW_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll and b/GMW/GMW_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll differ
diff --git a/GMW/GMW_data/obj/Release/TempPE/DS_DataMatrix.Designer.cs.dll b/GMW/GMW_data/obj/Release/TempPE/DS_DataMatrix.Designer.cs.dll
index 7822938f..40739b94 100644
Binary files a/GMW/GMW_data/obj/Release/TempPE/DS_DataMatrix.Designer.cs.dll and b/GMW/GMW_data/obj/Release/TempPE/DS_DataMatrix.Designer.cs.dll differ
diff --git a/GMW/GMW_data/obj/Release/TempPE/DS_Odette.Designer.cs.dll b/GMW/GMW_data/obj/Release/TempPE/DS_Odette.Designer.cs.dll
index f55d4dec..8fc9ed6e 100644
Binary files a/GMW/GMW_data/obj/Release/TempPE/DS_Odette.Designer.cs.dll and b/GMW/GMW_data/obj/Release/TempPE/DS_Odette.Designer.cs.dll differ
diff --git a/GMW/GMW_data/obj/Release/TempPE/DS_SM.Designer.cs.dll b/GMW/GMW_data/obj/Release/TempPE/DS_SM.Designer.cs.dll
index ccc9db55..ceac8641 100644
Binary files a/GMW/GMW_data/obj/Release/TempPE/DS_SM.Designer.cs.dll and b/GMW/GMW_data/obj/Release/TempPE/DS_SM.Designer.cs.dll differ
diff --git a/GMW/GMW_data/obj/Release/TempPE/DS_cartellini.Designer.cs.dll b/GMW/GMW_data/obj/Release/TempPE/DS_cartellini.Designer.cs.dll
index b23e9747..85776669 100644
Binary files a/GMW/GMW_data/obj/Release/TempPE/DS_cartellini.Designer.cs.dll and b/GMW/GMW_data/obj/Release/TempPE/DS_cartellini.Designer.cs.dll differ