From 28231bb1368688630eaf1d9a95f0d1ac59d7e502 Mon Sep 17 00:00:00 2001 From: david Date: Fri, 18 Apr 2008 09:15:53 +0000 Subject: [PATCH] =?UTF-8?q?-=20Cambio=20a=20la=20versi=C3=B3n=20D11=20de?= =?UTF-8?q?=20algunas=20librer=C3=ADas.=20-=20Repaso=20a=20los=20nombres?= =?UTF-8?q?=20de=20los=20paquetes=20(p.e.=20BaseD10=20->=20Base).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://192.168.0.254/svn/Proyectos.Varela_PuntosVenta/trunk@112 1c943782-d109-9647-9548-93b3ac332352 --- Build/Build.fbp5 | 53 +- Build/Build.fbw | 0 Source/AdminPVGroup.groupproj | 34 +- Source/ApplicationBase/ApplicationBase.dpk | 6 +- Source/ApplicationBase/ApplicationBase.dproj | 22 +- .../Controller/uUsuariosController.pas | 8 +- Source/ApplicationBase/uAdminPV_App.pas | 1 + Source/Base/{BaseD10.dpk => Base.dpk} | 19 +- Source/Base/{BaseD10.dproj => Base.dproj} | 31 +- Source/Base/{BaseD10.drc => Base.drc} | 4 +- Source/Base/{BaseD10.rc => Base.rc} | 0 Source/Base/Base.res | Bin 0 -> 4748 bytes Source/Base/BaseD10.bdsproj | 673 ------------------ Source/Base/BaseD10.res | Bin 384 -> 0 bytes Source/CargaEDI/CargaEDI.dproj | 11 +- Source/CargaEDI/CargaEDI.drc | 2 +- Source/Cliente/AdminPV.dproj | 8 +- Source/Cliente/AdminPV.drc | 2 +- Source/Cliente/AdminPV.rc | 2 +- Source/Cliente/AdminPV.res | Bin 18476 -> 18468 bytes ...ControlesBaseD10.dpk => ControlesBase.dpk} | 76 +- ...rolesBaseD10.dproj => ControlesBase.dproj} | 151 ++-- ...ControlesBaseD10.drc => ControlesBase.drc} | 4 +- .../{ControlesBaseD10.rc => ControlesBase.rc} | 0 ...ControlesBaseD10.res => ControlesBase.res} | Bin Source/ControlesBase/ControlesBaseD10.bdsproj | 658 ----------------- .../Devoluciones/Cliente/Devoluciones.dpk | 20 +- .../Devoluciones/Cliente/Devoluciones.dproj | 98 +-- .../Devoluciones/Cliente/Devoluciones.drc | 2 +- .../Servidor/srvDevoluciones_Impl.dfm | 7 +- .../FicherosEDI/Cliente/FicherosEDI.dpk | 16 +- .../FicherosEDI/Cliente/FicherosEDI.dproj | 21 +- .../FicherosEDI/Cliente/FicherosEDI.drc | 2 +- .../Modulos/Parametros/Cliente/Parametros.dpk | 4 +- .../Parametros/Cliente/Parametros.dproj | 8 +- .../Modulos/Parametros/Cliente/Parametros.drc | 2 +- .../Recepciones/Cliente/Recepciones.dpk | 20 +- .../Recepciones/Cliente/Recepciones.dproj | 114 +-- .../Recepciones/Cliente/Recepciones.drc | 2 +- .../Cliente/ReferenciaGenerica.dpk | 20 +- .../Cliente/ReferenciaGenerica.dproj | 88 ++- .../Cliente/ReferenciaGenerica.drc | 2 +- Source/Modulos/Stock/Cliente/Stock.dpk | 18 +- Source/Modulos/Stock/Cliente/Stock.dproj | 107 +-- Source/Modulos/Stock/Cliente/Stock.drc | 2 +- .../Modulos/Traspasos/Cliente/Traspasos.dpk | 20 +- .../Modulos/Traspasos/Cliente/Traspasos.dproj | 117 +-- .../Modulos/Traspasos/Cliente/Traspasos.drc | 2 +- .../Traspasos/Servidor/srvTraspasos_Impl.dfm | 7 +- .../VentasProceso/Cliente/VentasProceso.dpk | 18 +- .../VentasProceso/Cliente/VentasProceso.dproj | 92 ++- .../VentasProceso/Cliente/VentasProceso.drc | 2 +- .../Cliente/VentasTerminadas.dpk | 42 +- .../Cliente/VentasTerminadas.dproj | 93 +-- .../Cliente/VentasTerminadas.drc | 2 +- Source/Servidor/AdminPV_Server.dproj | 376 +++++----- Source/Servidor/AdminPV_Server.drc | 2 +- Source/Servidor/AdminPV_Server.rc | 2 +- 58 files changed, 964 insertions(+), 2129 deletions(-) delete mode 100644 Build/Build.fbw rename Source/Base/{BaseD10.dpk => Base.dpk} (91%) rename Source/Base/{BaseD10.dproj => Base.dproj} (95%) rename Source/Base/{BaseD10.drc => Base.drc} (90%) rename Source/Base/{BaseD10.rc => Base.rc} (100%) create mode 100644 Source/Base/Base.res delete mode 100644 Source/Base/BaseD10.bdsproj delete mode 100644 Source/Base/BaseD10.res rename Source/ControlesBase/{ControlesBaseD10.dpk => ControlesBase.dpk} (72%) rename Source/ControlesBase/{ControlesBaseD10.dproj => ControlesBase.dproj} (87%) rename Source/ControlesBase/{ControlesBaseD10.drc => ControlesBase.drc} (90%) rename Source/ControlesBase/{ControlesBaseD10.rc => ControlesBase.rc} (100%) rename Source/ControlesBase/{ControlesBaseD10.res => ControlesBase.res} (100%) delete mode 100644 Source/ControlesBase/ControlesBaseD10.bdsproj diff --git a/Build/Build.fbp5 b/Build/Build.fbp5 index 753596e..6894857 100644 --- a/Build/Build.fbp5 +++ b/Build/Build.fbp5 @@ -154,6 +154,7 @@ False False + True # @@ -381,11 +382,13 @@ %project_path%\Output\Release\Servidor\Informes ]]> + lsCRLF 0 False 0 1000 + , True False @@ -596,12 +599,12 @@ source_path False 0 - True + False 0 1000 False - + 0 @@ -615,7 +618,7 @@ source_path 12 Debug False - + True True @@ -624,6 +627,7 @@ source_path False False + False True True False @@ -637,11 +641,12 @@ source_path 3082 2 + 0 0 False 0 - %source_path%\Base\BaseD10.dpk + %source_path%\Base\Base.dpk True 0 @@ -726,7 +731,7 @@ Comments= - + 0 @@ -740,7 +745,7 @@ Comments= 12 Release False - + True True @@ -749,6 +754,7 @@ Comments= False False + False True True False @@ -762,11 +768,12 @@ Comments= 3082 1 + 0 0 False 0 - %source_path%\ControlesBase\ControlesBaseD10.dpk + %source_path%\ControlesBase\ControlesBase.dpk True 3 @@ -874,6 +881,7 @@ Comments= False False + False True True False @@ -887,6 +895,7 @@ Comments= 3082 1 + 0 0 False @@ -999,6 +1008,7 @@ Comments= False False + False True True False @@ -1012,6 +1022,7 @@ Comments= 3082 1 + 0 0 False @@ -1141,6 +1152,7 @@ Comments= False False + False True True False @@ -1154,6 +1166,7 @@ Comments= 3082 1 + 0 0 False @@ -1266,6 +1279,7 @@ Comments= False False + False True True False @@ -1279,6 +1293,7 @@ Comments= 3082 1 + 0 0 False @@ -1391,6 +1406,7 @@ Comments= False False + False True True False @@ -1404,6 +1420,7 @@ Comments= 3082 1 + 0 0 False @@ -1516,6 +1533,7 @@ Comments= False False + False True True False @@ -1529,6 +1547,7 @@ Comments= 3082 1 + 0 0 False @@ -1641,6 +1660,7 @@ Comments= False False + False True True False @@ -1654,6 +1674,7 @@ Comments= 3082 1 + 0 0 False @@ -1766,6 +1787,7 @@ Comments= False False + False True True False @@ -1779,6 +1801,7 @@ Comments= 3082 1 + 0 0 False @@ -1891,6 +1914,7 @@ Comments= False False + False True True False @@ -1904,6 +1928,7 @@ Comments= 3082 1 + 0 0 False @@ -2016,6 +2041,7 @@ Comments= False False + False True True False @@ -2029,6 +2055,7 @@ Comments= 3082 1 + 0 0 False @@ -2160,6 +2187,7 @@ Comments= %project_path%\Resources\Iconos\Cliente.ico False True + False True True False @@ -2173,6 +2201,7 @@ Comments= 3082 2 + 0 1 False @@ -2202,7 +2231,7 @@ OriginalFilename= ProductName=Administración de puntos de venta ProductVersion=1.0.0.0 Comments= -CompileDate=miércoles, 12 de marzo de 2008 12:35 +CompileDate=miércoles, 16 de abril de 2008 10:43 ]]> @@ -2245,7 +2274,7 @@ CompileDate=miércoles, 12 de marzo de 2008 12:35 True %output_path%\Cliente False - BaseD10;ControlesBaseD10;ApplicationBase;FicherosEDI;VentasProceso;VentasTerminadas;ReferenciaGenerica + Base;ControlesBase;ApplicationBase;FicherosEDI;VentasProceso;VentasTerminadas;ReferenciaGenerica False fa8 True @@ -2288,6 +2317,7 @@ CompileDate=miércoles, 12 de marzo de 2008 12:35 %project_path%\Resources\Iconos\CargaEDI.ico False False + False True True False @@ -2301,6 +2331,7 @@ CompileDate=miércoles, 12 de marzo de 2008 12:35 3082 2 + 0 1 False @@ -2372,7 +2403,7 @@ Comments= True %output_path%\Cliente False - BaseD10;FicherosEDI + Base;FicherosEDI False fa8 True @@ -2430,6 +2461,7 @@ Comments= %project_path%\Resources\Iconos\Servidor.ico False True + False True True False @@ -2443,6 +2475,7 @@ Comments= 3082 2 + 0 1 False diff --git a/Build/Build.fbw b/Build/Build.fbw deleted file mode 100644 index e69de29..0000000 diff --git a/Source/AdminPVGroup.groupproj b/Source/AdminPVGroup.groupproj index 1910b26..9158c71 100644 --- a/Source/AdminPVGroup.groupproj +++ b/Source/AdminPVGroup.groupproj @@ -5,10 +5,10 @@ - + - + @@ -26,23 +26,23 @@ - - + + - - + + - - + + - - + + - - + + - - + + @@ -162,13 +162,13 @@ - + - + - + \ No newline at end of file diff --git a/Source/ApplicationBase/ApplicationBase.dpk b/Source/ApplicationBase/ApplicationBase.dpk index ae542ea..e76f2a2 100644 --- a/Source/ApplicationBase/ApplicationBase.dpk +++ b/Source/ApplicationBase/ApplicationBase.dpk @@ -22,15 +22,15 @@ package ApplicationBase; {$WRITEABLECONST OFF} {$MINENUMSIZE 1} {$IMAGEBASE $400000} -{$IMPLICITBUILD OFF} +{$IMPLICITBUILD ON} {$DEFINE DEBUG} requires rtl, vcl, dbrtl, - PLuginSDK_D10R, - BaseD10, + PluginSDK_D11R, + Base, pckMD5, pckUserControl_RT; diff --git a/Source/ApplicationBase/ApplicationBase.dproj b/Source/ApplicationBase/ApplicationBase.dproj index 67b32d0..64b496a 100644 --- a/Source/ApplicationBase/ApplicationBase.dproj +++ b/Source/ApplicationBase/ApplicationBase.dproj @@ -45,7 +45,7 @@ Delphi.Personality Package -FalseTrueFalseFalseFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0 +FalseTrueFalseTrueFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0 @@ -67,6 +67,19 @@ MainSource + + + + + + + + + + + + +
DataModuleEmpresasObj
 @@ -91,17 +104,10 @@
