diff --git a/GMW/GMW.suo b/GMW/GMW.suo index 11b69679..acedfbc7 100644 Binary files a/GMW/GMW.suo and b/GMW/GMW.suo differ diff --git a/GMW/GMW/GMW.csproj b/GMW/GMW/GMW.csproj index cb2fbde8..0f904f72 100644 --- a/GMW/GMW/GMW.csproj +++ b/GMW/GMW/GMW.csproj @@ -889,6 +889,7 @@ + @@ -935,7 +936,7 @@ False True - 53622 + 55568 / http://localhost/GMW True diff --git a/GMW/GMW/WebUserControls/mod_main_help.ascx b/GMW/GMW/WebUserControls/mod_main_help.ascx index a918b4e0..79f9b018 100644 --- a/GMW/GMW/WebUserControls/mod_main_help.ascx +++ b/GMW/GMW/WebUserControls/mod_main_help.ascx @@ -17,23 +17,25 @@ - - - + + + + HotSpotMode="Navigate" Left="0" Right="105" Top="373" Bottom="439" AlternateText="Delibera Fusi" /> + Left="218" Right="329" Top="11" Bottom="53" AlternateText="Liste prelievo spedizione terzisti" /> - + HotSpotMode="Navigate" Left="135" Right="226" Top="73" Bottom="129" AlternateText="Delibera Spedizione Terzista" /> + + - + Left="434" Right="549" Top="69" Bottom="139" AlternateText="Liste prelievo spedizione Clienti/RoNo" /> + diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll index 71b61c4b..1686124c 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 a499c177..7d3597fa 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 ff6ffb8c..14010e51 100644 Binary files a/GMW/GMW/bin/SteamWare.dll and b/GMW/GMW/bin/SteamWare.dll differ diff --git a/GMW/GMW/images/SchemaMagNew.png b/GMW/GMW/images/SchemaMagNew.png new file mode 100644 index 00000000..4a3eecf1 Binary files /dev/null and b/GMW/GMW/images/SchemaMagNew.png differ diff --git a/GMW/GMW/obj/Debug/GMW.csproj.FileListAbsolute.txt b/GMW/GMW/obj/Debug/GMW.csproj.FileListAbsolute.txt index 0435c396..4e41091f 100644 --- a/GMW/GMW/obj/Debug/GMW.csproj.FileListAbsolute.txt +++ b/GMW/GMW/obj/Debug/GMW.csproj.FileListAbsolute.txt @@ -31,3 +31,36 @@ c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\obj\ c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\obj\Debug\RdlCompile.compiled c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\obj\Debug\GMW.dll c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\obj\Debug\GMW.pdb +C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\GMW.dll +C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\GMW.pdb +C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\AjaxControlToolkit.dll +C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\GMW_data.dll +C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\SteamWare.dll +C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\System.Web.Ajax.dll +C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\ICSharpCode.SharpZipLib.dll +C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\System.Web.Ajax.pdb +C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\AjaxControlToolkit.pdb +C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\GMW_data.pdb +C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\SteamWare.pdb +C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\SteamWare.xml +C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\ar\AjaxControlToolkit.resources.dll +C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\cs\AjaxControlToolkit.resources.dll +C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\de\AjaxControlToolkit.resources.dll +C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\es\AjaxControlToolkit.resources.dll +C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\fr\AjaxControlToolkit.resources.dll +C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\he\AjaxControlToolkit.resources.dll +C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\hi\AjaxControlToolkit.resources.dll +C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\it\AjaxControlToolkit.resources.dll +C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\ja\AjaxControlToolkit.resources.dll +C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\ko\AjaxControlToolkit.resources.dll +C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\nl\AjaxControlToolkit.resources.dll +C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\pt\AjaxControlToolkit.resources.dll +C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\ru\AjaxControlToolkit.resources.dll +C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\tr-TR\AjaxControlToolkit.resources.dll +C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\zh-CHS\AjaxControlToolkit.resources.dll +C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\zh-CHT\AjaxControlToolkit.resources.dll +C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\obj\Debug\ResolveAssemblyReference.cache +C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\obj\Debug\RdlCompile.cache +C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\obj\Debug\RdlCompile.compiled +C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\obj\Debug\GMW.dll +C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\obj\Debug\GMW.pdb diff --git a/GMW/GMW/obj/Debug/GMW.dll b/GMW/GMW/obj/Debug/GMW.dll index 71b61c4b..1686124c 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 f2b02b1b..21585842 100644 Binary files a/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache and b/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache differ