From 1e117bcf8c6e887b2af68ec99d3cb73280a6dd10 Mon Sep 17 00:00:00 2001 From: samuele Date: Mon, 9 Jul 2012 12:39:16 +0000 Subject: [PATCH] update 461 - fix sposta (da Web.config x dire se resettare LDP con sposta) - modifica viste con "order by" e top lente - fix stored spostaUdc con gestione del controllo (se UDC in LDP scaricata NON lo sposta) git-svn-id: https://keyhammer.ath.cx/svn/GMW/trunk@476 365432ac-a1b5-4ffd-bb28-6d3099d32164 --- GMW/GMW/Reports/CartellinoLiquidiF10.rdlc | 21 +- GMW/GMW/Reports/CartellinoLiquidiF18.rdlc | 989 +++-- GMW/GMW/Web.config | 5 +- GMW/GMW/Web.config.GMW | 5 +- GMW/GMW/Web.config.SP_test | 5 +- GMW/GMW/Web.config.TK_test | 5 +- GMW/GMW/WebUserControls/mod_UdcCella.ascx.cs | 2 +- GMW/GMW/WebUserControls/mod_animeMult.ascx.cs | 2 +- .../mod_elencoListePrelievo.ascx | 3 +- .../mod_elencoListePrelievo.ascx.cs | 40 + GMW/GMW/WebUserControls/mod_execUDC.ascx.cs | 2 +- GMW/GMW/bin/GMW.dll | Bin 189952 -> 177664 bytes GMW/GMW/bin/GMW_data.dll | Bin 1637376 -> 1498112 bytes GMW/GMW/bin/SteamWare.dll | Bin 421376 -> 385536 bytes GMW/GMW/mazzAppSettings.config | 86 +- GMW/GMW/mazzAppSettingsSP.config | 5 +- GMW/GMW/mazzAppSettingsSP_test.config | 5 +- GMW/GMW/mazzAppSettingsTK.config | 5 +- GMW/GMW/mazzAppSettingsTK_test.config | 5 +- GMW/GMW/obj/Release/GMW.dll | Bin 174592 -> 177664 bytes .../Release/ResolveAssemblyReference.cache | Bin 69240 -> 69240 bytes GMW/GMW_Term/Web.config | 4 +- .../WebUserControls/mod_barcode.ascx.cs | 46 +- .../WebUserControls/mod_btnUdc.ascx.cs | 2 +- .../WebUserControls/mod_execUdc.ascx.cs | 6 +- .../WebUserControls/mod_listePrelievo.ascx.cs | 41 +- .../WebUserControls/mod_makeMov.ascx.cs | 4 +- .../WebUserControls/mod_searchResults.ascx.cs | 43 +- .../WebUserControls/mod_smartList.ascx.cs | 2 +- GMW/GMW_Term/bin/GMW_Term.dll | Bin 61440 -> 61952 bytes GMW/GMW_Term/bin/GMW_data.dll | Bin 1495552 -> 1498112 bytes GMW/GMW_Term/bin/SteamWare.XML | 3377 ----------------- GMW/GMW_Term/bin/SteamWare.dll | Bin 385024 -> 385536 bytes GMW/GMW_Term/mazzAppSettings.config | 4 +- GMW/GMW_Term/mazzAppSettingsSP.config | 4 +- GMW/GMW_Term/mazzAppSettingsSP_test.config | 4 +- GMW/GMW_Term/mazzAppSettingsTK.config | 4 +- GMW/GMW_Term/mazzAppSettingsTK_test.config | 4 +- GMW/GMW_Term/obj/Debug/GMW_Term.dll | Bin 65024 -> 65536 bytes .../obj/Debug/ResolveAssemblyReference.cache | Bin 87591 -> 88240 bytes .../ResolveAssemblyReference.cache | Bin 56850 -> 56850 bytes .../ResolveAssemblyReference.cache | Bin 56850 -> 56850 bytes .../GMW_Term_installer.vdproj | 10 +- .../InstallerSP/GMW_Term_installer.msi | Bin 1810944 -> 1797632 bytes .../InstallerTK/GMW_Term_installer.msi | Bin 1808384 -> 1793536 bytes .../GMW_Term_test_installer.vdproj | 6 +- .../InstallerSP/GMW_Term_test_installer.msi | Bin 1461760 -> 1449472 bytes .../InstallerTK/GMW_Term_test_installer.msi | Bin 1461248 -> 1446400 bytes GMW/GMW_data/GMW_data.csproj | 1 + GMW/GMW_data/SqlScripts/V2.0/GMW_00460.sql | 171 + GMW/GMW_data/SqlScripts/V2.0/GMW_00461.sql | 149 + GMW/GMW_data/bin/Debug/GMW_data.dll | Bin 1637376 -> 1637376 bytes GMW/GMW_data/bin/Release/GMW_data.dll | Bin 1495552 -> 1498112 bytes GMW/GMW_data/bin/Release/SteamWare.dll | Bin 385024 -> 385536 bytes GMW/GMW_data/obj/Debug/GMW_data.dll | Bin 1637376 -> 1637376 bytes GMW/GMW_data/obj/Release/GMW_data.dll | Bin 1495552 -> 1498112 bytes .../Release/ResolveAssemblyReference.cache | Bin 47193 -> 47193 bytes GMW/GMW_deploy/InstallerSP/Web.config.GMW | 5 +- GMW/GMW_deploy/InstallerSP/Web.config.SP_test | 5 +- GMW/GMW_deploy/InstallerSP/Web.config.TK_test | 5 +- GMW/GMW_deploy/InstallerTK/Web.config.GMW | 5 +- GMW/GMW_deploy/InstallerTK/Web.config.SP_test | 5 +- GMW/GMW_deploy/InstallerTK/Web.config.TK_test | 5 +- GMW/GMW_deploy/Source/Web.config.GMW | 5 +- GMW/GMW_deploy/Source/Web.config.SP_test | 5 +- GMW/GMW_deploy/Source/Web.config.TK_test | 5 +- GMW/GMW_installer/GMW_installer.vdproj | 10 +- .../InstallerSP/GMW_installer.msi | Bin 4144128 -> 4145152 bytes .../InstallerTK/GMW_installer.msi | Bin 4364800 -> 4369408 bytes .../GMW_test_installer.vdproj | 10 +- .../InstallerSP/GMW_test_installer.msi | Bin 4150784 -> 4154880 bytes .../InstallerTK/GMW_test_installer.msi | Bin 4356608 -> 4362240 bytes 72 files changed, 1346 insertions(+), 3786 deletions(-) create mode 100644 GMW/GMW_data/SqlScripts/V2.0/GMW_00461.sql diff --git a/GMW/GMW/Reports/CartellinoLiquidiF10.rdlc b/GMW/GMW/Reports/CartellinoLiquidiF10.rdlc index 4373ebca..29213d40 100644 --- a/GMW/GMW/Reports/CartellinoLiquidiF10.rdlc +++ b/GMW/GMW/Reports/CartellinoLiquidiF10.rdlc @@ -13,7 +13,7 @@ String - USPLI20000006 + USPLI12000006 UDC @@ -650,7 +650,6 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB 2pt 11 - true @@ -680,7 +679,6 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB 2pt 10 - true ="DISEGNO : " + First(Fields!disegnogrezzo.Value).ToString @@ -709,7 +707,6 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB 2pt 9 - true @@ -798,7 +795,6 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB 2pt 18 - true @@ -828,7 +824,6 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB 2pt 17 - true @@ -858,7 +853,6 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB 2pt 16 - true @@ -888,7 +882,6 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB 2pt 15 - true @@ -915,7 +908,6 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB 2pt 14 - true @@ -1057,7 +1049,6 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB 2pt 21 - true @@ -1073,6 +1064,7 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB 30 - true @@ -1135,7 +1126,6 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB 2pt 29 - true @@ -1231,7 +1221,6 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB 2pt 26 - true @@ -1354,7 +1343,6 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB 2pt 33 - true @@ -1440,7 +1428,6 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB 2pt 41 - true @@ -1469,7 +1456,6 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB 2pt 40 - true @@ -1498,7 +1484,6 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB 2pt 39 - true @@ -1527,7 +1512,6 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB 2pt 38 - true @@ -1553,7 +1537,6 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB 2pt 37 - true diff --git a/GMW/GMW/Reports/CartellinoLiquidiF18.rdlc b/GMW/GMW/Reports/CartellinoLiquidiF18.rdlc index 69c132ef..a498c642 100644 --- a/GMW/GMW/Reports/CartellinoLiquidiF18.rdlc +++ b/GMW/GMW/Reports/CartellinoLiquidiF18.rdlc @@ -13,7 +13,7 @@ String - USPLI20000006 + USPLI12000006 UDC @@ -239,7 +239,7 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB 2pt 2pt - 37 + 43 @@ -273,7 +273,7 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB 2pt 2pt - 36 + 42 CARTELLINO LIQUIDI F18 @@ -307,7 +307,7 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB 2pt 2pt - 35 + 41 =FormatDateTime(Globals!ExecutionTime ) @@ -322,10 +322,10 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB 1.80475cm - 1.2533cm + 1.1533cm - 2.00528cm + 2.10528cm 2.30607cm @@ -349,17 +349,54 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB 1.2cm - 11.1cm + 11.4cm