DataModuleUsuarios
 - - - - - - -
fEditorCambiarPassword
 diff --git a/Source/ApplicationBase/Usuarios/Controller/uUsuariosController.pas b/Source/ApplicationBase/Usuarios/Controller/uUsuariosController.pas index f8c12c4..60353c2 100644 --- a/Source/ApplicationBase/Usuarios/Controller/uUsuariosController.pas +++ b/Source/ApplicationBase/Usuarios/Controller/uUsuariosController.pas @@ -86,6 +86,10 @@ type TUsuariosController = class(TControllerBase, IUsuariosController) private procedure FiltrarEmpresa(AUsuario: IBizUsuario); + procedure _ShowUserManager; + procedure _ShowProfileManager; + procedure _ShowLogManager; + procedure _ShowChangePassword; protected FDataModule : IDataModuleUsuarios; FUserControl: TUserControl; @@ -131,10 +135,6 @@ type procedure VerPerfil(const AIDPerfil: Integer); overload; procedure VerPerfil(APerfil : IBizPerfilUsuario); overload; - procedure _ShowUserManager; - procedure _ShowProfileManager; - procedure _ShowLogManager; - procedure _ShowChangePassword; function ComprobarUsuario(const User : String; const Password: String): Boolean; function CambiarPassword(const AIDUser: Integer): Boolean; overload; diff --git a/Source/ApplicationBase/uAdminPV_App.pas b/Source/ApplicationBase/uAdminPV_App.pas index a4c0d1b..e2120e2 100644 --- a/Source/ApplicationBase/uAdminPV_App.pas +++ b/Source/ApplicationBase/uAdminPV_App.pas @@ -304,6 +304,7 @@ end; procedure TAppAdminPV.Terminate; begin + UsuariosController.Logoff; ModuleManager.UnloadModules; FTerminated := True; end; diff --git a/Source/Base/BaseD10.dpk b/Source/Base/Base.dpk similarity index 91% rename from Source/Base/BaseD10.dpk rename to Source/Base/Base.dpk index cb0a75f..b825c73 100644 --- a/Source/Base/BaseD10.dpk +++ b/Source/Base/Base.dpk @@ -1,4 +1,4 @@ -package BaseD10; +package Base; {$R *.res} {$ALIGN 8} @@ -30,15 +30,15 @@ requires rtl, vcl, vcldb, - GUISDK_D10, + GUISDK_D11, vcljpg, dbrtl, dsnap, PNG_D10, PngComponentsD10, - JvCoreD10R, - JvStdCtrlsD10R, - JvPageCompsD10R, + JvCoreD11R, + JvStdCtrlsD11R, + JvPageCompsD11R, cxLibraryD10, dxThemeD10, cxEditorsD10, @@ -53,7 +53,7 @@ requires designide, cxExportD10, adortl, - JvSystemD10R, + JvSystemD11R, dxPSCoreD10, dxPScxCommonD10, dxPScxGridLnkD10, @@ -62,9 +62,8 @@ requires dxBarExtItemsD10, cxIntl5D10, dxPsPrVwAdvD10, - ccpack10, - JvMMD10R, - JvCtrlsD10R, + JvMMD11R, + JvCtrlsD11R, tee, frx10, fs10, @@ -73,7 +72,7 @@ requires dxComnD10, Jcl, JclVcl, - JvAppFrmD10R, + JvAppFrmD11R, dxPSLnksD10, vclshlctrls, dclcxLibraryD10, diff --git a/Source/Base/BaseD10.dproj b/Source/Base/Base.dproj similarity index 95% rename from Source/Base/BaseD10.dproj rename to Source/Base/Base.dproj index 5a7732f..7f91f97 100644 --- a/Source/Base/BaseD10.dproj +++ b/Source/Base/Base.dproj @@ -2,11 +2,11 @@ {51b1cbd5-e922-4e6d-b778-6de1bca9118c} - BaseD10.dpk + Base.dpk Debug AnyCPU DCC32 - ..\..\Output\Debug\Cliente\BaseD10.bpl + ..\..\Output\Debug\Cliente\Base.bpl 7.0 @@ -40,28 +40,21 @@ Package FalseTrueFalseFalseFalseTrueC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse2000FalseFalseFalseFalseFalse308212522.0.0.01.0.0.0 - - - - - - CodeGear WebSnap Components CodeGear SOAP Components Microsoft Office XP Sample Automation Server Wrapper Components Microsoft Office 2000 Sample Automation Server Wrapper Components CodeGear C++Builder Office 2000 Servers Package CodeGear C++Builder Office XP Servers Package - BaseD10.dpk + Base.dpk - + MainSource - @@ -89,17 +82,17 @@ - + - - - - - - - + + + + + + + diff --git a/Source/Base/BaseD10.drc b/Source/Base/Base.drc similarity index 90% rename from Source/Base/BaseD10.drc rename to Source/Base/Base.drc index 6319435..0fba550 100644 --- a/Source/Base/BaseD10.drc +++ b/Source/Base/Base.drc @@ -28,5 +28,5 @@ END /* C:\Varela_D2007\Source\Base\uEditorDBItem.dfm */ /* C:\Varela_D2007\Source\Base\uViewBarraSeleccion.dfm */ /* C:\Varela_D2007\Source\Base\uViewGrid.dfm */ -/* C:\Varela_D2007\Source\Base\BaseD10.res */ -/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf2.tmp */ +/* C:\Varela_D2007\Source\Base\Base.res */ +/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf57.tmp */ diff --git a/Source/Base/BaseD10.rc b/Source/Base/Base.rc similarity index 100% rename from Source/Base/BaseD10.rc rename to Source/Base/Base.rc diff --git a/Source/Base/Base.res b/Source/Base/Base.res new file mode 100644 index 0000000000000000000000000000000000000000..45dc55f7e508c2aadceb4f8bfc5080153c1b52cf GIT binary patch literal 4748 zcmbW5&1)oO5XLJepe&2#;C*uNAUVh=d+&(4um?YIom`vX7lLeHS8qb+Kbagvr2mJd z=PWtqD9j$byGIXV`~0fj>YkZQVq!y0y&v_~^Hja{zSFds*@2|*L)2V*e%;UcUD@pT z-2VQ(`)TyH8V8ai$&RS*lvEcnpYGCT*v*wp+Fc)g*7;Yqk{jGC8O%pW7aAkaj-i+H)%$#se=n^d0dxj@`?CHTJeXblZsiQn4#; z;)larTK+a4{3BqK;~~##CkNN+yB+@I$Mf%N$p7KMgBX2}l!I2baBv>WtMQXle0m(% z!z;3U;knszwriTjHwKM$eVoiR>!nS;C%} z=Gu<6*hu7mM!$>o;DbTT5qE37Y_cEt^4&;;yZC+K_Qc;dt@p{dHQEPkYOs?7y5O#1 zivxYlB|fp@8|^&05<5OMHmf6Ux9MUG4)oc7$DRv&0#E5$dcwMh-P<=AzIqiFcgST})7$=9$ z0c>Ov`|p_I4ky}h^&AMxYf;=n)4#5*+-n^;oZ$gm{$fu{{K=sj<0t1Pzr;^|IMcyn zbWd{^QpflG+$Puw`qaR)^FUK`+$kGky992@1oA=bh{?ZgkgJ$}!> zd^u*#-iDasXD;s?&ynV$?xlsD@l*S;KUxdE1k4oXX>W=#hj^PV`#P9pB zHt~9%YWbHP^X{_?ET7lfyc?Oz^FZ7C&362#Y2q$>hkwPN`0l&l2X@T2O{rh`jr@z7 z#u5w7I|4cdpPM=GJ(!pKjTj1kx1 zBgUv7;^Q5NbME8nb59MmDPGus&mG8r6~2;>lIU&LZsTwze(H0n{VM+hwDYd3nQzvN&G^e{AVpvI`R+lXu(Q#Hx^0|FO+A9fu% z!S`*RZ&d=s}zcA}H__yRQ$xF!#$)d=aG;-JHOrIT)h1o9h!t7P~enS`& zVO7HH`^9emrkPD8egC?BZ13A6`$Y1AeJY*L>URykX6Spy!GV9(;48?E9qIGOf&18( zA9eIhZTuE;wDUkC$M)E2{eEPhtM$kcYR7x1HqZ0DKmWm>*(=^pU6tOR?fGo!x;ppY z$M%CgweReSeQOV;zqhaD`H6jFr<(uCZKjH9stBj{KpbE+wb$e??T@wQsXf!`Q?2BA z&)$(uifIk@pULXfzOoDW%RDv?HJW^XAbvoADzBGhMMej=|U KhkN(`*!vewsZSLE literal 0 HcmV?d00001 diff --git a/Source/Base/BaseD10.bdsproj b/Source/Base/BaseD10.bdsproj deleted file mode 100644 index cf4977f..0000000 --- a/Source/Base/BaseD10.bdsproj +++ /dev/null @@ -1,673 +0,0 @@ - - - - - - - - - - - - BaseD10.dpk - - - 7.0 - - - 8 - 0 - 1 - 1 - 0 - 0 - 1 - 1 - 1 - 0 - 0 - 1 - 0 - 1 - 0 - 1 - 0 - 0 - 0 - 0 - 0 - 1 - 1 - 1 - 1 - 1 - True - True - WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE; - - False - - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - False - False - False - True - True - True - True - True - True - - - - 3 - 0 - False - 1 - False - False - False - 16384 - 1048576 - 4194304 - - - - - .\ - ..\..\Output\Debug\Cliente - ..\Lib - - - - - False - - - - - - False - - - True - False - - - - $00000000 - C:\Archivos de programa\Borland\Delphi7\Bin\ - - - True - False - 2 - 0 - 0 - 0 - False - False - False - False - False - 3082 - 1252 - - - - - 2.0.0.0 - - - - - - 1.0.0.0 - - - (untitled) - (untitled) - (untitled) - (untitled) - (untitled) - (untitled) - (untitled) - (untitled) - (untitled) - (untitled) - (untitled) - (untitled) - (untitled) - (untitled) - - - - diff --git a/Source/Base/BaseD10.res b/Source/Base/BaseD10.res deleted file mode 100644 index 01cbcba5c522d4341b374ed55ece934f71eafc4c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 384 zcmZ9HJqp4=5QRS_g@}bmu&|aW_D1{x8x@tb68s||2_)Ki7%$>&?7e~dc6AjUnAsWT zy*FapyLR)RfoTci3nYs}Z#+pZ}L-i&u-t7*CU$nD( zJMYQEv)lJ*pR=uV4rIh6?4%a6XCvi=Evfb=i}C5nRae=T2jj@6Bt3@@#mUIUPQ^6Q zq9Ke+#4-4(P$_GUtaSCC)%@TM5BgRqBofPA`Z|NU{saqcBVEnqJd*0yL%DMGp1*G} A!TDebug AnyCPU true - BaseD10;FicherosEDI + Base;FicherosEDI DCC32 ..\..\Output\Debug\Cliente\CargaEDI.exe @@ -51,13 +51,16 @@ + + + + + CodeGear WebSnap Components CodeGear SOAP Components Microsoft Office XP Sample Automation Server Wrapper Components - VCL for the Web Design Package for CodeGear RAD Studio + VCL for the Web 9.0 Design Package for CodeGear RAD Studio Microsoft Office 2000 Sample Automation Server Wrapper Components - CodeGear C++Builder Office 2000 Servers Package - CodeGear C++Builder Office XP Servers Package CargaEDI.dpr diff --git a/Source/CargaEDI/CargaEDI.drc b/Source/CargaEDI/CargaEDI.drc index 8d0b00e..118416c 100644 --- a/Source/CargaEDI/CargaEDI.drc +++ b/Source/CargaEDI/CargaEDI.drc @@ -15,4 +15,4 @@ END /* C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib\WindowsXP.res */ /* C:\Varela_D2007\Source\CargaEDI\uCargaEDI.dfm */ /* C:\Varela_D2007\Source\CargaEDI\CargaEDI.res */ -/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf1C.tmp */ +/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf71.tmp */ diff --git a/Source/Cliente/AdminPV.dproj b/Source/Cliente/AdminPV.dproj index e744c44..b7ca55b 100644 --- a/Source/Cliente/AdminPV.dproj +++ b/Source/Cliente/AdminPV.dproj @@ -8,7 +8,7 @@ DCC32 ..\..\Output\Debug\Cliente\AdminPV.exe true - BaseD10;ControlesBaseD10;Parametros;ApplicationBase;FicherosEDI + Base;ControlesBase;Parametros;ApplicationBase;FicherosEDI 7.0 @@ -42,14 +42,12 @@ Delphi.Personality VCLApplication - FalseTrueFalseTrueFalse2110FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.1.1.0Administración de puntos de ventaAdministración de puntos de venta1.0.0.0miércoles, 12 de marzo de 2008 12:35 + FalseTrueFalseTrueFalse2110FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.1.1.0Administración de puntos de ventaAdministración de puntos de venta1.0.0.0miércoles, 16 de abril de 2008 10:43 CodeGear WebSnap Components CodeGear SOAP Components Microsoft Office XP Sample Automation Server Wrapper Components - VCL for the Web Design Package for CodeGear RAD Studio + VCL for the Web 9.0 Design Package for CodeGear RAD Studio Microsoft Office 2000 Sample Automation Server Wrapper Components - CodeGear C++Builder Office 2000 Servers Package - CodeGear C++Builder Office XP Servers Package AdminPV.dpr diff --git a/Source/Cliente/AdminPV.drc b/Source/Cliente/AdminPV.drc index f6efbf9..4d4d2ed 100644 --- a/Source/Cliente/AdminPV.drc +++ b/Source/Cliente/AdminPV.drc @@ -18,4 +18,4 @@ END /* C:\Varela_D2007\Source\Cliente\uAcercaDe.dfm */ /* C:\Varela_D2007\Source\Cliente\uPantallaPrincipal.dfm */ /* C:\Varela_D2007\Source\Cliente\AdminPV.res */ -/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf1A.tmp */ +/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf6F.tmp */ diff --git a/Source/Cliente/AdminPV.rc b/Source/Cliente/AdminPV.rc index 38bf708..4417beb 100644 --- a/Source/Cliente/AdminPV.rc +++ b/Source/Cliente/AdminPV.rc @@ -17,7 +17,7 @@ BEGIN VALUE "InternalName", "Administración de puntos de venta\0" VALUE "ProductName", "Administración de puntos de venta\0" VALUE "ProductVersion", "1.0.0.0\0" - VALUE "CompileDate", "miércoles, 16 de abril de 2008 10:43\0" + VALUE "CompileDate", "jueves, 17 de abril de 2008 13:27\0" END END BLOCK "VarFileInfo" diff --git a/Source/Cliente/AdminPV.res b/Source/Cliente/AdminPV.res index d79605d81273963092b9a99fe26f77091df4c19f..21509fe914456619bf7d61dc8cb45412e4f1e9ae 100644 GIT binary patch delta 78 zcmZ28fpN(M#ti|kj9VrLy2=B|Lf2?Uk;!LWl^H*5{^;7x$ehBUG`ZegRyd2Hlp&R& f42X*vbQlyE3>nNPZ*^B^H)gP6Faolly1N4a1gsZA delta 86 zcmZ27fpN_Q#ti|kjC&>ry2=B|Lf2?UsmW(ul^MTn{^;7x$ehKXI=S9mRx+0%li?*p q5koRVK0^*eDnl`Y4ub-NA%ofE_3rAN1`JjVCJe?543qD=y8{5)Rv8cg diff --git a/Source/ControlesBase/ControlesBaseD10.dpk b/Source/ControlesBase/ControlesBase.dpk similarity index 72% rename from Source/ControlesBase/ControlesBaseD10.dpk rename to Source/ControlesBase/ControlesBase.dpk index fc02b39..5a3235f 100644 --- a/Source/ControlesBase/ControlesBaseD10.dpk +++ b/Source/ControlesBase/ControlesBase.dpk @@ -1,4 +1,4 @@ -package ControlesBaseD10; +package ControlesBase; {$R *.res} {$ALIGN 8} @@ -27,43 +27,43 @@ package ControlesBaseD10; {$DEFINE DEBUG} requires - rtl, - vcl, - PngComponentsD10, - PNG_D10, - BaseD10, - dbrtl, - dsnap, - adortl, - JvGlobusD10R, - cxTreeListD10, - vclactnband, - vclx, - tb2k_D10, - tbx_D10, - JvCoreD10R, - vcljpg, - Jcl, - JclVcl, - JvSystemD10R, - JvPageCompsD10R, - JvStdCtrlsD10R, - dxThemeD10, - cxLibraryD10, - cxExportD10, - cxEditorsD10, - cxDataD10, - vcldb, - cxExtEditorsD10, - cxGridD10, - cxPageControlD10, - dxLayoutControlD10, - dxComnD10, - cxVerticalGridD10, - dxPSCoreD10, - VclSmp, - bdertl, - EasyListviewD11; + rtl, + vcl, + PngComponentsD10, + PNG_D10, + dbrtl, + dsnap, + adortl, + JvGlobusD11R, + cxTreeListD10, + vclactnband, + vclx, + tb2k_D10, + tbx_D10, + JvCoreD11R, + vcljpg, + Jcl, + JclVcl, + JvSystemD11R, + JvPageCompsD11R, + JvStdCtrlsD11R, + dxThemeD10, + cxLibraryD10, + cxExportD10, + cxEditorsD10, + cxDataD10, + vcldb, + cxExtEditorsD10, + cxGridD10, + cxPageControlD10, + dxLayoutControlD10, + dxComnD10, + cxVerticalGridD10, + dxPSCoreD10, + VclSmp, + bdertl, + EasyListviewD11, + Base; contains uEditorControlesBase in 'Cliente\uEditorControlesBase.pas' {fEditorControlesBase: TCustomEditor}, diff --git a/Source/ControlesBase/ControlesBaseD10.dproj b/Source/ControlesBase/ControlesBase.dproj similarity index 87% rename from Source/ControlesBase/ControlesBaseD10.dproj rename to Source/ControlesBase/ControlesBase.dproj index 7b82d5e..bdb5ca9 100644 --- a/Source/ControlesBase/ControlesBaseD10.dproj +++ b/Source/ControlesBase/ControlesBase.dproj @@ -2,11 +2,11 @@ {5a36df18-a9b1-4d84-b46c-41d1522c62e2} - ControlesBaseD10.dpk + ControlesBase.dpk Debug AnyCPU DCC32 - ..\..\Output\Debug\Cliente\ControlesBaseD10.bpl + ..\..\Output\Debug\Cliente\ControlesBase.bpl 7.0 @@ -47,7 +47,85 @@ Delphi.Personality Package -FalseTrueFalseTrueFalseTrueC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse1030FalseFalseFalseFalseFalse308212521.0.3.01.0.0.0ControlesBaseD10.dpk +FalseTrueFalseTrueFalseTrueC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse1030FalseFalseFalseFalseFalse308212521.0.3.01.0.0.0ControlesBase.dpk + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + CodeGear WebSnap Components CodeGear SOAP Components Microsoft Office XP Sample Automation Server Wrapper Components @@ -58,11 +136,11 @@ - + MainSource - + @@ -82,11 +160,11 @@ - - - - - + + + + + @@ -98,59 +176,6 @@ - -
