diff --git a/GMW/GMW/GMW.csproj b/GMW/GMW/GMW.csproj
index db76cd87..dab9d6d0 100644
--- a/GMW/GMW/GMW.csproj
+++ b/GMW/GMW/GMW.csproj
@@ -84,6 +84,13 @@
anagMagazzini.aspx
+
+ chLang.aspx
+ ASPXCodeBehind
+
+
+ chLang.aspx
+
Default.aspx
ASPXCodeBehind
@@ -804,6 +811,7 @@
+
diff --git a/GMW/GMW/Web.config b/GMW/GMW/Web.config
index ba3f6f92..cb9b9ebb 100644
--- a/GMW/GMW/Web.config
+++ b/GMW/GMW/Web.config
@@ -61,7 +61,7 @@
-
+
diff --git a/GMW/GMW/WebUserControls/mod_listImballi.ascx b/GMW/GMW/WebUserControls/mod_listImballi.ascx
index cb17a3f9..8f35e727 100644
--- a/GMW/GMW/WebUserControls/mod_listImballi.ascx
+++ b/GMW/GMW/WebUserControls/mod_listImballi.ascx
@@ -3,7 +3,8 @@
<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+ DataKeyNames="CodImballo" DataSourceID="ods"
+ onpageindexchanged="grView_PageIndexChanged">
diff --git a/GMW/GMW/WebUserControls/mod_listImballi.ascx.cs b/GMW/GMW/WebUserControls/mod_listImballi.ascx.cs
index 88062a74..4ba53e37 100644
--- a/GMW/GMW/WebUserControls/mod_listImballi.ascx.cs
+++ b/GMW/GMW/WebUserControls/mod_listImballi.ascx.cs
@@ -190,6 +190,11 @@ namespace GMW.WebUserControls
checkFixOds();
}
+ protected void grView_PageIndexChanged(object sender, EventArgs e)
+ {
+ // fix dell'ODS
+ checkFixOds();
+ }
#endregion
}
diff --git a/GMW/GMW/WebUserControls/mod_listParticolari.ascx b/GMW/GMW/WebUserControls/mod_listParticolari.ascx
index ee91849f..84a38513 100644
--- a/GMW/GMW/WebUserControls/mod_listParticolari.ascx
+++ b/GMW/GMW/WebUserControls/mod_listParticolari.ascx
@@ -2,7 +2,8 @@
<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+ DataKeyNames="Particolare" DataSourceID="ods"
+ onpageindexchanged="grView_PageIndexChanged">
diff --git a/GMW/GMW/WebUserControls/mod_listParticolari.ascx.cs b/GMW/GMW/WebUserControls/mod_listParticolari.ascx.cs
index 6bc1f964..0c3d41c7 100644
--- a/GMW/GMW/WebUserControls/mod_listParticolari.ascx.cs
+++ b/GMW/GMW/WebUserControls/mod_listParticolari.ascx.cs
@@ -192,6 +192,12 @@ namespace GMW.WebUserControls
checkFixOds();
}
+ protected void grView_PageIndexChanged(object sender, EventArgs e)
+ {
+ // fix dell'ODS
+ checkFixOds();
+ }
+
#endregion
}
diff --git a/GMW/GMW/WebUserControls/mod_listUDC.ascx b/GMW/GMW/WebUserControls/mod_listUDC.ascx
index 6281b272..d9bc40cd 100644
--- a/GMW/GMW/WebUserControls/mod_listUDC.ascx
+++ b/GMW/GMW/WebUserControls/mod_listUDC.ascx
@@ -3,7 +3,8 @@
<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+ DataKeyNames="UDC" DataSourceID="ods"
+ onpageindexchanged="grView_PageIndexChanged">
@@ -44,9 +45,8 @@
+ SelectMethod="getByFullUdc" TypeName="GMW_data.DS_magazzinoTableAdapters.v_UdcDetailTableAdapter"
+ OnDataBinding="ods_DataBinding">
diff --git a/GMW/GMW/WebUserControls/mod_listUDC.ascx.cs b/GMW/GMW/WebUserControls/mod_listUDC.ascx.cs
index ad060424..e4fc79fb 100644
--- a/GMW/GMW/WebUserControls/mod_listUDC.ascx.cs
+++ b/GMW/GMW/WebUserControls/mod_listUDC.ascx.cs
@@ -194,6 +194,11 @@ namespace GMW.WebUserControls
checkFixOds();
}
+ protected void grView_PageIndexChanged(object sender, EventArgs e)
+ {
+ // fix dell'ODS
+ checkFixOds();
+ }
#endregion
}
diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll
index 0c82e859..b4adcea5 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 fb6d7cf9..dcb60eee 100644
Binary files a/GMW/GMW/bin/GMW_data.dll and b/GMW/GMW/bin/GMW_data.dll differ
diff --git a/GMW/GMW/chLang.aspx b/GMW/GMW/chLang.aspx
new file mode 100644
index 00000000..38e08d2c
--- /dev/null
+++ b/GMW/GMW/chLang.aspx
@@ -0,0 +1,13 @@
+<%@ Page Language="C#" MasterPageFile="~/WebMasterPages/MasterAjax.master" AutoEventWireup="true"
+ Inherits="chLang" Title="Untitled Page" Codebehind="chLang.aspx.cs" %>
+
+<%@ Register Src="~/WebUserControls/mod_chLang.ascx" TagName="mod_chLang" TagPrefix="uc1" %>
+
+
+
diff --git a/GMW/GMW/chLang.aspx.cs b/GMW/GMW/chLang.aspx.cs
new file mode 100644
index 00000000..8d0ecbe4
--- /dev/null
+++ b/GMW/GMW/chLang.aspx.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Data;
+using System.Configuration;
+using System.Collections;
+using System.Web;
+using System.Web.Security;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Web.UI.WebControls.WebParts;
+using System.Web.UI.HtmlControls;
+
+public partial class chLang : System.Web.UI.Page
+{
+}
diff --git a/GMW/GMW/chLang.aspx.designer.cs b/GMW/GMW/chLang.aspx.designer.cs
new file mode 100644
index 00000000..9e0cbedd
--- /dev/null
+++ b/GMW/GMW/chLang.aspx.designer.cs
@@ -0,0 +1,23 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Runtime Version:2.0.50727.4927
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+
+
+public partial class chLang {
+
+ ///
+ /// Mod_chLang1 control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::mod_chLang Mod_chLang1;
+}
diff --git a/GMW/GMW/mazzAppSettings.config b/GMW/GMW/mazzAppSettings.config
index 9fc3b47e..36162180 100644
--- a/GMW/GMW/mazzAppSettings.config
+++ b/GMW/GMW/mazzAppSettings.config
@@ -6,7 +6,7 @@
-
+
diff --git a/GMW/GMW/obj/Debug/GMW.dll b/GMW/GMW/obj/Debug/GMW.dll
index 0c82e859..b4adcea5 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 7f72fa63..84b0994f 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 a96627d4..368bfd73 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 3ce73924..38ff132a 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/Debug/GMW_data.dll b/GMW/GMW_data/bin/Debug/GMW_data.dll
index fb6d7cf9..dcb60eee 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 23f797b4..74d8e9d7 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 fb6d7cf9..dcb60eee 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/Debug/TempPE/DS_magazzino.Designer.cs.dll b/GMW/GMW_data/obj/Debug/TempPE/DS_magazzino.Designer.cs.dll
index 9b5e8cb5..fd8ea17d 100644
Binary files a/GMW/GMW_data/obj/Debug/TempPE/DS_magazzino.Designer.cs.dll and b/GMW/GMW_data/obj/Debug/TempPE/DS_magazzino.Designer.cs.dll differ
diff --git a/GMW/GMW_data/obj/Release/GMW_data.dll b/GMW/GMW_data/obj/Release/GMW_data.dll
index 23f797b4..74d8e9d7 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 f2138891..c40f1cd4 100644
--- a/GMW/GMW_installer/GMW_installer.vdproj
+++ b/GMW/GMW_installer/GMW_installer.vdproj
@@ -349,14 +349,14 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:GMW"
- "ProductCode" = "8:{057518C1-B9E4-4E8F-A92B-9404BA282303}"
- "PackageCode" = "8:{44F6DE13-79EE-48DA-8F57-A922A0B237F2}"
+ "ProductCode" = "8:{424F6F89-6F94-4027-9003-3114C2C07BF8}"
+ "PackageCode" = "8:{FA801E1E-CA12-4E0E-992C-836A37C09C25}"
"UpgradeCode" = "8:{C9BC0732-DC92-4336-BAC9-A05A5D2A97C0}"
"RestartWWWService" = "11:TRUE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE"
- "ProductVersion" = "8:1.0.95"
+ "ProductVersion" = "8:1.0.100"
"Manufacturer" = "8:SteamWare s.r.l."
"ARPHELPTELEPHONE" = "8:+39-035460560"
"ARPHELPLINK" = "8:http://www.steamware.net"
@@ -801,7 +801,7 @@
{
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_4FD0E5B75A7F47B79080EC0983BE6583"
{
- "SourcePath" = "8:..\\..\\SetDirectoryPermission\\obj\\Debug\\SetDirectoryPermission.exe"
+ "SourcePath" = "8:..\\..\\SetDirectoryPermission\\obj\\Release\\SetDirectoryPermission.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_5606017201AE45B480A8ABD8B8D68264"
@@ -829,7 +829,7 @@
}
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_8BDD7AA9D46A46EC80880F83F13C902E"
{
- "SourcePath" = "8:..\\..\\IISCustomActionVB\\IISConsoleVB\\obj\\Debug\\IISConsoleVB.exe"
+ "SourcePath" = "8:..\\..\\IISCustomActionVB\\IISConsoleVB\\obj\\Release\\IISConsoleVB.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_5606017201AE45B480A8ABD8B8D68264"
diff --git a/GMW/GMW_installer/Release/GMW_installer.msi b/GMW/GMW_installer/Release/GMW_installer.msi
index cec17005..b06ae29c 100644
Binary files a/GMW/GMW_installer/Release/GMW_installer.msi and b/GMW/GMW_installer/Release/GMW_installer.msi differ