dmControles
- TDAClientDataModule - - -
fEditorControlBase
- TCustomEditor - - -
fEditorControlesBase
- TCustomEditor - - -
frPropiedadesControl
- - -
frViewAgrupaciones
- TCustomView - - -
frViewColumnas
- TCustomView - - -
frViewControlBase
- TCustomView - - -
frViewControlesBase
- TCustomView - - -
frViewControlGrid
- TCustomView - - -
frViewFiltros
- TCustomView - - -
frViewParametrosControlGrid
- TCustomView - - -
frViewPeriodoFechas
- TCustomView - - -
frViewSumarios
- TCustomView - - - - diff --git a/Source/Modulos/Devoluciones/Cliente/Devoluciones.dpk b/Source/Modulos/Devoluciones/Cliente/Devoluciones.dpk index 929e16d..c307099 100644 --- a/Source/Modulos/Devoluciones/Cliente/Devoluciones.dpk +++ b/Source/Modulos/Devoluciones/Cliente/Devoluciones.dpk @@ -29,24 +29,24 @@ requires rtl, dbrtl, dsnap, - BaseD10, + Base, vcl, adortl, - PluginSDK_D10R, + PluginSDK_D11R, PngComponentsD10, PNG_D10, vclactnband, vclx, - GUISDK_D10, + GUISDK_D11, tb2k_D10, tbx_D10, - JvCoreD10R, + JvCoreD11R, vcljpg, Jcl, JclVcl, - JvSystemD10R, - JvPageCompsD10R, - JvStdCtrlsD10R, + JvSystemD11R, + JvPageCompsD11R, + JvStdCtrlsD11R, cxTreeListD10, dxThemeD10, cxLibraryD10, @@ -54,14 +54,14 @@ requires cxEditorsD10, cxDataD10, vcldb, - JvGlobusD10R, - ControlesBaseD10, + JvGlobusD11R, + ControlesBase, cxGridD10, cxPageControlD10, cxExtEditorsD10, dxPSCoreD10, dxComnD10, - JvCustomD10R, + JvCustomD11R, bdertl, VclSmp, dxLayoutControlD10, diff --git a/Source/Modulos/Devoluciones/Cliente/Devoluciones.dproj b/Source/Modulos/Devoluciones/Cliente/Devoluciones.dproj index 9ae57bb..2f6f0d5 100644 --- a/Source/Modulos/Devoluciones/Cliente/Devoluciones.dproj +++ b/Source/Modulos/Devoluciones/Cliente/Devoluciones.dproj @@ -52,61 +52,79 @@ MainSource + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
dmDevoluciones
+ TDAClientDataModule
fEditorAjustarRecepciones
fEditorListaDevoluciones
+ TCustomEditor
ModuleDevoluciones
+ TModuleController
frViewListaDevoluciones
+ TCustomView diff --git a/Source/Modulos/Devoluciones/Cliente/Devoluciones.drc b/Source/Modulos/Devoluciones/Cliente/Devoluciones.drc index 62e5ac9..eac0ae6 100644 --- a/Source/Modulos/Devoluciones/Cliente/Devoluciones.drc +++ b/Source/Modulos/Devoluciones/Cliente/Devoluciones.drc @@ -18,4 +18,4 @@ END /* C:\Varela_D2007\Source\Modulos\Devoluciones\Cliente\uPluginControllerDevoluciones.dfm */ /* C:\Varela_D2007\Source\Modulos\Devoluciones\Cliente\uEditorAjustarDevoluciones.dfm */ /* C:\Varela_D2007\Source\Modulos\Devoluciones\Cliente\Devoluciones.res */ -/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf14.tmp */ +/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf69.tmp */ diff --git a/Source/Modulos/Devoluciones/Servidor/srvDevoluciones_Impl.dfm b/Source/Modulos/Devoluciones/Servidor/srvDevoluciones_Impl.dfm index 961b1d4..2ceba13 100644 --- a/Source/Modulos/Devoluciones/Servidor/srvDevoluciones_Impl.dfm +++ b/Source/Modulos/Devoluciones/Servidor/srvDevoluciones_Impl.dfm @@ -1,13 +1,10 @@ object srvDevoluciones: TsrvDevoluciones OldCreateOrder = True SessionManager = dmServer.SessionManager - AcquireConnection = True ServiceSchema = schDevoluciones - ServiceAdapter = DABINAdapter - OnAfterProcessTransactionAction = pptaNone + ServiceDataStreamer = DABINAdapter + AllowWhereSQL = True ExportedDataTables = <> - CacheElements = <> - Options = [rsoProcessDeltasWithoutUpdateRules] Height = 300 Width = 300 object schDevoluciones: TDASchema diff --git a/Source/Modulos/FicherosEDI/Cliente/FicherosEDI.dpk b/Source/Modulos/FicherosEDI/Cliente/FicherosEDI.dpk index e014b67..42a9c08 100644 --- a/Source/Modulos/FicherosEDI/Cliente/FicherosEDI.dpk +++ b/Source/Modulos/FicherosEDI/Cliente/FicherosEDI.dpk @@ -28,12 +28,12 @@ package FicherosEDI; requires vcl, rtl, - PluginSDK_D10R, - GUISDK_D10, + PluginSDK_D11R, + GUISDK_D11, PNG_D10, PngComponentsD10, - BaseD10, - JvWizardD10R, + Base, + JvWizardD11R, dbrtl, vclx, dsnap, @@ -53,12 +53,12 @@ requires vclactnband, tb2k_D10, tbx_D10, - JvCoreD10R, + JvCoreD11R, Jcl, JclVcl, - JvSystemD10R, - JvPageCompsD10R, - JvStdCtrlsD10R; + JvSystemD11R, + JvPageCompsD11R, + JvStdCtrlsD11R; contains uPluginControllerFicherosEDI in 'uPluginControllerFicherosEDI.pas' {ModuleFicherosEDI: TModuleController}, diff --git a/Source/Modulos/FicherosEDI/Cliente/FicherosEDI.dproj b/Source/Modulos/FicherosEDI/Cliente/FicherosEDI.dproj index 4b660cf..be7c767 100644 --- a/Source/Modulos/FicherosEDI/Cliente/FicherosEDI.dproj +++ b/Source/Modulos/FicherosEDI/Cliente/FicherosEDI.dproj @@ -55,6 +55,9 @@ + + + @@ -68,15 +71,15 @@ - + - - - - - - + + + + + + @@ -93,16 +96,20 @@
dmFicherosEDI
+ TDAClientDataModule
fEditorHistorialCargasEDI
+ TCustomEditor
ModuleFicherosEDI
+ TModuleController
frViewHistorialCargasEDI
+ TCustomView diff --git a/Source/Modulos/FicherosEDI/Cliente/FicherosEDI.drc b/Source/Modulos/FicherosEDI/Cliente/FicherosEDI.drc index 49a13f0..eb2c7a4 100644 --- a/Source/Modulos/FicherosEDI/Cliente/FicherosEDI.drc +++ b/Source/Modulos/FicherosEDI/Cliente/FicherosEDI.drc @@ -18,4 +18,4 @@ END /* C:\Varela_D2007\Source\Modulos\FicherosEDI\Cliente\uEditorHistorialCargasEDI.dfm */ /* C:\Varela_D2007\Source\Modulos\FicherosEDI\Cliente\uPluginControllerFicherosEDI.dfm */ /* C:\Varela_D2007\Source\Modulos\FicherosEDI\Cliente\FicherosEDI.res */ -/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtfA.tmp */ +/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf5F.tmp */ diff --git a/Source/Modulos/Parametros/Cliente/Parametros.dpk b/Source/Modulos/Parametros/Cliente/Parametros.dpk index 90f6401..588584b 100644 --- a/Source/Modulos/Parametros/Cliente/Parametros.dpk +++ b/Source/Modulos/Parametros/Cliente/Parametros.dpk @@ -28,8 +28,8 @@ package Parametros; requires rtl, vcl, - BaseD10, - ControlesBaseD10; + Base, + ControlesBase; contains uDataModuleParametros in 'uDataModuleParametros.pas' {dmParametros: TDAClientDataModule}, diff --git a/Source/Modulos/Parametros/Cliente/Parametros.dproj b/Source/Modulos/Parametros/Cliente/Parametros.dproj index 8fcd636..e5a36a1 100644 --- a/Source/Modulos/Parametros/Cliente/Parametros.dproj +++ b/Source/Modulos/Parametros/Cliente/Parametros.dproj @@ -52,12 +52,12 @@ MainSource + + + + - - - -
dmParametros
TDAClientDataModule diff --git a/Source/Modulos/Parametros/Cliente/Parametros.drc b/Source/Modulos/Parametros/Cliente/Parametros.drc index d1a383d..8099d5b 100644 --- a/Source/Modulos/Parametros/Cliente/Parametros.drc +++ b/Source/Modulos/Parametros/Cliente/Parametros.drc @@ -17,4 +17,4 @@ END /* C:\Varela_D2007\Source\Modulos\Parametros\Cliente\uViewParametrosColeccion.dfm */ /* C:\Varela_D2007\Source\Modulos\Parametros\Cliente\uViewParametrosFecha.dfm */ /* C:\Varela_D2007\Source\Modulos\Parametros\Cliente\Parametros.res */ -/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf6.tmp */ +/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf5B.tmp */ diff --git a/Source/Modulos/Recepciones/Cliente/Recepciones.dpk b/Source/Modulos/Recepciones/Cliente/Recepciones.dpk index ad71ba4..40828b1 100644 --- a/Source/Modulos/Recepciones/Cliente/Recepciones.dpk +++ b/Source/Modulos/Recepciones/Cliente/Recepciones.dpk @@ -29,24 +29,24 @@ requires rtl, dbrtl, dsnap, - BaseD10, + Base, vcl, adortl, - PluginSDK_D10R, + PluginSDK_D11R, PngComponentsD10, PNG_D10, vclactnband, vclx, - GUISDK_D10, + GUISDK_D11, tb2k_D10, tbx_D10, - JvCoreD10R, + JvCoreD11R, vcljpg, Jcl, JclVcl, - JvSystemD10R, - JvPageCompsD10R, - JvStdCtrlsD10R, + JvSystemD11R, + JvPageCompsD11R, + JvStdCtrlsD11R, cxTreeListD10, dxThemeD10, cxLibraryD10, @@ -54,15 +54,15 @@ requires cxEditorsD10, cxDataD10, vcldb, - JvGlobusD10R, - ControlesBaseD10, + JvGlobusD11R, + ControlesBase, Parametros, cxGridD10, cxPageControlD10, cxExtEditorsD10, dxPSCoreD10, dxComnD10, - JvCustomD10R, + JvCustomD11R, bdertl, VclSmp, dxPScxGridLnkD10, diff --git a/Source/Modulos/Recepciones/Cliente/Recepciones.dproj b/Source/Modulos/Recepciones/Cliente/Recepciones.dproj index 418d2dc..6df979b 100644 --- a/Source/Modulos/Recepciones/Cliente/Recepciones.dproj +++ b/Source/Modulos/Recepciones/Cliente/Recepciones.dproj @@ -46,6 +46,10 @@ Package FalseTrueFalseTrueFalseFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse1030FalseFalseFalseFalseFalse308212521.0.3.01.0.0.0 + + + + Intraweb 8.0 Design Package for Borland Development Studio 2006 Recepciones.dpk @@ -54,72 +58,92 @@ MainSource + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
dmRecepciones
+ TDAClientDataModule
fEditorAjustarRecepciones
fEditorListaRecepciones
+ TCustomEditor
fEditorListaRecepcionesAlbaran
+ TCustomEditor
ModuleRecepciones
+ TModuleController
frViewListaRecepciones
+ TCustomView
frViewListaRecepcionesAlbaran
+ TCustomView diff --git a/Source/Modulos/Recepciones/Cliente/Recepciones.drc b/Source/Modulos/Recepciones/Cliente/Recepciones.drc index 1894a1d..e42d2fa 100644 --- a/Source/Modulos/Recepciones/Cliente/Recepciones.drc +++ b/Source/Modulos/Recepciones/Cliente/Recepciones.drc @@ -20,4 +20,4 @@ END /* C:\Varela_D2007\Source\Modulos\Recepciones\Cliente\uPluginControllerRecepciones.dfm */ /* C:\Varela_D2007\Source\Modulos\Recepciones\Cliente\uEditorAjustarRecepciones.dfm */ /* C:\Varela_D2007\Source\Modulos\Recepciones\Cliente\Recepciones.res */ -/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf12.tmp */ +/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf67.tmp */ diff --git a/Source/Modulos/ReferenciaGenerica/Cliente/ReferenciaGenerica.dpk b/Source/Modulos/ReferenciaGenerica/Cliente/ReferenciaGenerica.dpk index 1861207..80990f7 100644 --- a/Source/Modulos/ReferenciaGenerica/Cliente/ReferenciaGenerica.dpk +++ b/Source/Modulos/ReferenciaGenerica/Cliente/ReferenciaGenerica.dpk @@ -29,24 +29,24 @@ requires rtl, dbrtl, dsnap, - BaseD10, + Base, vcl, adortl, - PluginSDK_D10R, + PluginSDK_D11R, PngComponentsD10, PNG_D10, vclactnband, vclx, - GUISDK_D10, + GUISDK_D11, tb2k_D10, tbx_D10, - JvCoreD10R, + JvCoreD11R, vcljpg, Jcl, JclVcl, - JvSystemD10R, - JvPageCompsD10R, - JvStdCtrlsD10R, + JvSystemD11R, + JvPageCompsD11R, + JvStdCtrlsD11R, cxTreeListD10, dxThemeD10, cxLibraryD10, @@ -54,14 +54,14 @@ requires cxEditorsD10, cxDataD10, vcldb, - JvGlobusD10R, - ControlesBaseD10, + JvGlobusD11R, + ControlesBase, cxGridD10, cxPageControlD10, cxExtEditorsD10, dxPSCoreD10, dxComnD10, - JvCustomD10R, + JvCustomD11R, Parametros; contains diff --git a/Source/Modulos/ReferenciaGenerica/Cliente/ReferenciaGenerica.dproj b/Source/Modulos/ReferenciaGenerica/Cliente/ReferenciaGenerica.dproj index e3e2557..cb5bcd1 100644 --- a/Source/Modulos/ReferenciaGenerica/Cliente/ReferenciaGenerica.dproj +++ b/Source/Modulos/ReferenciaGenerica/Cliente/ReferenciaGenerica.dproj @@ -53,46 +53,60 @@ MainSource + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
dmReferenciaGenerica
TDAClientDataModule diff --git a/Source/Modulos/ReferenciaGenerica/Cliente/ReferenciaGenerica.drc b/Source/Modulos/ReferenciaGenerica/Cliente/ReferenciaGenerica.drc index 105c6ef..88c44eb 100644 --- a/Source/Modulos/ReferenciaGenerica/Cliente/ReferenciaGenerica.drc +++ b/Source/Modulos/ReferenciaGenerica/Cliente/ReferenciaGenerica.drc @@ -18,4 +18,4 @@ END /* C:\Varela_D2007\Source\Modulos\ReferenciaGenerica\Cliente\uPluginControllerReferenciaGenerica.dfm */ /* C:\Varela_D2007\Source\Modulos\ReferenciaGenerica\Cliente\uEditorCambioReferenciaGenerica.dfm */ /* C:\Varela_D2007\Source\Modulos\ReferenciaGenerica\Cliente\ReferenciaGenerica.res */ -/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf10.tmp */ +/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf65.tmp */ diff --git a/Source/Modulos/Stock/Cliente/Stock.dpk b/Source/Modulos/Stock/Cliente/Stock.dpk index 3477990..4c10844 100644 --- a/Source/Modulos/Stock/Cliente/Stock.dpk +++ b/Source/Modulos/Stock/Cliente/Stock.dpk @@ -32,10 +32,10 @@ requires PNG_D10, vclactnband, vclx, - PluginSDK_D10R, - GUISDK_D10, - BaseD10, - ControlesBaseD10, + PluginSDK_D11R, + GUISDK_D11, + Base, + ControlesBase, dbrtl, dsnap, adortl, @@ -59,14 +59,14 @@ requires dclcxLibraryD10, tb2k_D10, tbx_D10, - JvCoreD10R, + JvCoreD11R, Jcl, JclVcl, - JvSystemD10R, - JvPageCompsD10R, - JvStdCtrlsD10R, + JvSystemD11R, + JvPageCompsD11R, + JvStdCtrlsD11R, Parametros, - JvCustomD10R, + JvCustomD11R, RemObjects_Core_D11, DataAbstract_Core_D11; diff --git a/Source/Modulos/Stock/Cliente/Stock.dproj b/Source/Modulos/Stock/Cliente/Stock.dproj index 68a3388..1431992 100644 --- a/Source/Modulos/Stock/Cliente/Stock.dproj +++ b/Source/Modulos/Stock/Cliente/Stock.dproj @@ -50,74 +50,95 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - -
dmStock
+ TDAClientDataModule
fEditorControlStockEDI
+ TCustomEditor
fEditorControlStockVARELA
+ TCustomEditor
ModuleStock
+ TModuleController
frViewControlGridStockEDI
+ TCustomView
frViewControlGridStockEDIInventario
+ TCustomView
frViewControlGridStockPrendasCentros
+ TCustomView
frViewControlGridStockVARELA
+ TCustomView diff --git a/Source/Modulos/Stock/Cliente/Stock.drc b/Source/Modulos/Stock/Cliente/Stock.drc index ea27c74..a78211e 100644 --- a/Source/Modulos/Stock/Cliente/Stock.drc +++ b/Source/Modulos/Stock/Cliente/Stock.drc @@ -21,4 +21,4 @@ END /* C:\Varela_D2007\Source\Modulos\Stock\Cliente\uEditorControlStockVARELA.dfm */ /* C:\Varela_D2007\Source\Modulos\Stock\Cliente\uPluginControllerStock.dfm */ /* C:\Varela_D2007\Source\Modulos\Stock\Cliente\Stock.res */ -/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf18.tmp */ +/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf6D.tmp */ diff --git a/Source/Modulos/Traspasos/Cliente/Traspasos.dpk b/Source/Modulos/Traspasos/Cliente/Traspasos.dpk index 82c43ec..bd654e3 100644 --- a/Source/Modulos/Traspasos/Cliente/Traspasos.dpk +++ b/Source/Modulos/Traspasos/Cliente/Traspasos.dpk @@ -29,24 +29,24 @@ requires rtl, dbrtl, dsnap, - BaseD10, + Base, vcl, adortl, - PluginSDK_D10R, + PluginSDK_D11R, PngComponentsD10, PNG_D10, vclactnband, vclx, - GUISDK_D10, + GUISDK_D11, tb2k_D10, tbx_D10, - JvCoreD10R, + JvCoreD11R, vcljpg, Jcl, JclVcl, - JvSystemD10R, - JvPageCompsD10R, - JvStdCtrlsD10R, + JvSystemD11R, + JvPageCompsD11R, + JvStdCtrlsD11R, cxTreeListD10, dxThemeD10, cxLibraryD10, @@ -54,14 +54,14 @@ requires cxEditorsD10, cxDataD10, vcldb, - JvGlobusD10R, - ControlesBaseD10, + JvGlobusD11R, + ControlesBase, cxGridD10, cxPageControlD10, cxExtEditorsD10, dxPSCoreD10, dxComnD10, - JvCustomD10R, + JvCustomD11R, bdertl, VclSmp, dxPScxCommonD10, diff --git a/Source/Modulos/Traspasos/Cliente/Traspasos.dproj b/Source/Modulos/Traspasos/Cliente/Traspasos.dproj index 0cc553a..c70ffbc 100644 --- a/Source/Modulos/Traspasos/Cliente/Traspasos.dproj +++ b/Source/Modulos/Traspasos/Cliente/Traspasos.dproj @@ -53,67 +53,92 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
dmTraspasos
+ TDAClientDataModule
fEditorAjustarTraspasos
fEditorListaTraspasos
+ TCustomEditor
ModuleTraspasos
+ TModuleController
frViewListaTraspasos
+ TCustomView diff --git a/Source/Modulos/Traspasos/Cliente/Traspasos.drc b/Source/Modulos/Traspasos/Cliente/Traspasos.drc index 3bd1ac5..9c6fc4f 100644 --- a/Source/Modulos/Traspasos/Cliente/Traspasos.drc +++ b/Source/Modulos/Traspasos/Cliente/Traspasos.drc @@ -18,4 +18,4 @@ END /* C:\Varela_D2007\Source\Modulos\Traspasos\Cliente\uPluginControllerTraspasos.dfm */ /* C:\Varela_D2007\Source\Modulos\Traspasos\Cliente\uEditorAjustarTraspasos.dfm */ /* C:\Varela_D2007\Source\Modulos\Traspasos\Cliente\Traspasos.res */ -/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf16.tmp */ +/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf6B.tmp */ diff --git a/Source/Modulos/Traspasos/Servidor/srvTraspasos_Impl.dfm b/Source/Modulos/Traspasos/Servidor/srvTraspasos_Impl.dfm index e673da5..3e41616 100644 --- a/Source/Modulos/Traspasos/Servidor/srvTraspasos_Impl.dfm +++ b/Source/Modulos/Traspasos/Servidor/srvTraspasos_Impl.dfm @@ -1,13 +1,10 @@ object srvTraspasos: TsrvTraspasos OldCreateOrder = True SessionManager = dmServer.SessionManager - AcquireConnection = True ServiceSchema = schTraspasos - ServiceAdapter = DABINAdapter - OnAfterProcessTransactionAction = pptaNone + ServiceDataStreamer = DABINAdapter + AllowWhereSQL = True ExportedDataTables = <> - CacheElements = <> - Options = [rsoProcessDeltasWithoutUpdateRules] Height = 300 Width = 300 object DABINAdapter: TDABINAdapter diff --git a/Source/Modulos/VentasProceso/Cliente/VentasProceso.dpk b/Source/Modulos/VentasProceso/Cliente/VentasProceso.dpk index 25d89b6..2a93d2a 100644 --- a/Source/Modulos/VentasProceso/Cliente/VentasProceso.dpk +++ b/Source/Modulos/VentasProceso/Cliente/VentasProceso.dpk @@ -29,24 +29,24 @@ requires rtl, dbrtl, dsnap, - BaseD10, + Base, vcl, adortl, - PluginSDK_D10R, + PluginSDK_D11R, PngComponentsD10, PNG_D10, vclactnband, vclx, - GUISDK_D10, + GUISDK_D11, tb2k_D10, tbx_D10, - JvCoreD10R, + JvCoreD11R, vcljpg, Jcl, JclVcl, - JvSystemD10R, - JvPageCompsD10R, - JvStdCtrlsD10R, + JvSystemD11R, + JvPageCompsD11R, + JvStdCtrlsD11R, cxTreeListD10, dxThemeD10, cxLibraryD10, @@ -54,8 +54,8 @@ requires cxEditorsD10, cxDataD10, vcldb, - JvGlobusD10R, - ControlesBaseD10, + JvGlobusD11R, + ControlesBase, cxGridD10, cxPageControlD10, cxExtEditorsD10; diff --git a/Source/Modulos/VentasProceso/Cliente/VentasProceso.dproj b/Source/Modulos/VentasProceso/Cliente/VentasProceso.dproj index 4ba9792..9bf324e 100644 --- a/Source/Modulos/VentasProceso/Cliente/VentasProceso.dproj +++ b/Source/Modulos/VentasProceso/Cliente/VentasProceso.dproj @@ -52,62 +52,88 @@ MainSource + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
dmVentasEnProceso
+ TDAClientDataModule
fEditorControlesVentasProceso
+ TCustomEditor
fEditorControlVentaProceso
+ TCustomEditor
ModuleVentasProceso
+ TModuleController
frViewControlGridVentaProceso
+ TCustomView
frViewControlesVentaProceso
+ TCustomView
frViewControlVentaProceso
+ TCustomView diff --git a/Source/Modulos/VentasProceso/Cliente/VentasProceso.drc b/Source/Modulos/VentasProceso/Cliente/VentasProceso.drc index a4436af..35f1676 100644 --- a/Source/Modulos/VentasProceso/Cliente/VentasProceso.drc +++ b/Source/Modulos/VentasProceso/Cliente/VentasProceso.drc @@ -20,4 +20,4 @@ END /* C:\Varela_D2007\Source\Modulos\VentasProceso\Cliente\uViewControlVentaProceso.dfm */ /* C:\Varela_D2007\Source\Modulos\VentasProceso\Cliente\uEditorControlVentaProceso.dfm */ /* C:\Varela_D2007\Source\Modulos\VentasProceso\Cliente\VentasProceso.res */ -/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtfE.tmp */ +/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf63.tmp */ diff --git a/Source/Modulos/VentasTerminadas/Cliente/VentasTerminadas.dpk b/Source/Modulos/VentasTerminadas/Cliente/VentasTerminadas.dpk index 6926416..c607476 100644 --- a/Source/Modulos/VentasTerminadas/Cliente/VentasTerminadas.dpk +++ b/Source/Modulos/VentasTerminadas/Cliente/VentasTerminadas.dpk @@ -26,46 +26,12 @@ package VentasTerminadas; {$DEFINE DEBUG} requires - BaseD10, rtl, vcl, - PluginSDK_D10R, - PngComponentsD10, - PNG_D10, - vclactnband, - vclx, - GUISDK_D10, - dbrtl, - dsnap, - adortl, - tb2k_D10, - tbx_D10, - JvCoreD10R, - vcljpg, - Jcl, - JclVcl, - JvSystemD10R, - JvPageCompsD10R, - JvStdCtrlsD10R, - cxTreeListD10, - dxThemeD10, - cxLibraryD10, - cxExportD10, - cxEditorsD10, - cxDataD10, - vcldb, - cxGridD10, - cxPageControlD10, - cxExtEditorsD10, - dxPSCoreD10, - dxComnD10, - dxPScxCommonD10, - dxPSLnksD10, - designide, - vclshlctrls, - dxPScxGridLnkD10, - dclcxLibraryD10, - ControlesBaseD10; + Base, + ControlesBase, + ApplicationBase, + Parametros; contains uPluginControllerVentasTerminadas in 'uPluginControllerVentasTerminadas.pas' {ModuleVentasTerminadas: TModuleController}, diff --git a/Source/Modulos/VentasTerminadas/Cliente/VentasTerminadas.dproj b/Source/Modulos/VentasTerminadas/Cliente/VentasTerminadas.dproj index 483f859..a424684 100644 --- a/Source/Modulos/VentasTerminadas/Cliente/VentasTerminadas.dproj +++ b/Source/Modulos/VentasTerminadas/Cliente/VentasTerminadas.dproj @@ -46,6 +46,30 @@ Package FalseTrueFalseTrueFalseFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse1030FalseFalseFalseFalseFalse308212521.0.3.01.0.0.0VentasTerminadas.dpk + + + + + + + + + + + + + + + + + + + + + + + + CodeGear WebSnap Components CodeGear SOAP Components Microsoft Office XP Sample Automation Server Wrapper Components @@ -59,76 +83,65 @@ MainSource + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
dmVentasTerminadas
+ TDAClientDataModule
fEditorControlesVentasTerminadas
+ TCustomEditor
fEditorControlResumenVentas
+ TCustomEditor
fEditorControlVentasTerminadas
+ TCustomEditor
ModuleVentasTerminadas
+ TModuleController
frViewControlGridVentasTerminadas
+ TCustomView
frViewControlGridResumenVentas
+ TCustomView
frViewControlesVentasTerminadas
+ TCustomView
frViewControlVentasTerminadas
+ TCustomView diff --git a/Source/Modulos/VentasTerminadas/Cliente/VentasTerminadas.drc b/Source/Modulos/VentasTerminadas/Cliente/VentasTerminadas.drc index c24488a..c15adf6 100644 --- a/Source/Modulos/VentasTerminadas/Cliente/VentasTerminadas.drc +++ b/Source/Modulos/VentasTerminadas/Cliente/VentasTerminadas.drc @@ -22,4 +22,4 @@ END /* C:\Varela_D2007\Source\Modulos\VentasTerminadas\Cliente\uPluginControllerVentasTerminadas.dfm */ /* C:\Varela_D2007\Source\Modulos\VentasTerminadas\Cliente\uEditorControlVentasTerminadas.dfm */ /* C:\Varela_D2007\Source\Modulos\VentasTerminadas\Cliente\VentasTerminadas.res */ -/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtfC.tmp */ +/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf61.tmp */ diff --git a/Source/Servidor/AdminPV_Server.dproj b/Source/Servidor/AdminPV_Server.dproj index 5b62c99..3fb3880 100644 --- a/Source/Servidor/AdminPV_Server.dproj +++ b/Source/Servidor/AdminPV_Server.dproj @@ -1,192 +1,192 @@ - + - - {86364157-b301-43dd-bfad-250a58064559} - AdminPV_Server.dpr - Debug - AnyCPU - DCC32 - ..\..\Output\Debug\Servidor\AdminPV_Server.exe - vcl;rtl;vclx;vclactnband;dbrtl;vcldb;vcldbx;bdertl;dsnap;dbxcds;DbxCommonDriver;dbexpress;dsnapcon;vclib;ibxpress;adortl;IndyCore;IndySystem;IndyProtocols;VclSmp;vclie;xmlrtl;RemObjects_Core_D10;RemObjects_WebBroker_D10;RemObjects_RODX_D10;RemObjects_BPDX_D10;RemObjects_Synapse_D10;RemObjects_Indy_D10;DataAbstract_Core_D10;DataAbstract_IDE_D10;DataAbstract_DBXDriver_D10B;DataAbstract_SQLiteDriver_D10;DataAbstract_Scripting_D10;PascalScript_RO_D10;cxEditorsD10;cxLibraryD10;dxThemeD10;cxDataD10;cxExtEditorsD10;cxGridD10;cxPageControlD10;cxSchedulerD10;cxTreeListD10;cxVerticalGridD10;dxBarD10;dxComnD10;dxBarDBNavD10;dxBarExtDBItemsD10;dxBarExtItemsD10;dxDockingD10;dxLayoutControlD10;dxNavBarD10;dxPSCoreD10;dxsbD10;fqb100;frx10;frxADO10;frxBDE10;frxDB10;frxe10;frxIBX10;fs10;fsADO10;fsBDE10;fsDB10;fsIBX10;PluginSDK_D10R;PNG_D10;PngComponentsD10;tb2k_d10;tbx_d10;ccpack10dsg;ccpack10;EasyListviewD10;GUISDK_D10;JvAppFrmD10R;JvCoreD10R;JclVcl;Jcl;JvSystemD10R;JvStdCtrlsD10R;JvBandsD10R;JvDBD10R;JvDlgsD10R;JvBDED10R;JvCmpD10R;JvCryptD10R;JvCtrlsD10R;JvCustomD10R;JvDockingD10R;JvDotNetCtrlsD10R;JvEDID10R;JvGlobusD10R;JvHMID10R;JvInterpreterD10R;JvJansD10R;JvManagedThreadsD10R;JvMMD10R;JvPageCompsD10R;JvPrintPreviewD10R;JvRuntimeDesignD10R;JvTimeFrameworkD10R;JvUIBD10R;JvValidatorsD10R;JvWizardD10R;JvXPCtrlsD10R;cxIntlPrintSys3D10;cxExportD10;cxIntl5D10;RemObjects_DataSnap_D10 - - - 7.0 - False - False - True - 0 - 3 - ..\..\Output\Release\Servidor - .\ - .\ - .\ - ..\Lib;..\Base - ..\Lib;..\Base - ..\Lib;..\Base - ..\Lib;..\Base - RELEASE - - - 7.0 - True - 3 - ..\..\Output\Debug\Servidor - .\ - .\ - .\ - ..\Lib;..\Base - ..\Lib;..\Base - ..\Lib;..\Base - ..\Lib;..\Base - DEBUG; - - - Delphi.Personality - VCLApplication - - FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse2110FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.1.1.0AdminPV_Server2.1.0.0lunes, 10 de marzo de 2008 13:15AdminPV_Server.dpr - ExpressPrinting System by Developer Express Inc. - CodeGear WebSnap Components - CodeGear SOAP Components - Microsoft Office XP Sample Automation Server Wrapper Components - Microsoft Office 2000 Sample Automation Server Wrapper Components - CodeGear C++Builder Office 2000 Servers Package - CodeGear C++Builder Office XP Servers Package - - - - - - MainSource - - - - -
srvUsuarios
- TDataAbstractService - - - - - - - -
srvControles
- TDARemoteService - - -
srvDevoluciones
- TDARemoteService - - - - - - -
srvParametros
- TDARemoteService - - -
srvRecepciones
- TDARemoteService - - - - - -
srvReferenciaGenerica
- TDARemoteService - - - - -
srvStock
- TDARemoteService - - -
srvTraspasos
- TDARemoteService - - - - -
srvVentasEnProceso
- TDARemoteService - - - - -
srvVentasTerminadas
- TDARemoteService - - - - -
frConexionBD
- TFrame - - -
frConfFicherosEDI
- TFrame - - -
frConfGeneral
- TFrame - - -
fConfiguracion
- - -
FrameConfiguracion
- TFrame - - - - - - - - -
ServerForm
- - - - - - -
dmEDIInventary
- TDataModule - - - - - -
dmEDISales
- TDataModule - - -
srvLogin
- TDARemoteService - - -
srvTransfereciaFicheros
- TRORemoteDataModule - - -
srvInformes
- TDARemoteService - - -
fAcercaDe
- - -
dmServer
- TDataModule - - - - - + + {86364157-b301-43dd-bfad-250a58064559} + AdminPV_Server.dpr + Debug + AnyCPU + DCC32 + ..\..\Output\Debug\Servidor\AdminPV_Server.exe + vcl;rtl;vclx;vclactnband;dbrtl;vcldb;vcldbx;bdertl;dsnap;dbxcds;DbxCommonDriver;dbexpress;dsnapcon;vclib;ibxpress;adortl;IndyCore;IndySystem;IndyProtocols;VclSmp;vclie;xmlrtl;RemObjects_Core_D10;RemObjects_WebBroker_D10;RemObjects_RODX_D10;RemObjects_BPDX_D10;RemObjects_Synapse_D10;RemObjects_Indy_D10;DataAbstract_Core_D10;DataAbstract_IDE_D10;DataAbstract_DBXDriver_D10B;DataAbstract_SQLiteDriver_D10;DataAbstract_Scripting_D10;PascalScript_RO_D10;cxEditorsD10;cxLibraryD10;dxThemeD10;cxDataD10;cxExtEditorsD10;cxGridD10;cxPageControlD10;cxSchedulerD10;cxTreeListD10;cxVerticalGridD10;dxBarD10;dxComnD10;dxBarDBNavD10;dxBarExtDBItemsD10;dxBarExtItemsD10;dxDockingD10;dxLayoutControlD10;dxNavBarD10;dxPSCoreD10;dxsbD10;fqb100;frx10;frxADO10;frxBDE10;frxDB10;frxe10;frxIBX10;fs10;fsADO10;fsBDE10;fsDB10;fsIBX10;PluginSDK_D10R;PNG_D10;PngComponentsD10;tb2k_d10;tbx_d10;ccpack10dsg;ccpack10;EasyListviewD10;GUISDK_D10;JvAppFrmD10R;JvCoreD10R;JclVcl;Jcl;JvSystemD10R;JvStdCtrlsD10R;JvBandsD10R;JvDBD10R;JvDlgsD10R;JvBDED10R;JvCmpD10R;JvCryptD10R;JvCtrlsD10R;JvCustomD10R;JvDockingD10R;JvDotNetCtrlsD10R;JvEDID10R;JvGlobusD10R;JvHMID10R;JvInterpreterD10R;JvJansD10R;JvManagedThreadsD10R;JvMMD10R;JvPageCompsD10R;JvPrintPreviewD10R;JvRuntimeDesignD10R;JvTimeFrameworkD10R;JvUIBD10R;JvValidatorsD10R;JvWizardD10R;JvXPCtrlsD10R;cxIntlPrintSys3D10;cxExportD10;cxIntl5D10;RemObjects_DataSnap_D10 + + + 7.0 + False + False + True + 0 + 3 + ..\..\Output\Release\Servidor + .\ + .\ + .\ + ..\Lib;..\Base + ..\Lib;..\Base + ..\Lib;..\Base + ..\Lib;..\Base + RELEASE + + + 7.0 + True + 3 + ..\..\Output\Debug\Servidor + .\ + .\ + .\ + ..\Lib;..\Base + ..\Lib;..\Base + ..\Lib;..\Base + ..\Lib;..\Base + DEBUG; + + + Delphi.Personality + VCLApplication + +FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse2110FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.1.1.0AdminPV_Server2.1.0.0lunes, 10 de marzo de 2008 13:15AdminPV_Server.dpr + ExpressPrinting System by Developer Express Inc. + CodeGear WebSnap Components + CodeGear SOAP Components + Microsoft Office XP Sample Automation Server Wrapper Components + Microsoft Office 2000 Sample Automation Server Wrapper Components + CodeGear C++Builder Office 2000 Servers Package + CodeGear C++Builder Office XP Servers Package + + + + + + MainSource + + + + +
srvUsuarios
+ TDataAbstractService + + + + + + + +
srvControles
+ TDARemoteService + + +
srvDevoluciones
+ TDARemoteService + + + + + + +
srvParametros
+ TDARemoteService + + +
srvRecepciones
+ TDARemoteService + + + + + +
srvReferenciaGenerica
+ TDARemoteService + + + + +
srvStock
+ TDARemoteService + + +
srvTraspasos
+ TDARemoteService + + + + +
srvVentasEnProceso
+ TDARemoteService + + + + +
srvVentasTerminadas
+ TDARemoteService + + + + +
frConexionBD
+ TFrame + + +
frConfFicherosEDI
+ TFrame + + +
frConfGeneral
+ TFrame + + +
fConfiguracion
+ + +
FrameConfiguracion
+ TFrame + + + + + + + + +
ServerForm
+ + + + + + +
dmEDIInventary
+ TDataModule + + + + + +
dmEDISales
+ TDataModule + + +
srvLogin
+ TDARemoteService + + +
srvTransfereciaFicheros
+ TRORemoteDataModule + + +
srvInformes
+ TDARemoteService + + +
fAcercaDe
+ + +
dmServer
+ TDataModule + + + + +